@portabletext/editor 1.33.2 → 1.33.3

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

@@ -1,16 +1,369 @@
+import type {PortableTextBlock} from '@sanity/types'
 import {expect, test} from 'vitest'
-import type {EditorSchema, EditorSelection, EditorSnapshot} from '.'
+import type {EditorSelection, EditorSnapshot} from '.'
+import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
 import {getSelectionText} from './selector.get-selection-text'
 
+const brokenBlock = {
+  _type: 'block',
+  _key: 'b0',
+  style: 'normal',
+  markDefs: [],
+  children: [
+    {
+      _key: 's0',
+      _type: 'span',
+      text: '',
+    },
+    {
+      _key: 's1',
+      _type: 'stock-ticker',
+    },
+    {
+      _key: 's2',
+      _type: 'span',
+      text: 'b',
+    },
+    {
+      _key: 's3',
+      _type: 'span',
+      text: 'a',
+    },
+    {
+      _key: 's4',
+      _type: 'span',
+      text: 'r',
+    },
+    {
+      _key: 's5',
+      _type: 'stock-ticker',
+    },
+    {
+      _key: 's6',
+      _type: 'span',
+      text: '',
+    },
+  ],
+}
+const bazBlock = {
+  _type: 'block',
+  _key: 'b1',
+  style: 'normal',
+  markDefs: [],
+  children: [
+    {
+      _key: 's7',
+      _type: 'span',
+      text: 'baz',
+    },
+  ],
+}
+const imageBlock = {
+  _type: 'image',
+  _key: 'b2',
+}
+
 test(getSelectionText.name, () => {
-  function snapshot(selection: EditorSelection): EditorSnapshot {
+  function snapshot(
+    value: Array<PortableTextBlock>,
+    selection: EditorSelection,
+  ): EditorSnapshot {
     return {
       context: {
         converters: [],
-        schema: {} as EditorSchema,
+        schema: compileSchemaDefinition(
+          defineSchema({
+            inlineObjects: [{name: 'stock-ticker'}],
+          }),
+        ),
         keyGenerator: () => '',
         activeDecorators: [],
-        value: [
+        value,
+        selection,
+      },
+    }
+  }
+
+  expect(
+    getSelectionText(
+      snapshot(
+        [
+          {
+            _key: 'k0',
+            _type: 'block',
+            children: [
+              {
+                _type: 'span',
+                _key: 'k1',
+                text: 'f',
+                marks: ['strong'],
+              },
+              {
+                _type: 'span',
+                _key: 'k2',
+                marks: ['strong', 'em'],
+                text: 'oo b',
+              },
+              {
+                _type: 'span',
+                _key: 'k3',
+                marks: ['strong', 'em', 'underline'],
+                text: 'a',
+              },
+              {
+                _type: 'span',
+                _key: 'k4',
+                marks: ['strong', 'underline'],
+                text: 'r ba',
+              },
+              {
+                _type: 'span',
+                _key: 'k5',
+                marks: ['strong'],
+                text: 'z',
+              },
+            ],
+          },
+        ],
+        {
+          anchor: {path: [{_key: 'k0'}, 'children', {_key: 'k1'}], offset: 0},
+          focus: {path: [{_key: 'k0'}, 'children', {_key: 'k3'}], offset: 0},
+        },
+      ),
+    ),
+  ).toBe('foo b')
+  expect(
+    getSelectionText(
+      snapshot(
+        [
+          {
+            _key: 'b0',
+            _type: 'block',
+            children: [{_key: 's0', _type: 'span', text: 'foo bar'}],
+          },
+        ],
+        {
+          anchor: {
+            path: [{_key: 'b0'}, 'children', {_key: 's0'}],
+            offset: 0,
+          },
+          focus: {
+            path: [{_key: 'b0'}, 'children', {_key: 's0'}],
+            offset: 3,
+          },
+        },
+      ),
+    ),
+  ).toBe('foo')
+  expect(
+    getSelectionText(
+      snapshot(
+        [
+          {
+            _key: 'b0',
+            _type: 'block',
+            children: [{_key: 's0', _type: 'span', text: 'foo bar'}],
+          },
+        ],
+        {
+          anchor: {
+            path: [{_key: 'b0'}, 'children', {_key: 's0'}],
+            offset: 3,
+          },
+          focus: {
+            path: [{_key: 'b0'}, 'children', {_key: 's0'}],
+            offset: 7,
+          },
+        },
+      ),
+    ),
+  ).toBe(' bar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's0'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('bar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's1'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('bar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's2'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('bar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's2'}],
+          offset: 1,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('ar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's3'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('ar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's3'}],
+          offset: 1,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('r')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's4'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('r')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's6'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b0'}, 'children', {_key: 's5'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock, bazBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's3'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b1'}, 'children', {_key: 's7'}],
+          offset: 2,
+        },
+      }),
+    ),
+  ).toBe('arba')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock, bazBlock], {
+        anchor: {
+          path: [{_key: 'b0'}, 'children', {_key: 's3'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b1'}, 'children', {_key: 's7'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('ar')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock, imageBlock, bazBlock], {
+        anchor: {
+          path: [{_key: imageBlock._key}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b1'}, 'children', {_key: 's7'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toBe('')
+  expect(
+    getSelectionText(
+      snapshot([brokenBlock, imageBlock, bazBlock], {
+        anchor: {
+          path: [{_key: imageBlock._key}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'b1'}, 'children', {_key: 's7'}],
+          offset: 1,
+        },
+      }),
+    ),
+  ).toBe('b')
+  expect(
+    getSelectionText(
+      snapshot(
+        [
           {
             _type: 'block',
             _key: 'e0-k8',
@@ -38,39 +391,33 @@ test(getSelectionText.name, () => {
             ],
           },
         ],
-        selection,
-      },
-    }
-  }
-
-  expect(
-    getSelectionText(
-      snapshot({
-        anchor: {
-          path: [
-            {
-              _key: 'e0-k8',
-            },
-            'children',
-            {
-              _key: 'e0-k7',
-            },
-          ],
-          offset: 0,
-        },
-        focus: {
-          path: [
-            {
-              _key: 'e0-k8',
-            },
-            'children',
-            {
-              _key: 'e0-k10',
-            },
-          ],
-          offset: 1,
+        {
+          anchor: {
+            path: [
+              {
+                _key: 'e0-k8',
+              },
+              'children',
+              {
+                _key: 'e0-k7',
+              },
+            ],
+            offset: 0,
+          },
+          focus: {
+            path: [
+              {
+                _key: 'e0-k8',
+              },
+              'children',
+              {
+                _key: 'e0-k10',
+              },
+            ],
+            offset: 1,
+          },
         },
-      }),
+      ),
     ),
   ).toBe(':bar')
 })

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

@@ -23,62 +23,77 @@ export const getSelectionText: EditorSelector<string> = ({context}) => {
     return text
   }
 
-  for (const block of value) {
-    if (
-      isKeyedSegment(forwardSelection.anchor.path[0]) &&
-      block._key !== forwardSelection.anchor.path[0]._key
-    ) {
-      continue
-    }
+  const startBlockKey = isKeyedSegment(forwardSelection.anchor.path[0])
+    ? forwardSelection.anchor.path[0]._key
+    : undefined
+  const endBlockKey = isKeyedSegment(forwardSelection.focus.path[0])
+    ? forwardSelection.focus.path[0]._key
+    : undefined
+  const startChildKey = isKeyedSegment(forwardSelection.anchor.path[2])
+    ? forwardSelection.anchor.path[2]._key
+    : undefined
+  const endChildKey = isKeyedSegment(forwardSelection.focus.path[2])
+    ? forwardSelection.focus.path[2]._key
+    : undefined
+  let startFound = false
 
-    if (!isPortableTextTextBlock(block)) {
-      continue
-    }
+  if (!startBlockKey || !endBlockKey) {
+    return text
+  }
 
-    for (const child of block.children) {
-      if (isPortableTextSpan(child)) {
-        if (
-          isKeyedSegment(forwardSelection.anchor.path[2]) &&
-          child._key === forwardSelection.anchor.path[2]._key &&
-          isKeyedSegment(forwardSelection.focus.path[2]) &&
-          child._key === forwardSelection.focus.path[2]._key
-        ) {
-          text =
-            text +
-            child.text.slice(
-              forwardSelection.anchor.offset,
-              forwardSelection.focus.offset,
-            )
+  for (const block of value) {
+    if (block._key === startBlockKey) {
+      if (!isPortableTextTextBlock(block)) {
+        continue
+      }
 
-          break
+      for (const child of block.children) {
+        if (child._key === startChildKey) {
+          startFound = true
         }
 
-        if (
-          isKeyedSegment(forwardSelection.anchor.path[2]) &&
-          child._key === forwardSelection.anchor.path[2]._key
-        ) {
-          text = text + child.text.slice(forwardSelection.anchor.offset)
+        if (!startFound) {
           continue
         }
 
-        if (
-          isKeyedSegment(forwardSelection.focus.path[2]) &&
-          child._key === forwardSelection.focus.path[2]._key
-        ) {
-          text = text + child.text.slice(0, forwardSelection.focus.offset)
-          break
+        if (isPortableTextSpan(child) && startChildKey) {
+          if (child._key === startChildKey && child._key === endChildKey) {
+            text =
+              text +
+              child.text.slice(
+                forwardSelection.anchor.offset,
+                forwardSelection.focus.offset,
+              )
+          } else if (child._key === startChildKey) {
+            text = text + child.text.slice(forwardSelection.anchor.offset)
+          } else if (child._key === endChildKey) {
+            text = text + child.text.slice(0, forwardSelection.focus.offset)
+          } else {
+            text = text + child.text
+          }
         }
 
-        if (text.length > 0) {
-          text = text + child.text
+        if (child._key === endChildKey) {
+          break
         }
       }
+      continue
     }
 
-    if (
-      isKeyedSegment(forwardSelection.focus.path[0]) &&
-      block._key === forwardSelection.focus.path[0]._key
-    ) {
+    if (block._key === endBlockKey) {
+      if (!isPortableTextTextBlock(block)) {
+        continue
+      }
+
+      for (const child of block.children) {
+        if (isPortableTextSpan(child) && endChildKey) {
+          text = text + child.text.slice(0, forwardSelection.focus.offset)
+        }
+
+        if (child._key === endChildKey) {
+          break
+        }
+      }
       break
     }
   }