Commit aa5e8829 authored by Tamas Kecskes's avatar Tamas Kecskes
Browse files

Containment Canvas is building up and draws.

parent bc7bd2c4

demo/demoApp.jsx

+37 −20
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ import ExpansionPanel from '@material-ui/core/ExpansionPanel'; 
import ExpansionPanelSummary from '@material-ui/core/ExpansionPanelSummary';

import Typography from '@material-ui/core/Typography';



import {DragDropContext} from 'react-dnd';

import HTML5Backend from 'react-dnd-html5-backend';

import {Provider} from 'react-redux';

import {createStore} from 'redux';

import reducers from '../src/utils/reducers';



import DemoProjectSeedCards from '../src/components/ProjectSeedCards/demo';

import DemoAttributeEditor from '../src/components/AttributeEditor/demo';

import DemoConfirmDialog from '../src/components/ConfirmDialog/demo';
@@ -11,7 +17,13 @@ import DemoUserProfileNavigator from '../src/components/UserProfileNavigator/dem 
import DemoModalSpinner from '../src/components/ModalSpinner/demo';

import DemoContainmentCanvas from '../src/components/ContainmentCanvas/demo';



export default class demoApp extends Component {

/* eslint-disable */

const store = createStore(reducers, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__());



/* eslint-enable */





class demoApp extends Component {

    componentDidMount() {

        window.onGMEInit = () => {

            window.gmeClient = new window.GME.classes.Client(window.GME.gmeConfig);
@@ -40,13 +52,14 @@ export default class demoApp extends Component { 
                component: <DemoModalSpinner/>,

                title: 'ModalSpinner',

            },

            // {

            //     component: <DemoContainmentCanvas/>,

            //     title: 'ContainmentCanvas',

            // },

            {

                component: <DemoContainmentCanvas/>,

                title: 'ContainmentCanvas',

            },

        ];



        return (

            <Provider store={store}>

                <div>

                    {DEMOS.map((info) => {

                        return (
@@ -60,6 +73,10 @@ export default class demoApp extends Component { 
                            </ExpansionPanel>

                        )

                    })}

            </div>);

                </div>

            </Provider>);

    };

};





export default DragDropContext(HTML5Backend)(demoApp);
 
 No newline at end of file

demo/static/gme-dist/webgme.classes.build.js

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ 
                switch (regName) {

                    case 'position':

                        return {y: (Math.trunc(pos / 10)) * 40, x: (pos % 10) * 100};

                    case 'SVGIcon':

                    case 'SVGBbox':

                    case 'SVGPorts':

                    case 'SVGAttributes':

                        return undefined;

                    default:

                        return 'RegValue_' + cnt;

                }

package-lock.json

+9 −0
Original line number Diff line number Diff line
@@ -3884,6 +3884,15 @@ 
      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",

      "dev": true

    },

    "immutability-helper": {

      "version": "2.8.1",

      "resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-2.8.1.tgz",

      "integrity": "sha512-8AVB5EUpRBUdXqfe4cFsFECsOIZ9hX/Arl8B8S9/tmwpYv3UWvOsXUPOjkuZIMaVxfSWkxCzkng1rjmEoSWrxQ==",

      "dev": true,

      "requires": {

        "invariant": "^2.2.0"

      }

    },

    "import-local": {

      "version": "2.0.0",

      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",

package.json

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
    "@babel/preset-env": "^7.1.0",

    "@babel/preset-react": "^7.0.0",

    "babel-loader": "^8.0.2",

    "immutability-helper": "^2.8.1",

    "prop-types": "^15.6.2",

    "react": "^16.5.2",

    "react-dnd": "^2.5.4",

src/components/ContainmentCanvas/ContainmentCanvas.jsx

+3 −2
Original line number Diff line number Diff line 
import React from 'react';

import PropTypes from 'prop-types';

import {DropTarget} from 'react-dnd';

import {connect} from 'react-redux';



import SingleConnectedNode from './SingleConnectedNode';

import DRAG_TYPES from '../../utils/dragTypes';
@@ -218,11 +219,11 @@ class ContainmentCanvas extends SingleConnectedNode { 
                onMouseMove={this.onMouseMove}

            >

                <BasicConnectingComponent connectionManager={this.cm}/>

                {childrenItems.length > 0 ? childrenItems : ContainmentCanvasInfoCard()}

                {childrenItems.length > 0 ? childrenItems : null}

            </div>);



        return connectDropTarget(content);

    }

}



export default (DropTarget(DRAG_TYPES.GME_NODE, canvasTarget, collect)(ContainmentCanvas));
 
export default DropTarget(DRAG_TYPES.GME_NODE, canvasTarget, collect)(ContainmentCanvas);