@portabletext/editor 2.13.2 → 2.13.4

package/src/selectors/selector.get-selected-value.test.ts

@@ -2,8 +2,8 @@ import {compileSchema, defineSchema} from '@portabletext/schema'
 import {createTestKeyGenerator} from '@portabletext/test'
 import type {PortableTextBlock, PortableTextTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
-import {getSelectedValue} from '.'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
+import {getSelectedValue} from './selector.get-selected-value'
 
 const b1: PortableTextTextBlock = {
   _type: 'block',
@@ -73,6 +73,7 @@ const b4: PortableTextTextBlock = {
 
 const schema = compileSchema(
   defineSchema({
+    decorators: [{name: 'strong'}],
     blockObjects: [{name: 'image'}],
     inlineObjects: [{name: 'stock-ticker'}],
   }),
@@ -745,4 +746,89 @@ describe(getSelectedValue.name, () => {
       },
     ])
   })
+
+  test('starts and ends in different blocks with same span _key', () => {
+    const keyGenerator = createTestKeyGenerator()
+    const blockKey = keyGenerator()
+    const spanAKey = keyGenerator()
+    const spanBKey = keyGenerator()
+    const spanCKey = keyGenerator()
+    const blockBKey = keyGenerator()
+    const value = [
+      {
+        _type: 'block',
+        _key: blockKey,
+        children: [
+          {
+            _type: 'span',
+            _key: spanAKey,
+            text: 'foo ',
+            marks: [],
+          },
+          {
+            _type: 'span',
+            _key: spanBKey,
+            text: 'bar',
+            marks: ['strong'],
+          },
+          {
+            _type: 'span',
+            _key: spanCKey,
+            text: ' baz',
+            marks: [],
+          },
+        ],
+        markDefs: [],
+        style: 'normal',
+      },
+      {
+        _type: 'block',
+        _key: blockBKey,
+        children: [
+          {_type: 'span', _key: spanAKey, text: 'fizz buzz', marks: []},
+        ],
+        markDefs: [],
+        style: 'normal',
+      },
+    ]
+    const selection = {
+      anchor: {
+        path: [
+          {
+            _key: blockBKey,
+          },
+          'children',
+          {
+            _key: spanAKey,
+          },
+        ],
+        offset: 9,
+      },
+      focus: {
+        path: [
+          {
+            _key: blockKey,
+          },
+          'children',
+          {
+            _key: spanAKey,
+          },
+        ],
+        offset: 0,
+      },
+      backward: true,
+    }
+
+    expect(
+      getSelectedValue(
+        createTestSnapshot({
+          context: {
+            schema,
+            value,
+            selection,
+          },
+        }),
+      ),
+    ).toEqual(value)
+  })
 })

package/src/selectors/selector.get-selected-value.ts

