@portabletext/editor 2.13.3 → 2.13.5

package/src/editor/plugins/createWithSchemaTypes.ts

@@ -6,8 +6,8 @@ import type {
 } from '@sanity/types'
 import {Editor, Transforms, type Element} from 'slate'
 import {debugWithName} from '../../internal-utils/debug'
-import {isListBlock} from '../../internal-utils/parse-blocks'
 import type {PortableTextSlateEditor} from '../../types/editor'
+import {isListBlock} from '../../utils/parse-blocks'
 import type {EditorActor} from '../editor-machine'
 
 const debug = debugWithName('plugin:withSchemaTypes')

package/src/editor/plugins/createWithUndoRedo.ts

@@ -22,7 +22,11 @@ import {
 } from 'slate'
 import {debugWithName} from '../../internal-utils/debug'
 import {fromSlateValue} from '../../internal-utils/values'
-import {isChangingRemotely} from '../../internal-utils/withChanges'
+import type {BehaviorOperationImplementation} from '../../operations/behavior.operations'
+import type {PortableTextSlateEditor} from '../../types/editor'
+import type {EditorActor} from '../editor-machine'
+import {getCurrentUndoStepId} from '../with-undo-step'
+import {isChangingRemotely} from '../withChanges'
 import {
   isRedoing,
   isUndoing,
@@ -30,11 +34,7 @@ import {
   setIsUndoing,
   withRedoing,
   withUndoing,
-} from '../../internal-utils/withUndoRedo'
-import type {BehaviorOperationImplementation} from '../../operations/behavior.operations'
-import type {PortableTextSlateEditor} from '../../types/editor'
-import type {EditorActor} from '../editor-machine'
-import {getCurrentUndoStepId} from '../with-undo-step'
+} from '../withUndoRedo'
 
 const debug = debugWithName('plugin:withUndoRedo')
 const debugVerbose = debug.enabled && false

package/src/editor/plugins/slate-plugin.update-selection.ts

@@ -1,7 +1,7 @@
 import {slateRangeToSelection} from '../../internal-utils/slate-utils'
-import {SLATE_TO_PORTABLE_TEXT_RANGE} from '../../internal-utils/weakMaps'
 import type {PortableTextSlateEditor} from '../../types/editor'
 import type {EditorActor} from '../editor-machine'
