@portabletext/editor 1.36.6 → 1.37.0

package/src/selectors/selector.is-overlapping-selection.ts

@@ -1,4 +1,5 @@
 import type {EditorSelection} from '../types/editor'
+import {isEqualSelectionPoints} from '../utils'
 import type {EditorSelector} from './../editor/editor-selector'
 import {getSelectionEndPoint} from './selector.get-selection-end-point'
 import {getSelectionStartPoint} from './selector.get-selection-start-point'
@@ -31,18 +32,121 @@ export function isOverlappingSelection(
       },
     })
 
-    if (!selectionStartPoint || !selectionEndPoint) {
+    const originalSelectionStartPoint = getSelectionStartPoint(snapshot)
+    const originalSelectionEndPoint = getSelectionEndPoint(snapshot)
+
+    if (
+      !selectionStartPoint ||
+      !selectionEndPoint ||
+      !originalSelectionStartPoint ||
+      !originalSelectionEndPoint
+    ) {
       return false
     }
 
-    if (!isPointAfterSelection(selectionStartPoint)(snapshot)) {
+    const startPointBeforeSelection =
+      isPointBeforeSelection(selectionStartPoint)(snapshot)
+    const startPointAfterSelection =
+      isPointAfterSelection(selectionStartPoint)(snapshot)
+    const endPointBeforeSelection =
+      isPointBeforeSelection(selectionEndPoint)(snapshot)
+    const endPointAfterSelection =
+      isPointAfterSelection(selectionEndPoint)(snapshot)
+
+    const originalStartPointBeforeStartPoint = isPointBeforeSelection(
+      originalSelectionStartPoint,
+    )({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: selectionStartPoint,
+          focus: selectionStartPoint,
+        },
+      },
+    })
+    const originalStartPointAfterStartPoint = isPointAfterSelection(
+      originalSelectionStartPoint,
+    )({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: selectionStartPoint,
+          focus: selectionStartPoint,
+        },
+      },
+    })
+
+    const originalEndPointBeforeEndPoint = isPointBeforeSelection(
+      originalSelectionEndPoint,
+    )({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: selectionEndPoint,
+          focus: selectionEndPoint,
+        },
+      },
+    })
+    const originalEndPointAfterEndPoint = isPointAfterSelection(
+      originalSelectionEndPoint,
+    )({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: {
+          anchor: selectionEndPoint,
+          focus: selectionEndPoint,
+        },
+      },
+    })
+
+    const endPointEqualToOriginalStartPoint = isEqualSelectionPoints(
+      selectionEndPoint,
+      originalSelectionStartPoint,
+    )
+    const startPointEqualToOriginalEndPoint = isEqualSelectionPoints(
+      selectionStartPoint,
+      originalSelectionEndPoint,
+    )
+
+    if (endPointBeforeSelection && !endPointEqualToOriginalStartPoint) {
       return false
     }
 
-    if (!isPointBeforeSelection(selectionEndPoint)(snapshot)) {
+    if (startPointAfterSelection && !startPointEqualToOriginalEndPoint) {
       return false
     }
 
-    return true
+    if (
+      !originalStartPointBeforeStartPoint &&
+      originalStartPointAfterStartPoint &&
+      !originalEndPointBeforeEndPoint &&
+      originalEndPointAfterEndPoint
+    ) {
+      return !endPointEqualToOriginalStartPoint
+    }
+
+    if (
+      originalStartPointBeforeStartPoint &&
+      !originalStartPointAfterStartPoint &&
+      originalEndPointBeforeEndPoint &&
+      !originalEndPointAfterEndPoint
+    ) {
+      return !startPointEqualToOriginalEndPoint
+    }
+
+    if (
+      !startPointAfterSelection ||
+      !startPointBeforeSelection ||
+      !endPointAfterSelection ||
+      !endPointBeforeSelection
+    ) {
+      return true
+    }
+
+    return false
   }
 }

package/src/selectors/selector.is-point-after-selection.ts

@@ -14,7 +14,9 @@ export function isPointAfterSelection(
       return false
     }
 
-    const selection = reverseSelection(snapshot.context.selection)
+    const selection = snapshot.context.selection.backward
+      ? reverseSelection(snapshot.context.selection)
+      : snapshot.context.selection
 
     const pointBlockKey = isKeySegment(point.path[0])
       ? point.path[0]._key

package/src/selectors/selector.is-point-before-selection.ts

@@ -14,7 +14,9 @@ export function isPointBeforeSelection(
       return false
     }
 
-    const selection = reverseSelection(snapshot.context.selection)
+    const selection = snapshot.context.selection.backward
+      ? reverseSelection(snapshot.context.selection)
+      : snapshot.context.selection
 
     const pointBlockKey = isKeySegment(point.path[0])
       ? point.path[0]._key

package/src/selectors/selector.is-selecting-entire-blocks.ts

@@ -0,0 +1,34 @@
+import type {EditorSelector} from '../editor/editor-selector'
+import * as utils from '../utils'
+import {getSelectionEndBlock, getSelectionStartBlock} from './selectors'
+
+/**
+ * @public
+ */
+export const isSelectingEntireBlocks: EditorSelector<boolean> = (snapshot) => {
+  if (!snapshot.context.selection) {
+    return false
+  }
+
+  const startPoint = snapshot.context.selection.backward
+    ? snapshot.context.selection.focus
+    : snapshot.context.selection.anchor
+  const endPoint = snapshot.context.selection.backward
+    ? snapshot.context.selection.anchor
+    : snapshot.context.selection.focus
+
+  const startBlock = getSelectionStartBlock(snapshot)
+  const endBlock = getSelectionEndBlock(snapshot)
+
+  if (!startBlock || !endBlock) {
+    return false
+  }
+
+  const startBlockStartPoint = utils.getBlockStartPoint(startBlock)
+  const endBlockEndPoint = utils.getBlockEndPoint(endBlock)
+
+  return (
+    utils.isEqualSelectionPoints(startBlockStartPoint, startPoint) &&
+    utils.isEqualSelectionPoints(endBlockEndPoint, endPoint)
+  )
+}