@portabletext/editor 1.42.0 → 1.43.0

package/src/selectors/selector.get-active-annotations.test.ts

@@ -96,6 +96,20 @@ test(getActiveAnnotations.name, () => {
       }),
     ),
   ).toEqual([link, comment])
+  expect(
+    getActiveAnnotations(
+      snapshot([block], {
+        anchor: {
+          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
+          offset: 0,
+        },
+        focus: {
+          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
+          offset: 0,
+        },
+      }),
+    ),
+  ).toEqual([])
   expect(
     getActiveAnnotations(
       snapshot([block], {
@@ -110,4 +124,18 @@ test(getActiveAnnotations.name, () => {
       }),
     ),
   ).toEqual([comment])
+  expect(
+    getActiveAnnotations(
+      snapshot([block], {
+        anchor: {
+          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
+          offset: 3,
+        },
+        focus: {
+          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
+          offset: 3,
+        },
+      }),
+    ),
+  ).toEqual([])
 })

package/src/selectors/selector.get-active-annotations.ts

@@ -1,7 +1,8 @@
 import {isPortableTextTextBlock, type PortableTextObject} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
 import {getSelectedSpans} from './selector.get-selected-spans'
-import {getSelectedBlocks} from './selectors'
+import {isSelectionCollapsed} from './selector.is-selection-collapsed'
+import {getFocusSpan, getSelectedBlocks} from './selectors'
 
 /**
  * @public
@@ -15,11 +16,23 @@ export const getActiveAnnotations: EditorSelector<Array<PortableTextObject>> = (
 
   const selectedBlocks = getSelectedBlocks(snapshot)
   const selectedSpans = getSelectedSpans(snapshot)
+  const focusSpan = getFocusSpan(snapshot)
 
-  if (selectedSpans.length === 0) {
+  if (selectedSpans.length === 0 || !focusSpan) {
     return []
   }
 
+  if (selectedSpans.length === 1 && isSelectionCollapsed(snapshot)) {
+    if (snapshot.context.selection.focus.offset === 0) {
+      return []
+    }
+    if (
+      snapshot.context.selection.focus.offset === focusSpan.node.text.length
+    ) {
+      return []
+    }
+  }
+
   const selectionMarkDefs = selectedBlocks.flatMap((block) =>
     isPortableTextTextBlock(block.node) ? (block.node.markDefs ?? []) : [],
   )