fix: Bug when drag / drop second NMRium file

close #1421
cheminfo · Mar 11, 2022 · 08ada51 · 08ada51
1 parent 456e80a
commit 08ada51
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/component/1d/FooterBanner.tsx b/src/component/1d/FooterBanner.tsx
@@ -192,7 +192,7 @@ function FooterBannerInner({
 
 const MemoizedFooterBanner = memo(FooterBannerInner);
 
-const emptyData = { info: {}, data: {} };
+const emptyData = { info: {}, data: null };
 
 export default function FooterBanner() {
   const { margin, width, height, activeSpectrum, activeTab } = useChartData();

diff --git a/src/component/reducer/actions/LoadActions.ts b/src/component/reducer/actions/LoadActions.ts
@@ -11,6 +11,11 @@ import { State } from '../Reducer';
 import { changeSpectrumVerticalAlignment } from './PreferencesActions';
 import { setActiveTab } from './ToolsActions';
 
+function resetState(draft: Draft<State>) {
+  draft.activeSpectrum = null;
+  draft.activeTab = '';
+  draft.tabActiveSpectrum = {};
+}
 function setIsLoading(draft: Draft<State>, isLoading: boolean) {
   draft.isLoading = isLoading;
 }
@@ -125,6 +130,7 @@ function loadJcampFile(draft: Draft<State>, actions) {
 }
 
 function handleLoadJsonFile(draft: Draft<State>, action) {
+  resetState(draft);
   setData(draft, action.payload);
   const preferences = action.payload?.preferences || {};
   setActiveTab(draft, { tab: preferences?.activeTab || '' });
@@ -153,6 +159,7 @@ function handleLoadZIPFile(draft: Draft<State>, action) {
 }
 
 function handleLoadNmredata(draft: Draft<State>, action) {
+  resetState(draft);
   setData(draft, action.payload);
   setActiveTab(draft);
   changeSpectrumVerticalAlignment(draft, { align: 'auto-check' });