@portabletext/editor 1.41.1 → 1.41.3

package/src/internal-utils/drag-selection.ts

@@ -3,6 +3,11 @@ import * as selectors from '../selectors'
 import * as utils from '../utils'
 import type {EventPosition} from './event-position'
 
+/**
+ * Given the current editor `snapshot` and an `eventSelection` representing
+ * where the drag event origins from, this function calculates the selection
+ * in the editor that should be dragged.
+ */
 export function getDragSelection({
   eventSelection,
   snapshot,
@@ -12,21 +17,33 @@ export function getDragSelection({
 }) {
   let dragSelection = eventSelection
 
-  const collapsedSelection = selectors.isSelectionCollapsed({
+  const draggedInlineObject = selectors.getFocusInlineObject({
     ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection,
     },
   })
-  const focusTextBlock = selectors.getFocusTextBlock({
+
+  if (draggedInlineObject) {
+    return dragSelection
+  }
+
+  const draggingCollapsedSelection = selectors.isSelectionCollapsed({
+    ...snapshot,
+    context: {
+      ...snapshot.context,
+      selection: eventSelection,
+    },
+  })
+  const draggedTextBlock = selectors.getFocusTextBlock({
     ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection,
     },
   })
-  const focusSpan = selectors.getFocusSpan({
+  const draggedSpan = selectors.getFocusSpan({
     ...snapshot,
     context: {
       ...snapshot.context,
@@ -34,12 +51,12 @@ export function getDragSelection({
     },
   })
 
-  if (collapsedSelection && focusTextBlock && focusSpan) {
+  if (draggingCollapsedSelection && draggedTextBlock && draggedSpan) {
     // Looks like we are dragging an empty span
     // Let's drag the entire block instead
     dragSelection = {
-      anchor: utils.getBlockStartPoint(focusTextBlock),
-      focus: utils.getBlockEndPoint(focusTextBlock),
+      anchor: utils.getBlockStartPoint(draggedTextBlock),
+      focus: utils.getBlockEndPoint(draggedTextBlock),
     }
   }
 

package/src/internal-utils/slate-utils.ts

@@ -79,7 +79,7 @@ export function getNodeBlock({
     return undefined
   }
 
-  if (isBlockElement(schema, node)) {
+  if (isBlockElement({editor, schema}, node)) {
     return elementToBlock({schema, element: node})
   }
 
@@ -88,7 +88,7 @@ export function getNodeBlock({
       mode: 'highest',
       at: [],
       match: (n) =>
-        isBlockElement(schema, n) &&
+        isBlockElement({editor, schema}, n) &&
         n.children.some((child) => child._key === node._key),
     }),
   )
@@ -113,9 +113,13 @@ function elementToBlock({
   return fromSlateValue([element], schema.block.name)?.at(0)
 }
 
-function isBlockElement(schema: EditorSchema, node: Node): node is Element {
+function isBlockElement(
+  {editor, schema}: {editor: PortableTextSlateEditor; schema: EditorSchema},
+  node: Node,
+): node is Element {
   return (
     Element.isElement(node) &&
+    !editor.isInline(node) &&
     (schema.block.name === node._type ||
       schema.blockObjects.some(
         (blockObject) => blockObject.name === node._type,