@portabletext/editor 1.47.1 → 1.47.3

package/lib/_chunks-cjs/util.is-selection-collapsed.cjs

@@ -1,10 +1,15 @@
 "use strict";
+var util_sliceBlocks = require("./util.slice-blocks.cjs");
 function getSelectionEndPoint(selection) {
   return selection ? selection.backward ? selection.anchor : selection.focus : null;
 }
+function isEqualSelections(a, b) {
+  return !a && !b ? !0 : !a || !b ? !1 : util_sliceBlocks.isEqualSelectionPoints(a.anchor, b.anchor) && util_sliceBlocks.isEqualSelectionPoints(a.focus, b.focus);
+}
 function isSelectionCollapsed(selection) {
   return selection ? selection.anchor.path.join() === selection.focus.path.join() && selection.anchor.offset === selection.focus.offset : !1;
 }
 exports.getSelectionEndPoint = getSelectionEndPoint;
+exports.isEqualSelections = isEqualSelections;
 exports.isSelectionCollapsed = isSelectionCollapsed;
 //# sourceMappingURL=util.is-selection-collapsed.cjs.map

package/lib/_chunks-cjs/util.is-selection-collapsed.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"util.is-selection-collapsed.cjs","sources":["../../src/utils/util.get-selection-end-point.ts","../../src/utils/util.is-selection-collapsed.ts"],"sourcesContent":["import type {EditorSelection, EditorSelectionPoint} from '..'\n\n/**\n * @public\n */\nexport function getSelectionEndPoint<\n  TEditorSelection extends NonNullable<EditorSelection> | null,\n  TEditorSelectionPoint extends\n    EditorSelectionPoint | null = TEditorSelection extends NonNullable<EditorSelection>\n    ? EditorSelectionPoint\n    : null,\n>(selection: TEditorSelection): TEditorSelectionPoint {\n  if (!selection) {\n    return null as TEditorSelectionPoint\n  }\n\n  return (\n    selection.backward ? selection.anchor : selection.focus\n  ) as TEditorSelectionPoint\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function isSelectionCollapsed(selection: EditorSelection) {\n  if (!selection) {\n    return false\n  }\n\n  return (\n    selection.anchor.path.join() === selection.focus.path.join() &&\n    selection.anchor.offset === selection.focus.offset\n  )\n}\n"],"names":["getSelectionEndPoint","selection","backward","anchor","focus","isSelectionCollapsed","path","join","offset"],"mappings":";AAKO,SAASA,qBAMdC,WAAoD;AACpD,SAAKA,YAKHA,UAAUC,WAAWD,UAAUE,SAASF,UAAUG,QAJ3C;AAMX;ACdO,SAASC,qBAAqBJ,WAA4B;AAC/D,SAAKA,YAKHA,UAAUE,OAAOG,KAAKC,KAAAA,MAAWN,UAAUG,MAAME,KAAKC,KAAAA,KACtDN,UAAUE,OAAOK,WAAWP,UAAUG,MAAMI,SALrC;AAOX;;;"}
+{"version":3,"file":"util.is-selection-collapsed.cjs","sources":["../../src/utils/util.get-selection-end-point.ts","../../src/utils/util.is-equal-selections.ts","../../src/utils/util.is-selection-collapsed.ts"],"sourcesContent":["import type {EditorSelection, EditorSelectionPoint} from '..'\n\n/**\n * @public\n */\nexport function getSelectionEndPoint<\n  TEditorSelection extends NonNullable<EditorSelection> | null,\n  TEditorSelectionPoint extends\n    EditorSelectionPoint | null = TEditorSelection extends NonNullable<EditorSelection>\n    ? EditorSelectionPoint\n    : null,\n>(selection: TEditorSelection): TEditorSelectionPoint {\n  if (!selection) {\n    return null as TEditorSelectionPoint\n  }\n\n  return (\n    selection.backward ? selection.anchor : selection.focus\n  ) as TEditorSelectionPoint\n}\n","import type {EditorSelection} from '../types/editor'\nimport {isEqualSelectionPoints} from './util.is-equal-selection-points'\n\n/**\n * @public\n */\nexport function isEqualSelections(a: EditorSelection, b: EditorSelection) {\n  if (!a && !b) {\n    return true\n  }\n\n  if (!a || !b) {\n    return false\n  }\n\n  return (\n    isEqualSelectionPoints(a.anchor, b.anchor) &&\n    isEqualSelectionPoints(a.focus, b.focus)\n  )\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function isSelectionCollapsed(selection: EditorSelection) {\n  if (!selection) {\n    return false\n  }\n\n  return (\n    selection.anchor.path.join() === selection.focus.path.join() &&\n    selection.anchor.offset === selection.focus.offset\n  )\n}\n"],"names":["getSelectionEndPoint","selection","backward","anchor","focus","isEqualSelections","a","b","isEqualSelectionPoints","isSelectionCollapsed","path","join","offset"],"mappings":";;AAKO,SAASA,qBAMdC,WAAoD;AACpD,SAAKA,YAKHA,UAAUC,WAAWD,UAAUE,SAASF,UAAUG,QAJ3C;AAMX;ACbgBC,SAAAA,kBAAkBC,GAAoBC,GAAoB;AACpE,SAAA,CAACD,KAAK,CAACC,IACF,KAGL,CAACD,KAAK,CAACC,IACF,KAIPC,iBAAAA,uBAAuBF,EAAEH,QAAQI,EAAEJ,MAAM,KACzCK,wCAAuBF,EAAEF,OAAOG,EAAEH,KAAK;AAE3C;ACdO,SAASK,qBAAqBR,WAA4B;AAC/D,SAAKA,YAKHA,UAAUE,OAAOO,KAAKC,KAAAA,MAAWV,UAAUG,MAAMM,KAAKC,KAAAA,KACtDV,UAAUE,OAAOS,WAAWX,UAAUG,MAAMQ,SALrC;AAOX;;;;"}

