@portabletext/editor 1.40.3 → 1.40.4

package/lib/index.js

@@ -1,4 +1,4 @@
-import { fromSlateValue, toPortableTextRange, toSlateRange, debugWithName, EditorActorContext, KEY_TO_VALUE_ELEMENT, usePortableTextEditor, PortableTextEditor, moveRangeByOperation, isEqualToEmptyEditor, getEditorSnapshot, useEditor } from "./_chunks-es/editor-provider.js";
+import { getNodeBlock, toPortableTextRange, fromSlateValue, toSlateRange, debugWithName, EditorActorContext, KEY_TO_VALUE_ELEMENT, usePortableTextEditor, PortableTextEditor, moveRangeByOperation, isEqualToEmptyEditor, getEditorSnapshot, useEditor } from "./_chunks-es/editor-provider.js";
 import { EditorProvider, defineSchema, defaultKeyGenerator, useEditorSelector, usePortableTextEditorSelection } from "./_chunks-es/editor-provider.js";
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import { useSelector } from "@xstate/react";
@@ -7,10 +7,11 @@ import noop from "lodash/noop.js";
 import { useContext, useRef, useState, useEffect, useMemo, startTransition, useCallback, forwardRef, useImperativeHandle } from "react";
 import { Editor, Range, Element as Element$2, Text, Transforms, Path } from "slate";
 import { useSlateStatic, useSelected, ReactEditor, useSlate, Editable } from "slate-react";
-import { getBlockEndPoint, getBlockStartPoint } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockEndPoint, getBlockStartPoint, isKeyedSegment } from "./_chunks-es/util.slice-blocks.js";
 import { isSelectionCollapsed, getFocusTextBlock, getFocusSpan, getSelectedBlocks, isSelectionExpanded, getSelectionStartBlock, getSelectionEndBlock, getFocusBlock } from "./_chunks-es/selector.is-at-the-start-of-block.js";
 import { isOverlappingSelection, isSelectingEntireBlocks } from "./_chunks-es/selector.is-overlapping-selection.js";
 import { DOMEditor, isDOMNode } from "slate-dom";
+import { isSelectionCollapsed as isSelectionCollapsed$1 } from "./_chunks-es/util.is-selection-collapsed.js";
 import { parseBlocks } from "./_chunks-es/util.selection-point-to-block-offset.js";
 import { defineBehavior, isHotkey } from "./_chunks-es/behavior.core.js";
 import { c } from "react-compiler-runtime";
@@ -55,11 +56,23 @@ function getDragSelection({
     focus: getBlockEndPoint(focusTextBlock)
   });
   const selectedBlocks = getSelectedBlocks(snapshot);
-  if (snapshot.context.selection && isSelectionExpanded(snapshot) && isOverlappingSelection(eventSelection)(snapshot) && selectedBlocks.length > 1) {
+  if (snapshot.context.selection && isSelectionExpanded(snapshot) && selectedBlocks.length > 1) {
     const selectionStartBlock = getSelectionStartBlock(snapshot), selectionEndBlock = getSelectionEndBlock(snapshot);
-    selectionStartBlock && selectionEndBlock && (dragSelection = {
-      anchor: getBlockStartPoint(selectionStartBlock),
-      focus: getBlockEndPoint(selectionEndBlock)
+    if (!selectionStartBlock || !selectionEndBlock)
+      return dragSelection;
+    const selectionStartPoint = getBlockStartPoint(selectionStartBlock), selectionEndPoint = getBlockEndPoint(selectionEndBlock);
+    isOverlappingSelection(eventSelection)({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: selectionStartPoint,
+          focus: selectionEndPoint
+        }
+      }
+    }) && (dragSelection = {
+      anchor: selectionStartPoint,
+      focus: selectionEndPoint
     });
   }
   return dragSelection;
@@ -75,7 +88,11 @@ function getEventPosition({
   });
   if (!node)
     return;
-  const positionBlock = getEventPositionBlock({
+  const block = getNodeBlock({
+    editor: slateEditor,
+    schema,
+    node
+  }), positionBlock = getEventPositionBlock({
     node,
     slateEditor,
     event
@@ -84,9 +101,8 @@ function getEventPosition({
     slateEditor,
     event
   });
-  if (positionBlock && !selection && !Editor.isEditor(node)) {
-    const block = fromSlateValue([node], schema.block.name)?.at(0);
-    return block ? {
+  if (block && positionBlock && !selection && !Editor.isEditor(node))
+    return {
       block: positionBlock,
       isEditor: !1,
       selection: {
@@ -103,10 +119,29 @@ function getEventPosition({
           }]
         })
       }
-    } : void 0;
-  }
-  if (!(!positionBlock || !selection))
-    return {
+    };
+  if (!positionBlock || !selection)
+    return;
+  const focusBlockPath = selection.focus.path.at(0), focusBlockKey = isKeyedSegment(focusBlockPath) ? focusBlockPath._key : void 0;
+  if (focusBlockKey)
+    return isSelectionCollapsed$1(selection) && block && focusBlockKey !== block._key ? {
+      block: positionBlock,
+      isEditor: !1,
+      selection: {
+        anchor: getBlockStartPoint({
+          node: block,
+          path: [{
+            _key: block._key
+          }]
+        }),
+        focus: getBlockEndPoint({
+          node: block,
+          path: [{
+            _key: block._key
+          }]
+        })
+      }
+    } : {
       block: positionBlock,
       isEditor: Editor.isEditor(node),
       selection