@portabletext/editor 1.48.7 → 1.48.8

package/src/selectors/selector.is-at-the-end-of-block.ts

@@ -15,7 +15,10 @@ export function isAtTheEndOfBlock(block: {
       return false
     }
 
-    const blockEndPoint = utils.getBlockEndPoint(block)
+    const blockEndPoint = utils.getBlockEndPoint({
+      context: snapshot.context,
+      block,
+    })
 
     return utils.isEqualSelectionPoints(
       snapshot.context.selection.focus,

package/src/selectors/selector.is-at-the-start-of-block.ts

@@ -15,7 +15,10 @@ export function isAtTheStartOfBlock(block: {
       return false
     }
 
-    const blockStartPoint = utils.getBlockStartPoint(block)
+    const blockStartPoint = utils.getBlockStartPoint({
+      context: snapshot.context,
+      block,
+    })
 
     return utils.isEqualSelectionPoints(
       snapshot.context.selection.focus,

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

@@ -1,6 +1,7 @@
-import {isKeySegment, isPortableTextTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
+import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {EditorSelectionPoint} from '../types/editor'
+import {isKeyedSegment} from '../utils/util.is-keyed-segment'
 import {reverseSelection} from '../utils/util.reverse-selection'
 
 /**
@@ -18,17 +19,17 @@ export function isPointAfterSelection(
       ? reverseSelection(snapshot.context.selection)
       : snapshot.context.selection
 
-    const pointBlockKey = isKeySegment(point.path[0])
+    const pointBlockKey = isKeyedSegment(point.path[0])
       ? point.path[0]._key
       : undefined
-    const pointChildKey = isKeySegment(point.path[2])
+    const pointChildKey = isKeyedSegment(point.path[2])
       ? point.path[2]._key
       : undefined
 
-    const endBlockKey = isKeySegment(selection.focus.path[0])
+    const endBlockKey = isKeyedSegment(selection.focus.path[0])
       ? selection.focus.path[0]._key
       : undefined
-    const endChildKey = isKeySegment(selection.focus.path[2])
+    const endChildKey = isKeyedSegment(selection.focus.path[2])
       ? selection.focus.path[2]._key
       : undefined
 
@@ -47,7 +48,7 @@ export function isPointAfterSelection(
 
         // Both the point and the selection end in this block
 
-        if (!isPortableTextTextBlock(block)) {
+        if (!isTextBlock(snapshot.context, block)) {
           break
         }
 

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

@@ -1,6 +1,7 @@
-import {isKeySegment, isPortableTextTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
+import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {EditorSelectionPoint} from '../types/editor'
+import {isKeyedSegment} from '../utils/util.is-keyed-segment'
 import {reverseSelection} from '../utils/util.reverse-selection'
 
 /**
@@ -18,17 +19,17 @@ export function isPointBeforeSelection(
       ? reverseSelection(snapshot.context.selection)
       : snapshot.context.selection
 
-    const pointBlockKey = isKeySegment(point.path[0])
+    const pointBlockKey = isKeyedSegment(point.path[0])
       ? point.path[0]._key
       : undefined
-    const pointChildKey = isKeySegment(point.path[2])
+    const pointChildKey = isKeyedSegment(point.path[2])
       ? point.path[2]._key
       : undefined
 
-    const startBlockKey = isKeySegment(selection.anchor.path[0])
+    const startBlockKey = isKeyedSegment(selection.anchor.path[0])
       ? selection.anchor.path[0]._key
       : undefined
-    const startChildKey = isKeySegment(selection.anchor.path[2])
+    const startChildKey = isKeyedSegment(selection.anchor.path[2])
       ? selection.anchor.path[2]._key
       : undefined
 
@@ -47,7 +48,7 @@ export function isPointBeforeSelection(
 
         // Both the point and the selection start in this block
 
-        if (!isPortableTextTextBlock(block)) {
+        if (!isTextBlock(snapshot.context, block)) {
           break
         }
 

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

@@ -24,8 +24,14 @@ export const isSelectingEntireBlocks: EditorSelector<boolean> = (snapshot) => {
     return false
   }
 
-  const startBlockStartPoint = utils.getBlockStartPoint(startBlock)
-  const endBlockEndPoint = utils.getBlockEndPoint(endBlock)
+  const startBlockStartPoint = utils.getBlockStartPoint({
+    context: snapshot.context,
+    block: startBlock,
+  })
+  const endBlockEndPoint = utils.getBlockEndPoint({
+    context: snapshot.context,
+    block: endBlock,
+  })
 
   return (
     utils.isEqualSelectionPoints(startBlockStartPoint, startPoint) &&

package/src/selectors/selectors.ts

@@ -1,16 +1,14 @@
-import {
-  isKeySegment,
-  isPortableTextSpan,
-  isPortableTextTextBlock,
-  type KeyedSegment,
-  type PortableTextBlock,
-  type PortableTextListBlock,
-  type PortableTextObject,
-  type PortableTextSpan,
-  type PortableTextTextBlock,
+import type {
+  KeyedSegment,
+  PortableTextBlock,
+  PortableTextListBlock,
+  PortableTextObject,
+  PortableTextSpan,
+  PortableTextTextBlock,
 } from '@sanity/types'
-import {createGuards} from '../behavior-actions/behavior.guards'
 import type {EditorSelector} from '../editor/editor-selector'
+import {isListBlock, isSpan, isTextBlock} from '../internal-utils/parse-blocks'
+import {isKeyedSegment} from '../utils/util.is-keyed-segment'
 
 /**
  * @public
@@ -19,7 +17,7 @@ export const getFocusBlock: EditorSelector<
   {node: PortableTextBlock; path: [KeyedSegment]} | undefined
 > = (snapshot) => {
   const key = snapshot.context.selection
-    ? isKeySegment(snapshot.context.selection.focus.path[0])
+    ? isKeyedSegment(snapshot.context.selection.focus.path[0])
       ? snapshot.context.selection.focus.path[0]._key
       : undefined
     : undefined
@@ -37,11 +35,10 @@ export const getFocusBlock: EditorSelector<
 export const getFocusListBlock: EditorSelector<
   {node: PortableTextListBlock; path: [KeyedSegment]} | undefined
 > = (snapshot) => {
-  const guards = createGuards(snapshot.context)
-  const focusBlock = getFocusBlock(snapshot)
+  const focusTextBlock = getFocusTextBlock(snapshot)
 
-  return focusBlock && guards.isListBlock(focusBlock.node)
-    ? {node: focusBlock.node, path: focusBlock.path}
+  return focusTextBlock && isListBlock(snapshot.context, focusTextBlock.node)
+    ? {node: focusTextBlock.node, path: focusTextBlock.path}
     : undefined
 }
 
@@ -53,7 +50,7 @@ export const getFocusTextBlock: EditorSelector<
 > = (snapshot) => {
   const focusBlock = getFocusBlock(snapshot)
 
-  return focusBlock && isPortableTextTextBlock(focusBlock.node)
+  return focusBlock && isTextBlock(snapshot.context, focusBlock.node)
     ? {node: focusBlock.node, path: focusBlock.path}
     : undefined
 }
@@ -66,7 +63,7 @@ export const getFocusBlockObject: EditorSelector<
 > = (snapshot) => {
   const focusBlock = getFocusBlock(snapshot)
 
-  return focusBlock && !isPortableTextTextBlock(focusBlock.node)
+  return focusBlock && !isTextBlock(snapshot.context, focusBlock.node)
     ? {node: focusBlock.node, path: focusBlock.path}
     : undefined
 }
@@ -88,7 +85,7 @@ export const getFocusChild: EditorSelector<
   }
 
   const key = snapshot.context.selection
-    ? isKeySegment(snapshot.context.selection.focus.path[2])
+    ? isKeyedSegment(snapshot.context.selection.focus.path[2])
       ? snapshot.context.selection.focus.path[2]._key
       : undefined
     : undefined
@@ -111,7 +108,7 @@ export const getFocusSpan: EditorSelector<
 > = (snapshot) => {
   const focusChild = getFocusChild(snapshot)
 
-  return focusChild && isPortableTextSpan(focusChild.node)
+  return focusChild && isSpan(snapshot.context, focusChild.node)
     ? {node: focusChild.node, path: focusChild.path}
     : undefined
 }
@@ -153,17 +150,17 @@ export const getSelectedBlocks: EditorSelector<
   const selectedBlocks: Array<{node: PortableTextBlock; path: [KeyedSegment]}> =
     []
   const startKey = snapshot.context.selection.backward
-    ? isKeySegment(snapshot.context.selection.focus.path[0])
+    ? isKeyedSegment(snapshot.context.selection.focus.path[0])
       ? snapshot.context.selection.focus.path[0]._key
       : undefined
-    : isKeySegment(snapshot.context.selection.anchor.path[0])
+    : isKeyedSegment(snapshot.context.selection.anchor.path[0])
       ? snapshot.context.selection.anchor.path[0]._key
       : undefined
   const endKey = snapshot.context.selection.backward
-    ? isKeySegment(snapshot.context.selection.anchor.path[0])
+    ? isKeyedSegment(snapshot.context.selection.anchor.path[0])
       ? snapshot.context.selection.anchor.path[0]._key
       : undefined
-    : isKeySegment(snapshot.context.selection.focus.path[0])
+    : isKeyedSegment(snapshot.context.selection.focus.path[0])
       ? snapshot.context.selection.focus.path[0]._key
       : undefined
 
@@ -209,10 +206,10 @@ export const getSelectionStartBlock: EditorSelector<
   }
 
   const key = snapshot.context.selection.backward
-    ? isKeySegment(snapshot.context.selection.focus.path[0])
+    ? isKeyedSegment(snapshot.context.selection.focus.path[0])
       ? snapshot.context.selection.focus.path[0]._key
       : undefined
-    : isKeySegment(snapshot.context.selection.anchor.path[0])
+    : isKeyedSegment(snapshot.context.selection.anchor.path[0])
       ? snapshot.context.selection.anchor.path[0]._key
       : undefined
 
@@ -238,10 +235,10 @@ export const getSelectionEndBlock: EditorSelector<
   }
 
   const key = snapshot.context.selection.backward
-    ? isKeySegment(snapshot.context.selection.anchor.path[0])
+    ? isKeyedSegment(snapshot.context.selection.anchor.path[0])
       ? snapshot.context.selection.anchor.path[0]._key
       : undefined
-    : isKeySegment(snapshot.context.selection.focus.path[0])
+    : isKeyedSegment(snapshot.context.selection.focus.path[0])
       ? snapshot.context.selection.focus.path[0]._key
       : undefined
 

package/src/utils/util.block-offset-to-block-selection-point.ts

@@ -1,4 +1,4 @@
-import type {PortableTextBlock} from '@sanity/types'
+import type {EditorContext} from '../editor/editor-snapshot'
 import type {BlockOffset} from '../types/block-offset'
 import type {EditorSelectionPoint} from '../types/editor'
 
@@ -6,15 +6,15 @@ import type {EditorSelectionPoint} from '../types/editor'
  * @public
  */
 export function blockOffsetToBlockSelectionPoint({
-  value,
+  context,
   blockOffset,
 }: {
-  value: Array<PortableTextBlock>
+  context: Pick<EditorContext, 'value'>
   blockOffset: BlockOffset
 }): EditorSelectionPoint | undefined {
   let selectionPoint: EditorSelectionPoint | undefined
 
-  for (const block of value) {
+  for (const block of context.value) {
     if (block._key === blockOffset.path[0]._key) {
       selectionPoint = {
         path: [{_key: block._key}],

package/src/utils/util.block-offset-to-selection-point.ts

@@ -1,4 +1,4 @@
-import type {PortableTextBlock} from '@sanity/types'
+import type {EditorContext} from '../editor/editor-snapshot'
 import type {BlockOffset} from '../types/block-offset'
 import type {EditorSelectionPoint} from '../types/editor'
 import {blockOffsetToSpanSelectionPoint} from './util.block-offset'
@@ -8,23 +8,23 @@ import {blockOffsetToBlockSelectionPoint} from './util.block-offset-to-block-sel
  * @public
  */
 export function blockOffsetToSelectionPoint({
-  value,
+  context,
   blockOffset,
   direction,
 }: {
-  value: Array<PortableTextBlock>
+  context: Pick<EditorContext, 'schema' | 'value'>
   blockOffset: BlockOffset
   direction: 'forward' | 'backward'
 }): EditorSelectionPoint | undefined {
   const spanSelectionPoint = blockOffsetToSpanSelectionPoint({
-    value,
+    context,
     blockOffset,
     direction,
   })
 
   if (!spanSelectionPoint) {
     return blockOffsetToBlockSelectionPoint({
-      value,
+      context,
       blockOffset,
     })
   }