Fix rootDataAtom in ParamList

PainterQubits · Feb 6, 2024 · fde41ea · fde41ea
1 parent 657936c
commit fde41ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/atoms/commitSelect.ts b/src/atoms/commitSelect.ts
@@ -32,7 +32,6 @@ const selectedCommitIndexStateAtom = atom<number | Promise<number>>(0);
 export const selectedCommitIndexAtom = atom(
   (get) =>
     get(syncLatestAtom) ? get(latestCommitIndexAtom) : get(selectedCommitIndexStateAtom),
-
   (get, set, action: selectCommitIndexAction) => {
     if (action.type === "sync") {
       if (get(syncLatestAtom)) {

diff --git a/src/components/ParamSection/ParamList.tsx b/src/components/ParamSection/ParamList.tsx
@@ -10,9 +10,13 @@ import LeafItemContent from "./LeafItemContent";
 import GroupItemContent from "./GroupItemContent";
 import CollapseItem from "./CollapseItem";
 
-const rootDataAtom = atom((get) =>
-  get(editModeAtom) ? get(editedDataAtom) : get(originalDataAtom),
-);
+const rootDataAtom = atom((get) => {
+  // Reading the data atoms outside of the conditional ensures that Jotai will register
+  // both as dependencies, regardless of the result of the conditional.
+  const editedData = get(editedDataAtom);
+  const originalData = get(originalDataAtom);
+  return get(editModeAtom) ? editedData : originalData;
+});
 
 const rootListSx = {
   borderBottom: 1,