fix dragging

zindlerb · Feb 12, 2017 · 4680c7f · 4680c7f
1 parent 3eb76c3
commit 4680c7f
Show file tree

Hide file tree

Showing 9 changed files with 259 additions and 181 deletions.
diff --git a/app/app.js b/app/app.js
@@ -46,6 +46,11 @@ const Editor = React.createClass({
       }
     });
 
+    // TD:
+    // create menu from instances
+    // save redo instance on component
+    // enable and disable per-state
+
     const template = [
       {
         submenu: [
@@ -78,6 +83,23 @@ const Editor = React.createClass({
             }
           }
         ]
+      },
+      {
+        label: 'Edit',
+        submenu: [
+          {
+            label: 'Undo',
+            click() {
+              actions.undo();
+            }
+          },
+          {
+            label: 'Redo',
+            click() {
+              actions.redo()
+            }
+          }
+        ]
       }
     ];
 

diff --git a/app/base_components.js b/app/base_components.js
@@ -357,6 +357,8 @@ ComponentsContainer.prototype = {
   // Read
   _getAttributes(componentMap, componentId, attributeOptions) {
     let component = componentMap.get(componentId);
+    const { state, breakpoint } = attributeOptions || { state: NONE, breakpoint: NONE };
+
     const masterId = component.get('masterId');
     let masterAttrs = {};
     let attributes;
@@ -369,16 +371,12 @@ ComponentsContainer.prototype = {
       );
     }
 
-    if (attributeOptions) {
-      const { state, breakpoint } = attributeOptions;
-
-      if (state !== NONE &&
-          component.getIn(['states', state])) {
-        attributes = component.getIn(['states', state]).toJS();
-      } else if (breakpoint !== NONE &&
-                 component.getIn(['breakpoints', breakpoint])) {
-        attributes = component.getIn(['breakpoints', breakpoint]).toJS();
-      }
+    if (state !== NONE &&
+        component.getIn(['states', state])) {
+      attributes = component.getIn(['states', state]).toJS();
+    } else if (breakpoint !== NONE &&
+               component.getIn(['breakpoints', breakpoint])) {
+      attributes = component.getIn(['breakpoints', breakpoint]).toJS();
     } else {
       attributes = component.get('defaultAttributes').toJS();
     }
@@ -511,7 +509,7 @@ ComponentsContainer.prototype = {
 
       return componentJs;
     } else {
-      return;
+      return null;
     }
   },
 

diff --git a/app/containers/AssetsView.js b/app/containers/AssetsView.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { createSelector } from 'reselect';
 import _ from 'lodash';
 import { connect } from 'react-redux';
 import { remote } from 'electron';
@@ -134,11 +135,18 @@ const AssetsView = React.createClass({
   }
 });
 
+const assetsSelector = createSelector(
+  state => state.get('assets'),
+  (assets) => {
+    return _.toArray(assets.toJS());
+  }
+);
+
 export default connect(
   (state) => {
     return {
-      currentMainView: state.currentMainView,
-      assets: _.toArray(state.assets)
+      currentMainView: state.get('currentMainView'),
+      assets: assetsSelector(state)
     }
   },
   null,

diff --git a/app/containers/Attributes.js b/app/containers/Attributes.js
@@ -357,7 +357,7 @@ export default connect((state) => {
 
     return {
       componentName: componentsContainer.getName(activeComponentId),
-      componentType: componentsContainer.getIn([
+      componentType: componentsContainer.components.getIn([
         activeComponentId,
         'componentType'
       ]),

diff --git a/app/containers/LeftPanel.js b/app/containers/LeftPanel.js
@@ -8,46 +8,6 @@ import TextField from '../components/forms/TextField';
 import SidebarHeader from '../components/SidebarHeader';
 import ComponentTree from '../components/ComponentTree';
 
-/*
-function Pages() {
-  let {
-    pages,
-    currentPageId,
-  } = this.props;
-
-  const pageList = _.map(pages, (page, ind) => {
-    const isActive = page.id === currentPageId;
-    return (
-      <li
-          className={classnames({
-              highlighted: isActive,
-              'c-default': isActive,
-              'c-pointer': !isActive
-            }, 'pl2 pv1 page-item')}
-          onClick={() => this.props.actions.changePage(page.id)}
-          key={ind}
-      >
-        {page.name}
-      </li>);
-  });
-
-  return (
-    <div>
-      <div className="tc">
-        <h2 className="f4 mt3 mb2">Pages</h2>
-        <CartoonButton
-            text="New Page"
-            onClick={() => this.props.actions.addPage()}
-        />
-      </div>
-      <ul className="mt3">
-        {pageList}
-      </ul>
-    </div>
-  );
-}
-*/
-
 const LeftPanel = React.createClass({
   render() {
     let body;
@@ -157,12 +117,9 @@ export default connect((state) => {
     hoveredComponentId: state.get('hoveredComponentId'),
     componentsContainer: state.get('componentsContainer'),
     componentTreeId: state.getIn(['pages', state.get('currentPageId'), 'componentTreeId']),
-    siteComponents: state.siteComponents,
     currentPageId: state.get('currentPageId'),
-    currentPage: state.getIn(['pages', state.get('currentPageId')])
-
-    // TD: figure out new droppoints
-    //otherPossibleTreeViewDropSpots: state.otherPossibleTreeViewDropSpots,
-    //selectedTreeViewDropSpot: state.selectedTreeViewDropSpot,
+    currentPage: state.getIn(['pages', state.get('currentPageId')]),
+    otherPossibleTreeViewDropSpots: state.get('otherPossibleTreeViewDropSpots') && state.get('otherPossibleTreeViewDropSpots').toJS(),
+    selectedTreeViewDropSpot: state.get('selectedTreeViewDropSpot') && state.get('selectedTreeViewDropSpot').toJS(),
   }
 }, null, null, { pure: false })(LeftPanel);
diff --git a/app/serializer.js b/app/serializer.js
@@ -24,7 +24,7 @@ function serializerFactory() {
   }
 
   function deserialize(jsonState) {
-    let stateData =  JSON.parse(jsonState);
+    let stateData = JSON.parse(jsonState);
     let componentsMap = stateData.componentsContainer;
     delete stateData.componentsContainer;
     let imState = Immutable.fromJS(stateData);