@portabletext/editor 7.10.1 → 7.10.2

package/lib/index.js

@@ -3,13 +3,13 @@ import { c } from "react/compiler-runtime";
 import { useSelector, useActorRef } from "@xstate/react";
 import React, { createContext, useContext, useRef, useEffect, useLayoutEffect, useState, useReducer, useCallback, memo, forwardRef, useMemo, Component, useSyncExternalStore, startTransition } from "react";
 import { serializePath, isKeyedSegment, getNode, getParent, parentPath, getChildren, getNodeChildren } from "./_chunks-es/get-parent.js";
-import { isPath, getLeaf, isRange, isPoint, isObject, isLeafObject, getAncestor, pathContains, getSpan, isBeforePoint, getText, rangeIntersects, getTextBlock, getUnionSchema, getFirstChild, getContainer } from "./_chunks-es/get-container.js";
+import { isPath, getLeaf, isRange, isPoint, isObject, isLeafObject, getAncestor, pathContains, getSpan, isBeforePoint, getText, rangeIntersects, getTextBlock, getFirstChild, getLastChild, getUnionSchema, getContainer } from "./_chunks-es/get-container.js";
 import { rangeEdges, isTextBlockNode, isBackwardRange, hasNode, getNodes, isAncestorPath, isEditableContainer, getSibling, isInline, isObject as isObject$1, isSpanNode, isBlock, getEnclosingBlock, getAncestors, getPathSubSchema, getBlock, resolveContainerAt, resolveChildEntryIndex, getEnclosingContainer, comparePoints$1 as comparePoints, comparePaths, isAfterPoint } from "./_chunks-es/get-path-sub-schema.js";
 import { isSpan, isTextBlock, getSubSchema, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
 import scrollIntoView from "scroll-into-view-if-needed";
 import { createKeyboardShortcut, undo, redo, code, underline, italic as italic$1, bold as bold$1 } from "@portabletext/keyboard-shortcuts";
-import { rangesOverlap, getFocusInlineObject, isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan, getFragment, isSelectionExpanded, getSelectionStartBlock, getSelectionEndBlock, isOverlappingSelection, getFocusBlock, getSelectedBlocks, isSelectingEntireBlocks, getSelectedValue, isActiveAnnotation, getActiveAnnotationsMarks, getActiveDecorators, getCaretWordSelection, getSelectionStartChild, getSelectionStartPoint, getSelectionEndChild, getSelectionEndPoint, getPreviousSpan, getNextSpan, getFocusBlockObject, getLastBlock, getFirstBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getRootAcceptedTypes, getMarkState, getFocusListBlock, getNextBlock, getPreviousBlock, getSelectedTextBlocks, isActiveDecorator, getFocusChild, getActiveAnnotations, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
+import { rangesOverlap, getFocusInlineObject, isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan, getFragment, isSelectionExpanded, getSelectionStartBlock, getSelectionEndBlock, isOverlappingSelection, getFocusBlock, getSelectedBlocks, isSelectingEntireBlocks, getSelectedValue, isActiveAnnotation, getActiveAnnotationsMarks, getActiveDecorators, getCaretWordSelection, getSelectionStartChild, getSelectionStartPoint, getSelectionEndChild, getSelectionEndPoint, getPreviousSpan, getNextSpan, getFocusBlockObject, isAtTheEndOfBlock, isAtTheStartOfBlock, getLastBlock, getRootAcceptedTypes, getMarkState, getFocusListBlock, getNextBlock, getPreviousBlock, getSelectedTextBlocks, isActiveDecorator, getFocusChild, getActiveAnnotations, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
 import { isEqualSelectionPoints, blockOffsetToSpanSelectionPoint, getBlockKeyFromSelectionPoint, getBlockEndPoint, getBlockStartPoint, isSelectionCollapsed, defaultKeyGenerator, parseBlocks, parseBlock, isListBlock, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject } from "./_chunks-es/util.slice-blocks.js";
 import rawDebug from "debug";
 import { isEmptyTextBlock, isEqualSelections, getTextBlockText } from "./_chunks-es/util.is-equal-selections.js";
@@ -3900,7 +3900,14 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
         return;
     }
     leafEl.getBoundingClientRect = domFocusPoint.getBoundingClientRect.bind(domFocusPoint), scrollIntoView(leafEl, {
-      scrollMode: "if-needed"
+      scrollMode: "if-needed",
+      // Native-caret semantics: the minimal delta to the nearest edge. The
+      // library's default `block: 'center'` re-centered the viewport on
+      // every sync whose focus was even slightly clipped, yanking the
+      // editor around on programmatic selects (a table handle click whose
+      // rectangle ends in an off-screen column, for example).
+      block: "nearest",
+      inline: "nearest"
     }), delete leafEl.getBoundingClientRect;
   }
 }, isEventHandled = (event, handler) => handler ? handler(event) ?? (event.isDefaultPrevented() || event.isPropagationStopped()) : !1, isDOMEventTargetInput = (event) => isDOMNode(event.target) && (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement), isDOMEventHandled = (event, handler) => handler ? handler(event) ?? event.defaultPrevented : !1, handleNativeHistoryEvents = (editor, editorActor, event) => {
@@ -4127,7 +4134,7 @@ function getEventPosition({
         }
       }
     };
