@portabletext/editor 1.50.4 → 1.50.6

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

@@ -34,6 +34,7 @@ export const getActiveAnnotations: EditorSelector<Array<PortableTextObject>> = (
     }
   }
 
+  const activeAnnotations = snapshot.beta.activeAnnotations
   const selectionMarkDefs = selectedBlocks.flatMap((block) =>
     isTextBlock(snapshot.context, block.node)
       ? (block.node.markDefs ?? [])
@@ -41,6 +42,6 @@ export const getActiveAnnotations: EditorSelector<Array<PortableTextObject>> = (
   )
 
   return selectionMarkDefs.filter((markDef) =>
-    selectedSpans.some((span) => span.node.marks?.includes(markDef._key)),
+    activeAnnotations.includes(markDef._key),
   )
 }

package/src/selectors/selector.is-active-annotation.ts

@@ -1,8 +1,6 @@
 import type {EditorSelector} from '../editor/editor-selector'
 import {isTextBlock} from '../internal-utils/parse-blocks'
-import {getSelectedSpans} from './selector.get-selected-spans'
-import {isSelectionExpanded} from './selector.is-selection-expanded'
-import {getFocusSpan, getSelectedBlocks} from './selectors'
+import {getSelectedBlocks} from './selectors'
 
 /**
  * @public
@@ -11,48 +9,18 @@ export function isActiveAnnotation(
   annotation: string,
 ): EditorSelector<boolean> {
   return (snapshot) => {
-    if (!snapshot.context.selection) {
-      return false
-    }
-
     const selectedBlocks = getSelectedBlocks(snapshot)
-    const focusSpan = getFocusSpan(snapshot)
-
-    const selectedSpans = isSelectionExpanded(snapshot)
-      ? getSelectedSpans(snapshot)
-      : focusSpan
-        ? [focusSpan]
-        : []
-
-    if (selectedSpans.length === 0) {
-      return false
-    }
-
-    if (
-      selectedSpans.some(
-        (span) => !span.node.marks || span.node.marks?.length === 0,
-      )
-    ) {
-      return false
-    }
-
     const selectionMarkDefs = selectedBlocks.flatMap((block) =>
       isTextBlock(snapshot.context, block.node)
         ? (block.node.markDefs ?? [])
         : [],
     )
+    const activeMarkDefs = selectionMarkDefs.filter(
+      (markDef) =>
+        markDef._type === annotation &&
+        snapshot.beta.activeAnnotations.includes(markDef._key),
+    )
 
-    return selectedSpans.every((span) => {
-      const spanMarkDefs =
-        span.node.marks?.flatMap((mark) => {
-          const markDef = selectionMarkDefs.find(
-            (markDef) => markDef._key === mark,
-          )
-
-          return markDef ? [markDef._type] : []
-        }) ?? []
-
-      return spanMarkDefs.includes(annotation)
-    })
+    return activeMarkDefs.length > 0
   }
 }

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

@@ -16,6 +16,6 @@ export function isActiveDecorator(decorator: string): EditorSelector<boolean> {
       )
     }
 
-    return snapshot.context.activeDecorators.includes(decorator)
+    return snapshot.beta.activeDecorators.includes(decorator)
   }
 }

package/src/types/editor.ts

@@ -29,6 +29,7 @@ import type {DOMNode} from 'slate-dom'
 import type {ReactEditor} from 'slate-react'
 import type {PortableTextEditableProps} from '../editor/Editable'
 import type {PortableTextEditor} from '../editor/PortableTextEditor'
+import type {MarkState} from '../internal-utils/mark-state'
 import type {BlockPath} from './paths'
 
 /** @beta */
@@ -125,6 +126,8 @@ export interface PortableTextSlateEditor extends ReactEditor {
   isTextSpan: (value: unknown) => value is PortableTextSpan
   isListBlock: (value: unknown) => value is PortableTextListBlock
   value: Array<PortableTextBlock>
+  decoratorState: Record<string, boolean | undefined>
+  markState: MarkState | undefined
 
   /**
    * Use hotkeys

package/src/editor/get-value.ts

@@ -1,18 +0,0 @@
-import {fromSlateValue} from '../internal-utils/values'
-import {KEY_TO_VALUE_ELEMENT} from '../internal-utils/weakMaps'
-import type {PortableTextSlateEditor} from '../types/editor'
-import type {EditorActor} from './editor-machine'
-
-export function getValue({
-  editorActorSnapshot,
-  slateEditorInstance,
-}: {
-  editorActorSnapshot: ReturnType<EditorActor['getSnapshot']>
-  slateEditorInstance: PortableTextSlateEditor
-}) {
-  return fromSlateValue(
-    slateEditorInstance.children,
-    editorActorSnapshot.context.schema.block.name,
-    KEY_TO_VALUE_ELEMENT.get(slateEditorInstance),
-  )
-}

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

@@ -1,141 +0,0 @@
-import type {PortableTextBlock} from '@sanity/types'
-import {expect, test} from 'vitest'
-import type {EditorSelection} from '..'
-import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
-import {getActiveAnnotations} from './selector.get-active-annotations'
-
-function snapshot(value: Array<PortableTextBlock>, selection: EditorSelection) {
-  return createTestSnapshot({
-    context: {
-      value,
-      selection,
-    },
-  })
-}
-
-const link = {
-  _key: 'k4',
-  _type: 'link',
-  href: 'https://example.com',
-}
-
-const comment = {
-  _key: 'k5',
-  _type: 'comment',
-  comment: 'Consider rewriting this',
-}
-
-const block = {
-  _type: 'block',
-  _key: 'k0',
-  children: [
-    {
-      _key: 'k1',
-      _type: 'span',
-      text: 'foo',
-      marks: ['strong'],
-    },
-    {
-      _type: 'span',
-      _key: 'k2',
-      text: 'bar',
-      marks: [link._key, comment._key, 'strong'],
-    },
-    {
-      _key: 'k3',
-      _type: 'span',
-      text: 'baz',
-      marks: [comment._key, 'strong'],
-    },
-  ],
-  markDefs: [link, comment],
-}
-
-test(getActiveAnnotations.name, () => {
-  expect(getActiveAnnotations(snapshot([], null))).toEqual([])
-  expect(getActiveAnnotations(snapshot([block], null))).toEqual([])
-  expect(
-    getActiveAnnotations(
-      snapshot([block], {
-        anchor: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
-          offset: 0,
-        },
-        focus: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
-          offset: 3,
-        },
-      }),
-    ),
-  ).toEqual([])
-  expect(
-    getActiveAnnotations(
-      snapshot([block], {
-        anchor: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
-          offset: 0,
-        },
-        focus: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
-          offset: 3,
-        },
-      }),
-    ),
-  ).toEqual([link, comment])
-  expect(
-    getActiveAnnotations(
-      snapshot([block], {
-        anchor: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
-          offset: 0,
-        },
-        focus: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
-          offset: 3,
-        },
-      }),
-    ),
-  ).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], {
-        anchor: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
-          offset: 0,
-        },
-        focus: {
-          path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
-          offset: 3,
-        },
-      }),
-    ),
-  ).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([])
-})