fix: spectra stack alignment does not work when load .nmrium

close #1495
cheminfo · Apr 22, 2022 · 33ce29b · 33ce29b
1 parent dd470ce
commit 33ce29b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/component/reducer/actions/LoadActions.ts b/src/component/reducer/actions/LoadActions.ts
@@ -100,9 +100,9 @@ function initiate(draft: Draft<State>, action) {
   setData(state, action.payload);
   const preferences = action.payload?.preferences || {};
   setActiveTab(state, { tab: preferences?.activeTab || '' });
-  setPreferences(state, action.payload);
   state.width = draft.width;
   state.height = draft.height;
+  setPreferences(state, action.payload);
   state.isLoading = false;
   state.actionType = INITIATE;
   return state;
@@ -138,10 +138,9 @@ function handleLoadJsonFile(draft: Draft<State>, action) {
   setData(state, action.payload);
   const preferences = action.payload?.preferences || {};
   setActiveTab(state, { tab: preferences?.activeTab || '' });
-  setPreferences(state, preferences);
-
   state.width = draft.width;
   state.height = draft.height;
+  setPreferences(state, preferences);
   state.isLoading = false;
   state.actionType = LOAD_JSON_FILE;
   return state;

diff --git a/src/component/reducer/actions/PreferencesActions.ts b/src/component/reducer/actions/PreferencesActions.ts
@@ -55,8 +55,10 @@ function changeSpectrumVerticalAlignment(
         const visibleSpectra = dataPerNucleus.filter(
           (datum) => datum.display.isVisible === true,
         );
-        draft.verticalAlign.verticalShift = Math.floor(
-          (draft.height - draft.margin.bottom) / (visibleSpectra.length + 2),
+        draft.verticalAlign.verticalShift = Math.abs(
+          Math.floor(
+            (draft.height - draft.margin.bottom) / (visibleSpectra.length + 2),
+          ),
         );
         break;
       }