-  if (eventPositionBlock && !isEditor(eventNode) && isEditableContainer(editorEngine.snapshot, eventNode, eventPath) && isDragEvent(event))
+  if (eventPositionBlock && !isEditor(eventNode) && isEditableContainer(editorEngine.snapshot, eventNode, eventPath) && (isDragEvent(event) || event.type === "click"))
     return {
       block: eventPositionBlock,
       isEditor: !1,
@@ -11276,32 +11283,36 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
   }) => {
     if (snapshot.context.readOnly || snapshot.context.selection && !isSelectionCollapsed$1(snapshot))
       return !1;
-    const positionSnapshot = {
-      ...snapshot,
-      context: {
-        ...snapshot.context,
-        selection: event.position.selection
-      }
-    }, focusedBlockObject = getFocusBlockObject(positionSnapshot);
-    if (!focusedBlockObject)
+    const focusPath = event.position.selection.focus.path, focusBlock = event.position.isEditor ? focusPath.length >= 1 ? getNode(snapshot, focusPath.slice(0, 1)) : void 0 : event.position.isContainer ? getFirstChild(snapshot, focusPath) : void 0;
+    if (!focusBlock || isTextBlockNode(snapshot.context, focusBlock.node) || event.position.isContainer && !acceptsTextBlock(snapshot, focusBlock.path))
       return !1;
-    const previousSibling = getSibling(snapshot, focusedBlockObject.path, {
+    const previousSibling = getSibling(snapshot, focusBlock.path, {
       direction: "previous"
     });
-    return (event.position.isEditor || event.position.isContainer) && event.position.block === "start" && !previousSibling;
+    return (event.position.isEditor || event.position.isContainer) && event.position.block === "start" && !previousSibling ? {
+      blockPath: focusBlock.path
+    } : !1;
   },
   actions: [({
-    snapshot,
-    event
+    snapshot
+  }, {
+    blockPath
   }) => [raise({
-    type: "select",
-    at: event.position.selection
-  }), raise({
     type: "insert.block",
     block: {
       _type: snapshot.context.schema.block.name
     },
     placement: "before",
+    at: {
+      anchor: {
+        path: blockPath,
+        offset: 0
+      },
+      focus: {
+        path: blockPath,
+        offset: 0
+      }
+    },
     select: "start"
   })]]
 }), clickingBelowLonelyBlockObject = defineBehavior({
@@ -11312,35 +11323,44 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
   }) => {
     if (snapshot.context.readOnly || snapshot.context.selection && !isSelectionCollapsed$1(snapshot))
       return !1;
-    const positionSnapshot = {
-      ...snapshot,
-      context: {
-        ...snapshot.context,
-        selection: event.position.selection
-      }
-    }, focusedBlockObject = getFocusBlockObject(positionSnapshot);
-    if (!focusedBlockObject)
+    const focusPath = event.position.selection.focus.path, focusBlock = event.position.isEditor ? focusPath.length >= 1 ? getNode(snapshot, focusPath.slice(0, 1)) : void 0 : event.position.isContainer ? getLastChild(snapshot, focusPath) : void 0;
+    if (!focusBlock || isTextBlockNode(snapshot.context, focusBlock.node) || event.position.isContainer && !acceptsTextBlock(snapshot, focusBlock.path))
       return !1;
-    const nextSibling = getSibling(snapshot, focusedBlockObject.path, {
+    const nextSibling = getSibling(snapshot, focusBlock.path, {
       direction: "next"
     });
-    return (event.position.isEditor || event.position.isContainer) && event.position.block === "end" && !nextSibling;
+    return (event.position.isEditor || event.position.isContainer) && event.position.block === "end" && !nextSibling ? {
+      blockPath: focusBlock.path
+    } : !1;
   },
   actions: [({
-    snapshot,
-    event
+    snapshot
+  }, {
+    blockPath
   }) => [raise({
-    type: "select",
-    at: event.position.selection
-  }), raise({
     type: "insert.block",
     block: {
       _type: snapshot.context.schema.block.name
     },
     placement: "after",
+    at: {
+      anchor: {
+        path: blockPath,
+        offset: 0
+      },
+      focus: {
+        path: blockPath,
+        offset: 0
+      }
+    },
     select: "start"
   })]]
-}), deletingEmptyTextBlockAfterBlockObject = defineBehavior({
+});
+function acceptsTextBlock(snapshot, path2) {
+  const enclosing = getEnclosingContainer(snapshot, path2);
+  return !enclosing || enclosing.of.some((member) => member.type === snapshot.context.schema.block.name);
+}
+const deletingEmptyTextBlockAfterBlockObject = defineBehavior({
   on: "delete.backward",
   guard: ({
     snapshot
@@ -11426,34 +11446,80 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
   clickingBelowLonelyBlockObject,
   deletingEmptyTextBlockAfterBlockObject,
   deletingEmptyTextBlockBeforeBlockObject
-}, arrowDownOutOfContainer = defineBehavior({
+}, anyArrowDown = createKeyboardShortcut({
+  default: [{
+    key: "ArrowDown"
+  }]
+}), anyArrowUp = createKeyboardShortcut({
+  default: [{
+    key: "ArrowUp"
+  }]
+}), arrowDownOutOfContainer = defineBehavior({
   on: "keyboard.keydown",
   guard: ({
     snapshot,
     event
-  }) => event.originEvent.key === "ArrowDown" && isAtContainerDeadEnd(snapshot, "end"),
-  actions: []
+  }) => !anyArrowDown.guard(event.originEvent) || !isAtContainerDeadEnd(snapshot, "end") ? !1 : {
+    escapeTarget: arrowEscapeTarget(snapshot, event.originEvent, "end")
+  },
+  actions: [({
+    snapshot
+  }, {
+    escapeTarget
+  }) => escapeTarget ? [escapeAction(snapshot, escapeTarget, "after")] : []]
 }), arrowUpOutOfContainer = defineBehavior({
   on: "keyboard.keydown",
   guard: ({
     snapshot,
     event
-  }) => event.originEvent.key === "ArrowUp" && isAtContainerDeadEnd(snapshot, "start"),
-  actions: []
+  }) => !anyArrowUp.guard(event.originEvent) || !isAtContainerDeadEnd(snapshot, "start") ? !1 : {
+    escapeTarget: arrowEscapeTarget(snapshot, event.originEvent, "start")
+  },
+  actions: [({
+    snapshot
+  }, {
+    escapeTarget
+  }) => escapeTarget ? [escapeAction(snapshot, escapeTarget, "before")] : []]
 });
