@portabletext/editor 1.52.1 → 1.52.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.52.1",
+  "version": "1.52.3",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",

package/src/editor/Editable.tsx

@@ -15,7 +15,7 @@ import {
   type MutableRefObject,
   type TextareaHTMLAttributes,
 } from 'react'
-import {Editor, Transforms, type Text} from 'slate'
+import {Transforms, type Text} from 'slate'
 import {
   ReactEditor,
   Editable as SlateEditable,
@@ -52,7 +52,6 @@ import {RenderText, type RenderTextProps} from './components/render-text'
 import {EditorActorContext} from './editor-actor-context'
 import {usePortableTextEditor} from './hooks/usePortableTextEditor'
 import {createWithHotkeys} from './plugins/createWithHotKeys'
-import {PortableTextEditor} from './PortableTextEditor'
 import {
   createDecorate,
   rangeDecorationsMachine,
@@ -532,17 +531,19 @@ export const PortableTextEditable = forwardRef<
       if (onFocus) {
         onFocus(event)
       }
+
       if (!event.isDefaultPrevented()) {
-        const selection = PortableTextEditor.getSelection(portableTextEditor)
-        // Create an editor selection if it does'nt exist
-        if (selection === null) {
-          Transforms.select(slateEditor, Editor.start(slateEditor, []))
-          slateEditor.onChange()
-        }
         relayActor.send({type: 'focused', event})
-        const newSelection = PortableTextEditor.getSelection(portableTextEditor)
-        // If the selection is the same, emit it explicitly here as there is no actual onChange event triggered.
-        if (selection === newSelection) {
+
+        const selection = slateEditor.selection
+          ? slateRangeToSelection({
+              schema: editorActor.getSnapshot().context.schema,
+              editor: slateEditor,
+              range: slateEditor.selection,
+            })
+          : null
+
+        if (selection) {
           editorActor.send({
             type: 'update selection',
             selection,
@@ -550,7 +551,7 @@ export const PortableTextEditable = forwardRef<
         }
       }
     },
-    [editorActor, onFocus, slateEditor, portableTextEditor, relayActor],
+    [editorActor, onFocus, slateEditor, relayActor],
   )
 
   const handleClick = useCallback(

package/src/editor/plugins/with-plugins.ts

@@ -7,7 +7,6 @@ import {createWithMaxBlocks} from './createWithMaxBlocks'
 import {createWithObjectKeys} from './createWithObjectKeys'
 import {createWithPatches} from './createWithPatches'
 import {createWithPlaceholderBlock} from './createWithPlaceholderBlock'
-import {createWithPortableTextBlockStyle} from './createWithPortableTextBlockStyle'
 import {createWithPortableTextMarkModel} from './createWithPortableTextMarkModel'
 import {createWithPortableTextSelections} from './createWithPortableTextSelections'
 import {createWithSchemaTypes} from './createWithSchemaTypes'
@@ -49,8 +48,6 @@ export const withPlugins = <T extends Editor>(
     subscriptions: options.subscriptions,
   })
   const withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor)
-  const withPortableTextBlockStyle =
-    createWithPortableTextBlockStyle(editorActor)
 
   const withPlaceholderBlock = createWithPlaceholderBlock(editorActor)
 
@@ -66,19 +63,17 @@ export const withPlugins = <T extends Editor>(
     withSchemaTypes(
       withObjectKeys(
         withPortableTextMarkModel(
-          withPortableTextBlockStyle(
-            withPlaceholderBlock(
-              withUtils(
-                withMaxBlocks(
-                  withUndoRedo(
-                    withPatches(
-                      withPortableTextSelections(
-                        pluginUpdateValue(
+          withPlaceholderBlock(
+            withUtils(
+              withMaxBlocks(
+                withUndoRedo(
+                  withPatches(
+                    withPortableTextSelections(
+                      pluginUpdateValue(
+                        editorActor.getSnapshot().context,
+                        pluginUpdateMarkState(
                           editorActor.getSnapshot().context,
-                          pluginUpdateMarkState(
-                            editorActor.getSnapshot().context,
-                            e,
-                          ),
+                          e,
                         ),
                       ),
                     ),

package/src/internal-utils/create-placeholder-block.ts

@@ -1,3 +1,4 @@
+import type {PortableTextSpan} from '@sanity/types'
 import type {EditorContext} from '../editor/editor-snapshot'
 
 export function createPlaceholderBlock(
@@ -14,7 +15,7 @@ export function createPlaceholderBlock(
         _key: context.keyGenerator(),
         text: '',
         marks: [],
-      },
+      } as PortableTextSpan,
     ],
   }
 }

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

@@ -1,4 +1,5 @@
 import {Transforms} from 'slate'
+import {createPlaceholderBlock} from '../internal-utils/create-placeholder-block'
 import {toSlateRange} from '../internal-utils/ranges'
 import {getBlockPath} from '../internal-utils/slate-utils'
 import {getBlockKeyFromSelectionPoint} from '../selection/selection-point'
@@ -6,7 +7,7 @@ import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const deleteOperationImplementation: BehaviorOperationImplementation<
   'delete'
-> = ({operation}) => {
+> = ({context, operation}) => {
   const anchorBlockKey = getBlockKeyFromSelectionPoint(operation.at.anchor)
   const focusBlockKey = getBlockKeyFromSelectionPoint(operation.at.focus)
 
@@ -36,6 +37,10 @@ export const deleteOperationImplementation: BehaviorOperationImplementation<
       at: [anchorBlockPath[0]],
     })
 
+    if (operation.editor.children.length === 0) {
+      Transforms.insertNodes(operation.editor, createPlaceholderBlock(context))
+    }
+
     return
   }
 

package/src/editor/plugins/createWithPortableTextBlockStyle.ts

@@ -1,51 +0,0 @@
-import {Editor, Path, Text as SlateText, Transforms} from 'slate'
-import {debugWithName} from '../../internal-utils/debug'
-import type {PortableTextSlateEditor} from '../../types/editor'
-import type {EditorActor} from '../editor-machine'
-
-const debug = debugWithName('plugin:withPortableTextBlockStyle')
-
-export function createWithPortableTextBlockStyle(
-  editorActor: EditorActor,
-): (editor: PortableTextSlateEditor) => PortableTextSlateEditor {
-  const defaultStyle = editorActor.getSnapshot().context.schema.styles[0].name
-  return function withPortableTextBlockStyle(
-    editor: PortableTextSlateEditor,
-  ): PortableTextSlateEditor {
-    // Extend Slate's default normalization to reset split node to normal style
-    // if there is no text at the right end of the split.
-    const {normalizeNode} = editor
-
-    editor.normalizeNode = (nodeEntry) => {
-      const [, path] = nodeEntry
-
-      for (const op of editor.operations) {
-        if (
-          op.type === 'split_node' &&
-          op.path.length === 1 &&
-          editor.isTextBlock(op.properties) &&
-          op.properties.style !== defaultStyle &&
-          op.path[0] === path[0] &&
-          !Path.equals(path, op.path)
-        ) {
-          const [child] = Editor.node(editor, [op.path[0] + 1, 0])
-          if (SlateText.isText(child) && child.text === '') {
-            debug(`Normalizing split node to ${defaultStyle} style`, op)
-            editorActor.send({type: 'normalizing'})
-            Transforms.setNodes(
-              editor,
-              {style: defaultStyle},
-              {at: [op.path[0] + 1], voids: false},
-            )
-            editorActor.send({type: 'done normalizing'})
-            return
-          }
-        }
-      }
-
-      normalizeNode(nodeEntry)
-    }
-
-    return editor
-  }
-}