@portabletext/editor 1.40.4 → 1.41.1

package/src/internal-utils/event-position.ts

@@ -4,7 +4,7 @@ import type {EditorSchema, EditorSelection} from '..'
 import type {PortableTextSlateEditor} from '../types/editor'
 import * as utils from '../utils'
 import {toPortableTextRange} from './ranges'
-import {getNodeBlock} from './slate-utils'
+import {getFirstBlock, getLastBlock, getNodeBlock} from './slate-utils'
 import {fromSlateValue} from './values'
 
 export type EventPosition = {
@@ -128,6 +128,32 @@ function getEventPositionBlock({
   slateEditor: PortableTextSlateEditor
   event: DragEvent | MouseEvent
 }): EventPositionBlock | undefined {
+  const [firstBlock] = getFirstBlock({editor: slateEditor})
+
+  if (!firstBlock) {
+    return undefined
+  }
+
+  const firstBlockElement = DOMEditor.toDOMNode(slateEditor, firstBlock)
+  const firstBlockRect = firstBlockElement.getBoundingClientRect()
+
+  if (event.pageY < firstBlockRect.top) {
+    return 'start'
+  }
+
+  const [lastBlock] = getLastBlock({editor: slateEditor})
+
+  if (!lastBlock) {
+    return undefined
+  }
+
+  const lastBlockElement = DOMEditor.toDOMNode(slateEditor, lastBlock)
+  const lastBlockRef = lastBlockElement.getBoundingClientRect()
+
+  if (event.pageY > lastBlockRef.bottom) {
+    return 'end'
+  }
+
   const element = DOMEditor.toDOMNode(slateEditor, node)
   const elementRect = element.getBoundingClientRect()
   const top = elementRect.top
@@ -182,9 +208,11 @@ function getSlateRangeFromEvent(
     )
 
     if (position) {
-      domRange = window.document.createRange()
-      domRange.setStart(position.offsetNode, position.offset)
-      domRange.setEnd(position.offsetNode, position.offset)
+      try {
+        domRange = window.document.createRange()
+        domRange.setStart(position.offsetNode, position.offset)
+        domRange.setEnd(position.offsetNode, position.offset)
+      } catch {}
     }
   } else if (window.document.caretRangeFromPoint !== undefined) {
     // Use WebKit-proprietary fallback method

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

@@ -41,20 +41,29 @@ export function getFocusChild({
     : [undefined, undefined]
 }
 
-export function getLastBlock({
+export function getFirstBlock({
   editor,
 }: {
   editor: PortableTextSlateEditor
 }): [node: Node, path: Path] | [undefined, undefined] {
-  const lastBlock = Array.from(
-    Editor.nodes(editor, {
-      match: (n) => !Editor.isEditor(n),
-      at: [],
-      reverse: true,
-    }),
-  ).at(0)
+  const firstPoint = Editor.start(editor, [])
+  const firstBlockPath = firstPoint.path.at(0)
 
-  return lastBlock ?? [undefined, undefined]
+  return firstBlockPath !== undefined
+    ? (Editor.node(editor, [firstBlockPath]) ?? [undefined, undefined])
+    : [undefined, undefined]
+}
+
+export function getLastBlock({
+  editor,
+}: {
+  editor: PortableTextSlateEditor
+}): [node: Node, path: Path] | [undefined, undefined] {
+  const lastPoint = Editor.end(editor, [])
+  const lastBlockPath = lastPoint.path.at(0)
+  return lastBlockPath !== undefined
+    ? (Editor.node(editor, [lastBlockPath]) ?? [undefined, undefined])
+    : [undefined, undefined]
 }
 
 export function getNodeBlock({

package/src/utils/index.ts

@@ -8,6 +8,8 @@ export {blockOffsetsToSelection} from './util.block-offsets-to-selection'
 export {childSelectionPointToBlockOffset} from './util.child-selection-point-to-block-offset'
 export {getBlockEndPoint} from './util.get-block-end-point'
 export {getBlockStartPoint} from './util.get-block-start-point'
+export {getSelectionEndPoint} from './util.get-selection-end-point'
+export {getSelectionStartPoint} from './util.get-selection-start-point'
 export {getTextBlockText} from './util.get-text-block-text'
 export {isEmptyTextBlock} from './util.is-empty-text-block'
 export {isEqualSelectionPoints} from './util.is-equal-selection-points'

package/src/utils/util.get-selection-end-point.ts

@@ -0,0 +1,20 @@
+import type {EditorSelection, EditorSelectionPoint} from '..'
+
+/**
+ * @public
+ */
+export function getSelectionEndPoint<
+  TEditorSelection extends NonNullable<EditorSelection> | null,
+  TEditorSelectionPoint extends
+    EditorSelectionPoint | null = TEditorSelection extends NonNullable<EditorSelection>
+    ? EditorSelectionPoint
+    : null,
+>(selection: TEditorSelection): TEditorSelectionPoint {
+  if (!selection) {
+    return null as TEditorSelectionPoint
+  }
+
+  return (
+    selection.backward ? selection.anchor : selection.focus
+  ) as TEditorSelectionPoint
+}

package/src/utils/util.get-selection-start-point.ts

@@ -0,0 +1,20 @@
+import type {EditorSelection, EditorSelectionPoint} from '..'
+
+/**
+ * @public
+ */
+export function getSelectionStartPoint<
+  TEditorSelection extends NonNullable<EditorSelection> | null,
+  TEditorSelectionPoint extends
+    EditorSelectionPoint | null = TEditorSelection extends NonNullable<EditorSelection>
+    ? EditorSelectionPoint
+    : null,
+>(selection: TEditorSelection): TEditorSelectionPoint {
+  if (!selection) {
+    return null as TEditorSelectionPoint
+  }
+
+  return (
+    selection.backward ? selection.focus : selection.anchor
+  ) as TEditorSelectionPoint
+}