Make basic flow with add text work

package.json

@@ -6,6 +6,7 @@
   "author": "jun",
   "license": "ISC",
   "dependencies": {
+    "classnames": "^2.2.5",
     "express": "^4.13.4",
     "jquery": "^2.2.3",
     "junk": "^1.0.2",
@@ -13,7 +14,8 @@
     "nodemon": "^1.9.1",
     "react": "^16.3.1",
     "react-dom": "^16.3.1",
-    "react-scripts-ts": "2.14.0"
+    "react-scripts-ts": "2.14.0",
+    "uuid": "^3.2.1"
   },
   "scripts": {
     "start-server": "nodemon ./server/server.js",
@@ -23,10 +25,12 @@
     "eject": "react-scripts-ts eject"
   },
   "devDependencies": {
+    "@types/classnames": "^2.2.3",
     "@types/jest": "^22.2.2",
     "@types/node": "^9.6.2",
     "@types/react": "^16.3.5",
     "@types/react-dom": "^16.0.4",
+    "@types/uuid": "^3.4.3",
     "typescript": "^2.8.1"
   }
 }

src/Components/AddToCanvasInput/AddToCanvasInput.tsx

@@ -1,19 +1,60 @@
 import * as React from 'react';
+import * as uuid from 'uuid/v4';
 import './AddToCanvasInput.css';
+import { CanvasTextNode } from '../../Helpers';
 
 interface AddToCanvasInputProps {
-
+    addTextNode(nodeId: string, textNode: CanvasTextNode): void;
 }
+
 interface AddToCanvasInputState {
+    textInputValue: string;
 }
 
 export class AddToCanvasInput extends React.Component<AddToCanvasInputProps, AddToCanvasInputState> {
     constructor(props: AddToCanvasInputProps) {
         super(props);
 
+        this.state = {
+            textInputValue: ''
+        };
+
+        this.updateInputText = this.updateInputText.bind(this);
+        this.addTextNodeOnSubmit = this.addTextNodeOnSubmit.bind(this);
     }
 
+    updateInputText(ev: React.ChangeEvent<HTMLInputElement>) {
+        this.setState({
+            textInputValue: ev.target.value
+        });
+    }
+
+    addTextNodeOnSubmit() {
+        if (this.state.textInputValue.trim() !== '') {
+            const nodeId = uuid();
+
+            this.props.addTextNode(nodeId, {
+                value: this.state.textInputValue,
+                position: { x: 0, y: 0 }
+            });
+
+            this.setState({
+                textInputValue: ''
+            });
+        }
+    }
 
     render() {
+        return (
+            <div className="add-to-canvas-input">
+                <div className="add-text-input">
+                    <div className="desc">
+                        Add text
+                    </div>
+                    <input type="text" value={this.state.textInputValue} onChange={this.updateInputText} />
+                    <input type="button" value="Add" onClick={this.addTextNodeOnSubmit} />
+                </div>
+            </div>
+        );
     }
 }

src/Components/CanvasArea/CanvasArea.css

