Open settings modal via toolbar

src/app.jsx

@@ -106,13 +106,11 @@ export default class App extends React.Component {
     }
     return <div style={{ fontFamily: theme.fontFamily, color: theme.color, fontWeight: 300 }}>
       <Toolbar
-          styleAvailable={this.state.currentStyle.get('layers').size > 0}
+          mapStyle={this.state.currentStyle}
+          onStyleChanged={this.onStyleChanged.bind(this)}
           onStyleSave={this.onStyleSave.bind(this)}
           onStyleUpload={this.onStyleUpload.bind(this)}
           onStyleDownload={this.onStyleDownload.bind(this)}
-          onOpenSettings={this.onOpenSettings.bind(this)}
-          onOpenAbout={this.onOpenAbout.bind(this)}
-          onOpenSources={this.onOpenSources.bind(this)}
       />
       <WorkspaceDrawer
         onStyleChanged={this.onStyleChanged.bind(this)}

src/modals/settings.jsx

@@ -0,0 +1,78 @@
+import React from 'react'
+import Immutable from 'immutable'
+
+import Overlay from 'rebass/dist/Overlay'
+import Panel from 'rebass/dist/Panel'
+import PanelHeader from 'rebass/dist/PanelHeader'
+import PanelFooter from 'rebass/dist/PanelFooter'
+import Button from 'rebass/dist/Button'
+import Text from 'rebass/dist/Text'
+import Media from 'rebass/dist/Media'
+import Close from 'rebass/dist/Close'
+import Space from 'rebass/dist/Space'
+import Input from 'rebass/dist/Input'
+
+class SettingsModal extends React.Component {
+  static propTypes = {
+    mapStyle: React.PropTypes.instanceOf(Immutable.Map).isRequired,
+    onStyleChanged: React.PropTypes.func.isRequired,
+    open: React.PropTypes.bool.isRequired,
+    toggle: React.PropTypes.func.isRequired,
+  }
+
+  constructor(props) {
+    super(props);
+  }
+
+  onChange(property, e) {
+    const changedStyle = this.props.mapStyle.set(property, e.target.value)
+    this.props.onStyleChanged(changedStyle)
+  }
+
+  render() {
+    return <Overlay open={this.props.open} >
+      <Panel theme={'secondary'}>
+        <PanelHeader theme={'default'}>
+          Style Settings
+          <Space auto />
+          <Close onClick={this.props.toggle('modalOpen')} />
+        </PanelHeader>
+        <br />
+        <Input
+          name="name"
+          label="Name"
+          value={this.props.mapStyle.get('name')}
+          onChange={this.onChange.bind(this, "name")}
+        />
+        <Input
+          name="owner"
+          label="Owner"
+          value={this.props.mapStyle.get('owner')}
+          onChange={this.onChange.bind(this, "owner")}
+        />
+        <Input
+          name="sprite"
+          label="Sprite URL"
+          value={this.props.mapStyle.get('sprite')}
+          onChange={this.onChange.bind(this, "sprite")}
+        />
+        <Input
+          name="glyphs"
+          label="Glyphs URL"
+          value={this.props.mapStyle.get('glyphs')}
+          onChange={this.onChange.bind(this, "glyphs")}
+        />
+
+        <PanelFooter>
+          <Space auto />
+          <Button theme={'default'}
+            onClick={this.props.toggle('modalOpen')}
+            children='Close!'
+          />
+        </PanelFooter>
+      </Panel>
+    </Overlay>
+  }
+}
+
+export default SettingsModal

src/theme.js

@@ -80,6 +80,9 @@ const dark = {
     fontWeight: 400,
     color: colors.white,
   },
+  Panel: {
+    backgroundColor: colors.gray,
+  },
   Button: {
     color: '#00d9f7',
   },

src/toolbar.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import Immutable from 'immutable'
 import FileReaderInput from 'react-file-reader-input';
 
 import Button from 'rebass/dist/Button'
@@ -24,6 +25,7 @@ import MdFontDownload from 'react-icons/lib/md/font-download'
 import MdHelpOutline from 'react-icons/lib/md/help-outline'
 import MdFindInPage from 'react-icons/lib/md/find-in-page'
 
+import SettingsModal from './modals/settings.jsx'
 import style from './style.js'
 import { fullHeight } from './theme.js'
 import theme from './theme.js';
@@ -34,21 +36,21 @@ const InlineBlock = props => <div style={{display: "inline-block", ...props.styl
 
 export class Toolbar extends React.Component {
   static propTypes = {
+    mapStyle: React.PropTypes.instanceOf(Immutable.Map).isRequired,
+    onStyleChanged: React.PropTypes.func.isRequired,
     // A new style has been uploaded
     onStyleUpload: React.PropTypes.func.isRequired,
     // Current style is requested for download
     onStyleDownload: React.PropTypes.func.isRequired,
     // Style is explicitely saved to local cache
     onStyleSave: React.PropTypes.func,
-    // Open settings drawer
+  }
-    onOpenSettings: React.PropTypes.func,
+
-    // Open about page
+  constructor(props) {
-    onOpenAbout: React.PropTypes.func,
+    super(props)
-    // Open sources drawer
+    this.state = {
-    onOpenSources: React.PropTypes.func,
+      openSettingsModal: false,
-    // Whether a style is available for download or saving
+    }
-    // A style with no layers should not be available
-    styleAvailable: React.PropTypes.bool,
   }
 
   onUpload(_, files) {
@@ -64,7 +66,7 @@ export class Toolbar extends React.Component {
   }
 
   saveButton() {
-    if(this.props.styleAvailable) {
+    if(this.props.mapStyle.get('layers').size > 0) {
       return <InlineBlock>
         <Button onClick={this.props.onStyleSave} big={true}>
           <MdSave />
@@ -87,8 +89,11 @@ export class Toolbar extends React.Component {
     return null
   }
 
-  render() {
+  toggleSettings() {
+    this.setState({openSettingsModal: !this.state.openSettingsModal})
+  }
 
+  render() {
     return <div style={{
       position: "fixed",
       height: 50,
@@ -98,6 +103,12 @@ export class Toolbar extends React.Component {
       top: 0,
       backgroundColor: theme.colors.black
     }}>
+      <SettingsModal
+        mapStyle={this.props.mapStyle}
+        onStyleChanged={this.props.onStyleChanged}
+        open={this.state.openSettingsModal}
+        toggle={() => this.toggleSettings.bind(this)}
+      />
       <InlineBlock>
           <Button style={{width: 300, textAlign: 'left'}}>
             <img src="https://github.com/maputnik/editor/raw/master/media/maputnik.png" alt="Maputnik" style={{width: 40, height: 40, paddingRight: 5, verticalAlign: 'middle'}}/>
@@ -133,7 +144,7 @@ export class Toolbar extends React.Component {
         </Button>
       </InlineBlock>
       <InlineBlock>
-        <Button big={true} onClick={this.props.onOpenSettings}>
+        <Button big={true} onClick={this.toggleSettings.bind(this)}>
           <MdFindInPage />
           Inspect
         </Button>