@portabletext/editor 1.47.0 → 1.47.2

package/src/internal-utils/__tests__/operationToPatches.test.ts

@@ -4,24 +4,26 @@ import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
 import {coreBehaviors} from '../../behaviors/behavior.core'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
-import {createEditorSchema} from '../../editor/create-editor-schema'
 import {editorMachine} from '../../editor/editor-machine'
+import {legacySchemaToEditorSchema} from '../../editor/editor-schema'
 import {defaultKeyGenerator} from '../../editor/key-generator'
+import {createLegacySchema} from '../../editor/legacy-schema'
 import {withPlugins} from '../../editor/plugins/with-plugins'
 import {createOperationToPatches} from '../operationToPatches'
 
-const schemaTypes = createEditorSchema(schemaType)
+const schemaTypes = legacySchemaToEditorSchema(createLegacySchema(schemaType))
+const editorActor = createActor(editorMachine, {
+  input: {
+    behaviors: coreBehaviors,
+    schema: schemaTypes,
+    keyGenerator: defaultKeyGenerator,
+  },
+})
 
-const operationToPatches = createOperationToPatches(schemaTypes)
+const operationToPatches = createOperationToPatches(editorActor)
 
 const editor = withPlugins(createEditor(), {
-  editorActor: createActor(editorMachine, {
-    input: {
-      behaviors: coreBehaviors,
-      schema: schemaTypes,
-      keyGenerator: defaultKeyGenerator,
-    },
-  }),
+  editorActor,
   subscriptions: [],
 })
 

package/src/internal-utils/__tests__/patchToOperations.test.ts

@@ -4,14 +4,15 @@ import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
 import {coreBehaviors} from '../../behaviors/behavior.core'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
-import {createEditorSchema} from '../../editor/create-editor-schema'
 import {editorMachine} from '../../editor/editor-machine'
+import {legacySchemaToEditorSchema} from '../../editor/editor-schema'
 import {defaultKeyGenerator} from '../../editor/key-generator'
+import {createLegacySchema} from '../../editor/legacy-schema'
 import {withPlugins} from '../../editor/plugins/with-plugins'
 import {createApplyPatch} from '../applyPatch'
 import {VOID_CHILD_KEY} from '../values'
 
-const schemaTypes = createEditorSchema(schemaType)
+const schemaTypes = legacySchemaToEditorSchema(createLegacySchema(schemaType))
 
 const patchToOperations = createApplyPatch(schemaTypes)
 

package/src/internal-utils/__tests__/values.test.ts

@@ -1,9 +1,10 @@
 import {describe, expect, it} from 'vitest'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
-import {createEditorSchema} from '../../editor/create-editor-schema'
+import {legacySchemaToEditorSchema} from '../../editor/editor-schema'
+import {createLegacySchema} from '../../editor/legacy-schema'
 import {fromSlateValue, toSlateValue} from '../values'
 