package/lib/_chunks-es/util.is-selection-collapsed.js

@@ -1,11 +1,16 @@
+import { isEqualSelectionPoints } from "./util.slice-blocks.js";
 function getSelectionEndPoint(selection) {
   return selection ? selection.backward ? selection.anchor : selection.focus : null;
 }
+function isEqualSelections(a, b) {
+  return !a && !b ? !0 : !a || !b ? !1 : isEqualSelectionPoints(a.anchor, b.anchor) && isEqualSelectionPoints(a.focus, b.focus);
+}
 function isSelectionCollapsed(selection) {
   return selection ? selection.anchor.path.join() === selection.focus.path.join() && selection.anchor.offset === selection.focus.offset : !1;
 }
 export {
   getSelectionEndPoint,
+  isEqualSelections,
   isSelectionCollapsed
 };
 //# sourceMappingURL=util.is-selection-collapsed.js.map

package/lib/_chunks-es/util.is-selection-collapsed.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.is-selection-collapsed.js","sources":["../../src/utils/util.get-selection-end-point.ts","../../src/utils/util.is-selection-collapsed.ts"],"sourcesContent":["import type {EditorSelection, EditorSelectionPoint} from '..'\n\n/**\n * @public\n */\nexport function getSelectionEndPoint<\n  TEditorSelection extends NonNullable<EditorSelection> | null,\n  TEditorSelectionPoint extends\n    EditorSelectionPoint | null = TEditorSelection extends NonNullable<EditorSelection>\n    ? EditorSelectionPoint\n    : null,\n>(selection: TEditorSelection): TEditorSelectionPoint {\n  if (!selection) {\n    return null as TEditorSelectionPoint\n  }\n\n  return (\n    selection.backward ? selection.anchor : selection.focus\n  ) as TEditorSelectionPoint\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function isSelectionCollapsed(selection: EditorSelection) {\n  if (!selection) {\n    return false\n  }\n\n  return (\n    selection.anchor.path.join() === selection.focus.path.join() &&\n    selection.anchor.offset === selection.focus.offset\n  )\n}\n"],"names":["getSelectionEndPoint","selection","backward","anchor","focus","isSelectionCollapsed","path","join","offset"],"mappings":"AAKO,SAASA,qBAMdC,WAAoD;AACpD,SAAKA,YAKHA,UAAUC,WAAWD,UAAUE,SAASF,UAAUG,QAJ3C;AAMX;ACdO,SAASC,qBAAqBJ,WAA4B;AAC/D,SAAKA,YAKHA,UAAUE,OAAOG,KAAKC,KAAAA,MAAWN,UAAUG,MAAME,KAAKC,KAAAA,KACtDN,UAAUE,OAAOK,WAAWP,UAAUG,MAAMI,SALrC;AAOX;"}
+{"version":3,"file":"util.is-selection-collapsed.js","sources":["../../src/utils/util.get-selection-end-point.ts","../../src/utils/util.is-equal-selections.ts","../../src/utils/util.is-selection-collapsed.ts"],"sourcesContent":["import type {EditorSelection, EditorSelectionPoint} from '..'\n\n/**\n * @public\n */\nexport function getSelectionEndPoint<\n  TEditorSelection extends NonNullable<EditorSelection> | null,\n  TEditorSelectionPoint extends\n    EditorSelectionPoint | null = TEditorSelection extends NonNullable<EditorSelection>\n    ? EditorSelectionPoint\n    : null,\n>(selection: TEditorSelection): TEditorSelectionPoint {\n  if (!selection) {\n    return null as TEditorSelectionPoint\n  }\n\n  return (\n    selection.backward ? selection.anchor : selection.focus\n  ) as TEditorSelectionPoint\n}\n","import type {EditorSelection} from '../types/editor'\nimport {isEqualSelectionPoints} from './util.is-equal-selection-points'\n\n/**\n * @public\n */\nexport function isEqualSelections(a: EditorSelection, b: EditorSelection) {\n  if (!a && !b) {\n    return true\n  }\n\n  if (!a || !b) {\n    return false\n  }\n\n  return (\n    isEqualSelectionPoints(a.anchor, b.anchor) &&\n    isEqualSelectionPoints(a.focus, b.focus)\n  )\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function isSelectionCollapsed(selection: EditorSelection) {\n  if (!selection) {\n    return false\n  }\n\n  return (\n    selection.anchor.path.join() === selection.focus.path.join() &&\n    selection.anchor.offset === selection.focus.offset\n  )\n}\n"],"names":["getSelectionEndPoint","selection","backward","anchor","focus","isEqualSelections","a","b","isEqualSelectionPoints","isSelectionCollapsed","path","join","offset"],"mappings":";AAKO,SAASA,qBAMdC,WAAoD;AACpD,SAAKA,YAKHA,UAAUC,WAAWD,UAAUE,SAASF,UAAUG,QAJ3C;AAMX;ACbgBC,SAAAA,kBAAkBC,GAAoBC,GAAoB;AACpE,SAAA,CAACD,KAAK,CAACC,IACF,KAGL,CAACD,KAAK,CAACC,IACF,KAIPC,uBAAuBF,EAAEH,QAAQI,EAAEJ,MAAM,KACzCK,uBAAuBF,EAAEF,OAAOG,EAAEH,KAAK;AAE3C;ACdO,SAASK,qBAAqBR,WAA4B;AAC/D,SAAKA,YAKHA,UAAUE,OAAOO,KAAKC,KAAAA,MAAWV,UAAUG,MAAMM,KAAKC,KAAAA,KACtDV,UAAUE,OAAOS,WAAWX,UAAUG,MAAMQ,SALrC;AAOX;"}

package/lib/index.cjs

@@ -1036,18 +1036,18 @@ const debug = editorProvider.debugWithName("component:Editable"), PLACEHOLDER_ST
   React.useImperativeHandle(forwardedRef, () => ref.current);
   const editorActor = React.useContext(editorProvider.EditorActorContext), readOnly = react.useSelector(editorActor, (s) => s.matches({
     "edit mode": "read only"
-  })), schemaTypes = react.useSelector(editorActor, (s_0) => s_0.context.schema), slateEditor = slateReact.useSlate(), rangeDecorationsActor = react.useActorRef(rangeDecorationsMachine, {
+  })), slateEditor = slateReact.useSlate(), rangeDecorationsActor = react.useActorRef(rangeDecorationsMachine, {
     input: {
       rangeDecorations: rangeDecorations ?? [],
       readOnly,
-      schema: schemaTypes,
+      schema: editorActor.getSnapshot().context.schema,
       slateEditor,
       skipSetup: !editorActor.getSnapshot().matches({
         setup: "setting up"
       })
     }
   });
