@portabletext/editor 1.15.1 → 1.15.3

package/src/editor/editor-snapshot.ts

@@ -1,16 +1,14 @@
 import type {PortableTextBlock} from '@sanity/types'
-import type {
-  EditorSelection,
-  PortableTextMemberSchemaTypes,
-} from '../types/editor'
+import type {EditorSelection} from '../types/editor'
+import type {EditorSchema} from './define-schema'
 
 /**
  * @alpha
  */
 export type EditorContext = {
   keyGenerator: () => string
-  schema: PortableTextMemberSchemaTypes
-  selection: NonNullable<EditorSelection>
+  schema: EditorSchema
+  selection: EditorSelection
   value: Array<PortableTextBlock>
 }
 

package/src/editor/plugins/createWithEditableAPI.ts

@@ -18,6 +18,9 @@ import {
 } from 'slate'
 import type {DOMNode} from 'slate-dom'
 import {ReactEditor} from 'slate-react'
+import {isListItemActive} from '../../behavior-actions/behavior.action.list-item'
+import {isStyleActive} from '../../behavior-actions/behavior.action.style'
+import type {BehaviorActionImplementation} from '../../behavior-actions/behavior.actions'
 import type {
   EditableAPI,
   EditableAPIDeleteOptions,
@@ -31,9 +34,6 @@ import {
   KEY_TO_VALUE_ELEMENT,
   SLATE_TO_PORTABLE_TEXT_RANGE,
 } from '../../utils/weakMaps'
-import {isListItemActive} from '../behavior/behavior.action.list-item'
-import {isStyleActive} from '../behavior/behavior.action.style'
-import type {BehaviorActionImplementation} from '../behavior/behavior.actions'
 import type {EditorActor} from '../editor-machine'
 import {isDecoratorActive} from './createWithPortableTextMarkModel'
 

package/src/editor/plugins/createWithPortableTextMarkModel.ts

@@ -8,6 +8,7 @@ import {isPortableTextBlock, isPortableTextSpan} from '@portabletext/toolkit'
 import type {PortableTextObject, PortableTextSpan} from '@sanity/types'
 import {isEqual, uniq} from 'lodash'
 import {Editor, Element, Node, Path, Range, Text, Transforms} from 'slate'
+import type {BehaviorActionImplementation} from '../../behavior-actions/behavior.actions'
 import type {
   PortableTextMemberSchemaTypes,
   PortableTextSlateEditor,
@@ -16,7 +17,6 @@ import {debugWithName} from '../../utils/debug'
 import {getNextSpan, getPreviousSpan} from '../../utils/sibling-utils'
 import {isChangingRemotely} from '../../utils/withChanges'
 import {isRedoing, isUndoing} from '../../utils/withUndoRedo'
-import type {BehaviorActionImplementation} from '../behavior/behavior.actions'
 import type {EditorActor} from '../editor-machine'
 
 const debug = debugWithName('plugin:withPortableTextMarkModel')

package/src/editor/utils/utils.block-offset.ts

@@ -4,7 +4,7 @@ import {
   type KeyedSegment,
   type PortableTextBlock,
 } from '@sanity/types'
-import type {BlockOffset} from '../behavior/behavior.types'
+import type {BlockOffset} from '../../behaviors/behavior.types'
 
 export function blockOffsetToSpanSelectionPoint({
   value,

package/src/index.ts

@@ -1,31 +1,15 @@
 export type {Patch} from '@portabletext/patches'
 export type {PortableTextBlock, PortableTextChild} from '@sanity/types'
-export {
-  createCodeEditorBehaviors,
-  type CodeEditorBehaviorsConfig,
-} from './editor/behavior/behavior.code-editor'
-export {coreBehavior, coreBehaviors} from './editor/behavior/behavior.core'
-export {
-  createLinkBehaviors,
-  type LinkBehaviorsConfig,
-} from './editor/behavior/behavior.links'
-export {
-  createMarkdownBehaviors,
-  type MarkdownBehaviorsConfig,
-} from './editor/behavior/behavior.markdown'
-export {
-  defineBehavior,
-  type BehaviorEvent,
-  type Behavior,
-  type BehaviorActionIntend,
-  type BehaviorActionIntendSet,
-  type SyntheticBehaviorEvent,
-  type BehaviorGuard,
-  type BlockOffset,
-  type NativeBehaviorEvent,
-  type OmitFromUnion,
-  type PickFromUnion,
-} from './editor/behavior/behavior.types'
+export type {
+  Behavior,
+  BehaviorActionIntend,
+  BehaviorActionIntendSet,
+  BehaviorEvent,
+  BehaviorGuard,
+  BlockOffset,
+  NativeBehaviorEvent,
+  SyntheticBehaviorEvent,
+} from './behaviors/index'
 export type {Editor, EditorConfig, EditorEvent} from './editor/create-editor'
 export type {SlateEditor} from './editor/create-slate-editor'
 export {
@@ -33,6 +17,8 @@ export {
   type BaseDefinition,
   type SchemaDefinition,
 } from './editor/define-schema'
+export type {PortableTextMemberSchemaTypes} from './types/editor'
+export type {EditorSchema} from './editor/define-schema'
 export {PortableTextEditable} from './editor/Editable'
 export type {PortableTextEditableProps} from './editor/Editable'
 export {EditorEventListener} from './editor/editor-event-listener'
@@ -51,11 +37,7 @@ export {
   useEditor,
   type EditorProviderProps,
 } from './editor/editor-provider'
-export {
-  useEditorSelector,
-  type EditorSelector,
-  type EditorSelectorSnapshot,
-} from './editor/editor-selector'
+export {useEditorSelector, type EditorSelector} from './editor/editor-selector'
 export type {EditorContext, EditorSnapshot} from './editor/editor-snapshot'
 export {usePortableTextEditor} from './editor/hooks/usePortableTextEditor'
 export {usePortableTextEditorSelection} from './editor/hooks/usePortableTextEditorSelection'
@@ -63,5 +45,6 @@ export {defaultKeyGenerator as keyGenerator} from './editor/key-generator'
 export type {AddedAnnotationPaths} from './editor/plugins/createWithEditableAPI'
 export {PortableTextEditor} from './editor/PortableTextEditor'
 export type {PortableTextEditorProps} from './editor/PortableTextEditor'
+export type {OmitFromUnion, PickFromUnion} from './type-utils'
 export * from './types/editor'
 export type {HotkeyOptions} from './types/options'

package/src/selectors/index.ts

@@ -1,7 +1,4 @@
-export type {
-  EditorSelector,
-  EditorSelectorSnapshot,
-} from '../editor/editor-selector'
+export type {EditorSelector} from '../editor/editor-selector'
 export type {EditorContext, EditorSnapshot} from '../editor/editor-snapshot'
 export type {
   EditorSelection,
@@ -13,3 +10,4 @@ export {getActiveListItem} from './selector.get-active-list-item'
 export {getSelectionText} from './selector.get-selection-text'
 export {getBlockTextBefore} from './selector.get-text-before'
 export * from './selectors'
+export type {EditorSchema} from '../editor/define-schema'

package/src/selectors/selector.get-active-list-item.ts

@@ -1,5 +1,5 @@
 import type {PortableTextListBlock} from '@sanity/types'
-import {createGuards} from '../editor/behavior/behavior.guards'
+import {createGuards} from '../behavior-actions/behavior.guards'
 import type {EditorSelector} from '../editor/editor-selector'
 import {getSelectedBlocks} from './selectors'
 

package/src/selectors/selectors.ts

@@ -9,7 +9,7 @@ import {
   type PortableTextSpan,
   type PortableTextTextBlock,
 } from '@sanity/types'
-import {createGuards} from '../editor/behavior/behavior.guards'
+import {createGuards} from '../behavior-actions/behavior.guards'
 import type {EditorSelector} from '../editor/editor-selector'
 
 /**

package/src/type-utils.ts

@@ -0,0 +1,17 @@
+/**
+ * @alpha
+ */
+export type PickFromUnion<
+  TUnion,
+  TTagKey extends keyof TUnion,
+  TPickedTags extends TUnion[TTagKey],
+> = TUnion extends Record<TTagKey, TPickedTags> ? TUnion : never
+
+/**
+ * @alpha
+ */
+export type OmitFromUnion<
+  TUnion,
+  TTagKey extends keyof TUnion,
+  TOmittedTags extends TUnion[TTagKey],
+> = TUnion extends Record<TTagKey, TOmittedTags> ? never : TUnion

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

@@ -2,15 +2,15 @@ import type {PortableTextTextBlock} from '@sanity/types'
 import {createEditor, type Descendant} from 'slate'
 import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
+import {coreBehaviors} from '../../behaviors/behavior.core'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
-import {coreBehaviors} from '../../editor/behavior/behavior.core'
+import {createEditorSchema} from '../../editor/create-editor-schema'
 import {editorMachine} from '../../editor/editor-machine'
 import {defaultKeyGenerator} from '../../editor/key-generator'
 import {withPlugins} from '../../editor/plugins/with-plugins'
-import {getPortableTextMemberSchemaTypes} from '../getPortableTextMemberSchemaTypes'
 import {createOperationToPatches} from '../operationToPatches'
 
-const schemaTypes = getPortableTextMemberSchemaTypes(schemaType)
+const schemaTypes = createEditorSchema(schemaType)
 
 const operationToPatches = createOperationToPatches(schemaTypes)
 

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

@@ -2,16 +2,16 @@ import type {Patch} from '@portabletext/patches'
 import {createEditor, type Descendant} from 'slate'
 import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
+import {coreBehaviors} from '../../behaviors/behavior.core'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
-import {coreBehaviors} from '../../editor/behavior/behavior.core'
+import {createEditorSchema} from '../../editor/create-editor-schema'
 import {editorMachine} from '../../editor/editor-machine'
 import {defaultKeyGenerator} from '../../editor/key-generator'
 import {withPlugins} from '../../editor/plugins/with-plugins'
 import {createApplyPatch} from '../applyPatch'
-import {getPortableTextMemberSchemaTypes} from '../getPortableTextMemberSchemaTypes'
 import {VOID_CHILD_KEY} from '../values'
 
-const schemaTypes = getPortableTextMemberSchemaTypes(schemaType)
+const schemaTypes = createEditorSchema(schemaType)
 
 const patchToOperations = createApplyPatch(schemaTypes)
 

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

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