@portabletext/editor 1.52.4 → 1.52.6

package/lib/index.js

@@ -13,9 +13,9 @@ import { getBlockStartPoint, getBlockKeyFromSelectionPoint, isTextBlock, parseBl
 import { getBlockEndPoint, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-equal-selection-points.js";
 import { isSelectionCollapsed, selectionPointToBlockOffset } from "./_chunks-es/util.selection-point-to-block-offset.js";
 import isEqual from "lodash/isEqual.js";
-import { isKeySegment, defineType, defineField, isPortableTextSpan as isPortableTextSpan$1 } from "@sanity/types";
+import { isKeySegment, defineType, defineField } from "@sanity/types";
 import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, getSelectedBlocks, isSelectionExpanded, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, getFocusBlock as getFocusBlock$1, getFocusBlockObject, getPreviousBlock, getNextBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock } from "./_chunks-es/selector.is-selection-expanded.js";
-import { getFocusInlineObject, isOverlappingSelection, isSelectingEntireBlocks, getTrimmedSelection, getCaretWordSelection, isAtTheEndOfBlock, isAtTheStartOfBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations as getActiveAnnotations$1 } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
+import { getFocusInlineObject, isOverlappingSelection, isSelectingEntireBlocks, getTrimmedSelection, getSelectedSpans, getCaretWordSelection, isAtTheEndOfBlock, isAtTheStartOfBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations as getActiveAnnotations$1 } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
 import getRandomValues from "get-random-values-esm";
 import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
@@ -195,20 +195,6 @@ function getFocusSpan({
   }
   return [void 0, void 0];
 }
-function getSelectedSpans({
-  editor
-}) {
-  if (!editor.selection)
-    return [];
-  try {
-    return Array.from(Editor.nodes(editor, {
-      at: editor.selection,
-      match: (node) => editor.isTextSpan(node)
-    }));
-  } catch {
-    return [];
-  }
-}
 function getSelectionStartBlock({
   editor
 }) {
@@ -4571,40 +4557,6 @@ function createWithPlaceholderBlock(editorActor) {
     }, editor;
   };
 }
-debugWithName("plugin:withPortableTextSelections");
-function createWithPortableTextSelections(editorActor) {
-  let prevSelection = null;
-  return function(editor) {
-    const emitPortableTextSelection = () => {
-      if (prevSelection !== editor.selection) {
-        let ptRange = null;
-        if (editor.selection) {
-          const existing = SLATE_TO_PORTABLE_TEXT_RANGE.get(editor.selection);
-          existing ? ptRange = existing : (ptRange = slateRangeToSelection({
-            schema: editorActor.getSnapshot().context.schema,
-            editor,
-            range: editor.selection
-          }), SLATE_TO_PORTABLE_TEXT_RANGE.set(editor.selection, ptRange));
-        }
-        ptRange ? editorActor.send({
-          type: "update selection",
-          selection: ptRange
-        }) : editorActor.send({
-          type: "update selection",
-          selection: null
-        });
-      }
-      prevSelection = editor.selection;
-    }, {
-      onChange
-    } = editor;
-    return editor.onChange = () => {
-      onChange(), editorActor.getSnapshot().matches({
-        setup: "setting up"
-      }) || emitPortableTextSelection();
-    }, editor;
-  };
-}
 const debug$b = debugWithName("plugin:withSchemaTypes");
 function createWithSchemaTypes({
   editorActor
@@ -4692,12 +4644,23 @@ function getMarkState({
   if (!block || !editor.isTextBlock(block) || !span)
     return;
   if (Range.isExpanded(editor.selection)) {
-    const selectedSpans = getSelectedSpans({
-      editor
+    const selection = editor.selection ? slateRangeToSelection({
+      schema,
+      editor,
+      range: editor.selection
+    }) : null, selectedSpans = getSelectedSpans({
+      context: {
+        value: editor.value,
+        selection,
+        schema,
+        converters: [],
+        keyGenerator: () => "",
+        readOnly: !1
+      }
     });
     let index = 0, marks2 = [];
-    for (const [span2] of selectedSpans)
-      index === 0 ? marks2 = span2.marks ?? [] : (span2.marks?.length === 0 || (span2.marks ?? [])?.some((mark) => !marks2.includes(mark))) && (marks2 = []), index++;
+    for (const span2 of selectedSpans)
+      index === 0 ? marks2 = span2.node.marks ?? [] : (span2.node.marks?.length === 0 || (span2.node.marks ?? [])?.some((mark) => !marks2.includes(mark))) && (marks2 = []), index++;
     return {
       state: "unchanged",
       marks: marks2
@@ -4770,6 +4733,43 @@ function pluginUpdateMarkState(context, editor) {
     });
   }, editor;
 }
+function pluginUpdateSelection({
+  editor,
+  editorActor
+}) {
+  const updateSelection = () => {
+    if (editor.selection) {
+      const existingSelection = SLATE_TO_PORTABLE_TEXT_RANGE.get(editor.selection);
+      if (existingSelection)
+        editorActor.send({
+          type: "update selection",
+          selection: existingSelection
+        });
+      else {
+        const selection = slateRangeToSelection({
+          schema: editorActor.getSnapshot().context.schema,
+          editor,
+          range: editor.selection
+        });
+        SLATE_TO_PORTABLE_TEXT_RANGE.set(editor.selection, selection), editorActor.send({
+          type: "update selection",
+          selection
+        });
+      }
+    } else
+      editorActor.send({
+        type: "update selection",
+        selection: null
+      });
+  }, {
+    onChange
+  } = editor;
+  return editor.onChange = () => {
+    onChange(), editorActor.getSnapshot().matches({
+      setup: "setting up"
+    }) || updateSelection();
+  }, editor;
+}
 function isEditorNode(node) {
   return typeof node == "object" && node !== null ? !("_type" in node) && "children" in node && Array.isArray(node.children) : !1;
 }
@@ -5065,8 +5065,11 @@ const withPlugins = (editor, options) => {
     subscriptions: options.subscriptions
   }), withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor), withPlaceholderBlock = createWithPlaceholderBlock(editorActor), withUtils = createWithUtils({
     editorActor
-  }), withPortableTextSelections = createWithPortableTextSelections(editorActor);
-  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, e))))))))))));
+  });
+  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, pluginUpdateSelection({
+    editorActor,
+    editor: e
+  }))))))))))));
 }, debug$a = debugWithName("setup");
 function createSlateEditor(config) {
   debug$a("Creating new Slate editor instance");
@@ -8334,12 +8337,13 @@ function createEditableAPI(editor, editorActor) {
         return [];
       }
     },
