state props before non-state props

nytimes · Sep 11, 2023 · 2a19fb5 · 2a19fb5
1 parent 145b05a
commit 2a19fb5
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/hooks/useEditorView.ts b/src/hooks/useEditorView.ts
@@ -71,11 +71,19 @@ 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) {
@@ -109,8 +117,12 @@ export function useEditorView<T extends HTMLElement = HTMLElement>(
   }, [editorProps, mount, state, view]);
 
   useLayoutEffect(() => {
-    view?.setProps(editorProps);
-  }, [view, editorProps]);
+    if (stateProp) view?.setProps({ state: stateProp });
+  }, [view, stateProp]);
+
+  useLayoutEffect(() => {
+    view?.setProps(nonStateProps);
+  }, [view, nonStateProps]);
 
   return view;
 }