+function arrowEscapeTarget(snapshot, originEvent, edge) {
+  if (!(edge === "end" ? defaultKeyboardShortcuts.arrowDown.guard(originEvent) : defaultKeyboardShortcuts.arrowUp.guard(originEvent)))
+    return;
+  const focusTextBlock = getFocusTextBlock(snapshot);
+  return focusTextBlock ? getEscapeTarget(snapshot, focusTextBlock.path) : void 0;
+}
+function escapeAction(snapshot, escapeTarget, placement) {
+  return raise({
+    type: "insert.block",
+    block: createPlaceholderBlock(snapshot, escapeTarget),
+    placement,
+    at: {
+      anchor: {
+        path: escapeTarget,
+        offset: 0
+      },
+      focus: {
+        path: escapeTarget,
+        offset: 0
+      }
+    },
+    select: "start"
+  });
+}
 function isAtContainerDeadEnd(snapshot, edge) {
   if (!isSelectionCollapsed$1(snapshot))
     return !1;
   const focusTextBlock = getFocusTextBlock(snapshot);
-  if (!focusTextBlock)
-    return !1;
-  const container = getAncestor(snapshot, focusTextBlock.path, {
+  if (!focusTextBlock || !getAncestor(snapshot, focusTextBlock.path, {
     match: (node, path2) => isEditableContainer(snapshot, node, path2)
-  });
-  if (!container)
+  }))
     return !1;
-  const edgeBlock = edge === "end" ? getLastBlock(snapshot) : getFirstBlock(snapshot);
-  return !edgeBlock || !pathEquals(edgeBlock.path, focusTextBlock.path) || !(edge === "end" ? isAtTheEndOfBlock(focusTextBlock)(snapshot) : isAtTheStartOfBlock(focusTextBlock)(snapshot)) ? !1 : getSibling(snapshot, container.path, {
+  const rootSegment = focusTextBlock.path[0];
+  if (!rootSegment)
+    return !1;
+  const outerPath = [rootSegment], edgeLeaf = getLeaf(snapshot, outerPath, {
+    edge
+  }), edgeBlock = edgeLeaf && getEnclosingBlock(snapshot, edgeLeaf.path);
+  return !edgeBlock || !pathEquals(edgeBlock.path, focusTextBlock.path) || !(edge === "end" ? isAtTheEndOfBlock(focusTextBlock)(snapshot) : isAtTheStartOfBlock(focusTextBlock)(snapshot)) ? !1 : getSibling(snapshot, outerPath, {
     direction: edge === "end" ? "next" : "previous"
   }) === void 0;
 }