-  react.useSelector(rangeDecorationsActor, (s_1) => s_1.context.updateCount);
+  react.useSelector(rangeDecorationsActor, (s_0) => s_0.context.updateCount);
   const decorate = React.useMemo(() => createDecorate(rangeDecorationsActor), [rangeDecorationsActor]);
   React.useEffect(() => {
     rangeDecorationsActor.send({
@@ -1059,9 +1059,7 @@ const debug = editorProvider.debugWithName("component:Editable"), PLACEHOLDER_ST
       type: "range decorations updated",
       rangeDecorations: rangeDecorations ?? []
     });
-  }, [rangeDecorationsActor, rangeDecorations]);
-  const blockTypeName = schemaTypes.block.name;
-  React.useMemo(() => {
+  }, [rangeDecorationsActor, rangeDecorations]), React.useMemo(() => {
     if (readOnly)
       return debug("Editable is in read only mode"), slateEditor;
     const withHotKeys = createWithHotkeys(editorActor, portableTextEditor, hotkeys);
@@ -1081,10 +1079,10 @@ const debug = editorProvider.debugWithName("component:Editable"), PLACEHOLDER_ST
       })), rendered;
     }
     return lProps.children;
-  }, [editorActor, portableTextEditor.schemaTypes, readOnly, renderAnnotation, renderChild, renderDecorator, renderPlaceholder]), restoreSelectionFromProps = React.useCallback(() => {
+  }, [editorActor, portableTextEditor, readOnly, renderAnnotation, renderChild, renderDecorator, renderPlaceholder]), restoreSelectionFromProps = React.useCallback(() => {
     if (propsSelection) {
       debug(`Selection from props ${JSON.stringify(propsSelection)}`);
-      const normalizedSelection = normalizeSelection(propsSelection, editorProvider.fromSlateValue(slateEditor.children, blockTypeName));
+      const normalizedSelection = normalizeSelection(propsSelection, editorProvider.fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name));
       if (normalizedSelection !== null) {
         debug(`Normalized selection from props ${JSON.stringify(normalizedSelection)}`);
         const slateRange = editorProvider.toSlateRange(normalizedSelection, slateEditor);
@@ -1094,7 +1092,7 @@ const debug = editorProvider.debugWithName("component:Editable"), PLACEHOLDER_ST
         }), slateEditor.onChange());
       }
     }
