Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(pte): add hideToolbar and fullscreen props to PortableTextInput #6621

Merged
merged 5 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dev/test-studio/schema/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ import numbers from './standard/numbers'
import objects, {myObject} from './standard/objects'
import {ptAllTheBellsAndWhistlesType} from './standard/portableText/allTheBellsAndWhistles'
import blocks from './standard/portableText/blocks'
import {ptCustomBlockEditors} from './standard/portableText/customBlockEditors'
import {ptCustomMarkersTestType} from './standard/portableText/customMarkers'
import manyEditors from './standard/portableText/manyEditors'
import richTextObject from './standard/portableText/richTextObject'
Expand Down Expand Up @@ -159,6 +160,7 @@ export const schemaTypes = [
objects,
ptAllTheBellsAndWhistlesType,
blocks,
ptCustomBlockEditors,
ptCustomMarkersTestType,
richTextObject,
...Object.values(scrollBugTypes),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import {BlockEditor, defineType, type PortableTextInputProps} from 'sanity'

export const ptCustomBlockEditors = defineType({
name: 'pt_customBlockEditors',
title: 'BlockEditor examples',
type: 'document',
fields: [
{
name: 'title',
title: 'Title',
type: 'string',
},
{
name: 'default',
title: 'Default',
type: 'array',
of: [{type: 'block'}],
},
{
name: 'hiddenToolbar',
title: 'Hidden toolbar',
description: 'hideToolbar=true',
type: 'array',
components: {
input: (props: PortableTextInputProps) => <BlockEditor {...props} hideToolbar />,
},
of: [{type: 'block'}],
},
{
name: 'readOnly',
title: 'Read only',
description: 'readOnly=true',
type: 'array',
components: {
input: (props: PortableTextInputProps) => <BlockEditor {...props} readOnly />,
},
of: [{type: 'block'}],
},
],
})
1 change: 1 addition & 0 deletions dev/test-studio/structure/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const STANDARD_PORTABLE_TEXT_INPUT_TYPES = [
'simpleBlock',
'manyEditors',
'documentWithHoistedPt',
'pt_customBlockEditors',
]

export const PLUGIN_INPUT_TYPES = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {TextBlock} from './text'
interface InputProps extends ArrayOfObjectsInputProps<PortableTextBlock> {
elementRef: React.RefObject<HTMLDivElement>
hasFocusWithin: boolean
hideToolbar?: boolean
hotkeys?: HotkeyOptions
isActive: boolean
isFullscreen: boolean
Expand All @@ -54,6 +55,7 @@ export function Compositor(props: Omit<InputProps, 'schemaType' | 'arrayFunction
focused,
focusPath = EMPTY_ARRAY,
hasFocusWithin,
hideToolbar,
hotkeys,
isActive,
isFullscreen,
Expand Down Expand Up @@ -392,6 +394,7 @@ export function Compositor(props: Omit<InputProps, 'schemaType' | 'arrayFunction
ariaDescribedBy={ariaDescribedBy}
elementRef={elementRef}
initialSelection={initialSelection}
hideToolbar={hideToolbar}
hotkeys={editorHotkeys}
isActive={isActive}
isFullscreen={isFullscreen}
Expand Down Expand Up @@ -420,6 +423,7 @@ export function Compositor(props: Omit<InputProps, 'schemaType' | 'arrayFunction
editorRenderChild,
elementRef,
handleToggleFullscreen,
hideToolbar,
initialSelection,
isActive,
isFullscreen,
Expand Down
4 changes: 3 additions & 1 deletion packages/sanity/src/core/form/inputs/PortableText/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const PlaceholderWrapper = styled.span((props) => {

interface EditorProps {
elementRef: React.RefObject<HTMLDivElement>
hideToolbar?: boolean
hotkeys: HotkeyOptions
initialSelection?: EditorSelection
isActive: boolean
Expand Down Expand Up @@ -89,6 +90,7 @@ const renderListItem: RenderListItemFunction = (props) => {
export function Editor(props: EditorProps): ReactNode {
const {
elementRef,
hideToolbar,
hotkeys,
initialSelection,
isActive,
Expand Down Expand Up @@ -192,7 +194,7 @@ export function Editor(props: EditorProps): ReactNode {

return (
<Root data-fullscreen={isFullscreen} data-testid="pt-editor">
{isActive && (
{isActive && !hideToolbar && (
<TooltipDelayGroupProvider>
<ToolbarCard data-testid="pt-editor__toolbar-card" shadow={1}>
<Toolbar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export function PortableTextInput(props: PortableTextInputProps): ReactNode {
editorRef: editorRefProp,
elementProps,
hotkeys,
initialFullscreen,
markers = EMPTY_ARRAY,
onChange,
onCopy,
Expand Down Expand Up @@ -118,7 +119,7 @@ export function PortableTextInput(props: PortableTextInputProps): ReactNode {
const {t} = useTranslation()
const [ignoreValidationError, setIgnoreValidationError] = useState(false)
const [invalidValue, setInvalidValue] = useState<InvalidValue | null>(null)
const [isFullscreen, setIsFullscreen] = useState(false)
const [isFullscreen, setIsFullscreen] = useState(initialFullscreen ?? false)
const [isActive, setIsActive] = useState(false)
const [isOffline, setIsOffline] = useState(false)
const [hasFocusWithin, setHasFocusWithin] = useState(false)
Expand Down
8 changes: 8 additions & 0 deletions packages/sanity/src/core/form/types/inputProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -507,10 +507,18 @@ export interface PortableTextInputProps
* A React Ref that can reference the underlying editor instance
*/
editorRef?: React.MutableRefObject<PortableTextEditor | null>
/**
* Option to hide the default toolbar
*/
hideToolbar?: boolean
/**
* Assign hotkeys that can be attached to custom editing functions
*/
hotkeys?: HotkeyOptions
/**
* Whether the input is _initially_ open in fullscreen mode
*/
initialFullscreen?: boolean
/**
* Array of {@link PortableTextMarker} with meta data connected to the content.
* @deprecated will be removed in the next major version of Sanity Studio.
Expand Down
Loading