@portabletext/editor 2.13.2 → 2.13.4

package/src/behaviors/behavior.core.lists.ts

@@ -1,14 +1,20 @@
 import {isTextBlock} from '@portabletext/schema'
-import {isListBlock} from '../internal-utils/parse-blocks'
 import {defaultKeyboardShortcuts} from '../keyboard-shortcuts/default-keyboard-shortcuts'
-import * as selectors from '../selectors'
-import {
-  getBlockEndPoint,
-  getBlockStartPoint,
-  isEqualSelectionPoints,
-} from '../utils'
+import {getFocusListBlock} from '../selectors/selector.get-focus-list-block'
+import {getFocusSpan} from '../selectors/selector.get-focus-span'
+import {getFocusTextBlock} from '../selectors/selector.get-focus-text-block'
+import {getNextBlock} from '../selectors/selector.get-next-block'
+import {getPreviousBlock} from '../selectors/selector.get-previous-block'
+import {getSelectedBlocks} from '../selectors/selector.get-selected-blocks'
+import {getSelectionEndPoint} from '../selectors/selector.get-selection-end-point'
+import {getSelectionStartPoint} from '../selectors/selector.get-selection-start-point'
+import {isSelectionCollapsed} from '../selectors/selector.is-selection-collapsed'
+import {isListBlock} from '../utils/parse-blocks'
 import {isAtTheBeginningOfBlock} from '../utils/util.at-the-beginning-of-block'
+import {getBlockEndPoint} from '../utils/util.get-block-end-point'
+import {getBlockStartPoint} from '../utils/util.get-block-start-point'
 import {isEmptyTextBlock} from '../utils/util.is-empty-text-block'
+import {isEqualSelectionPoints} from '../utils/util.is-equal-selection-points'
 import {sliceTextBlock} from '../utils/util.slice-text-block'
 import {raise} from './behavior.types.action'
 import {defineBehavior} from './behavior.types.behavior'
