@portabletext/editor 1.1.1 → 1.1.3

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

@@ -1,7 +1,7 @@
-import {beforeEach, describe, expect, it} from '@jest/globals'
 import type {Patch} from '@portabletext/patches'
 import {noop} from 'lodash'
 import {createEditor, type Descendant} from 'slate'
+import {beforeEach, describe, expect, it} from 'vitest'
 import {keyGenerator, PortableTextEditor} from '../..'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
 import {withPlugins} from '../../editor/plugins'
@@ -70,21 +70,21 @@ describe('operationToPatches', () => {
       patchToOperations(editor, p)
     })
     expect(editor.children).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "__inline": false,
           "_key": "c01739b0d03b",
           "_type": "image",
-          "children": Array [
-            Object {
+          "children": [
+            {
               "_key": "${VOID_CHILD_KEY}",
               "_type": "span",
-              "marks": Array [],
+              "marks": [],
               "text": "",
             },
           ],
-          "value": Object {
-            "asset": Object {
+          "value": {
+            "asset": {
               "_ref": "image-f52f71bc1df46e080dabe43a8effe8ccfb5f21de-4032x3024-png",
               "_type": "reference",
             },
@@ -93,7 +93,7 @@ describe('operationToPatches', () => {
       ]
     `)
   })
-  it('will not create operations for insertion inside object blocks', () => {
+  it('will not create operations for insertion inside blocks', () => {
     editor.children = [
       {
         _type: 'someType',
@@ -127,31 +127,31 @@ describe('operationToPatches', () => {
       patchToOperations(editor, p)
     })
     expect(editor.children).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "__inline": false,
           "_key": "c01739b0d03b",
           "_type": "someType",
-          "children": Array [
-            Object {
+          "children": [
+            {
               "_key": "${VOID_CHILD_KEY}",
               "_type": "span",
-              "marks": Array [],
+              "marks": [],
               "text": "",
             },
           ],
-          "value": Object {
-            "asset": Object {
+          "value": {
+            "asset": {
               "_ref": "image-f52f71bc1df46e080dabe43a8effe8ccfb5f21de-4032x3024-png",
               "_type": "reference",
             },
-            "nestedArray": Array [],
+            "nestedArray": [],
           },
         },
       ]
     `)
   })
-  it('will not create operations for removal inside object blocks', () => {
+  it('will not create operations for removal inside blocks', () => {
     editor.children = [
       {
         _type: 'someType',
@@ -190,26 +190,26 @@ describe('operationToPatches', () => {
       patchToOperations(editor, p)
     })
     expect(editor.children).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "__inline": false,
           "_key": "c01739b0d03b",
           "_type": "someType",
-          "children": Array [
-            Object {
+          "children": [
+            {
               "_key": "${VOID_CHILD_KEY}",
               "_type": "span",
-              "marks": Array [],
+              "marks": [],
               "text": "",
             },
           ],
-          "value": Object {
-            "asset": Object {
+          "value": {
+            "asset": {
               "_ref": "image-f52f71bc1df46e080dabe43a8effe8ccfb5f21de-4032x3024-png",
               "_type": "reference",
             },
-            "nestedArray": Array [
-              Object {
+            "nestedArray": [
+              {
                 "_key": "foo",
                 "_type": "nestedValue",
               },
@@ -219,7 +219,7 @@ describe('operationToPatches', () => {
       ]
     `)
   })
-  it('will not create operations for setting data inside object blocks', () => {
+  it('will not create operations for setting data inside blocks', () => {
     editor.children = [
       {
         _key: '1335959d4d03',
@@ -265,34 +265,34 @@ describe('operationToPatches', () => {
       patchToOperations(editor, p)
     })
     expect(editor.children).toMatchInlineSnapshot(`
-      Array [
-        Object {
+      [
+        {
           "_key": "1335959d4d03",
           "_type": "block",
-          "children": Array [
-            Object {
+          "children": [
+            {
               "_key": "9bd868adcd6b",
               "_type": "span",
-              "marks": Array [],
+              "marks": [],
               "text": "1 ",
             },
-            Object {
+            {
               "_key": "6f75d593f3fc",
               "_type": "span",
-              "marks": Array [
+              "marks": [
                 "11de7fcea659",
               ],
               "text": "2",
             },
-            Object {
+            {
               "_key": "033618a7f081",
               "_type": "span",
-              "marks": Array [],
+              "marks": [],
               "text": " 3",
             },
           ],
-          "markDefs": Array [
-            Object {
+          "markDefs": [
+            {
               "_key": "11de7fcea659",
               "_type": "link",
             },

package/src/utils/__tests__/ranges.test.ts

@@ -1,5 +1,5 @@
-import {describe, expect, it} from '@jest/globals'
 import type {InsertTextOperation, Range} from 'slate'
+import {describe, expect, it} from 'vitest'
 import {moveRangeByOperation} from '../ranges'
 
 describe('moveRangeByOperation', () => {

package/src/utils/__tests__/valueNormalization.test.tsx

@@ -1,6 +1,6 @@
-import {describe, expect, it, jest} from '@jest/globals'
 import {render, waitFor} from '@testing-library/react'
 import {createRef, type RefObject} from 'react'
+import {describe, expect, it, vi} from 'vitest'
 import {
   PortableTextEditorTester,
   schemaType,
@@ -25,7 +25,7 @@ describe('values: normalization', () => {
         markDefs: [],
       },
     ]
-    const onChange = jest.fn()
+    const onChange = vi.fn()
     render(
       <PortableTextEditorTester
         onChange={onChange}
@@ -34,6 +34,17 @@ describe('values: normalization', () => {
         value={initialValue}
       />,
     )
+
+    await waitFor(() => {
+      if (editorRef.current) {
+        expect(onChange).toHaveBeenCalledWith({
+          type: 'value',
+          value: initialValue,
+        })
+        expect(onChange).toHaveBeenCalledWith({type: 'ready'})
+      }
+    })
+
     await waitFor(() => {
       if (editorRef.current) {
         PortableTextEditor.focus(editorRef.current)

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

@@ -1,4 +1,4 @@
-import {describe, expect, it} from '@jest/globals'
+import {describe, expect, it} from 'vitest'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
 import {getPortableTextMemberSchemaTypes} from '../getPortableTextMemberSchemaTypes'
 import {fromSlateValue, toSlateValue} from '../values'
@@ -59,12 +59,12 @@ describe('toSlateValue', () => {
       {schemaTypes},
     )
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
+[
+  {
     "_key": "123",
     "_type": "myTestBlockType",
-    "children": Array [
-      Object {
+    "children": [
+      {
         "_key": "1231",
         "_type": "span",
         "text": "123",
@@ -76,7 +76,7 @@ Array [
 `)
   })
 
-  it('given type is block and has custom object in children', () => {
+  it('given type is block and has custom in children', () => {
     const result = toSlateValue(
       [
         {
@@ -102,30 +102,30 @@ Array [
     )
 
     expect(result).toMatchInlineSnapshot(`
-Array [
-  Object {
+[
+  {
     "_key": "123",
     "_type": "myTestBlockType",
-    "children": Array [
-      Object {
+    "children": [
+      {
         "_key": "1231",
         "_type": "span",
         "text": "123",
       },
-      Object {
+      {
         "__inline": true,
         "_key": "1232",
         "_type": "image",
-        "children": Array [
-          Object {
+        "children": [
+          {
             "_key": "void-child",
             "_type": "span",
-            "marks": Array [],
+            "marks": [],
             "text": "",
           },
         ],
-        "value": Object {
-          "asset": Object {
+        "value": {
+          "asset": {
             "_ref": "ref-123",
           },
         },
@@ -213,7 +213,7 @@ describe('fromSlateValue', () => {
     ])
   })
 
-  it('has object equality', () => {
+  it('has equality', () => {
     const keyMap = {}
     const value = [
       {

package/src/utils/applyPatch.ts

@@ -47,8 +47,6 @@ const debugVerbose = debug.enabled && true
 export function createApplyPatch(
   schemaTypes: PortableTextMemberSchemaTypes,
 ): (editor: PortableTextSlateEditor, patch: Patch) => boolean {
-  let previousPatch: Patch | undefined
-
   return (editor: PortableTextSlateEditor, patch: Patch): boolean => {
     let changed = false
 
@@ -66,7 +64,7 @@ export function createApplyPatch(
           changed = insertPatch(editor, patch, schemaTypes)
           break
         case 'unset':
-          changed = unsetPatch(editor, patch, previousPatch)
+          changed = unsetPatch(editor, patch)
           break
         case 'set':
           changed = setPatch(editor, patch)
@@ -80,7 +78,7 @@ export function createApplyPatch(
     } catch (err) {
       console.error(err)
     }
-    previousPatch = patch
+
     return changed
   }
 }
@@ -308,18 +306,14 @@ function setPatch(editor: PortableTextSlateEditor, patch: SetPatch) {
   return true
 }
 
-function unsetPatch(
-  editor: PortableTextSlateEditor,
-  patch: UnsetPatch,
-  previousPatch?: Patch,
-) {
+function unsetPatch(editor: PortableTextSlateEditor, patch: UnsetPatch) {
   // Value
   if (patch.path.length === 0) {
     debug('Removing everything')
     debugState(editor, 'before')
     const previousSelection = editor.selection
     Transforms.deselect(editor)
-    editor.children.forEach((c, i) => {
+    editor.children.forEach((_child, i) => {
       Transforms.removeNodes(editor, {at: [i]})
     })
     Transforms.insertNodes(editor, editor.pteCreateTextBlock({decorators: []}))

package/src/utils/validateValue.ts

@@ -10,7 +10,6 @@ import type {
   InvalidValueResolution,
   PortableTextMemberSchemaTypes,
 } from '../types/editor'
-import {EMPTY_MARKDEFS} from './values'
 
 export interface Validation {
   valid: boolean
@@ -227,28 +226,7 @@ export function validateValue(
           }
           return true
         }
-        // Test that markDefs are valid if they exists
-        if (blk.markDefs && !Array.isArray(blk.markDefs)) {
-          resolution = {
-            patches: [
-              set({...textBlock, markDefs: EMPTY_MARKDEFS}, [
-                {_key: textBlock._key},
-              ]),
-            ],
-            description: `Block has invalid required property 'markDefs'.`,
-            action: 'Add empty markDefs array',
-            item: textBlock,
 
-            i18n: {
-              description:
-                'inputs.portable-text.invalid-value.missing-or-invalid-markdefs.description',
-              action:
-                'inputs.portable-text.invalid-value.missing-or-invalid-markdefs.action',
-              values: {key: textBlock._key},
-            },
-          }
-          return true
-        }
         const allUsedMarks = uniq(
           flatten(
             textBlock.children

package/src/editor/__tests__/utils.ts

@@ -1,44 +0,0 @@
-// This utils are inspired from https://github.dev/mwood23/slate-test-utils/blob/master/src/buildTestHarness.tsx
-import {fireEvent, type render} from '@testing-library/react'
-import {parseHotkey} from 'is-hotkey-esm'
-import {act} from 'react'
-
-export async function triggerKeyboardEvent(
-  hotkey: string,
-  element: Element,
-): Promise<void> {
-  const eventProps = parseHotkey(hotkey)
-  const values = hotkey.split('+')
-
-  fireEvent(
-    element,
-    new window.KeyboardEvent('keydown', {
-      key: values[values.length - 1],
-      code: `${eventProps.which}`,
-      keyCode: eventProps.which,
-      bubbles: true,
-      ...eventProps,
-    }),
-  )
-}
-
-export async function getEditableElement(
-  component: ReturnType<typeof render>,
-): Promise<Element> {
-  await act(async () => component)
-  const element = component.container.querySelector(
-    '[data-slate-editor="true"]',
-  )
-  if (!element) {
-    throw new Error('Could not find element')
-  }
-  /**
-   * Manually add this because JSDom doesn't implement this and Slate checks for it
-   * internally before doing stuff.
-   *
-   * https://github.com/jsdom/jsdom/issues/1670
-   */
-  // @ts-ignore
-  element.isContentEditable = true
-  return element
-}