Merge pull request #44 from ShlomoPorges/development

Fixed "focus component" & "focus child" in state and actions

Author: ShlomoPorges

src/actions/components.js

@@ -42,23 +42,23 @@ export const loadInitData = () => (dispatch) => {
   }));
 };
 
-export const updateChildren = ({ parentIds, childIndex, childId }) => ({
-  type: UPDATE_CHILDREN,
-  payload: {
-    parentIds,
-    childIndex,
-    childId,
-  },
-});
+// export const updateChildren = ({ parentIds, childIndex, childId }) => ({
+//   type: UPDATE_CHILDREN,
+//   payload: {
+//     parentIds,
+//     childIndex,
+//     childId,
+//   },
+// });
 
-export const parentReassignment = ({ index, id, parentIds }) => ({
-  type: REASSIGN_PARENT,
-  payload: {
-    index,
-    id,
-    parentIds,
-  },
-});
+// export const parentReassignment = ({ index, id, parentIds }) => ({
+//   type: REASSIGN_PARENT,
+//   payload: {
+//     index,
+//     id,
+//     parentIds,
+//   },
+// });
 
 export const addComponent = ({ title }) => (dispatch) => {
   dispatch({ type: ADD_COMPONENT, payload: { title } });
@@ -97,36 +97,36 @@ export const deleteComponent = ({ componentId, stateComponents }) => (dispatch)
   dispatch({ type: DELETE_COMPONENT, payload: { componentId } });
 };
 
-export const updateComponent = ({
-  id,
-  index,
-  newParentId = null,
-  color = null,
-  stateful = null,
-}) => (dispatch) => {
-  dispatch({
-    type: UPDATE_COMPONENT,
-    payload: {
-      id,
-      index,
-      newParentId,
-      color,
-      stateful,
-    },
-  });
+// export const updateComponent = ({
+//   id,
+//   index,
+//   newParentId = null,
+//   color = null,
+//   stateful = null,
+// }) => (dispatch) => {
+//   dispatch({
+//     type: UPDATE_COMPONENT,
+//     payload: {
+//       id,
+//       index,
+//       newParentId,
+//       color,
+//       stateful,
+//     },
+//   });
 
-  if (newParentId) {
-    dispatch(
-      updateChildren({
-        parentIds: [newParentId],
-        childId: id,
-        childIndex: index,
-      }),
-    );
-  }
-
-  dispatch({ type: SET_SELECTABLE_PARENTS });
-};
+//   if (newParentId) {
+//     dispatch(
+//       updateChildren({
+//         parentIds: [newParentId],
+//         childId: id,
+//         childIndex: index,
+//       }),
+//     );
+//   }
+
+//   dispatch({ type: SET_SELECTABLE_PARENTS });
+// };
 
 export const changeFocusComponent = ({ title }) => (dispatch) => {
   dispatch({ type: CHANGE_FOCUS_COMPONENT, payload: { title } });

src/components/DataTable.jsx

@@ -32,10 +32,10 @@ function dataTable(props) {
   const { classes , rowData, rowHeader , deletePropHandler } = props;
 
   // console.log(classes)
-  console.log(`rowHeader`)
-  console.log(rowHeader)
-   console.log(`rowData`)
-   console.log(rowData)
+  // console.log(`rowHeader`)
+  // console.log(rowHeader)
+  //  console.log(`rowData`)
+  //  console.log(rowData)
 
    const renderHeader = rowHeader.map( (col,idx) =>  {
     return <TableCell key={`head_+${idx}`}>{col}</TableCell>

src/containers/LeftContainer.jsx

@@ -77,7 +77,7 @@ class LeftContainer extends Component {
           key={component.id}
           index={i}
           id={component.id}
-          updateComponent={updateComponent}
+          // updateComponent={updateComponent}
           component={component}
           focusComponent={focusComponent}
           addChild={addChild}

src/reducers/componentReducer.js

@@ -86,19 +86,11 @@ const appComponent = {
 
   childrenArray: [],
   nextChildId: 1,
-  focusChild: null,
+  focusChildId: 0,
 };
 
-const initialApplicationState = {
-  totalComponents: 1,
-  nextId: 2,
-  // imagePath: '',
-  successOpen: false,
-  errorOpen: false,
-  focusComponent: appComponent,
-  selectableChildren: [],
-  ancestors: [],
-  focusChild: {
+const initialApplicationFocusChild =
+  {
     childId: 0,
     componentName: null,
     position: {
@@ -108,7 +100,19 @@ const initialApplicationState = {
       height: 400,
     },
     draggable: true,
-  },
+  }
+
+const initialApplicationState = {
+  totalComponents: 1,
+  nextId: 2,
+  // imagePath: '',
+  successOpen: false,
+  errorOpen: false,
+  focusComponent: appComponent,
+  selectableChildren: [],
+  ancestors: [],
+  initialApplicationFocusChild: initialApplicationFocusChild,
+  focusChild: JSON.parse(JSON.stringify(  initialApplicationFocusChild)) ,
   components: [appComponent],
   appDir: '',
   loading: false,
@@ -141,12 +145,12 @@ const componentReducer = (state = initialApplicationState, action) => {
       return changeFocusChild(state, action.payload);
     case CHANGE_COMPONENT_FOCUS_CHILD:
       return changeComponentFocusChild(state, action.payload);
-    case UPDATE_CHILDREN:
-      return updateChildren(state, action.payload);
-    case REASSIGN_PARENT:
-      return reassignParent(state, action.payload);
-    case SET_SELECTABLE_PARENTS:
-      return setSelectableP(state);
+    // case UPDATE_CHILDREN:
+    //   return updateChildren(state, action.payload);
+    // case REASSIGN_PARENT:
+    //   return reassignParent(state, action.payload);
+    // case SET_SELECTABLE_PARENTS:
+    //   return setSelectableP(state);
     case CREATE_APPLICATION:
     case EXPORT_FILES:
       return { ...state, loading: true };