@@ -18,7 +24,7 @@ const MAX_LIST_LEVEL = 10
 const clearListOnBackspace = defineBehavior({
   on: 'delete.backward',
   guard: ({snapshot}) => {
-    const focusTextBlock = selectors.getFocusTextBlock(snapshot)
+    const focusTextBlock = getFocusTextBlock(snapshot)
 
     if (!focusTextBlock) {
       return false
@@ -53,9 +59,9 @@ const clearListOnBackspace = defineBehavior({
 const unindentListOnBackspace = defineBehavior({
   on: 'delete.backward',
   guard: ({snapshot}) => {
-    const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
-    const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-    const focusSpan = selectors.getFocusSpan(snapshot)
+    const selectionCollapsed = isSelectionCollapsed(snapshot)
+    const focusTextBlock = getFocusTextBlock(snapshot)
+    const focusSpan = getFocusSpan(snapshot)
 
     if (!selectionCollapsed || !focusTextBlock || !focusSpan) {
       return false
@@ -94,8 +100,8 @@ const unindentListOnBackspace = defineBehavior({
 const mergeTextIntoListOnDelete = defineBehavior({
   on: 'delete.forward',
   guard: ({snapshot}) => {
-    const focusListBlock = selectors.getFocusListBlock(snapshot)
-    const nextBlock = selectors.getNextBlock(snapshot)
+    const focusListBlock = getFocusListBlock(snapshot)
+    const nextBlock = getNextBlock(snapshot)
 
     if (!focusListBlock || !nextBlock) {
       return false
@@ -135,8 +141,8 @@ const mergeTextIntoListOnDelete = defineBehavior({
 const mergeTextIntoListOnBackspace = defineBehavior({
   on: 'delete.backward',
   guard: ({snapshot}) => {
-    const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-    const previousBlock = selectors.getPreviousBlock(snapshot)
+    const focusTextBlock = getFocusTextBlock(snapshot)
+    const previousBlock = getPreviousBlock(snapshot)
 
     if (!focusTextBlock || !previousBlock) {
       return false
@@ -198,7 +204,7 @@ const mergeTextIntoListOnBackspace = defineBehavior({
 const deletingListFromStart = defineBehavior({
   on: 'delete',
   guard: ({snapshot, event}) => {
-    const blocksToDelete = selectors.getSelectedBlocks({
+    const blocksToDelete = getSelectedBlocks({
       ...snapshot,
       context: {
         ...snapshot.context,
@@ -223,14 +229,14 @@ const deletingListFromStart = defineBehavior({
       return false
     }
 
-    const deleteStartPoint = selectors.getSelectionStartPoint({
+    const deleteStartPoint = getSelectionStartPoint({
       ...snapshot,
       context: {
         ...snapshot.context,
         selection: event.at,
       },
     })
-    const deleteEndPoint = selectors.getSelectionEndPoint({
+    const deleteEndPoint = getSelectionEndPoint({
       ...snapshot,
       context: {
         ...snapshot.context,
@@ -338,8 +344,8 @@ const deletingListFromStart = defineBehavior({
 const clearListOnEnter = defineBehavior({
   on: 'insert.break',
   guard: ({snapshot}) => {
-    const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
-    const focusListBlock = selectors.getFocusListBlock(snapshot)
+    const selectionCollapsed = isSelectionCollapsed(snapshot)
+    const focusListBlock = getFocusListBlock(snapshot)
 
     if (
       !selectionCollapsed ||
@@ -374,7 +380,7 @@ const indentListOnTab = defineBehavior({
       return false
     }
 
-    const selectedBlocks = selectors.getSelectedBlocks(snapshot)
+    const selectedBlocks = getSelectedBlocks(snapshot)
     const selectedListBlocks = selectedBlocks.flatMap((block) =>
       isListBlock(snapshot.context, block.node)
         ? [
@@ -423,7 +429,7 @@ const unindentListOnShiftTab = defineBehavior({
       return false
     }
 
-    const selectedBlocks = selectors.getSelectedBlocks(snapshot)
+    const selectedBlocks = getSelectedBlocks(snapshot)
     const selectedListBlocks = selectedBlocks.flatMap((block) =>
       isListBlock(snapshot.context, block.node)
         ? [
@@ -465,7 +471,7 @@ const unindentListOnShiftTab = defineBehavior({
 const inheritListLevel = defineBehavior({
   on: 'insert.blocks',
   guard: ({snapshot, event}) => {
-    const focusListBlock = selectors.getFocusListBlock(snapshot)
+    const focusListBlock = getFocusListBlock(snapshot)
 
     if (!focusListBlock) {
       return false
@@ -541,7 +547,7 @@ const inheritListLevel = defineBehavior({
 const inheritListItem = defineBehavior({
   on: 'insert.blocks',
   guard: ({snapshot, event}) => {
-    const focusListBlock = selectors.getFocusListBlock(snapshot)
+    const focusListBlock = getFocusListBlock(snapshot)
 
     if (!focusListBlock) {
       return false
@@ -635,7 +641,7 @@ const inheritListProperties = defineBehavior({
       return false
     }
 
-    const focusListBlock = selectors.getFocusListBlock(snapshot)
+    const focusListBlock = getFocusListBlock(snapshot)
 
     if (!focusListBlock) {
       return false

package/src/behaviors/behavior.decorator-pair.ts

@@ -1,8 +1,13 @@
 import type {EditorSchema} from '../editor/editor-schema'
 import {createPairRegex} from '../internal-utils/get-text-to-emphasize'
-import * as selectors from '../selectors'
+import {getFocusTextBlock} from '../selectors/selector.get-focus-text-block'
+import {getPreviousInlineObject} from '../selectors/selector.get-previous-inline-object'
+import {getSelectionStartPoint} from '../selectors/selector.get-selection-start-point'
+import {getBlockTextBefore} from '../selectors/selector.get-text-before'
 import type {BlockOffset} from '../types/block-offset'
-import * as utils from '../utils'
+import {spanSelectionPointToBlockOffset} from '../utils/util.block-offset'
+import {blockOffsetsToSelection} from '../utils/util.block-offsets-to-selection'
+import {childSelectionPointToBlockOffset} from '../utils/util.child-selection-point-to-block-offset'
 import {effect, execute} from './behavior.types.action'
 import {defineBehavior} from './behavior.types.behavior'
 
@@ -33,10 +38,10 @@ export function createDecoratorPairBehavior(config: {
         return false
       }
 
-      const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-      const selectionStartPoint = selectors.getSelectionStartPoint(snapshot)
+      const focusTextBlock = getFocusTextBlock(snapshot)
+      const selectionStartPoint = getSelectionStartPoint(snapshot)
       const selectionStartOffset = selectionStartPoint
-        ? utils.spanSelectionPointToBlockOffset({
+        ? spanSelectionPointToBlockOffset({
             context: {
               schema: snapshot.context.schema,
               value: snapshot.context.value,
@@ -49,7 +54,7 @@ export function createDecoratorPairBehavior(config: {
         return false
       }
 
-      const textBefore = selectors.getBlockTextBefore(snapshot)
+      const textBefore = getBlockTextBefore(snapshot)
       const newText = `${textBefore}${event.text}`
       const textToDecorate = newText.match(regEx)?.at(0)
 
@@ -92,27 +97,25 @@ export function createDecoratorPairBehavior(config: {
       // If the prefix is more than one character, then we need to check if
       // there is an inline object inside it
       if (prefixOffsets.focus.offset - prefixOffsets.anchor.offset > 1) {
-        const prefixSelection = utils.blockOffsetsToSelection({
+        const prefixSelection = blockOffsetsToSelection({
           context: snapshot.context,
           offsets: prefixOffsets,
         })
-        const inlineObjectBeforePrefixFocus = selectors.getPreviousInlineObject(
-          {
-            ...snapshot,
-            context: {
-              ...snapshot.context,
-              selection: prefixSelection
-                ? {
-                    anchor: prefixSelection.focus,
-                    focus: prefixSelection.focus,
-                  }
-                : null,
-            },
+        const inlineObjectBeforePrefixFocus = getPreviousInlineObject({
+          ...snapshot,
+          context: {
+            ...snapshot.context,
+            selection: prefixSelection
+              ? {
+                  anchor: prefixSelection.focus,
+                  focus: prefixSelection.focus,
+                }
+              : null,
           },
-        )
+        })
         const inlineObjectBeforePrefixFocusOffset =
           inlineObjectBeforePrefixFocus
-            ? utils.childSelectionPointToBlockOffset({
+            ? childSelectionPointToBlockOffset({
                 context: {
                   schema: snapshot.context.schema,
                   value: snapshot.context.value,
@@ -138,9 +141,9 @@ export function createDecoratorPairBehavior(config: {
       // If the suffix is more than one character, then we need to check if
       // there is an inline object inside it
       if (suffixOffsets.focus.offset - suffixOffsets.anchor.offset > 1) {
-        const previousInlineObject = selectors.getPreviousInlineObject(snapshot)
+        const previousInlineObject = getPreviousInlineObject(snapshot)
         const previousInlineObjectOffset = previousInlineObject
-          ? utils.childSelectionPointToBlockOffset({
+          ? childSelectionPointToBlockOffset({
               context: {
                 schema: snapshot.context.schema,
                 value: snapshot.context.value,

package/src/behaviors/behavior.markdown.ts

@@ -1,6 +1,11 @@
 import {isTextBlock} from '@portabletext/schema'
 import type {EditorSchema} from '../editor/editor-schema'
-import * as selectors from '../selectors'
+import {getFocusBlock} from '../selectors/selector.get-focus-block'
+import {getFocusSpan} from '../selectors/selector.get-focus-span'
+import {getFocusTextBlock} from '../selectors/selector.get-focus-text-block'
+import {getPreviousInlineObject} from '../selectors/selector.get-previous-inline-object'
+import {getBlockTextBefore} from '../selectors/selector.get-text-before'
+import {isSelectionCollapsed} from '../selectors/selector.is-selection-collapsed'
 import {spanSelectionPointToBlockOffset} from '../utils/util.block-offset'
 import {getTextBlockText} from '../utils/util.get-text-block-text'
 import {execute} from './behavior.types.action'
@@ -30,15 +35,15 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
         return false
       }
 
-      const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
-      const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-      const focusSpan = selectors.getFocusSpan(snapshot)
+      const selectionCollapsed = isSelectionCollapsed(snapshot)
+      const focusTextBlock = getFocusTextBlock(snapshot)
+      const focusSpan = getFocusSpan(snapshot)
 
       if (!selectionCollapsed || !focusTextBlock || !focusSpan) {
         return false
       }
 
-      const previousInlineObject = selectors.getPreviousInlineObject(snapshot)
+      const previousInlineObject = getPreviousInlineObject(snapshot)
       const blockOffset = spanSelectionPointToBlockOffset({
         context: snapshot.context,
         selectionPoint: {
@@ -121,15 +126,15 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
       }
 
       const hrObject = config.horizontalRuleObject?.(snapshot.context)
-      const focusBlock = selectors.getFocusTextBlock(snapshot)
-      const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
+      const focusBlock = getFocusTextBlock(snapshot)
+      const selectionCollapsed = isSelectionCollapsed(snapshot)
 
       if (!hrObject || !focusBlock || !selectionCollapsed) {
         return false
       }
 
-      const previousInlineObject = selectors.getPreviousInlineObject(snapshot)
-      const textBefore = selectors.getBlockTextBefore(snapshot)
+      const previousInlineObject = getPreviousInlineObject(snapshot)
+      const textBefore = getBlockTextBefore(snapshot)
       const hrBlockOffsets = {
         anchor: {
           path: focusBlock.path,
@@ -180,7 +185,7 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
       const hrRegExp = /^(---)$|(___)$|(\*\*\*)$/
       const hrCharacters = text.match(hrRegExp)?.[0]
       const hrObject = config.horizontalRuleObject?.(snapshot.context)
-      const focusBlock = selectors.getFocusBlock(snapshot)
+      const focusBlock = getFocusBlock(snapshot)
 
       if (!hrCharacters || !hrObject || !focusBlock) {
         return false
@@ -240,9 +245,9 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
         return false
       }
 
-      const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
-      const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-      const focusSpan = selectors.getFocusSpan(snapshot)
+      const selectionCollapsed = isSelectionCollapsed(snapshot)
+      const focusTextBlock = getFocusTextBlock(snapshot)
+      const focusSpan = getFocusSpan(snapshot)
 
       if (!selectionCollapsed || !focusTextBlock || !focusSpan) {
         return false
@@ -264,7 +269,7 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
         return false
       }
 
-      const previousInlineObject = selectors.getPreviousInlineObject(snapshot)
+      const previousInlineObject = getPreviousInlineObject(snapshot)
       const blockText = getTextBlockText(focusTextBlock.node)
       const markdownHeadingSearch = /^#+/.exec(blockText)
       const level = markdownHeadingSearch
@@ -323,9 +328,9 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
   const clearStyleOnBackspace = defineBehavior({
     on: 'delete.backward',
     guard: ({snapshot}) => {
-      const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
-      const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-      const focusSpan = selectors.getFocusSpan(snapshot)
+      const selectionCollapsed = isSelectionCollapsed(snapshot)
+      const focusTextBlock = getFocusTextBlock(snapshot)
+      const focusSpan = getFocusSpan(snapshot)
 
       if (!selectionCollapsed || !focusTextBlock || !focusSpan) {
         return false
@@ -366,15 +371,15 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
         return false
       }
 
-      const selectionCollapsed = selectors.isSelectionCollapsed(snapshot)
-      const focusTextBlock = selectors.getFocusTextBlock(snapshot)
-      const focusSpan = selectors.getFocusSpan(snapshot)
+      const selectionCollapsed = isSelectionCollapsed(snapshot)
+      const focusTextBlock = getFocusTextBlock(snapshot)
+      const focusSpan = getFocusSpan(snapshot)
 
       if (!selectionCollapsed || !focusTextBlock || !focusSpan) {
         return false
       }
 
-      const previousInlineObject = selectors.getPreviousInlineObject(snapshot)
+      const previousInlineObject = getPreviousInlineObject(snapshot)
       const blockOffset = spanSelectionPointToBlockOffset({
         context: snapshot.context,
         selectionPoint: {

package/src/converters/converter.portable-text.ts

@@ -1,5 +1,5 @@
-import {parseBlock} from '../internal-utils/parse-blocks'
-import * as selectors from '../selectors'
+import {getSelectedValue} from '../selectors/selector.get-selected-value'
+import {parseBlock} from '../utils/parse-blocks'
 import {defineConverter} from './converter.types'
 
 export const converterPortableText = defineConverter({
@@ -16,7 +16,7 @@ export const converterPortableText = defineConverter({
       }
     }
 
-    const blocks = selectors.getSelectedValue(snapshot)
+    const blocks = getSelectedValue(snapshot)
 
     if (blocks.length === 0) {
       return {

package/src/converters/converter.text-html.serialize.test.ts

@@ -6,8 +6,8 @@ import {
 } from '@portabletext/schema'
 import type {PortableTextBlock, PortableTextTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
-import type {EditorSelection} from '..'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
+import type {EditorSelection} from '../types/editor'
 import {createConverterTextHtml} from './converter.text-html'
 
 const decoratedParagraph: PortableTextTextBlock = {

package/src/converters/converter.text-html.ts

@@ -1,9 +1,9 @@
 import {htmlToBlocks} from '@portabletext/block-tools'
 import {toHTML} from '@portabletext/to-html'
 import type {PortableTextBlock} from '@sanity/types'
-import {parseBlock} from '../internal-utils/parse-blocks'
-import * as selectors from '../selectors'
+import {getSelectedValue} from '../selectors/selector.get-selected-value'
 import type {PortableTextMemberSchemaTypes} from '../types/editor'
+import {parseBlock} from '../utils/parse-blocks'
 import {defineConverter} from './converter.types'
 
 export function createConverterTextHtml(
@@ -23,7 +23,7 @@ export function createConverterTextHtml(
         }
       }
 
-      const blocks = selectors.getSelectedValue(snapshot)
+      const blocks = getSelectedValue(snapshot)
 
       const html = toHTML(blocks, {
         onMissingComponent: false,

package/src/converters/converter.text-plain.test.ts

@@ -6,8 +6,8 @@ import {
 } from '@portabletext/schema'
 import type {PortableTextBlock, PortableTextTextBlock} 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 {createConverterTextPlain} from './converter.text-plain'
 
 const b1: PortableTextTextBlock = {

package/src/converters/converter.text-plain.ts

@@ -1,9 +1,9 @@
 import {htmlToBlocks} from '@portabletext/block-tools'
 import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
-import {parseBlock} from '../internal-utils/parse-blocks'
-import * as selectors from '../selectors'
+import {getSelectedValue} from '../selectors/selector.get-selected-value'
 import type {PortableTextMemberSchemaTypes} from '../types/editor'
+import {parseBlock} from '../utils/parse-blocks'
 import {defineConverter} from './converter.types'
 
 export function createConverterTextPlain(
@@ -23,7 +23,7 @@ export function createConverterTextPlain(
         }
       }
 
-      const blocks = selectors.getSelectedValue(snapshot)
+      const blocks = getSelectedValue(snapshot)
 
       const data = blocks
         .map((block) => {

package/src/editor/Editable.tsx

@@ -22,12 +22,10 @@ import {
 } from 'slate-react'
 import {debugWithName} from '../internal-utils/debug'
 import {getEventPosition} from '../internal-utils/event-position'
-import {parseBlocks} from '../internal-utils/parse-blocks'
 import {normalizeSelection} from '../internal-utils/selection'
 import {slateRangeToSelection} from '../internal-utils/slate-utils'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import {fromSlateValue, isEqualToEmptyEditor} from '../internal-utils/values'
-import {KEY_TO_VALUE_ELEMENT} from '../internal-utils/weakMaps'
 import type {
   EditorSelection,
   OnCopyFn,
@@ -43,6 +41,7 @@ import type {
   ScrollSelectionIntoViewFunction,
 } from '../types/editor'
 import type {HotkeyOptions} from '../types/options'
+import {parseBlocks} from '../utils/parse-blocks'
 import {RenderElement} from './components/render-element'
 import {RenderLeaf} from './components/render-leaf'
 import {RenderText, type RenderTextProps} from './components/render-text'
@@ -51,6 +50,8 @@ import {usePortableTextEditor} from './hooks/usePortableTextEditor'
 import {createWithHotkeys} from './plugins/createWithHotKeys'
 import {rangeDecorationsMachine} from './range-decorations-machine'
 import {RelayActorContext} from './relay-actor-context'
+import {validateSelectionMachine} from './validate-selection-machine'
+import {KEY_TO_VALUE_ELEMENT} from './weakMaps'
 
 const debug = debugWithName('component:Editable')
 
@@ -142,6 +143,11 @@ export const PortableTextEditable = forwardRef<
     s.matches({'edit mode': 'read only'}),
   )
   const slateEditor = useSlate()
+  const validateSelectionActor = useActorRef(validateSelectionMachine, {
+    input: {
+      slateEditor,
+    },
+  })
 
   const rangeDecorationsActor = useActorRef(rangeDecorationsMachine, {
     input: {
@@ -936,21 +942,24 @@ export const PortableTextEditable = forwardRef<
   )
 
   const callbackRef = useCallback(
-    (node: HTMLDivElement | null) => {
+    (editorElement: HTMLDivElement | null) => {
       if (typeof forwardedRef === 'function') {
-        forwardedRef(node)
+        forwardedRef(editorElement)
       } else if (forwardedRef) {
-        forwardedRef.current = node
+        forwardedRef.current = editorElement
       }
 
-      if (node) {
+      if (editorElement) {
         // Observe mutations (child list and subtree) to this component's DOM,
         // and make sure the editor selection is valid when that happens.
         const mutationObserver = new MutationObserver(() => {
-          validateSelection(slateEditor, node)
+          validateSelectionActor.send({
+            type: 'validate selection',
+            editorElement,
+          })
         })
 
-        mutationObserver.observe(node, {
+        mutationObserver.observe(editorElement, {
           attributeOldValue: false,
           attributes: false,
           characterData: false,
@@ -963,7 +972,7 @@ export const PortableTextEditable = forwardRef<
         }
       }
     },
-    [forwardedRef, slateEditor],
+    [forwardedRef, validateSelectionActor],
   )
 
   if (!portableTextEditor) {
@@ -1007,72 +1016,3 @@ export const PortableTextEditable = forwardRef<
 })
 
 PortableTextEditable.displayName = 'ForwardRef(PortableTextEditable)'
-
-// This function will handle unexpected DOM changes inside the Editable rendering,
-// and make sure that we can maintain a stable slateEditor.selection when that happens.
-//
-// For example, if this Editable is rendered inside something that might re-render
-// this component (hidden contexts) while the user is still actively changing the
-// contentEditable, this could interfere with the intermediate DOM selection,
-// which again could be picked up by ReactEditor's event listeners.
-// If that range is invalid at that point, the slate.editorSelection could be
-// set either wrong, or invalid, to which slateEditor will throw exceptions
-// that are impossible to recover properly from or result in a wrong selection.
-//
-// Also the other way around, when the ReactEditor will try to create a DOM Range
-// from the current slateEditor.selection, it may throw unrecoverable errors
-// if the current editor.selection is invalid according to the DOM.
-// If this is the case, default to selecting the top of the document, if the
-// user already had a selection.
-function validateSelection(slateEditor: Editor, activeElement: HTMLDivElement) {
-  if (!slateEditor.selection) {
-    return
-  }
-
-  let root: Document | ShadowRoot | undefined
-
-  try {
-    root = ReactEditor.findDocumentOrShadowRoot(slateEditor)
-  } catch {}
-
-  if (!root) {
-    // The editor has most likely been unmounted
-    return
-  }
-
-  // Return if the editor isn't the active element
-  if (activeElement !== root.activeElement) {
-    return
-  }
-  const window = ReactEditor.getWindow(slateEditor)
-  const domSelection = window.getSelection()
-  if (!domSelection || domSelection.rangeCount === 0) {
-    return
-  }
-  const existingDOMRange = domSelection.getRangeAt(0)
-  try {
-    const newDOMRange = ReactEditor.toDOMRange(
-      slateEditor,
-      slateEditor.selection,
-    )
-    if (
-      newDOMRange.startOffset !== existingDOMRange.startOffset ||
-      newDOMRange.endOffset !== existingDOMRange.endOffset
-    ) {
-      debug('DOM range out of sync, validating selection')
-      // Remove all ranges temporary
-      domSelection?.removeAllRanges()
-      // Set the correct range
-      domSelection.addRange(newDOMRange)
-    }
-  } catch {
-    debug(`Could not resolve selection, selecting top document`)
-    // Deselect the editor
-    Transforms.deselect(slateEditor)
-    // Select top document if there is a top block to select
-    if (slateEditor.children.length > 0) {
-      Transforms.select(slateEditor, [0, 0])
-    }
-    slateEditor.onChange()
-  }
-}

package/src/editor/components/render-span.tsx

@@ -3,11 +3,9 @@ import {useSelector} from '@xstate/react'
 import {uniq} from 'lodash'
 import {useContext, useMemo, useRef, type ReactElement} from 'react'
 import {useSlateStatic, type RenderLeafProps} from 'slate-react'
-import {
-  getFocusSpan,
-  isOverlappingSelection,
-  isSelectionCollapsed,
-} from '../../selectors'
+import {getFocusSpan} from '../../selectors/selector.get-focus-span'
+import {isOverlappingSelection} from '../../selectors/selector.is-overlapping-selection'
+import {isSelectionCollapsed} from '../../selectors/selector.is-selection-collapsed'
 import type {
   BlockAnnotationRenderProps,
   BlockChildRenderProps,

package/src/editor/create-editor.ts

@@ -10,20 +10,20 @@ import type {Editor, EditorConfig} from '../editor'
 import {debugWithName} from '../internal-utils/debug'
 import {compileType} from '../internal-utils/schema'
 import {fromSlateValue} from '../internal-utils/values'
-import {KEY_TO_VALUE_ELEMENT} from '../internal-utils/weakMaps'
 import {corePriority} from '../priority/priority.core'
 import {createEditorPriority} from '../priority/priority.types'
 import type {EditableAPI, PortableTextSlateEditor} from '../types/editor'
+import {defaultKeyGenerator} from '../utils/key-generator'
 import {createSlateEditor, type SlateEditor} from './create-slate-editor'
 import {createEditorDom} from './editor-dom'
 import type {EditorActor} from './editor-machine'
 import {editorMachine, rerouteExternalBehaviorEvent} from './editor-machine'
 import {getEditorSnapshot} from './editor-selector'
-import {defaultKeyGenerator} from './key-generator'
 import {mutationMachine, type MutationActor} from './mutation-machine'
 import {createEditableAPI} from './plugins/createWithEditableAPI'
 import {relayMachine, type RelayActor} from './relay-machine'
 import {syncMachine, type SyncActor} from './sync-machine'
+import {KEY_TO_VALUE_ELEMENT} from './weakMaps'
 
 const debug = debugWithName('setup')
 

package/src/editor/create-slate-editor.tsx

@@ -4,14 +4,11 @@ import {buildIndexMaps} from '../internal-utils/build-index-maps'
 import {createPlaceholderBlock} from '../internal-utils/create-placeholder-block'
 import {debugWithName} from '../internal-utils/debug'
 import {toSlateValue} from '../internal-utils/values'
-import {
-  KEY_TO_SLATE_ELEMENT,
-  KEY_TO_VALUE_ELEMENT,
-} from '../internal-utils/weakMaps'
 import type {PortableTextSlateEditor} from '../types/editor'
 import type {EditorActor} from './editor-machine'
 import {withPlugins} from './plugins/with-plugins'
 import type {RelayActor} from './relay-machine'
+import {KEY_TO_SLATE_ELEMENT, KEY_TO_VALUE_ELEMENT} from './weakMaps'
 
 const debug = debugWithName('setup')
 

package/src/editor/editor-dom.ts

@@ -1,10 +1,10 @@
 import {Editor} from 'slate'
 import {DOMEditor} from 'slate-dom'
-import type {EditorSnapshot} from '..'
-import type {BehaviorEvent} from '../behaviors'
+import type {BehaviorEvent} from '../behaviors/behavior.types.event'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import type {PickFromUnion} from '../type-utils'
 import type {PortableTextSlateEditor} from '../types/editor'
+import type {EditorSnapshot} from './editor-snapshot'
 
 export type EditorDom = {
   getBlockNodes: (snapshot: EditorSnapshot) => Array<Node>