@portabletext/editor 1.49.1 → 1.49.3

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

@@ -19,6 +19,7 @@ export function parseBlocks({
   blocks: unknown
   options: {
     refreshKeys: boolean
+    validateFields: boolean
   }
 }): Array<PortableTextBlock> {
   if (!Array.isArray(blocks)) {
@@ -41,6 +42,7 @@ export function parseBlock({
   block: unknown
   options: {
     refreshKeys: boolean
+    validateFields: boolean
   }
 }): PortableTextBlock | undefined {
   return (
@@ -56,7 +58,7 @@ export function parseBlockObject({
 }: {
   blockObject: unknown
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>
-  options: {refreshKeys: boolean}
+  options: {refreshKeys: boolean; validateFields: boolean}
 }): PortableTextObject | undefined {
   if (!isTypedObject(blockObject)) {
     return undefined
@@ -99,7 +101,7 @@ export function isTextBlock(
     parseTextBlock({
       block,
       context: {schema: context.schema, keyGenerator: () => ''},
-      options: {refreshKeys: false},
+      options: {refreshKeys: false, validateFields: false},
     }) !== undefined
   )
 }
@@ -111,12 +113,28 @@ export function parseTextBlock({
 }: {
   block: unknown
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>
-  options: {refreshKeys: boolean}
+  options: {refreshKeys: boolean; validateFields: boolean}
 }): PortableTextTextBlock | undefined {
   if (!isTypedObject(block)) {
     return undefined
   }
 
+  const customFields: Record<string, unknown> = {}
+
+  for (const key of Object.keys(block)) {
+    if (
+      key !== '_type' &&
+      key !== '_key' &&
+      key !== 'children' &&
+      key !== 'markDefs' &&
+      key !== 'style' &&
+      key !== 'listItem' &&
+      key !== 'level'
+    ) {
+      customFields[key] = block[key]
+    }
+  }
+
   if (block._type !== context.schema.block.name) {
     return undefined
   }
@@ -195,6 +213,7 @@ export function parseTextBlock({
             },
           ],
     markDefs,
+    ...(options.validateFields ? {} : customFields),
   }
 
   if (
@@ -235,7 +254,7 @@ export function isSpan(
       span: child,
       markDefKeyMap: new Map(),
       context: {schema: context.schema, keyGenerator: () => ''},
-      options: {refreshKeys: false},
+      options: {refreshKeys: false, validateFields: false},
     }) !== undefined
   )
 }
@@ -249,12 +268,25 @@ export function parseSpan({
   span: unknown
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>
   markDefKeyMap: Map<string, string>
-  options: {refreshKeys: boolean}
+  options: {refreshKeys: boolean; validateFields: boolean}
 }): PortableTextSpan | undefined {
   if (!isTypedObject(span)) {
     return undefined
   }
 
+  const customFields: Record<string, unknown> = {}
+
+  for (const key of Object.keys(span)) {
+    if (
+      key !== '_type' &&
+      key !== '_key' &&
+      key !== 'text' &&
+      key !== 'marks'
+    ) {
+      customFields[key] = span[key]
+    }
+  }
+
   // In reality, the span schema name is always 'span', but we only the check here anyway
   if (span._type !== context.schema.span.name || span._type !== 'span') {
     return undefined
@@ -292,6 +324,7 @@ export function parseSpan({
         : context.keyGenerator(),
     text: typeof span.text === 'string' ? span.text : '',
     marks,
+    ...(options.validateFields ? {} : customFields),
   }
 }
 
@@ -302,7 +335,7 @@ export function parseInlineObject({
 }: {
   inlineObject: unknown
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>
-  options: {refreshKeys: boolean}
+  options: {refreshKeys: boolean; validateFields: boolean}
 }): PortableTextObject | undefined {
   if (!isTypedObject(inlineObject)) {
     return undefined
@@ -333,7 +366,7 @@ export function parseAnnotation({
 }: {
   annotation: TypedObject
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>
-  options: {refreshKeys: boolean}
+  options: {refreshKeys: boolean; validateFields: boolean}
 }): PortableTextObject | undefined {
   if (!isTypedObject(annotation)) {
     return undefined
@@ -366,22 +399,26 @@ function parseObject({
   context: Pick<EditorContext, 'keyGenerator'> & {
     schemaType: EditorSchema['blockObjects'][0]
   }
-  options: {refreshKeys: boolean}
+  options: {refreshKeys: boolean; validateFields: boolean}
 }): PortableTextObject {
+  const {_type, _key, ...customFields} = object
+
   // Validates all props on the object and only takes those that match
   // the name of a field
-  const values = context.schemaType.fields.reduce<Record<string, unknown>>(
-    (fieldValues, field) => {
-      const fieldValue = object[field.name]
-
-      if (fieldValue !== undefined) {
-        fieldValues[field.name] = fieldValue
-      }
-
-      return fieldValues
-    },
-    {},
-  )
+  const values = options.validateFields
+    ? context.schemaType.fields.reduce<Record<string, unknown>>(
+        (fieldValues, field) => {
+          const fieldValue = object[field.name]
+
+          if (fieldValue !== undefined) {
+            fieldValues[field.name] = fieldValue
+          }
+
+          return fieldValues
+        },
+        {},
+      )
+    : customFields
 
   return {
     _type: context.schemaType.name,

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

@@ -6,6 +6,17 @@ import {
 } from './text-selection'
 
 test(getTextSelection.name, () => {
+  const simpleBlock = {
+    _key: 'b1',
+    _type: 'block',
+    children: [{_key: 's1', _type: 'span', text: 'foo'}],
+  }
+
+  expect(getTextSelection([simpleBlock], 'foo')).toEqual({
+    anchor: {path: [{_key: 'b1'}, 'children', {_key: 's1'}], offset: 0},
+    focus: {path: [{_key: 'b1'}, 'children', {_key: 's1'}], offset: 3},
+  })
+
   const joinedBlock = {
     _key: 'b1',
     _type: 'block',

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

@@ -31,7 +31,7 @@ export const addAnnotationOperationImplementation: BehaviorOperationImplementati
       ...operation.annotation.value,
     },
     context,
-    options: {refreshKeys: false},
+    options: {refreshKeys: false, validateFields: true},
   })
 
   if (!parsedAnnotation) {

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

@@ -47,7 +47,7 @@ export const blockSetOperationImplementation: BehaviorOperationImplementation<
       ...parsedBlock,
       ...filteredProps,
     },
-    options: {refreshKeys: false},
+    options: {refreshKeys: false, validateFields: true},
   })
 
   if (!updatedBlock) {

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

@@ -46,7 +46,7 @@ export const blockUnsetOperationImplementation: BehaviorOperationImplementation<
     const updatedTextBlock = parseBlock({
       context,
       block: omit(parsedBlock, propsToRemove),
-      options: {refreshKeys: false},
+      options: {refreshKeys: false, validateFields: true},
     })
 
     if (!updatedTextBlock) {
@@ -76,7 +76,7 @@ export const blockUnsetOperationImplementation: BehaviorOperationImplementation<
       parsedBlock,
       operation.props.filter((prop) => prop !== '_type'),
     ),
-    options: {refreshKeys: false},
+    options: {refreshKeys: false, validateFields: true},
   })
 
   if (!updatedBlockObject) {

package/src/operations/behavior.operation.insert-inline-object.ts

@@ -12,7 +12,7 @@ export const insertInlineObjectOperationImplementation: BehaviorOperationImpleme
       _type: operation.inlineObject.name,
       ...(operation.inlineObject.value ?? {}),
     },
-    options: {refreshKeys: false},
+    options: {refreshKeys: false, validateFields: true},
   })
 
   if (!parsedInlineObject) {

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

@@ -19,7 +19,7 @@ export const insertBlockOperationImplementation: BehaviorOperationImplementation
   const parsedBlock = parseBlock({
     block: operation.block,
     context,
-    options: {refreshKeys: false},
+    options: {refreshKeys: false, validateFields: true},
   })
 
   if (!parsedBlock) {

package/src/plugins/plugin.behavior.tsx

@@ -1,6 +1,6 @@
 import {useEffect} from 'react'
 import type {Behavior} from '../behaviors'
-import {useEditor} from '../editor/editor-provider'
+import {useEditor} from '../editor/use-editor'
 
 /**
  * @beta

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

@@ -10,9 +10,9 @@ import {
 import {createDecoratorPairBehavior} from '../behaviors/behavior.decorator-pair'
 import {effect, execute, forward} from '../behaviors/behavior.types.action'
 import {defineBehavior} from '../behaviors/behavior.types.behavior'
-import type {Editor} from '../editor/create-editor'
-import {useEditor} from '../editor/editor-provider'
+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'
 

package/src/plugins/plugin.editor-ref.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
-import type {Editor} from '../editor/create-editor'
-import {useEditor} from '../editor/editor-provider'
+import type {Editor} from '../editor'
+import {useEditor} from '../editor/use-editor'
 
 /**
  * @beta

package/src/plugins/plugin.event-listener.tsx

@@ -1,7 +1,7 @@
 import {useEffect} from 'react'
 import {useEffectEvent} from 'use-effect-event'
 import type {EditorEmittedEvent} from '../editor/editor-machine'
-import {useEditor} from '../editor/editor-provider'
+import {useEditor} from '../editor/use-editor'
 
 /**
  * @public

package/src/plugins/plugin.markdown.tsx

@@ -3,8 +3,8 @@ import {
   createMarkdownBehaviors,
   type MarkdownBehaviorsConfig,
 } from '../behaviors/behavior.markdown'
-import {useEditor} from '../editor/editor-provider'
 import type {EditorSchema} from '../editor/editor-schema'
+import {useEditor} from '../editor/use-editor'
 import {DecoratorShortcutPlugin} from './plugin.decorator-shortcut'
 
 /**

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

@@ -34,6 +34,7 @@ function snapshot(
           block,
           options: {
             refreshKeys: false,
+            validateFields: false,
           },
         })
 

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

@@ -18,7 +18,7 @@ export function mergeTextBlocks({
   const parsedIncomingBlock = parseBlock({
     context,
     block: incomingBlock,
-    options: {refreshKeys: true},
+    options: {refreshKeys: true, validateFields: true},
   })
 
   if (!parsedIncomingBlock || !isTextBlock(context, parsedIncomingBlock)) {