-const schemaTypes = createEditorSchema(schemaType)
+const schemaTypes = legacySchemaToEditorSchema(createLegacySchema(schemaType))
 
 describe('toSlateValue', () => {
   it('checks undefined', () => {

package/src/internal-utils/applyPatch.ts

@@ -30,10 +30,8 @@ import {
   type Node,
   type Path as SlatePath,
 } from 'slate'
-import type {
-  PortableTextMemberSchemaTypes,
-  PortableTextSlateEditor,
-} from '../types/editor'
+import type {EditorSchema} from '../editor/editor-schema'
+import type {PortableTextSlateEditor} from '../types/editor'
 import {debugWithName} from './debug'
 import {toSlateValue} from './values'
 import {KEY_TO_SLATE_ELEMENT} from './weakMaps'
@@ -45,7 +43,7 @@ const debugVerbose = debug.enabled && true
  * Creates a function that can apply a patch onto a PortableTextSlateEditor.
  */
 export function createApplyPatch(
-  schemaTypes: PortableTextMemberSchemaTypes,
+  schema: EditorSchema,
 ): (editor: PortableTextSlateEditor, patch: Patch) => boolean {
   return (editor: PortableTextSlateEditor, patch: Patch): boolean => {
     let changed = false
@@ -61,7 +59,7 @@ export function createApplyPatch(
     try {
       switch (patch.type) {
         case 'insert':
-          changed = insertPatch(editor, patch, schemaTypes)
+          changed = insertPatch(editor, patch, schema)
           break
         case 'unset':
           changed = unsetPatch(editor, patch)
@@ -148,7 +146,7 @@ export function diffMatchPatch(
 function insertPatch(
   editor: PortableTextSlateEditor,
   patch: InsertPatch,
-  schemaTypes: PortableTextMemberSchemaTypes,
+  schema: EditorSchema,
 ) {
   const {
     block: targetBlock,
@@ -169,7 +167,7 @@ function insertPatch(
     const {items, position} = patch
     const blocksToInsert = toSlateValue(
       items as PortableTextBlock[],
-      {schemaTypes},
+      {schemaTypes: schema},
       KEY_TO_SLATE_ELEMENT.get(editor),
     ) as Descendant[]
     const targetBlockIndex = targetBlockPath[0]
@@ -191,7 +189,7 @@ function insertPatch(
     targetBlock &&
     toSlateValue(
       [{...targetBlock, children: items as PortableTextChild[]}],
-      {schemaTypes},
+      {schemaTypes: schema},
       KEY_TO_SLATE_ELEMENT.get(editor),
     )
   const targetChildIndex = targetChildPath[1]

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

@@ -1,5 +1,5 @@
 import type {EditorSnapshot} from '..'
-import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
+import {compileSchemaDefinition, defineSchema} from '../editor/editor-schema'
 import {createTestKeyGenerator} from './test-key-generator'
 
 export function createTestSnapshot(snapshot: {

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

@@ -1,5 +1,5 @@
 import {describe, expect, test} from 'vitest'
-import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
+import {compileSchemaDefinition, defineSchema} from '../editor/editor-schema'
 import type {EditorSelection} from '../types/editor'
 import {createTestSnapshot} from './create-test-snapshot'
 import {getDragSelection} from './drag-selection'

package/src/internal-utils/operationToPatches.ts

@@ -21,20 +21,18 @@ import {
   type SetNodeOperation,
   type SplitNodeOperation,
 } from 'slate'
+import type {EditorActor} from '../editor/editor-machine'
 import type {PatchFunctions} from '../editor/plugins/createWithPatches'
-import type {
-  PortableTextMemberSchemaTypes,
-  PortableTextSlateEditor,
-} from '../types/editor'
+import type {PortableTextSlateEditor} from '../types/editor'
 import {debugWithName} from './debug'
 import {fromSlateValue} from './values'
 
 const debug = debugWithName('operationToPatches')
 
 export function createOperationToPatches(
-  types: PortableTextMemberSchemaTypes,
+  editorActor: EditorActor,
 ): PatchFunctions {
-  const textBlockName = types.block.name
+  const textBlockName = editorActor.getSnapshot().context.schema.block.name
   function insertTextPatch(
     editor: PortableTextSlateEditor,
     operation: InsertTextOperation,

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

@@ -1,5 +1,5 @@
 import {describe, expect, test} from 'vitest'
-import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
+import {compileSchemaDefinition, defineSchema} from '../editor/editor-schema'
 import {parseBlock, parseSpan} from './parse-blocks'
 import {createTestKeyGenerator} from './test-key-generator'
 

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

@@ -1,12 +1,11 @@
 import type {
-  ObjectSchemaType,
   PortableTextBlock,
   PortableTextObject,
   PortableTextSpan,
   PortableTextTextBlock,
   TypedObject,
 } from '@sanity/types'
-import type {EditorSchema} from '../editor/define-schema'
+import type {EditorSchema} from '../editor/editor-schema'
 import type {EditorContext} from '../editor/editor-snapshot'
 import {isTypedObject} from './asserters'
 
@@ -192,9 +191,9 @@ function parseTextBlock({
    */
   if (
     typeof parsedBlock.style !== 'string' ||
-    !context.schema.styles.find((style) => style.value === block.style)
+    !context.schema.styles.find((style) => style.name === block.style)
   ) {
-    const defaultStyle = context.schema.styles.at(0)?.value
+    const defaultStyle = context.schema.styles.at(0)?.name
 
     if (defaultStyle !== undefined) {
       parsedBlock.style = defaultStyle
@@ -208,7 +207,7 @@ function parseTextBlock({
    */
   if (
     typeof parsedBlock.listItem !== 'string' ||
-    !context.schema.lists.find((list) => list.value === block.listItem)
+    !context.schema.lists.find((list) => list.name === block.listItem)
   ) {
     delete parsedBlock.listItem
   }
@@ -272,7 +271,7 @@ export function parseSpan({
     }
 
     if (
-      context.schema.decorators.some((decorator) => decorator.value === mark)
+      context.schema.decorators.some((decorator) => decorator.name === mark)
     ) {
       return [mark]
     }
@@ -362,7 +361,9 @@ function parseObject({
   options,
 }: {
   object: TypedObject
-  context: Pick<EditorContext, 'keyGenerator'> & {schemaType: ObjectSchemaType}
+  context: Pick<EditorContext, 'keyGenerator'> & {
+    schemaType: EditorSchema['blockObjects'][0]
+  }
   options: {refreshKeys: boolean}
 }): PortableTextObject {
   // Validates all props on the object and only takes those that match

package/src/internal-utils/slate-children-to-blocks.ts

@@ -1,6 +1,6 @@
 import type {PortableTextBlock} from '@sanity/types'
 import type {Descendant} from 'slate'
-import type {EditorSchema} from '../editor/define-schema'
+import type {EditorSchema} from '../editor/editor-schema'
 
 export function slateChildrenToBlocks(
   schema: EditorSchema,

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

@@ -1,5 +1,5 @@
 import {Editor, Element, Node, Range, type Path, type Point} from 'slate'
-import type {EditorSchema} from '../editor/define-schema'
+import type {EditorSchema} from '../editor/editor-schema'
 import type {EditorSelection, PortableTextSlateEditor} from '../types/editor'
 import {fromSlateValue} from './values'
 

package/src/internal-utils/validateValue.ts

@@ -6,10 +6,8 @@ import {
   type PortableTextTextBlock,
 } from '@sanity/types'
 import {flatten, isPlainObject, uniq} from 'lodash'
-import type {
-  InvalidValueResolution,
-  PortableTextMemberSchemaTypes,
-} from '../types/editor'
+import type {EditorSchema} from '../editor/editor-schema'
+import type {InvalidValueResolution} from '../types/editor'
 
 export interface Validation {
   valid: boolean
@@ -19,7 +17,7 @@ export interface Validation {
 
 export function validateValue(
   value: PortableTextBlock[] | undefined,
-  types: PortableTextMemberSchemaTypes,
+  types: EditorSchema,
   keyGenerator: () => string,
 ): Validation {
   let resolution: InvalidValueResolution | null = null
@@ -270,7 +268,7 @@ export function validateValue(
 
         // Test that every annotation mark used has a definition
         const annotationMarks = allUsedMarks.filter(
-          (mark) => !types.decorators.map((dec) => dec.value).includes(mark),
+          (mark) => !types.decorators.map((dec) => dec.name).includes(mark),
         )
         const orphanedMarks = annotationMarks.filter(
           (mark) =>

package/src/internal-utils/values.ts

@@ -7,7 +7,7 @@ import type {
 } from '@sanity/types'
 import {isEqual} from 'lodash'
 import {Element, Text, type Descendant, type Node} from 'slate'
-import type {PortableTextMemberSchemaTypes} from '../types/editor'
+import type {EditorSchema} from '../editor/editor-schema'
 
 export const EMPTY_MARKDEFS: PortableTextObject[] = []
 
@@ -31,7 +31,7 @@ function keepObjectEquality(
 
 export function toSlateValue(
   value: PortableTextBlock[] | undefined,
-  {schemaTypes}: {schemaTypes: PortableTextMemberSchemaTypes},
+  {schemaTypes}: {schemaTypes: EditorSchema},
   keyMap: Record<string, any> = {},
 ): Descendant[] {
   if (value && Array.isArray(value)) {
@@ -88,7 +88,7 @@ export function toSlateValue(
         }
         // TODO: remove this when we have a better way to handle missing style
         if (hasMissingStyle) {
-          rest.style = schemaTypes.styles[0].value
+          rest.style = schemaTypes.styles[0].name
         }
         return keepObjectEquality({_type, _key, ...rest, children}, keyMap)
       }
@@ -167,7 +167,7 @@ export function fromSlateValue(
 
 export function isEqualToEmptyEditor(
   children: Descendant[] | PortableTextBlock[],
-  schemaTypes: PortableTextMemberSchemaTypes,
+  schemaTypes: EditorSchema,
 ): boolean {
   return (
     children === undefined ||
@@ -178,7 +178,7 @@ export function isEqualToEmptyEditor(
       Element.isElement(children[0]) &&
       children[0]._type === schemaTypes.block.name &&
       'style' in children[0] &&
-      children[0].style === schemaTypes.styles[0].value &&
+      children[0].style === schemaTypes.styles[0].name &&
       !('listItem' in children[0]) &&
       Array.isArray(children[0].children) &&
       children[0].children.length === 1 &&

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

@@ -11,8 +11,8 @@ import {createDecoratorPairBehavior} from '../behaviors/behavior.decorator-pair'
 import {effect, execute} from '../behaviors/behavior.types.action'
 import {defineBehavior} from '../behaviors/behavior.types.behavior'
 import type {Editor} from '../editor/create-editor'
-import type {EditorSchema} from '../editor/define-schema'
 import {useEditor} from '../editor/editor-provider'
+import type {EditorSchema} from '../editor/editor-schema'
 import type {BlockOffset} from '../types/block-offset'
 import * as utils from '../utils'
 

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

@@ -3,8 +3,8 @@ import React from 'react'
 import {describe, expect, test, vi} from 'vitest'
 import {render} from 'vitest-browser-react'
 import {PortableTextEditable, type Editor} from '..'
-import {defineSchema} from '../editor/define-schema'
 import {EditorProvider} from '../editor/editor-provider'
+import {defineSchema} from '../editor/editor-schema'
 import {getTersePt} from '../internal-utils/terse-pt'
 import {createTestKeyGenerator} from '../internal-utils/test-key-generator'
 import {getTextMarks} from '../internal-utils/text-marks'

package/src/plugins/plugin.markdown.tsx

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

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

@@ -1,7 +1,7 @@
 import type {PortableTextBlock} from '@sanity/types'
 import {expect, test} from 'vitest'
 import type {EditorSelection} from '..'
-import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
+import {compileSchemaDefinition, defineSchema} from '../editor/editor-schema'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
 import {getSelectionText} from './selector.get-selection-text'
 

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

@@ -1,6 +1,6 @@
 import type {PortableTextBlock} from '@sanity/types'
 import {describe, expect, test} from 'vitest'
-import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
+import {compileSchemaDefinition, defineSchema} from '../editor/editor-schema'
 import {createTestSnapshot} from '../internal-utils/create-test-snapshot'
 import {parseBlock} from '../internal-utils/parse-blocks'
 import {createTestKeyGenerator} from '../internal-utils/test-key-generator'