fix: Crash, when loading presets into livemode

TimSusa · Sep 20, 2020 · 626c8f0 · 626c8f0
1 parent 9d419df
commit 626c8f0
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 30 deletions.
diff --git a/lerna.json b/lerna.json
@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.3.39-alpha.10"
+  "version": "1.3.39-alpha.12"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "midi-bricks-mono",
-  "version": "1.3.39-alpha.10",
+  "version": "1.3.39-alpha.12",
   "private": false,
   "license": "MIT",
   "repository": "https://github.com/TimSusa/midi-bricks-mono.git",

diff --git a/packages/midi-bricks-doc/package.json b/packages/midi-bricks-doc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "midi-bricks-doc",
-  "version": "1.3.39-alpha.10",
+  "version": "1.3.39-alpha.12",
   "private": true,
   "description": "Documentation for midi-bricks",
   "author": "TimSusa <[email protected]>",

diff --git a/packages/midi-bricks-electron/package.json b/packages/midi-bricks-electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "midi-bricks-electron",
   "productName": "MIDI-Bricks",
-  "version": "1.3.39-alpha.10",
+  "version": "1.3.39-alpha.12",
   "main": "./app/electron.js",
   "homepage": ".",
   "repository": "https://github.com/TimSusa/midi-bricks-mono.git",

diff --git a/packages/midi-bricks/package.json b/packages/midi-bricks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "midi-bricks",
-  "version": "1.3.39-alpha.10",
+  "version": "1.3.39-alpha.12",
   "private": false,
   "homepage": "https://midi-bricks.timsusa.now.sh",
   "main": "./src/index.js",

diff --git a/packages/midi-bricks/src/components/drawer-list/DrawerListCmp.jsx b/packages/midi-bricks/src/components/drawer-list/DrawerListCmp.jsx
@@ -27,7 +27,7 @@ import { Actions as ViewSettingsActions } from '../../global-state/actions/view-
 import { useSelector, useDispatch } from 'react-redux'
 
 const version = process.env.REACT_APP_VERSION || 'dev'
-const { togglePage, saveFile, deleteFooterPages, deleteAll } = {
+const { togglePage, saveFile } = {
   ...MidiSliderActions,
   ...ViewSettingsActions
 }
@@ -125,16 +125,12 @@ function DrawerListCmp(props) {
       <List>
         {process.env.REACT_APP_IS_WEB_MODE === 'true' ? (
           <ListItemLoadFileOnWeb
-            onFileChange={(e) =>
-              handleFileChange(e, thunkLoadFile, onFileChange)
-            }
+            onFileChange={handleFileChange}
             iconColor={classes.iconColor}
           />
         ) : (
           <ListItemLoadFileOnElectron
-            onFileChange={(e) =>
-              handleFileChange(e, thunkLoadFile, onFileChange)
-            }
+            onFileChange={handleFileChange}
             iconColor={classes.iconColor}
           />
         )}
@@ -161,9 +157,7 @@ function DrawerListCmp(props) {
           </ListItem>
         ) : (
           <ListItemSaveFileOnElectron
-            onFileChange={(e) =>
-              handleFileChange(e, thunkLoadFile, onFileChange)
-            }
+            onFileChange={handleFileChange}
             iconColor={classes.iconColor}
           />
         )}
@@ -178,13 +172,7 @@ function DrawerListCmp(props) {
             sliderEntry={{
               i: 'me'
             }}
-            onAction={handleResetSliders.bind(
-              this,
-              thunkDelete,
-              handleResetSlidersTmp,
-              deleteAll,
-              deleteFooterPages
-            )}
+            onAction={handleResetSliders}
             onClose={setOpen}
           />
         </ListItem>
@@ -198,13 +186,13 @@ function DrawerListCmp(props) {
       <Divider />
     </React.Fragment>
   )
-  function handleResetSliders(thunkDeletet, cb) {
-    cb()
-    return dispatch(thunkDeletet('all'))
+  function handleResetSliders() {
+    handleResetSlidersTmp()
+    return dispatch(thunkDelete('all'))
   }
-  async function handleFileChange(content, thunkLoadFilet, cb) {
-    await thunkLoadFilet(content.content, content.presetName)
-    cb(content.content, content.presetName)
+  async function handleFileChange(content) {
+    await dispatch(thunkLoadFile(content.content, content.presetName))
+    onFileChange(content.content, content.presetName)
   }
 }
 

diff --git a/packages/midi-bricks/src/global-state/actions/thunks/thunk-load-file.js b/packages/midi-bricks/src/global-state/actions/thunks/thunk-load-file.js
@@ -3,7 +3,7 @@ import { Actions as viewSettingsActions } from '../view-settings'
 import { Actions as pageActions } from '../pages'
 import { initApp } from '../init'
 import { initId } from '../../reducers/slider-list'
-
+import localforage from 'localforage'
 const { loadFile, deleteAll } = sliderListActions
 const { updateViewSettings, setLastFocusedPage, deleteFooterPages } = viewSettingsActions
 const { updatePages } = pageActions
@@ -24,6 +24,7 @@ export function thunkLoadFile(content, presetName) {
 
     if (pages) {
       promArray.push(dispatch(updatePages({ pages })))
+      await localforage.setItem('pages', pages)
     } else {
       const {
         pages: oldPages,

diff --git a/packages/midi-bricks/src/global-state/reducers/slider-list.js b/packages/midi-bricks/src/global-state/reducers/slider-list.js
@@ -343,7 +343,17 @@ export const sliders = {
     const tmpFilterStore = {
       version,
       pages,
-      viewSettings,
+      viewSettings:
+      {
+        ...viewSettings,   
+        isLiveMode: true,
+        isSettingsDialogMode: false,
+        isLayoutMode: false,
+        isCompactHorz: false,
+        isSettingsMode: false,
+        isMidiLearnMode: false,
+        isAutoArrangeMode: false
+      },
       sliders: tmpSliders
     }
     const content = JSON.stringify(tmpFilterStore)