Fab style

exced · Dec 15, 2017 · 8dabf19 · 8dabf19
1 parent 75297e9
commit 8dabf19
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 165 deletions.
diff --git a/lib/Components/App.js b/lib/Components/App.js
@@ -12,8 +12,6 @@ var _layout = require('antd/es/layout');
 
 var _layout2 = _interopRequireDefault(_layout);
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
 require('antd/es/back-top/style');
 
 require('antd/es/layout/style');
@@ -26,90 +24,50 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _SiderMenu = require('../Containers/SiderMenu');
+var _FAB = require('../Containers/FAB');
 
-var _SiderMenu2 = _interopRequireDefault(_SiderMenu);
+var _FAB2 = _interopRequireDefault(_FAB);
 
 var _SurveyEditor = require('../Containers/SurveyEditor');
 
 var _SurveyEditor2 = _interopRequireDefault(_SurveyEditor);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-var Content = _layout2.default.Content,
-    Sider = _layout2.default.Sider;
-
-var App = function (_Component) {
-  _inherits(App, _Component);
-
-  function App(props) {
-    _classCallCheck(this, App);
-
-    var _this = _possibleConstructorReturn(this, (App.__proto__ || Object.getPrototypeOf(App)).call(this, props));
+var Content = _layout2.default.Content;
 
-    _this.toggleCollapsed = function () {
-      return _this.setState({ collapsed: !_this.state.collapsed });
-    };
 
-    _this.state = {
-      collapsed: false
-    };
-    return _this;
-  }
-
-  _createClass(App, [{
-    key: 'render',
-    value: function render() {
-      var collapsed = this.state.collapsed;
-      var _props = this.props,
-          value = _props.value,
-          onExport = _props.onExport;
-
-
-      return _react2.default.createElement(
+var App = function App(_ref) {
+  var value = _ref.value,
+      onExport = _ref.onExport;
+  return _react2.default.createElement(
+    'div',
+    null,
+    _react2.default.createElement(
+      _layout2.default,
+      { style: { minHeight: '100vh' } },
+      _react2.default.createElement(_backTop2.default, null),
+      _react2.default.createElement(
         'div',
+        { style: { position: 'fixed', bottom: 30, right: 30 } },
+        _react2.default.createElement(_FAB2.default, { value: value, onExport: onExport })
+      ),
+      _react2.default.createElement(
+        Content,
         null,
         _react2.default.createElement(
-          _layout2.default,
-          { style: { minHeight: '100vh' } },
-          _react2.default.createElement(_backTop2.default, null),
-          _react2.default.createElement(
-            Sider,
-            { collapsible: true, trigger: null, collapsed: collapsed, style: { height: '100%', position: 'fixed', left: 0 } },
-            _react2.default.createElement('div', { style: { height: 32, background: 'rgba(255, 255, 255, .2)', margin: 16 } }),
-            _react2.default.createElement(_SiderMenu2.default, { value: value, onExport: onExport, collapsed: collapsed, onCollapse: this.toggleCollapsed })
-          ),
-          _react2.default.createElement(
-            _layout2.default,
-            { style: { marginLeft: collapsed ? 60 : 200, transition: "all 0.3s" } },
-            _react2.default.createElement(
-              Content,
-              null,
-              _react2.default.createElement(
-                'div',
-                { style: { padding: 24, background: '#fff', textAlign: 'center' } },
-                _react2.default.createElement(_SurveyEditor2.default, { value: value })
-              )
-            )
-          )
+          'div',
+          { style: { padding: 24, background: '#fff', textAlign: 'center' } },
+          _react2.default.createElement(_SurveyEditor2.default, { value: value })
         )
-      );
-    }
-  }]);
-
-  return App;
-}(_react.Component);
-
-exports.default = App;
-
+      )
+    )
+  );
+};
 
 App.propTypes = {
   value: _propTypes2.default.object.isRequired,
   onExport: _propTypes2.default.func.isRequired
-};
+};
+
+exports.default = App;
diff --git a/lib/Components/FAB.js b/lib/Components/FAB.js
@@ -0,0 +1,92 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _dropdown = require('antd/es/dropdown');
+
+var _dropdown2 = _interopRequireDefault(_dropdown);
+
+var _icon = require('antd/es/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+var _menu = require('antd/es/menu');
+
+var _menu2 = _interopRequireDefault(_menu);
+
+var _button = require('antd/es/button');
+
+var _button2 = _interopRequireDefault(_button);
+
+require('antd/es/dropdown/style');
+
+require('antd/es/icon/style');
+
+require('antd/es/menu/style');
+
+require('antd/es/button/style');
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var FAB = function FAB(_ref) {
+  var onUndo = _ref.onUndo,
+      onRedo = _ref.onRedo,
+      onExport = _ref.onExport,
+      denormalize = _ref.denormalize;
+
+
+  var menu = _react2.default.createElement(
+    _menu2.default,
+    null,
+    _react2.default.createElement(
+      _menu2.default.Item,
+      { key: 'onUndo' },
+      _react2.default.createElement(_button2.default, { type: 'primary', onClick: onUndo, shape: 'circle', icon: 'rollback', size: 'large' })
+    ),
+    _react2.default.createElement(
+      _menu2.default.Item,
+      { key: 'onRedo' },
+      _react2.default.createElement(
+        _button2.default,
+        { type: 'primary', onClick: onRedo, shape: 'circle', size: 'large' },
+        _react2.default.createElement(_icon2.default, { type: 'enter', style: { transform: 'rotate(180deg)' } })
+      )
+    ),
+    _react2.default.createElement(
+      _menu2.default.Item,
+      { key: 'onExport' },
+      _react2.default.createElement(_button2.default, { type: 'primary', onClick: function onClick() {
+          return onExport(denormalize());
+        }, shape: 'circle', icon: 'save', size: 'large' })
+    )
+  );
+
+  return _react2.default.createElement(
+    'div',
+    null,
+    _react2.default.createElement(
+      _dropdown2.default,
+      { overlay: menu, placement: 'topCenter' },
+      _react2.default.createElement(_button2.default, { type: 'primary', shape: 'circle', icon: 'plus', size: 'large' })
+    )
+  );
+};
+
+FAB.propTypes = {
+  onUndo: _propTypes2.default.func.isRequired,
+  onRedo: _propTypes2.default.func.isRequired,
+  onExport: _propTypes2.default.func.isRequired,
+  denormalize: _propTypes2.default.func.isRequired
+};
+
+exports.default = FAB;
diff --git a/lib/Components/PageEditor.js b/lib/Components/PageEditor.js
@@ -139,7 +139,7 @@ var PageEditor = function (_Component) {
               _react2.default.createElement(
                 _tag2.default,
                 { color: 'blue' },
-                'Page ' + index
+                'Page ' + (index + 1)
               )
             ),
             _react2.default.createElement(

diff --git a/lib/Components/QuestionEditor.js b/lib/Components/QuestionEditor.js
@@ -151,7 +151,7 @@ var QuestionEditor = function (_Component) {
               _react2.default.createElement(
                 _tag2.default,
                 { color: 'gold' },
-                'Question ' + index
+                'Question ' + (index + 1)
               )
             ),
             _react2.default.createElement(

diff --git a/lib/Containers/FAB.js b/lib/Containers/FAB.js
@@ -4,113 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _dropdown = require('antd/lib/dropdown');
-
-var _dropdown2 = _interopRequireDefault(_dropdown);
-
-var _menu = require('antd/lib/menu');
-
-var _menu2 = _interopRequireDefault(_menu);
-
-var _button = require('antd/lib/button');
-
-var _button2 = _interopRequireDefault(_button);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-require('antd/lib/dropdown/style');
-
-require('antd/lib/menu/style');
-
-require('antd/lib/button/style');
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
 var _reactRedux = require('react-redux');
 
 var _reduxUndo = require('redux-undo');
 
-var _Editor = require('../Actions/Editor');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Normalizr = require('../Selectors/Normalizr');
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _Survey = require('../Schemas/Survey');
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+var _FAB = require('../Components/FAB');
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+var _FAB2 = _interopRequireDefault(_FAB);
 
-var FAB = function (_Component) {
-  _inherits(FAB, _Component);
-
-  function FAB() {
-    _classCallCheck(this, FAB);
-
-    return _possibleConstructorReturn(this, (FAB.__proto__ || Object.getPrototypeOf(FAB)).apply(this, arguments));
-  }
-
-  _createClass(FAB, [{
-    key: 'render',
-    value: function render() {
-      var _props = this.props,
-          undo = _props.undo,
-          redo = _props.redo,
-          addPage = _props.addPage;
-
-
-      var menu = _react2.default.createElement(
-        _menu2.default,
-        null,
-        _react2.default.createElement(
-          _menu2.default.Item,
-          null,
-          _react2.default.createElement(_button2.default, { onClick: undo, shape: 'circle', icon: 'backward', size: 'large' })
-        ),
-        _react2.default.createElement(
-          _menu2.default.Item,
-          null,
-          _react2.default.createElement(_button2.default, { onClick: redo, shape: 'circle', icon: 'forward', size: 'large' })
-        ),
-        _react2.default.createElement(
-          _menu2.default.Item,
-          null,
-          _react2.default.createElement(_button2.default, { onClick: addPage, shape: 'circle', icon: 'file-add', size: 'large' })
-        )
-      );
-
-      return _react2.default.createElement(
-        'div',
-        null,
-        _react2.default.createElement(
-          _dropdown2.default,
-          { overlay: menu, placement: 'bottomCenter' },
-          _react2.default.createElement(_button2.default, { type: 'primary', shape: 'circle', icon: 'plus', size: 'large' })
-        )
-      );
-    }
-  }]);
-
-  return FAB;
-}(_react.Component);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var mapStateToProps = function mapStateToProps(state, ownProps) {
-  return {};
+  return {
+    denormalize: function denormalize() {
+      return (0, _Survey.denormalize)((0, _Normalizr.getResult)(state), (0, _Normalizr.getEntities)(state));
+    }
+  };
 };
 
-var mapDispatchToProps = function mapDispatchToProps(dispatch) {
+var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
   return {
-    undo: function undo() {
+    onUndo: function onUndo() {
       return dispatch(_reduxUndo.ActionCreators.undo());
     },
-    redo: function redo() {
+    onRedo: function onRedo() {
       return dispatch(_reduxUndo.ActionCreators.redo());
-    },
-    addPage: function addPage() {
-      return dispatch((0, _Editor.addPage)());
     }
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(FAB);
+exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_FAB2.default);
diff --git a/src/lib/Components/App.js b/src/lib/Components/App.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Layout, BackTop} from 'antd'
+import { Layout, BackTop } from 'antd'
 import FAB from '../Containers/FAB'
 import SurveyEditor from '../Containers/SurveyEditor'
 
@@ -10,7 +10,7 @@ const App = ({ value, onExport }) => (
   <div>
     <Layout style={{ minHeight: '100vh' }}>
       <BackTop />
-      <div style={{ position: 'fixed', bottom: 30, right: 30 }}>
+      <div style={{ zIndex: 9999, position: 'fixed', bottom: 30, right: 30 }}>
         <FAB value={value} onExport={onExport} />
       </div>
       <Content>