@portabletext/editor 1.47.0 → 1.47.2

package/lib/index.d.cts

@@ -64,7 +64,6 @@ import {
   Values,
 } from 'xstate'
 import {GuardArgs} from 'xstate/guards'
-import {PortableTextMemberSchemaTypes as PortableTextMemberSchemaTypes_2} from '..'
 
 declare type AbstractBehaviorEvent =
   | {
@@ -1455,7 +1454,7 @@ declare const editorMachine: StateMachine<
       converters: Set<Converter>
       keyGenerator: () => string
       pendingEvents: never[]
-      schema: PortableTextMemberSchemaTypes_2
+      schema: EditorSchema
       selection: null
       initialReadOnly: boolean
       maxBlocks: number | undefined
@@ -4965,7 +4964,65 @@ export declare type EditorProviderProps = {
 /**
  * @public
  */
-export declare type EditorSchema = PortableTextMemberSchemaTypes
+export declare type EditorSchema = {
+  annotations: ReadonlyArray<
+    BaseDefinition & {
+      fields: ReadonlyArray<{
+        name: string
+        type: string
+      }>
+    }
+  >
+  block: {
+    name: string
+  }
+  blockObjects: ReadonlyArray<
+    BaseDefinition & {
+      fields: ReadonlyArray<{
+        name: string
+        type: string
+      }>
+    }
+  >
+  decorators: ReadonlyArray<
+    BaseDefinition & {
+      /**
+       * @deprecated
+       * Use `name` instead
+       */
+      value: string
+    }
+  >
+  inlineObjects: ReadonlyArray<
+    BaseDefinition & {
+      fields: ReadonlyArray<{
+        name: string
+        type: string
+      }>
+    }
+  >
+  span: {
+    name: string
+  }
+  styles: ReadonlyArray<
+    BaseDefinition & {
+      /**
+       * @deprecated
+       * Use `name` instead
+       */
+      value: string
+    }
+  >
+  lists: ReadonlyArray<
+    BaseDefinition & {
+      /**
+       * @deprecated
+       * Use `name` instead
+       */
+      value: string
+    }
+  >
+}
 
 /** @public */
 export declare type EditorSelection = {
@@ -5153,6 +5210,7 @@ declare type InternalEditor = Editor & {
     editable: EditableAPI
     editorActor: EditorActor
     slateEditor: SlateEditor
+    legacySchema: PortableTextMemberSchemaTypes
   }
 }
 

package/lib/index.d.ts

@@ -64,7 +64,6 @@ import {
   Values,
 } from 'xstate'
 import {GuardArgs} from 'xstate/guards'
-import {PortableTextMemberSchemaTypes as PortableTextMemberSchemaTypes_2} from '..'
 
 declare type AbstractBehaviorEvent =
   | {
@@ -1455,7 +1454,7 @@ declare const editorMachine: StateMachine<
       converters: Set<Converter>
       keyGenerator: () => string
       pendingEvents: never[]
-      schema: PortableTextMemberSchemaTypes_2
+      schema: EditorSchema
       selection: null
       initialReadOnly: boolean
       maxBlocks: number | undefined
@@ -4965,7 +4964,65 @@ export declare type EditorProviderProps = {
 /**
  * @public
  */
-export declare type EditorSchema = PortableTextMemberSchemaTypes
+export declare type EditorSchema = {
+  annotations: ReadonlyArray<
+    BaseDefinition & {
+      fields: ReadonlyArray<{
+        name: string
+        type: string
+      }>
+    }
+  >
+  block: {
+    name: string
+  }
+  blockObjects: ReadonlyArray<
+    BaseDefinition & {
+      fields: ReadonlyArray<{
+        name: string
+        type: string
+      }>
+    }
+  >
+  decorators: ReadonlyArray<
+    BaseDefinition & {
+      /**
+       * @deprecated
+       * Use `name` instead
+       */
+      value: string
+    }
+  >
+  inlineObjects: ReadonlyArray<
+    BaseDefinition & {
+      fields: ReadonlyArray<{
+        name: string
+        type: string
+      }>
+    }
+  >
+  span: {
+    name: string
+  }
+  styles: ReadonlyArray<
+    BaseDefinition & {
+      /**
+       * @deprecated
+       * Use `name` instead
+       */
+      value: string
+    }
+  >
+  lists: ReadonlyArray<
+    BaseDefinition & {
+      /**
+       * @deprecated
+       * Use `name` instead
+       */
+      value: string
+    }
+  >
+}
 
 /** @public */
 export declare type EditorSelection = {
@@ -5153,6 +5210,7 @@ declare type InternalEditor = Editor & {
     editable: EditableAPI
     editorActor: EditorActor
     slateEditor: SlateEditor
+    legacySchema: PortableTextMemberSchemaTypes
   }
 }
 

package/lib/index.js

@@ -1050,18 +1050,18 @@ const debug = debugWithName("component:Editable"), PLACEHOLDER_STYLE = {
   useImperativeHandle(forwardedRef, () => ref.current);
   const editorActor = useContext(EditorActorContext), readOnly = useSelector(editorActor, (s) => s.matches({
     "edit mode": "read only"
-  })), schemaTypes = useSelector(editorActor, (s_0) => s_0.context.schema), slateEditor = useSlate(), rangeDecorationsActor = useActorRef(rangeDecorationsMachine, {
+  })), slateEditor = useSlate(), rangeDecorationsActor = useActorRef(rangeDecorationsMachine, {
     input: {
       rangeDecorations: rangeDecorations ?? [],
       readOnly,
-      schema: schemaTypes,
+      schema: editorActor.getSnapshot().context.schema,
       slateEditor,
       skipSetup: !editorActor.getSnapshot().matches({
         setup: "setting up"
       })
     }
   });
-  useSelector(rangeDecorationsActor, (s_1) => s_1.context.updateCount);
+  useSelector(rangeDecorationsActor, (s_0) => s_0.context.updateCount);
   const decorate = useMemo(() => createDecorate(rangeDecorationsActor), [rangeDecorationsActor]);
   useEffect(() => {
     rangeDecorationsActor.send({
@@ -1073,17 +1073,15 @@ const debug = debugWithName("component:Editable"), PLACEHOLDER_STYLE = {
       type: "range decorations updated",
       rangeDecorations: rangeDecorations ?? []
     });
-  }, [rangeDecorationsActor, rangeDecorations]);
-  const blockTypeName = schemaTypes.block.name;
-  useMemo(() => {
+  }, [rangeDecorationsActor, rangeDecorations]), useMemo(() => {
     if (readOnly)
       return debug("Editable is in read only mode"), slateEditor;
     const withHotKeys = createWithHotkeys(editorActor, portableTextEditor, hotkeys);
     return debug("Editable is in edit mode"), withHotKeys(slateEditor);
   }, [editorActor, hotkeys, portableTextEditor, readOnly, slateEditor]);
-  const renderElement = useCallback((eProps) => /* @__PURE__ */ jsx(Element$1, { ...eProps, readOnly, renderBlock, renderChild, renderListItem, renderStyle, schemaTypes, spellCheck }), [schemaTypes, spellCheck, readOnly, renderBlock, renderChild, renderListItem, renderStyle]), renderLeaf = useCallback((lProps) => {
+  const renderElement = useCallback((eProps) => /* @__PURE__ */ jsx(Element$1, { ...eProps, readOnly, renderBlock, renderChild, renderListItem, renderStyle, schemaTypes: portableTextEditor.schemaTypes, spellCheck }), [portableTextEditor, spellCheck, readOnly, renderBlock, renderChild, renderListItem, renderStyle]), renderLeaf = useCallback((lProps) => {
     if (lProps.leaf._type === "span") {
-      let rendered = /* @__PURE__ */ jsx(Leaf, { ...lProps, editorActor, schemaTypes, renderAnnotation, renderChild, renderDecorator, readOnly });
+      let rendered = /* @__PURE__ */ jsx(Leaf, { ...lProps, editorActor, schemaTypes: portableTextEditor.schemaTypes, renderAnnotation, renderChild, renderDecorator, readOnly });
       if (renderPlaceholder && lProps.leaf.placeholder && lProps.text.text === "")
         return /* @__PURE__ */ jsxs(Fragment, { children: [
           /* @__PURE__ */ jsx("span", { style: PLACEHOLDER_STYLE, contentEditable: !1, children: renderPlaceholder() }),
@@ -1095,10 +1093,10 @@ const debug = debugWithName("component:Editable"), PLACEHOLDER_STYLE = {
       })), rendered;
     }
     return lProps.children;
-  }, [editorActor, readOnly, renderAnnotation, renderChild, renderDecorator, renderPlaceholder, schemaTypes]), restoreSelectionFromProps = useCallback(() => {
+  }, [editorActor, portableTextEditor, readOnly, renderAnnotation, renderChild, renderDecorator, renderPlaceholder]), restoreSelectionFromProps = useCallback(() => {
     if (propsSelection) {
       debug(`Selection from props ${JSON.stringify(propsSelection)}`);
-      const normalizedSelection = normalizeSelection(propsSelection, fromSlateValue(slateEditor.children, blockTypeName));
+      const normalizedSelection = normalizeSelection(propsSelection, fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name));
       if (normalizedSelection !== null) {
         debug(`Normalized selection from props ${JSON.stringify(normalizedSelection)}`);
         const slateRange = toSlateRange(normalizedSelection, slateEditor);
@@ -1108,7 +1106,7 @@ const debug = debugWithName("component:Editable"), PLACEHOLDER_STYLE = {
         }), slateEditor.onChange());
       }
     }
-  }, [blockTypeName, editorActor, propsSelection, slateEditor]);
+  }, [editorActor, propsSelection, slateEditor]);
   useEffect(() => {
     const onReady = editorActor.on("ready", () => {
       rangeDecorationsActor.send({
@@ -1181,14 +1179,14 @@ const debug = debugWithName("component:Editable"), PLACEHOLDER_STYLE = {
     }
   }, [onCut, editorActor, slateEditor]), handlePaste = useCallback((event_1) => {
     const value = PortableTextEditor.getValue(portableTextEditor), path = (slateEditor.selection ? slateRangeToSelection({
-      schema: schemaTypes,
+      schema: editorActor.getSnapshot().context.schema,
       editor: slateEditor,
       range: slateEditor.selection
     }) : null)?.focus.path || [], onPasteResult = onPaste?.({
       event: event_1,
       value,
       path,
-      schemaTypes
+      schemaTypes: portableTextEditor.schemaTypes
     });
     if (onPasteResult || !slateEditor.selection)
       event_1.preventDefault(), editorActor.send({
@@ -1261,7 +1259,7 @@ const debug = debugWithName("component:Editable"), PLACEHOLDER_STYLE = {
       });
     }
     debug("No result from custom paste handler, pasting normally");
-  }, [editorActor, onPaste, portableTextEditor, schemaTypes, slateEditor]), handleOnFocus = useCallback((event_2) => {
+  }, [editorActor, onPaste, portableTextEditor, slateEditor]), handleOnFocus = useCallback((event_2) => {
     if (onFocus && onFocus(event_2), !event_2.isDefaultPrevented()) {
       const selection_3 = PortableTextEditor.getSelection(portableTextEditor);
       selection_3 === null && (Transforms.select(slateEditor, Editor.start(slateEditor, [])), slateEditor.onChange()), editorActor.send({