Merge branch 'staging' into feature

src/actionTypes/index.js

@@ -28,3 +28,6 @@ export const DELETE_ALL_DATA = 'DELETE_ALL_DATA';
 export const CHANGE_IMAGE_PATH = 'CHANGE_IMAGE_PATH';
 export const UPDATE_HTML_ATTR = 'UPDATE_HTML_ATTR';
 export const UPDATE_CHILDREN_SORT = 'UPDATE_CHILDREN_SORT';
+export const CHANGE_IMAGE_SOURCE = 'CHANGE_IMAGE_SOURCE';
+export const DELETE_IMAGE = 'DELETE_IMAGE';
+

src/actions/components.ts

@@ -28,13 +28,22 @@ import {
   ADD_PROP,
   DELETE_ALL_DATA,
   UPDATE_HTML_ATTR,
-  UPDATE_CHILDREN_SORT
+
+  UPDATE_CHILDREN_SORT,
+  CHANGE_IMAGE_SOURCE,
+  DELETE_IMAGE
+
 } from '../actionTypes/index.js';
 
 import { loadState } from '../localStorage';
 import createFiles from '../utils/createFiles.util.ts';
 import createApplicationUtil from '../utils/createApplication.util.ts';
 
+export const changeImagePath = (imageSource: string) => ({
+  type: CHANGE_IMAGE_SOURCE,
+  payload: imageSource,
+})
+
 export const loadInitData = () => (dispatch: any) => {
   loadState().then((data: any) =>
     dispatch({
@@ -124,6 +133,12 @@ export const changeComponentFocusChild = ({
   });
 };
 
+export const deleteImage = () => ({
+  type: DELETE_IMAGE,
+  payload: ''
+})
+
+
 export const exportFiles = ({
   components,
   path,

src/components/KonvaStage.tsx

@@ -1,10 +1,15 @@
+//This component includes a component for the background image to be uploaded as reference for drawing components
+//and also the parent rectangle components.
+
 import React, { Component } from "react";
-import { Stage, Layer, Line } from "react-konva";
+import { Stage, Layer, Line, Image } from "react-konva";
 import Rectangle from "./Rectangle.tsx";
 import cloneDeep from "../utils/cloneDeep.ts";
 import { ComponentInt, ComponentsInt, ChildInt } from "../utils/Interfaces.ts";
+import isEmpty from '../utils/isEmpty';
 
 interface PropsInt {
+  image: HTMLImageElement;
   components: ComponentsInt;
   focusComponent: ComponentInt;
   selectableChildren: Array<number>;
@@ -102,6 +107,7 @@ class KonvaStage extends Component<PropsInt, StateInt> {
     }
   };
 
+  //event handler to handle mouse click
   handleStageMouseDown = (e: any) => {
     // clicked on stage - clear selection
     if (e.target === e.target.getStage()) {
@@ -116,7 +122,6 @@ class KonvaStage extends Component<PropsInt, StateInt> {
 
     // find clicked rect by its name
     const rectChildId = e.target.attrs.childId;
-    // console.log("user clicked on child rectangle with childId: ", rectChildId);
     this.props.changeFocusChild({ childId: rectChildId });
     this.props.changeComponentFocusChild({
       componentId: this.props.focusComponent.id,
@@ -167,6 +172,7 @@ class KonvaStage extends Component<PropsInt, StateInt> {
 
   render() {
     const {
+      image,
       components,
       handleTransform,
       focusComponent,
@@ -202,7 +208,10 @@ class KonvaStage extends Component<PropsInt, StateInt> {
             }}
           >
             {this.state.grid}
-            {this.getDirectChildrenCopy(focusComponent)
+            <Image image={this.props.focusComponent.id === 1 ? image : null //only display background image if the focused component is <App>
+            } draggable width={this.state.stageWidth*0.8} height={this.state.stageHeight*0.9 } //for background image uploaded, fix to fit screen
+            />
+            {!isEmpty(focusComponent) && this.getDirectChildrenCopy(focusComponent) 
               .map((child: ChildInt, i: number) => (
                 <Rectangle
                   childType={child.childType}

src/components/Rectangle.tsx

@@ -73,7 +73,6 @@ class Rectangle extends Component<PropsInt, StateInt> {
       x: target.x() + focChild.position.x,
       y: target.y() + focChild.position.y
     };
-
     this.props.handleTransform(componentId, childId, transformation);
   }
 
@@ -166,17 +165,13 @@ class Rectangle extends Component<PropsInt, StateInt> {
           strokeWidth={childType === 'COMP' ? 4 : 2}
           strokeScaleEnabled={false}
           draggable={false}
-          fill={childId === -1 ? 'white' : null}
+          fill={null}
           shadowBlur={childId === -1 ? 6 : null}
-          fillPatternImage={
-            this.state.image ? this.state.image : this.setImage(imageSource)
-          }
-          fillPatternScaleX={
-            this.state.image ? width / this.state.image.width : 1
-          }
-          fillPatternScaleY={
-            this.state.image ? height / this.state.image.height : 1
-          }
+
+          fillPatternImage={this.state.image ? this.state.image : null}
+          fillPatternScaleX={this.state.image ? width / this.state.image.width : 1}
+          fillPatternScaleY={this.state.image ? height / this.state.image.height : 1}
+
           _useStrictMode
         />
         <Label>

src/containers/AppContainer.tsx

@@ -2,35 +2,94 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { MuiThemeProvider } from '@material-ui/core/styles';
 import LinearProgress from '@material-ui/core/LinearProgress';
-import LeftContainer from './LeftContainer';
-import MainContainer from './MainContainer';
-import theme from '../components/theme';
-import { loadInitData } from '../actions/components';
-import { ComponentInt, ComponentsInt } from '../utils/Interfaces';
+
+import LeftContainer from './LeftContainer.tsx';
+import MainContainer from './MainContainer.tsx';
+import theme from '../components/theme.ts';
+import { loadInitData } from '../actions/components.ts';
+import { ComponentInt, ComponentsInt } from '../utils/Interfaces.ts';
+import * as actions from '../actions/components';
+
+// ** Used with electron to render
+const IPC = require('electron').ipcRenderer;
 
 type Props = {
+  imageSource: string;
   components: ComponentsInt;
   focusComponent: ComponentInt;
   totalComponents: number;
   loading: boolean;
   selectableChildren: Array<number>;
   loadInitData: any;
+  changeImagePath: any;
+  changed: boolean;
 };
 
+type State = {
+  image: HTMLImageElement | null;
+  width: number;
+  changed: boolean;
+}
+
 const mapStateToProps = (store: any) => ({
+  imageSource: store.workspace.imageSource,
   components: store.workspace.components,
   totalComponents: store.workspace.totalComponents,
   focusComponent: store.workspace.focusComponent,
   loading: store.workspace.loading,
   selectableChildren: store.workspace.selectableChildren
 });
 
-const mapDispatchToProps = { loadInitData };
+const mapDispatchToProps = (dispatch: any) => ({
+  loadInitData,
+  changeImagePath: (imageSource: string) => dispatch(actions.changeImagePath(imageSource)),
+});
+
+class AppContainer extends Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    // ** state here to create a collapsable right column where bottom panel currently lives
+    this.state = {
+      image: null,
+      width: 25,
+      changed: false
+    };
 
-class AppContainer extends Component<Props> {
-  state = {
-    width: 25,
-    rightColumnOpen: true
+    IPC.on('new-file', (event, file: string) => {
+      const image = new window.Image();
+      image.src = file;
+      image.onload = () => {
+        // update state when the image has been uploaded
+        this.props.changeImagePath(file);
+        this.setState({ image });
+      };
+    });
+  }
+
+  componentDidUpdate(prevProps: Props) {
+    const { imageSource } = this.props;
+    const {changed} = this.state;
+    if (imageSource == '' && changed) {
+      this.setState({...this.state, image:null, changed:false});
+
+    }
+    else if (imageSource !== prevProps.imageSource) {
+      this.setImage(imageSource);
+    }
+  }
+
+  setImage = (imageSource: string) => {
+    if (imageSource) {
+    let image: HTMLImageElement;
+    image = new window.Image();
+    image.src = imageSource;
+    image.onload = () => {
+      // setState will redraw layer
+      // because "image" property is changed
+      this.setState({ image, changed: true });
+    };
+  }
   };
 
   componentDidMount() {
@@ -57,7 +116,8 @@ class AppContainer extends Component<Props> {
             focusComponent={focusComponent}
             selectableChildren={selectableChildren}
           />
-          <MainContainer components={components} />
+          <MainContainer components={components} image={this.state.image} 
+            imageSource={this.props.imageSource}/>
           {loading ? (
             <div
               style={{

src/containers/LeftContainer.tsx

@@ -21,6 +21,7 @@ import cloneDeep from '../utils/cloneDeep';
 const IPC = require('electron').ipcRenderer;
 
 interface PropsInt {
+  imageSource: string;
   components: ComponentsInt;
   focusComponent: ComponentInt;
   selectableChildren: Array<number>;
@@ -33,6 +34,7 @@ interface PropsInt {
   createApp: any;
   deleteAllData: any;
   toggleComponentState: any;
+  deleteImage: any;
 }
 
 interface StateInt {
@@ -42,6 +44,10 @@ interface StateInt {
   genOption: number;
 }
 
+const mapStateToProps = (store: any) => ({
+  imageSource: store.workspace.imageSource
+});
+
 const mapDispatchToProps = (dispatch: any) => ({
   addComponent: ({ title }: { title: string }) =>
     dispatch(actions.addComponent({ title })),
@@ -68,6 +74,7 @@ const mapDispatchToProps = (dispatch: any) => ({
   toggleComponentState: (id: string) =>
     dispatch(actions.toggleComponentState(id)),
   deleteAllData: () => dispatch(actions.deleteAllData()),
+  deleteImage: () => dispatch(actions.deleteImage()),
   createApp: ({
     path,
     components,
@@ -101,7 +108,8 @@ class LeftContainer extends Component<PropsInt, StateInt> {
         'Export components',
         'Export components with application files'
       ],
-      genOption: 0
+      genOption: 0.,
+      imageSource: this.props.imageSource
     };
 
     IPC.on('app_dir_selected', (event: any, path: string) => {
@@ -160,7 +168,10 @@ class LeftContainer extends Component<PropsInt, StateInt> {
     this.chooseAppDir();
   };
 
-  chooseAppDir = () => IPC.send('choose_app_dir');
+
+  chooseAppDir = () => IPC.send("choose_app_dir");
+  addImage = () => IPC.send('update-file');
+
 
   showGenerateAppModal = () => {
     const { closeModal, chooseGenOptions } = this;
@@ -199,6 +210,7 @@ class LeftContainer extends Component<PropsInt, StateInt> {
 
   render(): JSX.Element {
     const {
+      imageSource,
       components,
       deleteComponent,
       focusComponent,
@@ -207,7 +219,8 @@ class LeftContainer extends Component<PropsInt, StateInt> {
       changeFocusComponent,
       changeFocusChild,
       selectableChildren,
-      toggleComponentState
+      toggleComponentState,
+      deleteImage
     } = this.props;
     const { componentName, modal } = this.state;
 
@@ -229,6 +242,7 @@ class LeftContainer extends Component<PropsInt, StateInt> {
           toggleComponentState={toggleComponentState}
         />
       ));
+      const { addImage, clearImage } = this;
 
     return (
       <div className='column left'>
@@ -299,6 +313,32 @@ class LeftContainer extends Component<PropsInt, StateInt> {
               flexDirection: 'column'
             }}
           >
+             { 
+            imageSource ? (
+              <Button
+                aria-label="Remove Image"
+                variant="contained"
+                fullWidth
+                onClick={deleteImage
+                }
+                className={classes.clearButton}
+                style={{ borderRadius: 0, top: 0, backgroundColor: '#dc004e', color: '#fff' }}
+              >
+                Remove Image
+              </Button> 
+            ) : (
+              <Button
+                aria-label="Upload Image"
+                variant="contained"
+                fullWidth
+                onClick={addImage}
+                className={classes.clearButton}
+                style={{ borderRadius: 0, top: 0, backgroundColor: '#dc004e', color: '#fff' }}
+              >
+                Upload Image
+              </Button> 
+            )
+          }
             <Button
               color='secondary'
               aria-label='Delete All'
@@ -383,5 +423,10 @@ function styles(): any {
 
 export default compose(
   withStyles(styles),
-  connect(null, mapDispatchToProps)
+
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )
+
 )(LeftContainer);