@portabletext/editor 2.6.2 → 2.6.4

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

@@ -1,6 +1,6 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
+import {createTestKeyGenerator} from '@portabletext/test'
 import {describe, expect, test} from 'vitest'
-import {createTestKeyGenerator} from './test-key-generator'
 import {toSlateRange} from './to-slate-range'
 
 describe(toSlateRange.name, () => {

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

@@ -1,3 +1,4 @@
+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'
@@ -8,7 +9,6 @@ import {
 import type {EditorSelectionPoint} from '../types/editor'
 import {isEqualSelectionPoints} from '../utils'
 import {blockOffsetToSpanSelectionPoint} from '../utils/util.block-offset'
-import {isSpan, isTextBlock} from './parse-blocks'
 
 export function toSlateRange(
   snapshot: {

package/src/internal-utils/validateValue.ts

@@ -1,4 +1,5 @@
 import {insert, set, setIfMissing, unset} from '@portabletext/patches'
+import {isTextBlock} from '@portabletext/schema'
 import type {
   PortableTextBlock,
   PortableTextSpan,
@@ -7,7 +8,6 @@ import type {
 import {flatten, isPlainObject, uniq} from 'lodash'
 import type {EditorSchema} from '../editor/editor-schema'
 import type {InvalidValueResolution} from '../types/editor'
-import {isTextBlock} from './parse-blocks'
 
 export interface Validation {
   valid: boolean

package/src/internal-utils/value-annotations.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorSchema} from '../editor/editor-schema'
-import {isSpan, isTextBlock} from './parse-blocks'
 
 export function getValueAnnotations(
   schema: EditorSchema,

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

@@ -1,6 +1,7 @@
+import {isTextBlock} from '@portabletext/schema'
 import {omit} from 'lodash'
 import {Editor, Transforms} from 'slate'
-import {isTextBlock, parseBlock} from '../internal-utils/parse-blocks'
+import {parseBlock} from '../internal-utils/parse-blocks'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import {fromSlateValue} from '../internal-utils/values'
 import {KEY_TO_VALUE_ELEMENT} from '../internal-utils/weakMaps'

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

@@ -1,9 +1,18 @@
-import {deleteText, setSelection, Transforms} from 'slate'
+import {isTextBlock} from '@portabletext/schema'
+import {
+  deleteText,
+  Editor,
+  Element,
+  Range,
+  setSelection,
+  Transforms,
+} from 'slate'
+import {DOMEditor} from 'slate-dom'
 import {createPlaceholderBlock} from '../internal-utils/create-placeholder-block'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getBlockPath} from '../internal-utils/slate-utils'
 import {toSlateRange} from '../internal-utils/to-slate-range'
 import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
+import {PortableTextSlateEditor} from '../types/editor'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const deleteOperationImplementation: BehaviorOperationImplementation<
@@ -98,6 +107,32 @@ export const deleteOperationImplementation: BehaviorOperationImplementation<
     )
   }
 
+  if (operation.direction === 'backward' && operation.unit === 'line') {
+    const parentBlockEntry = Editor.above(operation.editor, {
+      match: (n) => Element.isElement(n) && Editor.isBlock(operation.editor, n),
+      at: range,
+    })
+
+    if (parentBlockEntry) {
+      const [, parentBlockPath] = parentBlockEntry
+      const parentElementRange = Editor.range(
+        operation.editor,
+        parentBlockPath,
+        range.anchor,
+      )
+
+      const currentLineRange = findCurrentLineRange(
+        operation.editor,
+        parentElementRange,
+      )
+
+      if (!Range.isCollapsed(currentLineRange)) {
+        Transforms.delete(operation.editor, {at: currentLineRange})
+        return
+      }
+    }
+  }
+
   const hanging = isTextBlock(context, endBlock) && endOffset === 0
 
   deleteText(operation.editor, {
@@ -118,3 +153,64 @@ export const deleteOperationImplementation: BehaviorOperationImplementation<
     })
   }
 }
+
+function findCurrentLineRange(
+  editor: PortableTextSlateEditor,
+  parentRange: Range,
+): Range {
+  const parentRangeBoundary = Editor.range(editor, Range.end(parentRange))
+  const positions = Array.from(Editor.positions(editor, {at: parentRange}))
+
+  let left = 0
+  let right = positions.length
+  let middle = Math.floor(right / 2)
+
+  if (
+    rangesAreOnSameLine(
+      editor,
+      Editor.range(editor, positions[left]),
+      parentRangeBoundary,
+    )
+  ) {
+    return Editor.range(editor, positions[left], parentRangeBoundary)
+  }
+
+  if (positions.length < 2) {
+    return Editor.range(
+      editor,
+      positions[positions.length - 1],
+      parentRangeBoundary,
+    )
+  }
+
+  while (middle !== positions.length && middle !== left) {
+    if (
+      rangesAreOnSameLine(
+        editor,
+        Editor.range(editor, positions[middle]),
+        parentRangeBoundary,
+      )
+    ) {
+      right = middle
+    } else {
+      left = middle
+    }
+
+    middle = Math.floor((left + right) / 2)
+  }
+
+  return Editor.range(editor, positions[left], parentRangeBoundary)
+}
+
+function rangesAreOnSameLine(editor: DOMEditor, range1: Range, range2: Range) {
+  const rect1 = DOMEditor.toDOMRange(editor, range1).getBoundingClientRect()
+  const rect2 = DOMEditor.toDOMRange(editor, range2).getBoundingClientRect()
+
+  return domRectsIntersect(rect1, rect2) && domRectsIntersect(rect2, rect1)
+}
+
+function domRectsIntersect(rect: DOMRect, compareRect: DOMRect) {
+  const middle = (compareRect.top + compareRect.bottom) / 2
+
+  return rect.top <= middle && rect.bottom >= middle
+}

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

@@ -1,7 +1,8 @@
+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 {isSpan, parseBlock} from '../internal-utils/parse-blocks'
+import {parseBlock} from '../internal-utils/parse-blocks'
 import {
   getFocusBlock,
   getFocusChild,

package/src/plugins/plugin.behavior.tsx

@@ -14,7 +14,9 @@ export function BehaviorPlugin(props: {behaviors: Array<Behavior>}) {
     )
 
     return () => {
-      unregisterBehaviors.forEach((unregister) => unregister())
+      unregisterBehaviors.forEach((unregister) => {
+        unregister()
+      })
     }
   }, [editor, props.behaviors])
 

package/src/plugins/plugin.internal.auto-close-brackets.test.tsx

@@ -1,11 +1,10 @@
 import {defineSchema} from '@portabletext/schema'
+import {createTestKeyGenerator, getTersePt} from '@portabletext/test'
 import {page, userEvent} from '@vitest/browser/context'
 import React from 'react'
 import {describe, expect, test, vi} from 'vitest'
 import {render} from 'vitest-browser-react'
 import {EditorProvider, PortableTextEditable, type Editor} from '..'
-import {getTersePt} from '../internal-utils/terse-pt'
-import {createTestKeyGenerator} from '../internal-utils/test-key-generator'
 import {EditorRefPlugin} from './plugin.editor-ref'
 import {AutoCloseBracketsPlugin} from './plugin.internal.auto-close-brackets'
 

package/src/plugins/plugin.markdown.test.tsx

@@ -1,12 +1,11 @@
 import {defineSchema} from '@portabletext/schema'
+import {createTestKeyGenerator, getTersePt} from '@portabletext/test'
 import {page, userEvent} from '@vitest/browser/context'
 import React from 'react'
 import {describe, expect, test, vi} from 'vitest'
 import {render} from 'vitest-browser-react'
 import {PortableTextEditable, type Editor} from '..'
 import {EditorProvider} from '../editor/editor-provider'
-import {getTersePt} from '../internal-utils/terse-pt'
-import {createTestKeyGenerator} from '../internal-utils/test-key-generator'
 import {getTextMarks} from '../internal-utils/text-marks'
 import {EditorRefPlugin} from './plugin.editor-ref'
 import {MarkdownPlugin} from './plugin.markdown'

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

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextObject} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getMarkState} from './selector.get-mark-state'
 import {getSelectedBlocks} from './selector.get-selected-blocks'
 