@@ -1,3 +1,5 @@
-.drag-container {
+.canvas-area {
-    overflow: hidden;
+    float: right;
+    width: 80%;
+    height: 100%;
 }

src/Components/CanvasArea/CanvasArea.tsx

@@ -1,19 +1,64 @@
 import * as React from 'react';
+import * as uuid from 'uuid/v4';
 import './CanvasArea.css';
+import { CanvasTextNode } from '../../Helpers';
+import { DragContainer } from '../DragContainer';
+import { DraggableNode } from '../DraggableNode';
 
 interface CanvasAreaProps {
-
+    nodes: {
+        text: {
+            [nodeId: string]: CanvasTextNode;
+        }
+    };
 }
 interface CanvasAreaState {
 }
 
 export class CanvasArea extends React.Component<CanvasAreaProps, CanvasAreaState> {
+    containerId: string;
+
     constructor(props: CanvasAreaProps) {
         super(props);
 
+        this.containerId = 'container-' + uuid();
     }
 
+    renderDraggableNodes() {
+        return Object.keys(this.props.nodes.text).map((nodeId) => {
+            const tmpTextNode = this.props.nodes.text[nodeId];
+            return (
+                <DraggableNode key={nodeId} id={nodeId} containerId={this.containerId}>
+                    {tmpTextNode.value}
+                </DraggableNode>
+            );
+        });
+    }
 
     render() {
+        return (
+            <div className="canvas-area">
+                <DragContainer id={this.containerId} >
+                    <div className="drag-container-inner" style={{ width: '500px', height: '500px' }}>
+                        {
+                            this.renderDraggableNodes()
+                        }
+                    </div>
+                </DragContainer>
+            </div>
+            // <DragContainer id="test">
+            //   <header className="App-header">
+            //     <DraggableNode id="test-img" containerId="test">
+            //       <img src={logo} className="App-logo" alt="logo" draggable={false} />
+            //     </DraggableNode>
+            //     <DraggableNode id="test-text" containerId="test">
+            //       <h1 className="App-title">Welcome to React</h1>
+            //     </DraggableNode>
+            //   </header>
+            // </DragContainer>
+            // <p className="App-intro">
+            //   To get started, edit <code>src/App.tsx</code> and save to reload.
+            // </p>
+        );
     }
 }

src/Components/CreateEditorApp/CreateEditorApp.css

@@ -1,29 +1,4 @@
-.App {
+.create-editor-app {
-  text-align: center;
+  width: 100%;
-}
+  height: 100%;
-
-.App-logo {
-  animation: App-logo-spin infinite 20s linear;
-  height: 80px;
-}
-
-.App-header {
-  background-color: #222;
-  height: 150px;
-  padding: 20px;
-  color: white;
-}
-
-.App-title {
-  font-size: 1.5em;
-}
-
-.App-intro {
-  font-size: large;
-  background-color: gray;
-}
-
-@keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
 }

src/Components/CreateEditorApp/CreateEditorApp.tsx

@@ -1,32 +1,40 @@
 import * as React from 'react';
 import './CreateEditorApp.css';
-import { DragContainer } from '../DragContainer';
+import { Sidebar } from '../Sidebar';
-import { DraggableNode } from '../DraggableNode';
+import { CanvasArea } from '../CanvasArea';
+import { deppCloneNaive, CanvasTextNode } from '../../Helpers';
 
-const logo = require('./logo.svg');
+interface CreateEditorAppState {
+  text: {
+    [nodeId: string]: CanvasTextNode;
+  };
+}
 
-export class CreateEditorApp extends React.Component {
+export class CreateEditorApp extends React.Component<{}, CreateEditorAppState> {
-  logFn() {
+  constructor(props: {}) {
-    // tslint:disable-next-line:no-console
+    super(props);
-    console.log(arguments);
+
+    this.state = {
+      text: {}
+    };
+
+    this.addOrUpdateTextNode = this.addOrUpdateTextNode.bind(this);
+  }
+
+  addOrUpdateTextNode(nodeId: string, textNode: CanvasTextNode): void {
+    this.setState((prevState) => {
+      const newState = deppCloneNaive(prevState as CreateEditorAppState);
+      newState.text[nodeId] = textNode;
+
+      return newState;
+    });
   }
 
   render() {
     return (
-      <div className="App">
+      <div className="create-editor-app">
-        <DragContainer id="test">
+        <Sidebar addTextNode={this.addOrUpdateTextNode} />
-          <header className="App-header">
+        <CanvasArea nodes={this.state}/>
-            <DraggableNode id="test-img" containerId="test">
-              <img src={logo} className="App-logo" alt="logo" draggable={false} />
-            </DraggableNode>
-            <DraggableNode id="test-text" containerId="test">
-              <h1 className="App-title">Welcome to React</h1>
-            </DraggableNode>
-          </header>
-        </DragContainer>
-        <p className="App-intro">
-          To get started, edit <code>src/App.tsx</code> and save to reload.
-        </p>
       </div>
     );
   }

src/Components/CreateEditorApp/logo.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>

src/Components/DragContainer/DragContainer.css

@@ -1,3 +1,9 @@
 .drag-container {
     overflow: hidden;
+
+    position: relative;
+}
+
+.drag-container.dragging {
+    cursor: move;
 }

src/Components/DragContainer/DragContainer.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import * as classNames from 'classnames';
 import './DragContainer.css';
 import { DragContextProvider, DragSharedInfo, XYPair } from '../../Helpers';
 
@@ -129,10 +130,16 @@ export class DragContainer extends React.Component<DragContainerProps, DragConta
             offsetMap: currentOffsetMap
         };
 
+        const defaultClassName = 'drag-container';
+        const classNamesArray = [defaultClassName];
+        if (this.state.ongoing.dragging) {
+            classNamesArray.push('dragging');
+        }
+
         return (
             <CustomProvider value={providerValue}>
                 <div
-                    className="drag-container"
+                    className={classNames(classNamesArray)}
                     onMouseMove={this.handleDragMove}
                     onMouseUp={this.handleDragStop}
                     // tslint:disable-next-line:no-console

src/Components/DraggableNode/DraggableNode.css

@@ -1,4 +1,9 @@
 .draggable-node {
     cursor: move;
     user-select: none;
+
+    position: absolute;
+    left: 0;
+    top: 0;
+    padding: 0.5em;
 }

src/Components/Sidebar/Sidebar.css

@@ -1,3 +1,5 @@
-.drag-container {
+.sidebar {
-    overflow: hidden;
+    float: left;
+    width: 20%;
+    height: 100%;
 }

src/Components/Sidebar/Sidebar.tsx

@@ -1,19 +1,28 @@
 import * as React from 'react';
 import './Sidebar.css';
+import { UploadResourcesInput } from '../UploadResourcesInput';
+import { AddToCanvasInput } from '../AddToCanvasInput';
+import { CanvasTextNode } from '../../Helpers';
 
 interface SidebarProps {
-
+    addTextNode(nodeId: string, textNode: CanvasTextNode): void;
 }
+
 interface SidebarState {
 }
 
 export class Sidebar extends React.Component<SidebarProps, SidebarState> {
     constructor(props: SidebarProps) {
         super(props);
-
     }
 
-
     render() {
+        return (
+            <div className="sidebar">
+                <UploadResourcesInput />
+                <AddToCanvasInput addTextNode={this.props.addTextNode} />
+            </div>
+
+        );
     }
 }

src/Components/UploadResourcesInput/UploadResourcesInput.tsx

@@ -10,10 +10,9 @@ interface UploadResourcesInputState {
 export class UploadResourcesInput extends React.Component<UploadResourcesInputProps, UploadResourcesInputState> {
     constructor(props: UploadResourcesInputProps) {
         super(props);
-
     }
 
-
     render() {
+        return '';
     }
 }

src/Helpers/utils.ts

@@ -2,3 +2,12 @@ export interface XYPair {
     x: number;
     y: number;
 }
+
+export function deppCloneNaive<T>(originalObject: T): T {
+    return JSON.parse(JSON.stringify(originalObject));
+}
+
+export interface CanvasTextNode {
+    value: string;
+    position: XYPair;
+  }

yarn.lock

@@ -16,6 +16,10 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@types/classnames@^2.2.3":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5"
+
 "@types/jest@^22.2.2":
   version "22.2.2"
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-22.2.2.tgz#afe5dacbd00d65325f52da0ed3e76e259629ac9d"
@@ -37,6 +41,12 @@
   dependencies:
     csstype "^2.0.0"
 
+"@types/uuid@^3.4.3":
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.3.tgz#121ace265f5569ce40f4f6d0ff78a338c732a754"
+  dependencies:
+    "@types/node" "*"
+
 abab@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -1457,6 +1467,10 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+classnames@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+
 clean-css@4.1.x:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
@@ -7284,7 +7298,7 @@ uuid@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0, uuid@^3.1.0:
+uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"