@portabletext/editor 1.47.4 → 1.47.6

package/package.json

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

package/src/editor/Editable.tsx

@@ -16,7 +16,7 @@ import {
   type MutableRefObject,
   type TextareaHTMLAttributes,
 } from 'react'
-import {Transforms, type Text} from 'slate'
+import {Editor, Transforms, type Text} from 'slate'
 import {
   ReactEditor,
   Editable as SlateEditable,
@@ -59,6 +59,7 @@ import {EditorActorContext} from './editor-actor-context'
 import {getEditorSnapshot} from './editor-selector'
 import {usePortableTextEditor} from './hooks/usePortableTextEditor'
 import {createWithHotkeys} from './plugins/createWithHotKeys'
+import {PortableTextEditor} from './PortableTextEditor'
 import {
   createDecorate,
   rangeDecorationsMachine,
@@ -570,17 +571,16 @@ export const PortableTextEditable = forwardRef<
         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()
+        }
         editorActor.send({type: 'notify.focused', event})
-
-        const selection = slateEditor.selection
-          ? slateRangeToSelection({
-              schema: editorActor.getSnapshot().context.schema,
-              editor: slateEditor,
-              range: slateEditor.selection,
-            })
-          : null
-
-        if (selection) {
+        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) {
           editorActor.send({
             type: 'notify.selection',
             selection,
@@ -588,7 +588,7 @@ export const PortableTextEditable = forwardRef<
         }
       }
     },
-    [editorActor, onFocus, slateEditor],
+    [editorActor, onFocus, slateEditor, portableTextEditor],
   )
 
   const handleClick = useCallback(

package/src/internal-utils/parse-blocks.test.ts

@@ -379,7 +379,6 @@ describe(parseSpan.name, () => {
       _type: 'span',
       text: '',
       marks: [],
-      foo: 'bar',
     })
   })
 

package/src/internal-utils/parse-blocks.ts

@@ -169,8 +169,7 @@ function parseTextBlock({
     .filter((child) => child !== undefined)
 
   const parsedBlock: PortableTextTextBlock = {
-    // Spread the entire block to allow custom properties on it
-    ...block,
+    _type: context.schema.block.name,
     _key,
     children:
       children.length > 0
@@ -186,37 +185,30 @@ function parseTextBlock({
     markDefs,
   }
 
-  /**
-   * Reset text block .style if it's somehow set to an invalid type
-   */
   if (
-    typeof parsedBlock.style !== 'string' ||
-    !context.schema.styles.find((style) => style.name === block.style)
+    typeof block.style === 'string' &&
+    context.schema.styles.find((style) => style.name === block.style)
   ) {
+    parsedBlock.style = block.style
+  } else {
     const defaultStyle = context.schema.styles.at(0)?.name
 
     if (defaultStyle !== undefined) {
       parsedBlock.style = defaultStyle
     } else {
-      delete parsedBlock.style
+      console.error('Expected default style')
     }
   }
 
-  /**
-   * Reset text block .listItem if it's somehow set to an invalid type
-   */
   if (
-    typeof parsedBlock.listItem !== 'string' ||
-    !context.schema.lists.find((list) => list.name === block.listItem)
+    typeof block.listItem === 'string' &&
+    context.schema.lists.find((list) => list.name === block.listItem)
   ) {
-    delete parsedBlock.listItem
+    parsedBlock.listItem = block.listItem
   }
 
-  /**
-   * Reset text block .level if it's somehow set to an invalid type
-   */
-  if (typeof parsedBlock.level !== 'number') {
-    delete parsedBlock.level
+  if (typeof block.level === 'number') {
+    parsedBlock.level = block.level
   }
 
   return parsedBlock
@@ -280,8 +272,6 @@ export function parseSpan({
   })
 
   return {
-    // Spread the entire span to allow custom properties on it
-    ...span,
     _type: 'span',
     _key: options.refreshKeys
       ? context.keyGenerator()