package/src/selectors/selector.get-active-list-item.ts

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextListBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getSelectedBlocks} from './selector.get-selected-blocks'
 
 /**

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

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getSelectedBlocks} from './selector.get-selected-blocks'
 
 /**

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

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {BlockPath} from '../types/paths'
 import {getAnchorBlock} from './selector.get-anchor-block'
 

package/src/selectors/selector.get-caret-word-selection.test.ts

@@ -1,8 +1,8 @@
+import {createTestKeyGenerator} from '@portabletext/test'
 import type {PortableTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
 import type {EditorSelection} from '..'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
-import {createTestKeyGenerator} from '../internal-utils/test-key-generator'
 import {getCaretWordSelection} from './selector.get-caret-word-selection'
 
 const keyGenerator = createTestKeyGenerator()

package/src/selectors/selector.get-focus-block-object.ts

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextObject} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {BlockPath} from '../types/paths'
 import {getFocusBlock} from './selector.get-focus-block'
 

package/src/selectors/selector.get-focus-span.ts

@@ -1,6 +1,6 @@
+import {isSpan} from '@portabletext/schema'
 import type {PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isSpan} from '../internal-utils/parse-blocks'
 import type {ChildPath} from '../types/paths'
 import {getFocusChild} from './selector.get-focus-child'
 

package/src/selectors/selector.get-focus-text-block.ts

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {BlockPath} from '../types/paths'
 import {getFocusBlock} from './selector.get-focus-block'
 

package/src/selectors/selector.get-list-state.ts

@@ -1,5 +1,5 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {BlockPath} from '../types/paths'
 import {getFocusTextBlock} from './selector.get-focus-text-block'
 

package/src/selectors/selector.get-next-span.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {KeyedSegment, PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {getChildKeyFromSelectionPoint} from '../selection/selection-point'
 import {getSelectionEndBlock} from './selector.get-selection-end-block'
 import {getSelectionEndPoint} from './selector.get-selection-end-point'

package/src/selectors/selector.get-previous-span.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {KeyedSegment, PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {getChildKeyFromSelectionPoint} from '../selection/selection-point'
 import {getSelectionStartBlock} from './selector.get-selection-start-block'
 import {getSelectionStartPoint} from './selector.get-selection-start-point'

package/src/selectors/selector.get-selected-spans.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/selectors/selector.get-selected-text-blocks.ts

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
 import type {BlockPath} from '../types/paths'
 import {getSelectionEndPoint, getSelectionStartPoint} from '../utils'

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

@@ -1,5 +1,5 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {getSelectedValue} from './selector.get-selected-value'
 
 /**

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

@@ -1,9 +1,9 @@
 import {compileSchema, defineSchema} from '@portabletext/schema'
+import {createTestKeyGenerator} from '@portabletext/test'
 import type {PortableTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
 import {parseBlock} from '../internal-utils/parse-blocks'
-import {createTestKeyGenerator} from '../internal-utils/test-key-generator'
 import type {EditorSelection} from '../types/editor'
 import {getTrimmedSelection} from './selector.get-trimmed-selection'
 

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

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextSpan} from '@sanity/types'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

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

@@ -1,5 +1,5 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getActiveAnnotationsMarks} from './selector.get-active-annotation-marks'
 import {getSelectedBlocks} from './selector.get-selected-blocks'
 

package/src/selectors/selector.is-point-after-selection.ts

@@ -1,5 +1,5 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/selectors/selector.is-point-before-selection.ts

@@ -1,5 +1,5 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {EditorSelector} from '../editor/editor-selector'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/utils/index.ts

@@ -16,8 +16,7 @@ export {isEqualSelectionPoints} from './util.is-equal-selection-points'
 export {isEqualSelections} from './util.is-equal-selections'
 export {isKeyedSegment} from './util.is-keyed-segment'
 export {isSelectionCollapsed} from './util.is-selection-collapsed'
-export {isSpan} from './util.is-span'
-export {isTextBlock} from './util.is-text-block'
+export {isSpan, isTextBlock} from '@portabletext/schema'
 export {mergeTextBlocks} from './util.merge-text-blocks'
 export {reverseSelection} from './util.reverse-selection'
 export {selectionPointToBlockOffset} from './util.selection-point-to-block-offset'

package/src/utils/util.at-the-beginning-of-block.ts

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import {getChildKeyFromSelectionPoint} from '../selection/selection-point'
 import {isSelectionCollapsed} from './util.is-selection-collapsed'
 

package/src/utils/util.block-offset.ts

@@ -1,5 +1,5 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/utils/util.child-selection-point-to-block-offset.ts

@@ -1,5 +1,5 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/utils/util.get-block-end-point.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import type {EditorSelectionPoint} from '../types/editor'
 import type {BlockPath} from '../types/paths'
 

package/src/utils/util.get-block-start-point.ts

@@ -1,6 +1,6 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isTextBlock} from '../internal-utils/parse-blocks'
 import type {EditorSelectionPoint} from '../types/editor'
 import type {BlockPath} from '../types/paths'
 

package/src/utils/util.is-empty-text-block.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
 import {getTextBlockText} from './util.get-text-block-text'
 
 /**

package/src/utils/util.merge-text-blocks.ts

@@ -1,7 +1,7 @@
+import {isTextBlock} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
 import type {EditorContext} from '..'
 import {parseBlock} from '../internal-utils/parse-blocks'
-import {isTextBlock} from './util.is-text-block'
 
 /**
  * @beta

package/src/utils/util.slice-blocks.ts

@@ -1,6 +1,6 @@
+import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {PortableTextBlock} from '@sanity/types'
-import type {EditorContext} from '..'
-import {isSpan, isTextBlock} from '../internal-utils/parse-blocks'
+import type {EditorContext} from '../editor/editor-snapshot'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/utils/util.slice-text-block.ts

@@ -1,6 +1,6 @@
+import {isSpan} from '@portabletext/schema'
 import type {PortableTextChild, PortableTextTextBlock} from '@sanity/types'
-import type {EditorContext} from '..'
-import {isSpan} from '../internal-utils/parse-blocks'
+import type {EditorContext} from '../editor/editor-snapshot'
 import {
   getBlockKeyFromSelectionPoint,
   getChildKeyFromSelectionPoint,

package/src/utils/util.split-text-block.ts

@@ -1,7 +1,7 @@
+import {isSpan} from '@portabletext/schema'
 import type {PortableTextTextBlock} from '@sanity/types'
 import type {EditorSelectionPoint} from '..'
 import type {EditorContext} from '../editor/editor-snapshot'
-import {isSpan} from './util.is-span'
 import {sliceTextBlock} from './util.slice-text-block'
 
 /**