refactor

udecode · Dec 25, 2024 · 392d0f7 · 392d0f7
1 parent 51b2d4a
commit 392d0f7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/packages/plate-utils/src/react/selectSiblingNodePoint.ts b/packages/plate-utils/src/react/selectSiblingNodePoint.ts
@@ -1,7 +1,7 @@
 import type { Path } from 'slate';
 
 import { type TEditor, type TNode, setSelection } from '@udecode/slate';
-import { findPath, focusEditor } from '@udecode/slate-react';
+import { focusEditor } from '@udecode/slate-react';
 import {
   getNextNodeStartPoint,
   getPreviousNodeEndPoint,
@@ -22,7 +22,7 @@ export const selectSiblingNodePoint = (
   } = {}
 ) => {
   if (node) {
-    at = findPath(editor, node);
+    at = editor.findPath(node);
   }
   if (!at) return;
 

diff --git a/packages/plate-utils/src/react/useRemoveNodeButton.ts b/packages/plate-utils/src/react/useRemoveNodeButton.ts
@@ -1,14 +1,13 @@
 import { useEditorRef } from '@udecode/plate-core/react';
 import { type TElement, removeNodes } from '@udecode/slate';
-import { findPath } from '@udecode/slate-react';
 
 export const useRemoveNodeButton = ({ element }: { element: TElement }) => {
   const editor = useEditorRef();
 
   return {
     props: {
       onClick: () => {
-        const path = findPath(editor, element);
+        const path = editor.findPath(element);
 
         removeNodes(editor, { at: path });
       },

diff --git a/packages/resizable/src/components/Resizable.tsx b/packages/resizable/src/components/Resizable.tsx
@@ -35,7 +35,6 @@ export const useResizableState = ({
 
   const setNodeWidth = React.useCallback(
     (w: number) => {
-      if (!path) return;
       if (w === nodeWidth) {
         // Focus the node if not resized
         select(editor, path);

diff --git a/packages/selection/src/react/hooks/useBlockSelectable.ts b/packages/selection/src/react/hooks/useBlockSelectable.ts
@@ -22,7 +22,7 @@ export const useBlockSelectable = () => {
     props: {
       className: 'slate-selectable',
       onContextMenu: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
-        if (!element || !path) return;
+        if (!element) return;
 
         const { enableContextMenu } = getOptions();
 

diff --git a/packages/slate-react/src/utils/setNode.ts b/packages/slate-react/src/utils/setNode.ts
@@ -5,15 +5,13 @@ import type {
   TNodeProps,
 } from '@udecode/slate';
 
-import { findPath } from '../react-editor';
-
 export const setNode = <N extends NodeOf<E>, E extends TEditor = TEditor>(
   editor: E,
   node: N,
   props: Partial<TNodeProps<N>>,
   options?: Omit<SetNodesOptions<E>, 'at'>
 ) => {
-  const path = findPath(editor, node);
+  const path = editor.findPath(node);
 
   if (!path) return;
 

diff --git a/packages/slate/src/interfaces/editor/TEditor.ts b/packages/slate/src/interfaces/editor/TEditor.ts
@@ -2,6 +2,7 @@ import type { Modify, UnknownObject } from '@udecode/utils';
 import type { Editor, Path, Range } from 'slate';
 import type { HistoryEditor } from 'slate-history';
 
+import type { FindNodeOptions } from '../../queries';
 import type { TOperation } from '../../types/TOperation';
 import type { TElement } from '../element/TElement';
 import type { TDescendant } from '../node/TDescendant';
@@ -30,6 +31,11 @@ export type TEditor<V extends Value = Value> = {
     data: DataTransfer,
     originEvent?: 'copy' | 'cut' | 'drag'
   ) => void;
+  /**
+   * Find the path of a node. Overridden by `withPlate` to use React.findPath
+   * (memo). Default is `findNodePath` (traversal).
+   */
+  findPath: (node: TNode, options?: FindNodeOptions) => Path | undefined;
   hasRange: (editor: TEditor<V>, range: Range) => boolean;
   hasTarget: (editor: TEditor<V>, target: EventTarget | null) => target is Node;
   insertData: (data: DataTransfer) => void;

diff --git a/packages/slate/src/transforms/setNode.ts b/packages/slate/src/transforms/setNode.ts
@@ -5,15 +5,13 @@ import type {
   TNodeProps,
 } from '../interfaces';
 
-import { findNodePath } from '../queries';
-
 export const setNode = <N extends NodeOf<E>, E extends TEditor = TEditor>(
   editor: E,
   node: N,
   props: Partial<TNodeProps<N>>,
   options?: Omit<SetNodesOptions<E>, 'at'>
 ) => {
-  const path = findNodePath(editor, node);
+  const path = editor.findPath(node);
 
   if (!path) return;
 

diff --git a/packages/suggestion/src/lib/withSuggestion.ts b/packages/suggestion/src/lib/withSuggestion.ts
@@ -239,7 +239,7 @@ export const withSuggestion: ExtendEditor<SuggestionConfig> = ({
 //         return;
 //       }
 //
-//       const path = findNodePath(editor, node);
+//       const path = editor.findPath(node);
 //       if (!path) return;
 //
 //       const id = findSuggestionId(editor, path) ?? nanoid();

diff --git a/packages/tabbable/src/react/TabbableEffects.tsx b/packages/tabbable/src/react/TabbableEffects.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 
 import {
-  findPath,
   focusEditor,
   toDOMNode,
   toSlateNode,
@@ -75,7 +74,7 @@ export function TabbableEffects() {
 
           return {
             domNode,
-            path: findPath(editor, slateNode),
+            path: editor.findPath(slateNode),
             slateNode,
           } as TabbableEntry;
         })