@@ -1,11 +1,9 @@
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
-import {
-  getSelectionEndPoint,
-  getSelectionStartPoint,
-  sliceBlocks,
-} from '../utils'
+import {getSelectionEndPoint} from '../utils/util.get-selection-end-point'
+import {getSelectionStartPoint} from '../utils/util.get-selection-start-point'
+import {getBlockKeyFromSelectionPoint} from '../utils/util.selection-point'
+import {sliceBlocks} from '../utils/util.slice-blocks'
 
 /**
  * @public

package/src/selectors/selector.get-selection-end-point.ts

@@ -1,5 +1,5 @@
-import type {EditorSelectionPoint} from '..'
 import type {EditorSelector} from '../editor/editor-selector'
+import type {EditorSelectionPoint} from '../types/editor'
 
 /**
  * @public

package/src/selectors/selector.get-selection-start-point.ts

@@ -1,5 +1,5 @@
-import type {EditorSelectionPoint} from '..'
 import type {EditorSelector} from '../editor/editor-selector'
+import type {EditorSelectionPoint} from '../types/editor'
 
 /**
  * @public

package/src/selectors/selector.get-selection-text.test.ts

@@ -1,8 +1,8 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import {expect, test} from 'vitest'
-import type {EditorSelection} from '..'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
+import type {EditorSelection} from '../types/editor'
 import {getSelectionText} from './selector.get-selection-text'
 
 const brokenBlock = {

package/src/selectors/selector.get-selection.ts

@@ -1,5 +1,5 @@
-import type {EditorSelection} from '..'
 import type {EditorSelector} from '../editor/editor-selector'
+import type {EditorSelection} from '../types/editor'
 
 /**
  * @public

package/src/selectors/selector.get-text-before.ts

@@ -1,6 +1,6 @@
 import type {EditorSelector} from '../editor/editor-selector'
-import {getSelectionStartPoint} from '../utils'
 import {getBlockStartPoint} from '../utils/util.get-block-start-point'
+import {getSelectionStartPoint} from '../utils/util.get-selection-start-point'
 import {getFocusBlock} from './selector.get-focus-block'
 import {getSelectionText} from './selector.get-selection-text'
 

package/src/selectors/selector.get-trimmed-selection.test.ts

@@ -3,8 +3,8 @@ import {createTestKeyGenerator} from '@portabletext/test'
 import type {PortableTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
-import {parseBlock} from '../internal-utils/parse-blocks'
 import type {EditorSelection} from '../types/editor'
+import {parseBlock} from '../utils/parse-blocks'
 import {getTrimmedSelection} from './selector.get-trimmed-selection'
 
 const keyGenerator = createTestKeyGenerator()

package/src/selectors/selector.get-trimmed-selection.ts

@@ -1,16 +1,14 @@
 import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
+import type {EditorSelection, EditorSelectionPoint} from '../types/editor'
+import {getSelectionEndPoint} from '../utils/util.get-selection-end-point'
+import {getSelectionStartPoint} from '../utils/util.get-selection-start-point'
+import {isEmptyTextBlock} from '../utils/util.is-empty-text-block'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import type {EditorSelection, EditorSelectionPoint} from '../types/editor'
-import {
-  getSelectionEndPoint,
-  getSelectionStartPoint,
-  isEmptyTextBlock,
-} from '../utils'
+} from '../utils/util.selection-point'
 import {getFocusTextBlock} from './selector.get-focus-text-block'
 import {isSelectionCollapsed} from './selector.is-selection-collapsed'
 

package/src/selectors/selector.is-active-decorator.test.ts

@@ -1,6 +1,7 @@
+import type {PortableTextBlock} from '@portabletext/schema'
 import {expect, test} from 'vitest'
-import type {EditorSelection, PortableTextBlock} from '..'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
+import type {EditorSelection} from '../types/editor'
 import {isActiveDecorator} from './selector.is-active-decorator'
 
 test(isActiveDecorator.name, () => {

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

@@ -1,7 +1,8 @@
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
 import type {BlockPath} from '../types/paths'
-import * as utils from '../utils'
+import {getBlockEndPoint} from '../utils/util.get-block-end-point'
+import {isEqualSelectionPoints} from '../utils/util.is-equal-selection-points'
 import {isSelectionCollapsed} from './selector.is-selection-collapsed'
 
 /**
@@ -16,12 +17,12 @@ export function isAtTheEndOfBlock(block: {
       return false
     }
 
-    const blockEndPoint = utils.getBlockEndPoint({
+    const blockEndPoint = getBlockEndPoint({
       context: snapshot.context,
       block,
     })
 
-    return utils.isEqualSelectionPoints(
+    return isEqualSelectionPoints(
       snapshot.context.selection.focus,
       blockEndPoint,
     )

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

@@ -1,7 +1,8 @@
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
 import type {BlockPath} from '../types/paths'
-import * as utils from '../utils'
+import {getBlockStartPoint} from '../utils/util.get-block-start-point'
+import {isEqualSelectionPoints} from '../utils/util.is-equal-selection-points'
 import {isSelectionCollapsed} from './selector.is-selection-collapsed'
 
 /**
@@ -16,12 +17,12 @@ export function isAtTheStartOfBlock(block: {
       return false
     }
 
-    const blockStartPoint = utils.getBlockStartPoint({
+    const blockStartPoint = getBlockStartPoint({
       context: snapshot.context,
       block,
     })
 
-    return utils.isEqualSelectionPoints(
+    return isEqualSelectionPoints(
       snapshot.context.selection.focus,
       blockStartPoint,
     )

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

@@ -1,7 +1,7 @@
 import {describe, expect, test} from 'vitest'
-import {defaultKeyGenerator} from '../editor/key-generator'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
 import type {EditorSelection} from '../types/editor'
+import {defaultKeyGenerator} from '../utils/key-generator'
 import {isOverlappingSelection} from './selector.is-overlapping-selection'
 
 function snapshot(selection: EditorSelection) {

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

@@ -1,5 +1,5 @@
 import type {EditorSelection} from '../types/editor'
-import {isEqualSelectionPoints} from '../utils'
+import {isEqualSelectionPoints} from '../utils/util.is-equal-selection-points'
 import type {EditorSelector} from './../editor/editor-selector'
 import {getSelectionEndPoint} from './selector.get-selection-end-point'
 import {getSelectionStartPoint} from './selector.get-selection-start-point'

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

@@ -1,11 +1,11 @@
 import {isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
+import type {EditorSelectionPoint} from '../types/editor'
+import {getSelectionEndPoint} from '../utils/util.get-selection-end-point'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import type {EditorSelectionPoint} from '../types/editor'
-import {getSelectionEndPoint} from '../utils'
+} from '../utils/util.selection-point'
 
 /**
  * @public

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

@@ -1,11 +1,11 @@
 import {isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
+import type {EditorSelectionPoint} from '../types/editor'
+import {getSelectionStartPoint} from '../utils/util.get-selection-start-point'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import type {EditorSelectionPoint} from '../types/editor'
-import {getSelectionStartPoint} from '../utils'
+} from '../utils/util.selection-point'
 
 /**
  * @public

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

@@ -1,5 +1,7 @@
 import type {EditorSelector} from '../editor/editor-selector'
-import * as utils from '../utils'
+import {getBlockEndPoint} from '../utils/util.get-block-end-point'
+import {getBlockStartPoint} from '../utils/util.get-block-start-point'
+import {isEqualSelectionPoints} from '../utils/util.is-equal-selection-points'
 import {getSelectionEndBlock} from './selector.get-selection-end-block'
 import {getSelectionStartBlock} from './selector.get-selection-start-block'
 
@@ -25,17 +27,17 @@ export const isSelectingEntireBlocks: EditorSelector<boolean> = (snapshot) => {
     return false
   }
 
-  const startBlockStartPoint = utils.getBlockStartPoint({
+  const startBlockStartPoint = getBlockStartPoint({
     context: snapshot.context,
     block: startBlock,
   })
-  const endBlockEndPoint = utils.getBlockEndPoint({
+  const endBlockEndPoint = getBlockEndPoint({
     context: snapshot.context,
     block: endBlock,
   })
 
   return (
-    utils.isEqualSelectionPoints(startBlockStartPoint, startPoint) &&
-    utils.isEqualSelectionPoints(endBlockEndPoint, endPoint)
+    isEqualSelectionPoints(startBlockStartPoint, startPoint) &&
+    isEqualSelectionPoints(endBlockEndPoint, endPoint)
   )
 }

package/src/test/gherkin-parameter-types.ts

@@ -70,7 +70,7 @@ const parameterType = {
   }),
   tersePt: createParameterType<Array<string>>({
     name: 'terse-pt',
-    matcher: /"([a-z-,#>:\\n \d|{}'"‘’“”?—]*)"/u,
+    matcher: /"(.*)"/u,
     type: Array,
     transform: parseTersePtString,
   }),

package/src/test/vitest/step-definitions.tsx

@@ -4,11 +4,6 @@ import {userEvent} from '@vitest/browser/context'
 import {Given, Then, When} from 'racejar'
 import {assert, expect, vi} from 'vitest'
 import {getEditorSelection} from '../../internal-utils/editor-selection'
-import {
-  parseBlocks,
-  parseInlineObject,
-  parseSpan,
-} from '../../internal-utils/parse-blocks'
 import {getSelectionText} from '../../internal-utils/selection-text'
 import {getTextBlockKey} from '../../internal-utils/text-block-key'
 import {getTextMarks} from '../../internal-utils/text-marks'
@@ -20,10 +15,13 @@ import {
 import {getValueAnnotations} from '../../internal-utils/value-annotations'
 import {createTestEditor} from '../../test/vitest'
 import {
-  reverseSelection,
-  selectionPointToBlockOffset,
-  spanSelectionPointToBlockOffset,
-} from '../../utils'
+  parseBlocks,
+  parseInlineObject,
+  parseSpan,
+} from '../../utils/parse-blocks'
+import {spanSelectionPointToBlockOffset} from '../../utils/util.block-offset'
+import {reverseSelection} from '../../utils/util.reverse-selection'
+import {selectionPointToBlockOffset} from '../../utils/util.selection-point-to-block-offset'
 import type {Parameter} from '../gherkin-parameter-types'
 import type {Context} from './step-context'
 
@@ -232,6 +230,12 @@ export const stepDefinitions = [
           at: selection,
         })
       })
+
+      await vi.waitFor(() => {
+        expect(context.editor.getSnapshot().context.selection).toEqual(
+          getSelectionBeforeText(context.editor.getSnapshot().context, text),
+        )
+      })
     },
   ),
   Then(
@@ -264,6 +268,12 @@ export const stepDefinitions = [
           at: getSelectionAfterText(context.editor.getSnapshot().context, text),
         })
       })
+
+      await vi.waitFor(() => {
+        expect(context.editor.getSnapshot().context.selection).toEqual(
+          getSelectionAfterText(context.editor.getSnapshot().context, text),
+        )
+      })
     },
   ),
   Then(

package/src/types/paths.ts

@@ -1,5 +1,4 @@
 import type {Path} from '@sanity/types'
-import {isRecord} from '../internal-utils/asserters'
 
 /**
  * @public
@@ -21,6 +20,10 @@ export function isBlockPath(path: Path): path is BlockPath {
   )
 }
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return !!value && (typeof value === 'object' || typeof value === 'function')
+}
+
 /**
  * @public
  */