-    isAnnotationActive: (annotationType) => isAnnotationActive({
-      editor,
-      annotation: {
-        name: annotationType
-      }
-    }),
+    isAnnotationActive: (annotationType) => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      });
+      return isActiveAnnotation(annotationType)(snapshot);
+    },
     addAnnotation: (type, value) => {
       let paths;
       return Editor.withoutNormalizing(editor, () => {
@@ -8426,41 +8430,60 @@ function createEditableAPI(editor, editorActor) {
     }
   };
 }
-function isAnnotationActive({
-  editor,
-  annotation
-}) {
-  if (!editor.selection || editor.selection.focus.path.length < 2)
-    return !1;
-  try {
-    const spans = [...Editor.nodes(editor, {
-      at: editor.selection,
-      match: (node) => Text.isText(node)
-    })];
-    if (spans.length === 0 || spans.some(([span]) => !isPortableTextSpan$1(span) || !span.marks || span.marks?.length === 0)) return !1;
-    const selectionMarkDefs = spans.reduce((accMarkDefs, [, path]) => {
-      const [block] = Editor.node(editor, path, {
-        depth: 1
-      });
-      return editor.isTextBlock(block) && block.markDefs ? [...accMarkDefs, ...block.markDefs] : accMarkDefs;
-    }, []);
-    return spans.every(([span]) => isPortableTextSpan$1(span) ? span.marks?.map((markKey) => selectionMarkDefs.find((def) => def?._key === markKey)?._type)?.includes(annotation.name) : !1);
-  } catch {
-    return !1;
-  }
-}
 const relayMachine = setup({
   types: {
+    context: {},
     events: {},
     emitted: {}
   }
 }).createMachine({
   id: "relay",
+  context: {
+    prevSelection: null,
+    lastEventWasFocused: !1
+  },
   on: {
+    focused: {
+      actions: [assign({
+        lastEventWasFocused: !0
+      }), emit(({
+        event
+      }) => event)]
+    },
+    selection: [{
+      guard: ({
+        context
+      }) => context.lastEventWasFocused,
+      actions: [assign({
+        prevSelection: ({
+          event
+        }) => event.selection
+      }), emit(({
+        event
+      }) => event), assign({
+        lastEventWasFocused: !1
+      })]
+    }, {
+      guard: ({
+        context,
+        event
+      }) => context.prevSelection !== event.selection,
+      actions: [assign({
+        prevSelection: ({
+          event
+        }) => event.selection
+      }), emit(({
+        event
+      }) => event), assign({
+        lastEventWasFocused: !1
+      })]
+    }],
     "*": {
-      actions: emit(({
+      actions: [emit(({
         event
-      }) => event)
+      }) => event), assign({
+        lastEventWasFocused: !1
+      })]
     }
   }
 });
@@ -10748,22 +10771,11 @@ const debug = debugWithName("component:Editable"), PortableTextEditable = forwar
     }
     debug("No result from custom paste handler, pasting normally");
   }, [editorActor, onPaste, portableTextEditor, relayActor, slateEditor]), handleOnFocus = useCallback((event_2) => {
-    if (onFocus && onFocus(event_2), !event_2.isDefaultPrevented()) {
-      relayActor.send({
-        type: "focused",
-        event: event_2
-      });
-      const selection_3 = slateEditor.selection ? slateRangeToSelection({
-        schema: editorActor.getSnapshot().context.schema,
-        editor: slateEditor,
-        range: slateEditor.selection
-      }) : null;
-      selection_3 && editorActor.send({
-        type: "update selection",
-        selection: selection_3
-      });
-    }
-  }, [editorActor, onFocus, slateEditor, relayActor]), handleClick = useCallback((event_3) => {
+    onFocus && onFocus(event_2), event_2.isDefaultPrevented() || relayActor.send({
+      type: "focused",
+      event: event_2
+    });
+  }, [onFocus, relayActor]), handleClick = useCallback((event_3) => {
     if (onClick && onClick(event_3), event_3.isDefaultPrevented() || event_3.isPropagationStopped())
       return;
     const position_3 = getEventPosition({