+import {SLATE_TO_PORTABLE_TEXT_RANGE} from '../weakMaps'
 
 export function pluginUpdateSelection({
   editor,

package/src/editor/sync-machine.ts

@@ -25,11 +25,6 @@ import type {ActorRefFrom} from 'xstate'
 import {debugWithName} from '../internal-utils/debug'
 import {validateValue} from '../internal-utils/validateValue'
 import {toSlateValue, VOID_CHILD_KEY} from '../internal-utils/values'
-import {
-  isChangingRemotely,
-  withRemoteChanges,
-} from '../internal-utils/withChanges'
-import {withoutPatching} from '../internal-utils/withoutPatching'
 import type {PickFromUnion} from '../type-utils'
 import type {
   InvalidValueResolution,
@@ -37,6 +32,8 @@ import type {
 } from '../types/editor'
 import type {EditorSchema} from './editor-schema'
 import {withoutSaving} from './plugins/createWithUndoRedo'
+import {isChangingRemotely, withRemoteChanges} from './withChanges'
+import {withoutPatching} from './withoutPatching'
 
 const debug = debugWithName('sync machine')
 

package/src/{internal-utils → editor}/weakMaps.ts

@@ -1,5 +1,5 @@
 import type {Editor, Range} from 'slate'
-import type {EditorSelection} from '..'
+import type {EditorSelection} from '../types/editor'
 
 // Is the editor currently receiving remote changes that are being applied to the content?
 export const IS_PROCESSING_REMOTE_CHANGES: WeakMap<Editor, boolean> =

package/src/editor/with-undo-step.ts

@@ -1,5 +1,5 @@
 import type {Editor} from 'slate'
-import {defaultKeyGenerator} from './key-generator'
+import {defaultKeyGenerator} from '../utils/key-generator'
 
 const CURRENT_UNDO_STEP: WeakMap<Editor, {undoStepId: string} | undefined> =
   new WeakMap()

package/src/index.ts

@@ -40,7 +40,7 @@ export {useEditorSelector, type EditorSelector} from './editor/editor-selector'
 export type {EditorContext, EditorSnapshot} from './editor/editor-snapshot'
 export {usePortableTextEditor} from './editor/hooks/usePortableTextEditor'
 export {usePortableTextEditorSelection} from './editor/hooks/usePortableTextEditorSelection'
-export {defaultKeyGenerator as keyGenerator} from './editor/key-generator'
+export {defaultKeyGenerator as keyGenerator} from './utils/key-generator'
 export {PortableTextEditor} from './editor/PortableTextEditor'
 export type {PortableTextEditorProps} from './editor/PortableTextEditor'
 export type {EditorEmittedEvent, MutationEvent} from './editor/relay-machine'

package/src/internal-utils/applyPatch.ts

@@ -18,10 +18,10 @@ import {
 import type {Path, PortableTextBlock, PortableTextChild} from '@sanity/types'
 import {Element, Node, Text, Transforms, type Descendant} from 'slate'
 import type {EditorSchema} from '../editor/editor-schema'
+import {KEY_TO_SLATE_ELEMENT} from '../editor/weakMaps'
 import type {PortableTextSlateEditor} from '../types/editor'
-import {isKeyedSegment} from '../utils'
+import {isKeyedSegment} from '../utils/util.is-keyed-segment'
 import {isEqualToEmptyEditor, toSlateValue} from './values'
-import {KEY_TO_SLATE_ELEMENT} from './weakMaps'
 
 /**
  * Creates a function that can apply a patch onto a PortableTextSlateEditor.

package/src/internal-utils/build-index-maps.test.ts

@@ -1,7 +1,7 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
-import {defaultKeyGenerator} from '../editor/key-generator'
+import {defaultKeyGenerator} from '../utils/key-generator'
 import {buildIndexMaps} from './build-index-maps'
 
 function blockObject(_key: string, name: string) {

package/src/internal-utils/create-test-snapshot.ts

@@ -1,6 +1,6 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
 import {createTestKeyGenerator} from '@portabletext/test'
-import type {EditorSnapshot} from '..'
+import type {EditorSnapshot} from '../editor/editor-snapshot'
 
 export function createTestSnapshot(snapshot: {
   context?: Partial<EditorSnapshot['context']>

package/src/internal-utils/event-position.ts

@@ -1,10 +1,12 @@
 import {Editor, type BaseRange, type Node} from 'slate'
 import {DOMEditor, isDOMNode} from 'slate-dom'
-import type {EditorSchema, EditorSelection} from '..'
 import type {EditorActor} from '../editor/editor-machine'
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
-import type {PortableTextSlateEditor} from '../types/editor'
-import * as utils from '../utils'
+import type {EditorSchema} from '../editor/editor-schema'
+import type {EditorSelection, PortableTextSlateEditor} from '../types/editor'
+import {getBlockEndPoint} from '../utils/util.get-block-end-point'
+import {getBlockStartPoint} from '../utils/util.get-block-start-point'
+import {isSelectionCollapsed} from '../utils/util.is-selection-collapsed'
+import {getBlockKeyFromSelectionPoint} from '../utils/util.selection-point'
 import {
   getFirstBlock,
   getLastBlock,
@@ -69,14 +71,14 @@ export function getEventPosition({
       block: eventPositionBlock,
       isEditor: false,
       selection: {
-        anchor: utils.getBlockStartPoint({
+        anchor: getBlockStartPoint({
           context: editorActor.getSnapshot().context,
           block: {
             node: eventBlock,
             path: [{_key: eventBlock._key}],
           },
         }),
-        focus: utils.getBlockEndPoint({
+        focus: getBlockEndPoint({
           context: editorActor.getSnapshot().context,
           block: {
             node: eventBlock,
@@ -100,7 +102,7 @@ export function getEventPosition({
   }
 
   if (
-    utils.isSelectionCollapsed(eventSelection) &&
+    isSelectionCollapsed(eventSelection) &&
     eventBlock &&
     eventSelectionFocusBlockKey !== eventBlock._key
   ) {
@@ -110,14 +112,14 @@ export function getEventPosition({
       block: eventPositionBlock,
       isEditor: false,
       selection: {
-        anchor: utils.getBlockStartPoint({
+        anchor: getBlockStartPoint({
           context: editorActor.getSnapshot().context,
           block: {
             node: eventBlock,
             path: [{_key: eventBlock._key}],
           },
         }),
-        focus: utils.getBlockEndPoint({
+        focus: getBlockEndPoint({
           context: editorActor.getSnapshot().context,
           block: {
             node: eventBlock,

package/src/internal-utils/operation-to-patches.test.ts

@@ -5,9 +5,9 @@ import {createEditor, type Descendant} from 'slate'
 import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
 import {editorMachine} from '../editor/editor-machine'
-import {defaultKeyGenerator} from '../editor/key-generator'
 import {withPlugins} from '../editor/plugins/with-plugins'
 import {relayMachine} from '../editor/relay-machine'
+import {defaultKeyGenerator} from '../utils/key-generator'
 import {
   insertNodePatch,
   insertTextPatch,

package/src/internal-utils/portable-text-node.ts

@@ -1,5 +1,5 @@
 import type {EditorSchema} from '../editor/editor-schema'
-import {isTypedObject} from './asserters'
+import {isTypedObject} from '../utils/asserters'
 
 type Path = Array<number>
 

package/src/internal-utils/selection-block-keys.ts

@@ -1,5 +1,5 @@
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
 import type {EditorSelection} from '../types/editor'
+import {getBlockKeyFromSelectionPoint} from '../utils/util.selection-point'
 
 export function getSelectionBlockKeys(selection: EditorSelection) {
   if (!selection) {

package/src/internal-utils/selection-focus-text.ts

@@ -3,7 +3,7 @@ import type {EditorContext} from '../editor/editor-snapshot'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
+} from '../utils/util.selection-point'
 
 export function getSelectionFocusText(
   context: Pick<EditorContext, 'schema' | 'value' | 'selection'>,

package/src/internal-utils/to-slate-range.ts

@@ -2,13 +2,13 @@ import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextObject, PortableTextSpan} from '@sanity/types'
 import type {Path, Range} from 'slate'
 import type {EditorContext, EditorSnapshot} from '../editor/editor-snapshot'
+import type {EditorSelectionPoint} from '../types/editor'
+import {blockOffsetToSpanSelectionPoint} from '../utils/util.block-offset'
+import {isEqualSelectionPoints} from '../utils/util.is-equal-selection-points'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,
-} from '../selection/selection-point'
-import type {EditorSelectionPoint} from '../types/editor'
-import {isEqualSelectionPoints} from '../utils'
-import {blockOffsetToSpanSelectionPoint} from '../utils/util.block-offset'
+} from '../utils/util.selection-point'
 
 export function toSlateRange(
   snapshot: {

package/src/operations/behavior.operation.annotation.add.ts

@@ -1,5 +1,5 @@
 import {Editor, Node, Range, Text, Transforms} from 'slate'
-import {parseAnnotation} from '../internal-utils/parse-blocks'
+import {parseAnnotation} from '../utils/parse-blocks'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const addAnnotationOperationImplementation: BehaviorOperationImplementation<

package/src/operations/behavior.operation.block.set.ts

@@ -1,6 +1,6 @@
 import {Transforms, type Element as SlateElement} from 'slate'
-import {parseBlock} from '../internal-utils/parse-blocks'
 import {toSlateValue} from '../internal-utils/values'
+import {parseBlock} from '../utils/parse-blocks'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const blockSetOperationImplementation: BehaviorOperationImplementation<

package/src/operations/behavior.operation.block.unset.ts

@@ -1,10 +1,10 @@
 import {isTextBlock} from '@portabletext/schema'
 import {omit} from 'lodash'
 import {Editor, Transforms} from 'slate'
-import {parseBlock} from '../internal-utils/parse-blocks'
+import {KEY_TO_VALUE_ELEMENT} from '../editor/weakMaps'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import {fromSlateValue} from '../internal-utils/values'
-import {KEY_TO_VALUE_ELEMENT} from '../internal-utils/weakMaps'
+import {parseBlock} from '../utils/parse-blocks'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const blockUnsetOperationImplementation: BehaviorOperationImplementation<

package/src/operations/behavior.operation.decorator.add.ts

@@ -1,10 +1,12 @@
 import {Editor, Range, Text, Transforms} from 'slate'
+import {KEY_TO_VALUE_ELEMENT} from '../editor/weakMaps'
 import {slateRangeToSelection} from '../internal-utils/slate-utils'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import {fromSlateValue} from '../internal-utils/values'
-import {KEY_TO_VALUE_ELEMENT} from '../internal-utils/weakMaps'
-import * as selectors from '../selectors'
-import * as utils from '../utils'
+import {getTrimmedSelection} from '../selectors/selector.get-trimmed-selection'
+import {blockOffsetToSpanSelectionPoint} from '../utils/util.block-offset'
+import {blockOffsetsToSelection} from '../utils/util.block-offsets-to-selection'
+import {selectionPointToBlockOffset} from '../utils/util.selection-point-to-block-offset'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const decoratorAddOperationImplementation: BehaviorOperationImplementation<
@@ -19,7 +21,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
   )
 
   const manualAnchor = operation.at?.anchor
-    ? utils.blockOffsetToSpanSelectionPoint({
+    ? blockOffsetToSpanSelectionPoint({
         context: {
           ...context,
           value,
@@ -29,7 +31,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
       })
     : undefined
   const manualFocus = operation.at?.focus
-    ? utils.blockOffsetToSpanSelectionPoint({
+    ? blockOffsetToSpanSelectionPoint({
         context: {
           ...context,
           value,
@@ -67,7 +69,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
     range: selection,
   })
   const anchorOffset = editorSelection
-    ? utils.selectionPointToBlockOffset({
+    ? selectionPointToBlockOffset({
         context: {
           ...context,
           value,
@@ -76,7 +78,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
       })
     : undefined
   const focusOffset = editorSelection
-    ? utils.selectionPointToBlockOffset({
+    ? selectionPointToBlockOffset({
         context: {
           ...context,
           value,
@@ -105,7 +107,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
     )
     // We need to find the new selection from the original offsets because the
     // split operation might have changed the value.
-    const newSelection = utils.blockOffsetsToSelection({
+    const newSelection = blockOffsetsToSelection({
       context: {
         ...context,
         value: newValue,
@@ -114,7 +116,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
       backward: editorSelection?.backward,
     })
 
-    const trimmedSelection = selectors.getTrimmedSelection({
+    const trimmedSelection = getTrimmedSelection({
       blockIndexMap: editor.blockIndexMap,
       context: {
         converters: [],

package/src/operations/behavior.operation.delete.ts

@@ -10,8 +10,8 @@ import {
 import {DOMEditor} from 'slate-dom'
 import {createPlaceholderBlock} from '../internal-utils/create-placeholder-block'
 import {toSlateRange} from '../internal-utils/to-slate-range'
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
 import type {PortableTextSlateEditor} from '../types/editor'
+import {getBlockKeyFromSelectionPoint} from '../utils/util.selection-point'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const deleteOperationImplementation: BehaviorOperationImplementation<

package/src/operations/behavior.operation.insert.block.ts

@@ -2,7 +2,6 @@ import {isSpan} from '@portabletext/schema'
 import {isEqual} from 'lodash'
 import {Editor, Path, Point, Range, Transforms, type Descendant} from 'slate'
 import {DOMEditor} from 'slate-dom'
-import {parseBlock} from '../internal-utils/parse-blocks'
 import {
   getFocusBlock,
   getFocusChild,
@@ -12,7 +11,8 @@ import {
 } from '../internal-utils/slate-utils'
 import {isEqualToEmptyEditor, toSlateValue} from '../internal-utils/values'
 import type {PortableTextSlateEditor} from '../types/editor'
-import {isEmptyTextBlock} from '../utils'
+import {parseBlock} from '../utils/parse-blocks'
+import {isEmptyTextBlock} from '../utils/util.is-empty-text-block'
 import type {
   BehaviorOperationImplementation,
   BehaviorOperationImplementationContext,

package/src/operations/behavior.operation.insert.child.ts

@@ -1,9 +1,9 @@
 import {isTextBlock} from '@portabletext/schema'
 import {Transforms} from 'slate'
 import {EDITOR_TO_PENDING_SELECTION} from 'slate-dom'
-import {parseInlineObject, parseSpan} from '../internal-utils/parse-blocks'
 import {getFocusBlock, getFocusSpan} from '../internal-utils/slate-utils'
 import {VOID_CHILD_KEY} from '../internal-utils/values'
+import {parseInlineObject, parseSpan} from '../utils/parse-blocks'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const insertChildOperationImplementation: BehaviorOperationImplementation<

package/src/operations/behavior.operation.move.block.ts

@@ -1,5 +1,5 @@
 import {Transforms} from 'slate'
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
+import {getBlockKeyFromSelectionPoint} from '../utils/util.selection-point'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const moveBlockOperationImplementation: BehaviorOperationImplementation<

package/src/plugins/plugin.behavior.tsx

@@ -1,5 +1,5 @@
 import {useEffect} from 'react'
-import type {Behavior} from '../behaviors'
+import type {Behavior} from '../behaviors/behavior.types.behavior'
 import {useEditor} from '../editor/use-editor'
 
 /**

package/src/plugins/plugin.decorator-shortcut.ts

@@ -14,7 +14,7 @@ import type {Editor} from '../editor'
 import type {EditorSchema} from '../editor/editor-schema'
 import {useEditor} from '../editor/use-editor'
 import type {BlockOffset} from '../types/block-offset'
-import * as utils from '../utils'
+import {spanSelectionPointToBlockOffset} from '../utils/util.block-offset'
 
 /**
  * @beta
@@ -88,11 +88,11 @@ const selectionListenerCallback: CallbackLogicFunction<
           return {blockOffsets: undefined}
         }
 
-        const anchor = utils.spanSelectionPointToBlockOffset({
+        const anchor = spanSelectionPointToBlockOffset({
           context: snapshot.context,
           selectionPoint: event.at.anchor,
         })
-        const focus = utils.spanSelectionPointToBlockOffset({
+        const focus = spanSelectionPointToBlockOffset({
           context: snapshot.context,
           selectionPoint: event.at.focus,
         })

package/src/plugins/plugin.internal.auto-close-brackets.ts

@@ -1,5 +1,6 @@
 import {useEffect} from 'react'
-import {defineBehavior, execute} from '../behaviors'
+import {execute} from '../behaviors/behavior.types.action'
+import {defineBehavior} from '../behaviors/behavior.types.behavior'
 import {useEditor} from '../editor/use-editor'
 
 export function AutoCloseBracketsPlugin() {

package/src/plugins/plugin.one-line.tsx

@@ -1,6 +1,9 @@
-import {defineBehavior, execute, raise} from '../behaviors'
-import * as selectors from '../selectors'
-import * as utils from '../utils'
+import {isTextBlock} from '@portabletext/schema'
+import {execute, raise} from '../behaviors/behavior.types.action'
+import {defineBehavior} from '../behaviors/behavior.types.behavior'
+import {getFocusTextBlock} from '../selectors/selector.get-focus-text-block'
+import {isSelectionExpanded} from '../selectors/selector.is-selection-expanded'
+import {mergeTextBlocks} from '../utils/util.merge-text-blocks'
 import {BehaviorPlugin} from './plugin.behavior'
 
 const oneLineBehaviors = [
@@ -11,7 +14,7 @@ const oneLineBehaviors = [
   defineBehavior({
     on: 'insert.break',
     guard: ({snapshot}) =>
-      snapshot.context.selection && selectors.isSelectionExpanded(snapshot)
+      snapshot.context.selection && isSelectionExpanded(snapshot)
         ? {selection: snapshot.context.selection}
         : false,
     actions: [(_, {selection}) => [execute({type: 'delete', at: selection})]],
@@ -39,12 +42,9 @@ const oneLineBehaviors = [
   defineBehavior({
     on: 'insert.block',
     guard: ({snapshot, event}) => {
-      const focusTextBlock = selectors.getFocusTextBlock(snapshot)
+      const focusTextBlock = getFocusTextBlock(snapshot)
 
-      if (
-        !focusTextBlock ||
-        !utils.isTextBlock(snapshot.context, event.block)
-      ) {
+      if (!focusTextBlock || !isTextBlock(snapshot.context, event.block)) {
         return false
       }
 
@@ -77,7 +77,7 @@ const oneLineBehaviors = [
     on: 'insert.blocks',
     guard: ({snapshot, event}) => {
       const textBlocks = event.blocks.filter((block) =>
-        utils.isTextBlock(snapshot.context, block),
+        isTextBlock(snapshot.context, block),
       )
 
       if (textBlocks.length === 0) {
@@ -85,7 +85,7 @@ const oneLineBehaviors = [
       }
 
       return textBlocks.reduce((targetBlock, incomingBlock) => {
-        return utils.mergeTextBlocks({
+        return mergeTextBlocks({
           context: snapshot.context,
           targetBlock,
           incomingBlock,

package/src/priority/priority.types.ts

@@ -1,4 +1,4 @@
-import {defaultKeyGenerator} from '../editor/key-generator'
+import {defaultKeyGenerator} from '../utils/key-generator'
 
 export type EditorPriority = {
   id: string

package/src/{internal-utils → selectors}/drag-selection.test.ts

@@ -1,8 +1,8 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
 import {createTestKeyGenerator} from '@portabletext/test'
 import {describe, expect, test} from 'vitest'
+import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
 import type {EditorSelection} from '../types/editor'
-import {createTestSnapshot} from './create-test-snapshot'
 import {getDragSelection} from './drag-selection'
 
 describe(getDragSelection.name, () => {

package/src/{internal-utils → selectors}/drag-selection.ts

@@ -1,7 +1,16 @@
-import type {EditorSnapshot} from '..'
-import * as selectors from '../selectors'
-import * as utils from '../utils'
-import type {EventPosition} from './event-position'
+import type {EditorSnapshot} from '../editor/editor-snapshot'
+import type {EventPosition} from '../internal-utils/event-position'
+import {getBlockEndPoint} from '../utils/util.get-block-end-point'
+import {getBlockStartPoint} from '../utils/util.get-block-start-point'
+import {getFocusInlineObject} from './selector.get-focus-inline-object'
+import {getFocusSpan} from './selector.get-focus-span'
+import {getFocusTextBlock} from './selector.get-focus-text-block'
+import {getSelectedBlocks} from './selector.get-selected-blocks'
+import {getSelectionEndBlock} from './selector.get-selection-end-block'
+import {getSelectionStartBlock} from './selector.get-selection-start-block'
+import {isOverlappingSelection} from './selector.is-overlapping-selection'
+import {isSelectionCollapsed} from './selector.is-selection-collapsed'
+import {isSelectionExpanded} from './selector.is-selection-expanded'
 
 /**
  * Given the current editor `snapshot` and an `eventSelection` representing
@@ -17,7 +26,7 @@ export function getDragSelection({
 }) {
   let dragSelection = eventSelection
 
-  const draggedInlineObject = selectors.getFocusInlineObject({
+  const draggedInlineObject = getFocusInlineObject({
     ...snapshot,
     context: {
       ...snapshot.context,
@@ -29,21 +38,21 @@ export function getDragSelection({
     return dragSelection
   }
 
-  const draggingCollapsedSelection = selectors.isSelectionCollapsed({
+  const draggingCollapsedSelection = isSelectionCollapsed({
     ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection,
     },
   })
-  const draggedTextBlock = selectors.getFocusTextBlock({
+  const draggedTextBlock = getFocusTextBlock({
     ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection,
     },
   })
-  const draggedSpan = selectors.getFocusSpan({
+  const draggedSpan = getFocusSpan({
     ...snapshot,
     context: {
       ...snapshot.context,
@@ -55,43 +64,41 @@ export function getDragSelection({
     // Looks like we are dragging an empty span
     // Let's drag the entire block instead
     dragSelection = {
-      anchor: utils.getBlockStartPoint({
+      anchor: getBlockStartPoint({
         context: snapshot.context,
         block: draggedTextBlock,
       }),
-      focus: utils.getBlockEndPoint({
+      focus: getBlockEndPoint({
         context: snapshot.context,
         block: draggedTextBlock,
       }),
     }
   }
 
-  const selectedBlocks = selectors.getSelectedBlocks(snapshot)
+  const selectedBlocks = getSelectedBlocks(snapshot)
 
   if (
     snapshot.context.selection &&
-    selectors.isSelectionExpanded(snapshot) &&
+    isSelectionExpanded(snapshot) &&
     selectedBlocks.length > 1
   ) {
-    const selectionStartBlock = selectors.getSelectionStartBlock(snapshot)
-    const selectionEndBlock = selectors.getSelectionEndBlock(snapshot)
+    const selectionStartBlock = getSelectionStartBlock(snapshot)
+    const selectionEndBlock = getSelectionEndBlock(snapshot)
 
     if (!selectionStartBlock || !selectionEndBlock) {
       return dragSelection
     }
 
-    const selectionStartPoint = utils.getBlockStartPoint({
+    const selectionStartPoint = getBlockStartPoint({
       context: snapshot.context,
       block: selectionStartBlock,
     })
-    const selectionEndPoint = utils.getBlockEndPoint({
+    const selectionEndPoint = getBlockEndPoint({
       context: snapshot.context,
       block: selectionEndBlock,
     })
 
-    const eventSelectionInsideBlocks = selectors.isOverlappingSelection(
-      eventSelection,
-    )({
+    const eventSelectionInsideBlocks = isOverlappingSelection(eventSelection)({
       ...snapshot,
       context: {
         ...snapshot.context,

package/src/selectors/selector.get-anchor-block.ts

@@ -1,7 +1,7 @@
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
 import type {BlockPath} from '../types/paths'
+import {getBlockKeyFromSelectionPoint} from '../utils/util.selection-point'
 
 /**
  * @public

package/src/selectors/selector.get-anchor-child.ts

@@ -1,7 +1,7 @@
 import type {PortableTextObject, PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {getChildKeyFromSelectionPoint} from '../selection/selection-point'
 import type {ChildPath} from '../types/paths'
+import {getChildKeyFromSelectionPoint} from '../utils/util.selection-point'
 import {getAnchorTextBlock} from './selector.get-anchor-text-block'
 
 /**