package/src/utils/util.at-the-beginning-of-block.ts

@@ -1,8 +1,8 @@
 import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {getChildKeyFromSelectionPoint} from '../selection/selection-point'
 import {isSelectionCollapsed} from './util.is-selection-collapsed'
+import {getChildKeyFromSelectionPoint} from './util.selection-point'
 
 export function isAtTheBeginningOfBlock({
   context,

package/src/utils/util.block-offset.ts

@@ -1,12 +1,12 @@
 import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {
-  getBlockKeyFromSelectionPoint,
-  getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
 import type {BlockOffset} from '../types/block-offset'
 import type {EditorSelectionPoint} from '../types/editor'
 import type {ChildPath} from '../types/paths'
+import {
+  getBlockKeyFromSelectionPoint,
+  getChildKeyFromSelectionPoint,
+} from './util.selection-point'
 
 /**
  * @public

package/src/utils/util.block-offsets-to-selection.ts

@@ -1,6 +1,6 @@
-import type {EditorSelection} from '..'
 import type {EditorContext} from '../editor/editor-snapshot'
 import type {BlockOffset} from '../types/block-offset'
+import type {EditorSelection} from '../types/editor'
 import {blockOffsetToSelectionPoint} from './util.block-offset-to-selection-point'
 
 /**

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

@@ -1,11 +1,11 @@
 import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {EditorContext} from '../editor/editor-snapshot'
+import type {BlockOffset} from '../types/block-offset'
+import type {EditorSelectionPoint} from '../types/editor'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import type {BlockOffset} from '../types/block-offset'
-import type {EditorSelectionPoint} from '../types/editor'
+} from './util.selection-point'
 
 /**
  * @public

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

@@ -1,4 +1,4 @@
-import type {EditorSelection, EditorSelectionPoint} from '..'
+import type {EditorSelection, EditorSelectionPoint} from '../types/editor'
 
 /**
  * @public

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

@@ -1,4 +1,4 @@
-import type {EditorSelection, EditorSelectionPoint} from '..'
+import type {EditorSelection, EditorSelectionPoint} from '../types/editor'
 
 /**
  * @public

package/src/utils/util.merge-text-blocks.ts

@@ -1,7 +1,7 @@
 import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
-import type {EditorContext} from '..'
-import {parseBlock} from '../internal-utils/parse-blocks'
+import type {EditorContext} from '../editor/editor-snapshot'
+import {parseBlock} from './parse-blocks'
 
 /**
  * @beta

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

@@ -1,8 +1,8 @@
 import type {EditorContext} from '../editor/editor-snapshot'
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
 import type {BlockOffset} from '../types/block-offset'
 import type {EditorSelectionPoint} from '../types/editor'
 import {childSelectionPointToBlockOffset} from './util.child-selection-point-to-block-offset'
+import {getBlockKeyFromSelectionPoint} from './util.selection-point'
 
 /**
  * @public

package/src/{selection/selection-point.ts → utils/util.selection-point.ts}

@@ -1,5 +1,5 @@
 import type {EditorSelectionPoint} from '../types/editor'
-import {isKeyedSegment} from '../utils/util.is-keyed-segment'
+import {isKeyedSegment} from './util.is-keyed-segment'
 
 export function getBlockKeyFromSelectionPoint(point: EditorSelectionPoint) {
   const blockPathSegment = point.path.at(0)

package/src/utils/util.slice-blocks.ts

@@ -1,14 +1,14 @@
 import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {defaultKeyGenerator} from '../editor/key-generator'
-import {parseBlock} from '../internal-utils/parse-blocks'
+import {defaultKeyGenerator} from './key-generator'
+import {parseBlock} from './parse-blocks'
+import {getSelectionEndPoint} from './util.get-selection-end-point'
+import {getSelectionStartPoint} from './util.get-selection-start-point'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import {getSelectionEndPoint} from '../utils/util.get-selection-end-point'
-import {getSelectionStartPoint} from '../utils/util.get-selection-start-point'
+} from './util.selection-point'
 
 /**
  * @public
@@ -80,7 +80,7 @@ export function sliceBlocks({
               }
             }
 
-            if (startChildKey === endChildKey) {
+            if (block._key === endBlockKey && startChildKey === endChildKey) {
               break
             }
             continue

package/src/utils/util.slice-text-block.test.ts

@@ -1,13 +1,15 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
+import {createTestKeyGenerator} from '@portabletext/test'
 import type {
   PortableTextObject,
   PortableTextSpan,
   PortableTextTextBlock,
 } from '@sanity/types'
 import {describe, expect, test} from 'vitest'
-import {keyGenerator} from '..'
 import {sliceTextBlock} from './util.slice-text-block'
 
+const keyGenerator = createTestKeyGenerator()
+
 const schema = compileSchema(
   defineSchema({
     inlineObjects: [{name: 'stock-ticker'}],

package/src/utils/util.slice-text-block.ts

@@ -1,12 +1,12 @@
 import {isSpan} from '@portabletext/schema'
 import type {PortableTextChild, PortableTextTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
+import {getSelectionEndPoint} from './util.get-selection-end-point'
+import {getSelectionStartPoint} from './util.get-selection-start-point'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import {getSelectionEndPoint} from './util.get-selection-end-point'
-import {getSelectionStartPoint} from './util.get-selection-start-point'
+} from './util.selection-point'
 
 export function sliceTextBlock({
   context,

package/src/utils/util.split-text-block.ts

@@ -1,7 +1,7 @@
 import {isSpan} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
-import type {EditorSelectionPoint} from '..'
 import type {EditorContext} from '../editor/editor-snapshot'
+import type {EditorSelectionPoint} from '../types/editor'
 import {sliceTextBlock} from './util.slice-text-block'
 
 /**