Added conditional rendering for colorName and color setting in menu

unicar9 · May 19, 2019 · 1ea5fee · 1ea5fee
1 parent 68cd711
commit 1ea5fee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -101,7 +101,7 @@ class App extends Component {
 
     return selected ? (
       <div className='App' tabIndex='-1' onKeyPress={this.handleKeyPress}>
-        <div id='color-name' className={colorStayChecked ? '' : 'fadeout'} />
+        <div id='color-name' style={{ display: selected === 'blobs' ? 'none' : 'block' }} className={colorStayChecked ? '' : 'fadeout'} />
         <LoadedVerses className={selected} />
         <P5Wrapper sketch={sketches[selected]} isPlaying={isPlaying} />
         <ConfigMenu

diff --git a/src/components/ConfigMenu.jsx b/src/components/ConfigMenu.jsx
@@ -81,12 +81,14 @@ class ConfigMenu extends Component {
                     onChange={onDefaultPlayChange}
                   />
                 </Menu.Item>
-                <Menu.Item secondaryText='保留颜色名称'>
-                  <Switch
-                    checked={colorStayChecked}
-                    onChange={onColorStayChange}
-                  />
-                </Menu.Item>
+                {selected === 'waves' && (
+                  <Menu.Item secondaryText='保留颜色名称'>
+                    <Switch
+                      checked={colorStayChecked}
+                      onChange={onColorStayChange}
+                    />
+                  </Menu.Item>
+                )}
               </Menu.Group>
             </Menu>
           }