chore: update mui

TimSusa · Apr 4, 2021 · 39f3ab1 · 39f3ab1
1 parent ef73eec
commit 39f3ab1
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 67 deletions.
diff --git a/package.json b/package.json
@@ -56,11 +56,11 @@
     }
   },
   "dependencies": {
-    "@material-ui/core": "4.11.2",
+    "@material-ui/core": "4.11.3",
     "@material-ui/icons": "4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.57",
-    "@material-ui/styles": "4.11.2",
-    "@material-ui/system": "4.11.2",
+    "@material-ui/styles": "4.11.3",
+    "@material-ui/system": "4.11.3",
     "@reduxjs/toolkit": "1.5.0",
     "debounce": "1.2.0",
     "downshift": "6.0.6",

diff --git a/src/components/menu-app-bar/MenuAppBarCmp.jsx b/src/components/menu-app-bar/MenuAppBarCmp.jsx
@@ -75,12 +75,16 @@ function MenuAppBarCmp(props) {
   const { presetName, monitorVal } = useSelector((state) => state.sliders)
   const classes = makeStyles(styles.bind(this, theme))()
   const [isCopyDialogOpen, setIsCopyDialogOpen] = useState(false)
+  const isPage = [PAGE_TYPES.MIDI_DRIVER_MODE, PAGE_TYPES.GLOBAL_MODE].includes(
+    pageType
+  )
   if (isLiveMode) {
     return <div />
   }
 
   return (
-    <div className={classes.root}>
+    <div className={classes.root}
+    >
       <AppBar className={classes.appBar} position='fixed'>
         <Toolbar>
           <ToolTipIconButton
@@ -169,9 +173,7 @@ function MenuAppBarCmp(props) {
               </Button>
             </React.Fragment>
           )}
-          {[PAGE_TYPES.MIDI_DRIVER_MODE, PAGE_TYPES.GLOBAL_MODE].includes(
-            pageType
-          ) && (
+          {isPage && (
             <React.Fragment>
               <Button
                 className={classes.resetButton}
@@ -219,7 +221,7 @@ function MenuAppBarCmp(props) {
                 handleClick={() => dispatch(toggleMultiSelectionMode())}
               />
               {Array.isArray(lastFocusedIdxs) && lastFocusedIdxs.length > 0 && (
-                <>
+                <React.Fragment>
                   <ToolTipIconButton
                     handleClick={() => setIsCopyDialogOpen(true)}
                     title={'Copy to page.'}
@@ -247,7 +249,7 @@ function MenuAppBarCmp(props) {
                     isInvisible={isMidiLearnMode || isLayoutMode}
                     icon={<DeleteIcon />}
                   />
-                </>
+                </React.Fragment>
               )}
               <ToolTipIconButton
                 handleClick={async () =>
@@ -285,7 +287,7 @@ function MenuAppBarCmp(props) {
                 isInvisible={
                   !JSON.parse(window.sessionStorage.getItem('history')) ||
                   JSON.parse(window.sessionStorage.getItem('history')).length <
-                    1
+                  1
                 }
               />
             </Fragment>
@@ -366,10 +368,13 @@ MenuAppBarCmp.propTypes = {
 function styles(theme) {
   return {
     root: {
-      flexGrow: 1
+      flexGrow: 1,
+      background: theme.palette.appBar.background,
+      backgroundColor: theme.palette.appBar.background,
     },
     appBar: {
       background: theme.palette.appBar.background,
+      backgroundColor: theme.palette.appBar.background,
       fontWeight: 600
     },
     typoColorStyle: {

diff --git a/src/utils/midi-bricks-preset-apc-40.js b/src/utils/midi-bricks-preset-apc-40.js
@@ -1,5 +1,5 @@
 export const preset = {
-  "version": "1.3.44-alpha.10",
+  "version": "1.3.45",
   "pages": {
     "page-15595424091230.d16be927299392": {
       "sliderList": [
@@ -1265,6 +1265,44 @@ export const preset = {
             "15",
             "16"
           ]
+        },
+        "Impact LX61+ MIDI1": {
+          "noteChannels": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "10",
+            "11",
+            "12",
+            "13",
+            "14",
+            "15",
+            "16"
+          ],
+          "ccChannels": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "10",
+            "11",
+            "12",
+            "13",
+            "14",
+            "15",
+            "16"
+          ]
         }
       },
       "outputs": {
@@ -1534,7 +1572,7 @@ export const preset = {
     "isFullscreenOnLivemode": false,
     "pageType": "HOME_MODE",
     "lastFocusedPage": "page-16175039754180.96e59126dc5092",
-    "lastFocusedIdx": "16175039789990.c836299723aea4",
+    "lastFocusedIdx": "16175039815110.85e1c6c4ce7266",
     "lastFocusedIdxs": [],
     "globalMidiInputDelay": 3,
     "historyMaxLength": 10,
@@ -1574,13 +1612,16 @@ export const preset = {
           "midi-iac IAC Bus 1",
           "midi-iac IAC Bus 2",
           "midi-iac IAC Bus 3",
-          "Network Session 1"
+          "Network Session 1",
+          "Impact LX61+ MIDI1",
+          "Impact LX61+ MIDI2"
         ],
         "outputs": [
           "midi-iac IAC Bus 1",
           "midi-iac IAC Bus 2",
           "midi-iac IAC Bus 3",
-          "Network Session 1"
+          "Network Session 1",
+          "Impact LX61+ MIDI1"
         ]
       }
     },
@@ -1624,10 +1665,10 @@ export const preset = {
         "moved": false
       },
       {
-        "driverNameInput": "None",
+        "driverNameInput": "Impact LX61+ MIDI1",
         "backgroundImage": null,
         "midiChannel": 1,
-        "midiChannelInput": 1,
+        "midiChannelInput": "16",
         "isNoteOn": false,
         "isDraggable": false,
         "isResizable": false,
@@ -1657,7 +1698,10 @@ export const preset = {
         "midiCC": [
           60
         ],
-        "listenToCc": [],
+        "listenToCc": [
+          "21",
+          "12"
+        ],
         "driverName": "None",
         "moved": false
       }

diff --git a/yarn.lock b/yarn.lock
@@ -1471,14 +1471,14 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@material-ui/[email protected].2":
-  version "4.11.2"
-  resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.11.2.tgz#f8276dfa40d88304e6ceb98962af73803d27d42d"
-  integrity sha512-/D1+AQQeYX/WhT/FUk78UCRj8ch/RCglsQLYujYTIqPSJlwZHKcvHidNeVhODXeApojeXjkl0tWdk5C9ofwOkQ==
+"@material-ui/[email protected].3":
+  version "4.11.3"
+  resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.11.3.tgz#f22e41775b0bd075e36a7a093d43951bf7f63850"
+  integrity sha512-Adt40rGW6Uds+cAyk3pVgcErpzU/qxc7KBR94jFHBYretU4AtWZltYcNsbeMn9tXL86jjVL1kuGcIHsgLgFGRw==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.11.2"
-    "@material-ui/system" "^4.11.2"
+    "@material-ui/styles" "^4.11.3"
+    "@material-ui/system" "^4.11.3"
     "@material-ui/types" "^5.1.0"
     "@material-ui/utils" "^4.11.2"
     "@types/react-transition-group" "^4.2.0"
@@ -1507,29 +1507,7 @@
     prop-types "^15.7.2"
     react-is "^16.8.0 || ^17.0.0"
 
-"@material-ui/[email protected]":
-  version "4.11.2"
-  resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.2.tgz#e70558be3f41719e8c0d63c7a3c9ae163fdc84cb"
-  integrity sha512-xbItf8zkfD3FuGoD9f2vlcyPf9jTEtj9YTJoNNV+NMWaSAHXgrW6geqRoo/IwBuMjqpwqsZhct13e2nUyU9Ljw==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@emotion/hash" "^0.8.0"
-    "@material-ui/types" "^5.1.0"
-    "@material-ui/utils" "^4.11.2"
-    clsx "^1.0.4"
-    csstype "^2.5.2"
-    hoist-non-react-statics "^3.3.2"
-    jss "^10.0.3"
-    jss-plugin-camel-case "^10.0.3"
-    jss-plugin-default-unit "^10.0.3"
-    jss-plugin-global "^10.0.3"
-    jss-plugin-nested "^10.0.3"
-    jss-plugin-props-sort "^10.0.3"
-    jss-plugin-rule-value-function "^10.0.3"
-    jss-plugin-vendor-prefixer "^10.0.3"
-    prop-types "^15.7.2"
-
-"@material-ui/styles@^4.11.2":
+"@material-ui/[email protected]", "@material-ui/styles@^4.11.3":
   version "4.11.3"
   resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.3.tgz#1b8d97775a4a643b53478c895e3f2a464e8916f2"
   integrity sha512-HzVzCG+PpgUGMUYEJ2rTEmQYeonGh41BYfILNFb/1ueqma+p1meSdu4RX6NjxYBMhf7k+jgfHFTTz+L1SXL/Zg==
@@ -1551,17 +1529,7 @@
     jss-plugin-vendor-prefixer "^10.5.1"
     prop-types "^15.7.2"
 
-"@material-ui/[email protected]":
-  version "4.11.2"
-  resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.11.2.tgz#7f0a754bba3673ed5fdbfa02fe438096c104b1f6"
-  integrity sha512-BELFJEel5E+5DMiZb6XXT3peWRn6UixRvBtKwSxqntmD0+zwbbfCij6jtGwwdJhN1qX/aXrKu10zX31GBaeR7A==
-  dependencies:
-    "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.2"
-    csstype "^2.5.2"
-    prop-types "^15.7.2"
-
-"@material-ui/system@^4.11.2":
+"@material-ui/[email protected]", "@material-ui/system@^4.11.3":
   version "4.11.3"
   resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.11.3.tgz#466bc14c9986798fd325665927c963eb47cc4143"
   integrity sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw==
@@ -8453,7 +8421,7 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-jss-plugin-camel-case@^10.0.3, jss-plugin-camel-case@^10.5.1:
+jss-plugin-camel-case@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.6.0.tgz#93d2cd704bf0c4af70cc40fb52d74b8a2554b170"
   integrity sha512-JdLpA3aI/npwj3nDMKk308pvnhoSzkW3PXlbgHAzfx0yHWnPPVUjPhXFtLJzgKZge8lsfkUxvYSQ3X2OYIFU6A==
@@ -8462,23 +8430,23 @@ jss-plugin-camel-case@^10.0.3, jss-plugin-camel-case@^10.5.1:
     hyphenate-style-name "^1.0.3"
     jss "10.6.0"
 
-jss-plugin-default-unit@^10.0.3, jss-plugin-default-unit@^10.5.1:
+jss-plugin-default-unit@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.6.0.tgz#af47972486819b375f0f3a9e0213403a84b5ef3b"
   integrity sha512-7y4cAScMHAxvslBK2JRK37ES9UT0YfTIXWgzUWD5euvR+JR3q+o8sQKzBw7GmkQRfZijrRJKNTiSt1PBsLI9/w==
   dependencies:
     "@babel/runtime" "^7.3.1"
     jss "10.6.0"
 
-jss-plugin-global@^10.0.3, jss-plugin-global@^10.5.1:
+jss-plugin-global@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.6.0.tgz#3e8011f760f399cbadcca7f10a485b729c50e3ed"
   integrity sha512-I3w7ji/UXPi3VuWrTCbHG9rVCgB4yoBQLehGDTmsnDfXQb3r1l3WIdcO8JFp9m0YMmyy2CU7UOV6oPI7/Tmu+w==
   dependencies:
     "@babel/runtime" "^7.3.1"
     jss "10.6.0"
 
-jss-plugin-nested@^10.0.3, jss-plugin-nested@^10.5.1:
+jss-plugin-nested@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.6.0.tgz#5f83c5c337d3b38004834e8426957715a0251641"
   integrity sha512-fOFQWgd98H89E6aJSNkEh2fAXquC9aZcAVjSw4q4RoQ9gU++emg18encR4AT4OOIFl4lQwt5nEyBBRn9V1Rk8g==
@@ -8487,15 +8455,15 @@ jss-plugin-nested@^10.0.3, jss-plugin-nested@^10.5.1:
     jss "10.6.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-props-sort@^10.0.3, jss-plugin-props-sort@^10.5.1:
+jss-plugin-props-sort@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.6.0.tgz#297879f35f9fe21196448579fee37bcde28ce6bc"
   integrity sha512-oMCe7hgho2FllNc60d9VAfdtMrZPo9n1Iu6RNa+3p9n0Bkvnv/XX5San8fTPujrTBScPqv9mOE0nWVvIaohNuw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     jss "10.6.0"
 
-jss-plugin-rule-value-function@^10.0.3, jss-plugin-rule-value-function@^10.5.1:
+jss-plugin-rule-value-function@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.6.0.tgz#3c1a557236a139d0151e70a82c810ccce1c1c5ea"
   integrity sha512-TKFqhRTDHN1QrPTMYRlIQUOC2FFQb271+AbnetURKlGvRl/eWLswcgHQajwuxI464uZk91sPiTtdGi7r7XaWfA==
@@ -8504,7 +8472,7 @@ jss-plugin-rule-value-function@^10.0.3, jss-plugin-rule-value-function@^10.5.1:
     jss "10.6.0"
     tiny-warning "^1.0.2"
 
-jss-plugin-vendor-prefixer@^10.0.3, jss-plugin-vendor-prefixer@^10.5.1:
+jss-plugin-vendor-prefixer@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.6.0.tgz#e1fcd499352846890c38085b11dbd7aa1c4f2c78"
   integrity sha512-doJ7MouBXT1lypLLctCwb4nJ6lDYqrTfVS3LtXgox42Xz0gXusXIIDboeh6UwnSmox90QpVnub7au8ybrb0krQ==
@@ -8513,7 +8481,7 @@ jss-plugin-vendor-prefixer@^10.0.3, jss-plugin-vendor-prefixer@^10.5.1:
     css-vendor "^2.0.8"
     jss "10.6.0"
 
-[email protected], jss@^10.0.3, jss@^10.5.1:
+[email protected], jss@^10.5.1:
   version "10.6.0"
   resolved "https://registry.npmjs.org/jss/-/jss-10.6.0.tgz#d92ff9d0f214f65ca1718591b68e107be4774149"
   integrity sha512-n7SHdCozmxnzYGXBHe0NsO0eUf9TvsHVq2MXvi4JmTn3x5raynodDVE/9VQmBdWFyyj9HpHZ2B4xNZ7MMy7lkw==
@@ -11252,7 +11220,7 @@ react-app-polyfill@^2.0.0:
 
 "react-canvas-rotary-knob@https://github.com/TimSusa/react-canvas-rotary-knob":
   version "0.1.3"
-  resolved "https://github.com/TimSusa/react-canvas-rotary-knob#4fb2983759903b94c3878a5b8442f4ed4c93d95b"
+  resolved "https://github.com/TimSusa/react-canvas-rotary-knob#d6bfd5b266833878d17d52b630198f312b7e647c"
   dependencies:
     debounce "1.2.0"
     react "17.0.1"