Merge pull request #116 from prezly/refactor/editor-with-overrides

Move `Extension.withOverrides` support into `createEditorV4()`
prezly · Feb 23, 2022 · b760c3a · b760c3a
2 parents fb18d41 + 3efd5a3
commit b760c3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/slate-commons/src/types/index.ts b/packages/slate-commons/src/types/index.ts
@@ -9,3 +9,4 @@ export type { OnDOMBeforeInput } from './OnDOMBeforeInput';
 export type { OnKeyDown } from './OnKeyDown';
 export type { RenderElement } from './RenderElement';
 export type { RenderLeaf } from './RenderLeaf';
+export type { WithOverrides } from './WithOverrides';
diff --git a/packages/slate-editor/src/modules/editor-v4/createEditorV4.ts b/packages/slate-editor/src/modules/editor-v4/createEditorV4.ts
@@ -1,11 +1,12 @@
-import type { Extension } from '@prezly/slate-commons';
 import {
     withBreaksOnExpandedSelection,
     withBreaksOnVoidNodes,
     withInlineVoid,
     withNormalization,
     withUserFriendlyDeleteBehavior,
 } from '@prezly/slate-commons';
+import type { Extension } from '@prezly/slate-commons';
+import type { WithOverrides } from '@prezly/slate-commons';
 import type { Editor } from 'slate';
 import { withHistory } from 'slate-history';
 import { withReact } from 'slate-react';
@@ -28,8 +29,12 @@ import {
 export function createEditorV4(
     baseEditor: Editor,
     getExtensions: () => Extension[],
-    plugins: (<T extends Editor>(editor: T) => T)[],
+    plugins: WithOverrides[],
 ) {
+    const overrides = getExtensions()
+        .map(({ withOverrides }) => withOverrides)
+        .filter((o): o is WithOverrides => Boolean(o));
+
     return flow([
         withReact,
         withHistory,
@@ -49,6 +54,7 @@ export function createEditorV4(
         withRichFormatting,
         withImages,
         withFilePasting(getExtensions),
+        ...overrides,
         ...plugins,
     ])(baseEditor);
 }
diff --git a/packages/slate-editor/src/modules/editor-v4/useCreateEditor.ts b/packages/slate-editor/src/modules/editor-v4/useCreateEditor.ts
@@ -51,11 +51,7 @@ export function useCreateEditor({
     const [userPlugins] = useState(plugins);
     const finalPlugins = useMemo(() => [withEvents(events), ...userPlugins], [userPlugins, events]);
     const editor = useMemo(() => {
-        const editor = createEditor();
-
-        getExtensions().forEach((ext) => ext.withOverrides?.(editor));
-
-        return createEditorV4(editor, getExtensions, finalPlugins);
+        return createEditorV4(createEditor(), getExtensions, finalPlugins);
     }, [getExtensions, finalPlugins]);
 
     useEffect(() => {