Merge pull request #148 from prezly/refactor/slate-lists

Refactor - Slate Lists package
prezly · Apr 21, 2022 · 9c38f3c · 9c38f3c
2 parents b681c6d + 7e77235
commit 9c38f3c
Show file tree

Hide file tree

Showing 94 changed files with 3,860 additions and 3,934 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/slate-commons/src/EditableWithExtensions.tsx b/packages/slate-commons/src/EditableWithExtensions.tsx
@@ -1,7 +1,9 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import type { FunctionComponent } from 'react';
 import React, { useCallback, useMemo } from 'react';
-import { Editable, useSlateStatic } from 'slate-react';
+import type { Editor } from 'slate';
+import type { ReactEditor } from 'slate-react';
+import { Editable } from 'slate-react';
 
 import {
     combineDecorate,
@@ -22,6 +24,7 @@ import type {
 
 export interface Props {
     decorate?: Decorate;
+    editor: Editor & ReactEditor;
     /**
      * Each extension fields will be combined by role.
      *
@@ -67,6 +70,7 @@ export interface Props {
 
 export const EditableWithExtensions: FunctionComponent<Props> = ({
     decorate,
+    editor,
     extensions = [],
     onDOMBeforeInput: onDOMBeforeInputList = [],
     onDOMBeforeInputDeps = [],
@@ -78,8 +82,6 @@ export const EditableWithExtensions: FunctionComponent<Props> = ({
     renderLeafDeps = [],
     ...props
 }) => {
-    const editor = useSlateStatic();
-
     const combinedDecorate: Decorate = useMemo(
         function () {
             const decorateFns = createExtensionsDecorators(editor, extensions);

diff --git a/packages/slate-commons/src/commands/focus.ts b/packages/slate-commons/src/commands/focus.ts
@@ -3,7 +3,7 @@ import { ReactEditor } from 'slate-react';
 
 import { moveCursorToEndOfDocument } from './moveCursorToEndOfDocument';
 
-export function focus(editor: Editor): void {
+export function focus(editor: Editor & ReactEditor): void {
     ReactEditor.focus(editor);
     moveCursorToEndOfDocument(editor);
 }
diff --git a/packages/slate-commons/src/commands/getCurrentDomNode.ts b/packages/slate-commons/src/commands/getCurrentDomNode.ts
@@ -1,9 +1,10 @@
 import type { Editor } from 'slate';
+import type { ReactEditor } from 'slate-react';
 
 import { getCurrentNodeEntry } from './getCurrentNodeEntry';
 import { toDomNode } from './toDomNode';
 
-export function getCurrentDomNode(editor: Editor): HTMLElement | null {
+export function getCurrentDomNode(editor: Editor & ReactEditor): HTMLElement | null {
     const [currentNode] = getCurrentNodeEntry(editor) || [];
 
     if (!currentNode) {