-  }, [blockTypeName, editorActor, propsSelection, slateEditor]);
+  }, [editorActor, propsSelection, slateEditor]);
   React.useEffect(() => {
     const onReady = editorActor.on("ready", () => {
       rangeDecorationsActor.send({
@@ -1166,8 +1164,8 @@ const debug = editorProvider.debugWithName("component:Editable"), PLACEHOLDER_ST
       });
     }
   }, [onCut, editorActor, slateEditor]), handlePaste = React.useCallback((event_1) => {
-    const value = editorProvider.PortableTextEditor.getValue(portableTextEditor), path = (slateEditor.selection ? editorProvider.slateRangeToSelection({
-      schema: schemaTypes,
+    const value = editorProvider.fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name, editorProvider.KEY_TO_VALUE_ELEMENT.get(slateEditor)), path = (slateEditor.selection ? editorProvider.slateRangeToSelection({
+      schema: editorActor.getSnapshot().context.schema,
       editor: slateEditor,
       range: slateEditor.selection
     }) : null)?.focus.path || [], onPasteResult = onPaste?.({
@@ -1247,20 +1245,28 @@ const debug = editorProvider.debugWithName("component:Editable"), PLACEHOLDER_ST
       });
     }
     debug("No result from custom paste handler, pasting normally");
-  }, [editorActor, onPaste, portableTextEditor, schemaTypes, slateEditor]), handleOnFocus = React.useCallback((event_2) => {
+  }, [editorActor, onPaste, portableTextEditor, slateEditor]), handleOnFocus = React.useCallback((event_2) => {
     if (onFocus && onFocus(event_2), !event_2.isDefaultPrevented()) {
-      const selection_3 = editorProvider.PortableTextEditor.getSelection(portableTextEditor);
-      selection_3 === null && (slate.Transforms.select(slateEditor, slate.Editor.start(slateEditor, [])), slateEditor.onChange()), editorActor.send({
+      const selectionBefore = slateEditor.selection ? editorProvider.slateRangeToSelection({
+        schema: editorActor.getSnapshot().context.schema,
+        editor: slateEditor,
+        range: slateEditor.selection
+      }) : null;
+      editorActor.send({
         type: "notify.focused",
         event: event_2
       });
-      const newSelection = editorProvider.PortableTextEditor.getSelection(portableTextEditor);
-      selection_3 === newSelection && editorActor.send({
+      const selectionAfter = slateEditor.selection ? editorProvider.slateRangeToSelection({
+        schema: editorActor.getSnapshot().context.schema,
+        editor: slateEditor,
+        range: slateEditor.selection
+      }) : null;
+      selectionBefore && selectionAfter && util_isSelectionCollapsed.isEqualSelections(selectionBefore, selectionAfter) && editorActor.send({
         type: "notify.selection",
-        selection: selection_3
+        selection: selectionBefore
       });
     }
-  }, [editorActor, onFocus, portableTextEditor, slateEditor]), handleClick = React.useCallback((event_3) => {
+  }, [editorActor, onFocus, slateEditor]), handleClick = React.useCallback((event_3) => {
     if (onClick && onClick(event_3), event_3.isDefaultPrevented() || event_3.isPropagationStopped())
       return;
     const position_3 = getEventPosition({