fix: unify props setting to avoid composition errors

nytimes · Sep 11, 2023 · fa41fa1 · fa41fa1
1 parent 64dd486
commit fa41fa1
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/src/hooks/useEditorView.ts b/src/hooks/useEditorView.ts
@@ -71,19 +71,11 @@ export function useEditorView<T extends HTMLElement = HTMLElement>(
 
   const editorProps = withFlushedDispatch(props, forceUpdate);
 
-  const stateProp = "state" in editorProps ? editorProps.state : undefined;
-
   const state =
     "defaultState" in editorProps
       ? editorProps.defaultState
       : editorProps.state;
 
-  const nonStateProps = Object.fromEntries(
-    Object.entries(editorProps).filter(
-      ([propName]) => propName !== "state" && propName !== "defaultState"
-    )
-  );
-
   useLayoutEffect(() => {
     return () => {
       if (view) {
@@ -117,12 +109,8 @@ export function useEditorView<T extends HTMLElement = HTMLElement>(
   }, [editorProps, mount, state, view]);
 
   useLayoutEffect(() => {
-    view?.setProps(nonStateProps);
-  }, [view, nonStateProps]);
-
-  useLayoutEffect(() => {
-    if (stateProp) view?.setProps({ state: stateProp });
-  }, [view, stateProp]);
+    view?.setProps(editorProps);
+  }, [view, editorProps]);
 
   return view;
 }