kitchen-simulator 1.0.0-clark.71 → 1.0.0-clark.90

package/lib/devLiteRenderer.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactContainerDimensions = _interopRequireDefault(require("react-container-dimensions"));
-var _mockProps = _interopRequireDefault(require("./mocks/mockProps.json"));
+var _mockProps = _interopRequireDefault(require("./mocks/mockProps2.json"));
 var _dataBundle = _interopRequireDefault(require("./mocks/dataBundle2.json"));
 var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload2.json"));
 var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload.json"));
@@ -23,6 +23,9 @@ var options = {
   unit: 'in',
   enable3D: true
 };
+var onInternalEvent = function onInternalEvent(evt) {
+  console.log('EVENT:', evt.type, evt.value);
+};
 document.getElementById('app').style.display = 'block';
 function WorkSpace(props) {
   var _useState = (0, _react.useState)(null),
@@ -239,7 +242,31 @@ function WorkSpace(props) {
       };
       setExternalEvent(evt);
     }
-  }, "Individual Molding (FBM)"), /*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], {
+  }, "Individual Molding (FBM)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    actionType: "danger",
+    onClick: function onClick() {
+      var evt = {
+        type: _constants.EXTERNAL_EVENT_PROJECT_SETTING,
+        payload: {
+          option: _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT,
+          value: 100 // ceiling length
+        }
+      };
+      setExternalEvent(evt);
+    }
+  }, "Setting-CeilingHeight"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    actionType: "danger",
+    onClick: function onClick() {
+      var evt = {
+        type: _constants.EXTERNAL_EVENT_PROJECT_SETTING,
+        payload: {
+          option: _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE,
+          value: 1 // 0-false, 1-true
+        }
+      };
+      setExternalEvent(evt);
+    }
+  }, "Setting-WallLength"), /*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], {
     width: props.width,
     height: props.height,
     projectElement: _mockProps["default"].projectElement,
@@ -250,6 +277,7 @@ function WorkSpace(props) {
     companyUrl: "https://example.com",
     toolbarButtons: [],
     externalEvent: externalEvent,
+    onInternalEvent: onInternalEvent,
     onError: function onError(payload) {
       // payload = {
       //   type: 'render-error' | 'runtime-error' | 'unhandled-rejection',

package/lib/models.js

@@ -45,16 +45,16 @@ var DefaultGrids = exports.DefaultGrids = new _immutable.Map({
     id: 'h1',
     type: 'horizontal-streak',
     properties: {
-      step: 24,
-      colors: ['rgba(193, 202, 228, 0.45)'] // dot's color
+      step: 30.48,
+      colors: ['#bbb', '#bbb', '#bbb', '#bbb', '#bbb'] // dot's color
     }
   }),
   v1: new Grid({
     id: 'v1',
     type: 'vertical-streak',
     properties: {
-      step: 24,
-      colors: ['rgba(193, 202, 228, 0.45)'] // dot's color
+      step: 30.48,
+      colors: ['#bbb', '#bbb', '#bbb', '#bbb', '#bbb'] // dot's color
     }
   })
 });

package/lib/shared-style.js

@@ -60,13 +60,13 @@ var AREA_MESH_COLOR = exports.AREA_MESH_COLOR = {
   unselected: 'rgb(221,221,255)'
 };
 var INTERIOR_LINE = exports.INTERIOR_LINE = {
-  selected: '#6E1EA8',
-  unselected: ' #455A64'
+  unselected: ' #0a0a10',
+  selected: '#4C12A1'
 };
 var LINE_MESH_COLOR = exports.LINE_MESH_COLOR = {
-  selected: '#6E1EA8',
+  selected: '#4C12A1',
   unselected: 'rgb(135,145,171)'
 };
 var LINE_MESH = exports.LINE_MESH = {
-  selected: '#6E1EA8'
+  selected: '#4C12A1'
 };

package/lib/utils/geometry.js

@@ -972,18 +972,18 @@ function getAllItemSnap(allItemRects) {
     var snap4 = itemrectInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
     var sizeinfo = otherItems[index].cat && otherItems[index].cat.info.sizeinfo;
     if (sizeinfo) {
-      var left_blind_length = sizeinfo.left_blind_length,
-        right_blind_length = sizeinfo.right_blind_length;
-      if (left_blind_length > 0) {
-        var vx = left_blind_length - ch;
+      var leftBlindLength = sizeinfo.leftBlindLength,
+        rightBlindLength = sizeinfo.rightBlindLength;
+      if (leftBlindLength > 0) {
+        var vx = leftBlindLength - ch;
         var vy = cw;
         var dx = vx * cos + vy * sin;
         var dy = vx * sin - vy * cos;
         var snap6 = itemrectInfo(rect.rect[0].x + dx, rect.rect[0].y + dy, rect.rotRad + Math.PI / 2, cur && cur.size, rect.layoutpos, rect.is_corner);
         allItemSnap.push(snap6);
       }
-      if (right_blind_length > 0) {
-        var _vx = ch - right_blind_length;
+      if (rightBlindLength > 0) {
+        var _vx = ch - rightBlindLength;
         var _vy = cw;
         var _dx = _vx * cos + _vy * sin;
         var _dy = _vx * sin - _vy * cos;

package/lib/utils/isolate-event-handler.js

@@ -480,31 +480,32 @@ function handleExternalEvent(_x7) {
 }
 function _handleExternalEvent() {
   _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(props) {
-    var evt, state, sLineCnt, elementJs, _element, catalog, outlineSVGData, catalogInstance, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _evt$payload3, moldingInfo, isGlobal, _t5, _t6;
+    var evt, state, sLineCnt, elementJs, _element, catalog, outlineSVGData, catalogInstance, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _evt$payload3, moldingInfo, isGlobal, _evt$payload4, option, _value3, _t5, _t6;
     return _regenerator["default"].wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
+          console.log('***external event****', props.externalEvent);
           evt = props.externalEvent;
           state = props.state.get('KitchenConfigurator');
           _t5 = evt === null || evt === void 0 ? void 0 : evt.type;
-          _context5.next = _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 4 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 5 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 10 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 16 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 17 : _t5 === _constants.EXTERNAL_EVENT_SET_INITIAL_DATA ? 18 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 23 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 26 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 27 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 28 : 29;
+          _context5.next = _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 4 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 5 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 10 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 16 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 17 : _t5 === _constants.EXTERNAL_EVENT_SET_INITIAL_DATA ? 18 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 23 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 26 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 27 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 28 : _t5 === _constants.EXTERNAL_EVENT_PROJECT_SETTING ? 29 : 30;
           break;
         case 1:
           props.projectActions.setMode(_constants.MODE_IDLE_3D);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 2:
           props.projectActions.setMode(_constants.MODE_IDLE);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 3:
           sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
           if (sLineCnt > 0) props.projectActions.setMode(_constants.MODE_ELEVATION_VIEW);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 4:
           if (state.mode === _constants.MODE_IDLE || state.mode === _constants.MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
             props.projectActions.setMode(_constants.MODE_IDLE);
             props.linesActions.selectToolDrawingLine('wall');
           }
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 5:
           if ((0, _helper.isEmpty)(evt === null || evt === void 0 ? void 0 : evt.payload)) {
             _context5.next = 9;
@@ -514,6 +515,7 @@ function _handleExternalEvent() {
           catalog = state.getIn(['catalog']).toJS(); // add item to catalog of state
           _element = _objectSpread(_objectSpread({}, _element), {}, {
             cds: {
+              data: [_objectSpread({}, _element.customer_property)],
               itemID: _element.itemID
             }
           });
@@ -546,7 +548,7 @@ function _handleExternalEvent() {
           props.projectActions.pushLastSelectedCatalogElementToHistory(_element);
           props.projectActions.setIsCabinetDrawing(true);
         case 9:
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 10:
           _evt$payload = evt.payload, moveType = _evt$payload.moveType, moveValue = _evt$payload.moveValue;
           value = state.getIn(['viewer2D']).toJS();
@@ -567,23 +569,23 @@ function _handleExternalEvent() {
           return _context5.abrupt("continue", 15);
         case 15:
           if (compareSVGRect(value)) props.viewer2DActions.updateCameraView(value);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 16:
           defaulTitle = 'Untitle';
           props.projectActions.newProject();
           props.projectActions.rename(defaulTitle);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 17:
           _evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, itemCDS = _evt$payload2.itemCDS, isAll = _evt$payload2.isAll;
           props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 18:
           _doorStyle = evt.payload.doorStyle;
           props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 19:
           props.projectActions.loadProject(evt.payload);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 20:
           _value = state.getIn(['viewer2D']).toJS();
           _value.a -= 0.1;
@@ -616,7 +618,7 @@ function _handleExternalEvent() {
             _value.f += 0.1;
           }
           if (compareSVGRect(_value)) props.viewer2DActions.updateCameraView(_value);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 23:
           _value2 = state.getIn(['viewer2D']).toJS();
           _value2.a += 0.1;
@@ -637,18 +639,33 @@ function _handleExternalEvent() {
           return _context5.abrupt("return");
         case 25:
           if (compareSVGRect(_value2)) props.viewer2DActions.updateCameraView(_value2);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 26:
           props.projectActions.undo();
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 27:
           props.projectActions.redo();
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 28:
           _evt$payload3 = evt.payload, moldingInfo = _evt$payload3.moldingInfo, isGlobal = _evt$payload3.isGlobal;
           props.itemsActions.setMolding(moldingInfo, isGlobal);
-          return _context5.abrupt("continue", 29);
+          return _context5.abrupt("continue", 30);
         case 29:
+          _evt$payload4 = evt.payload, option = _evt$payload4.option, _value3 = _evt$payload4.value;
+          if (option === _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
+            props.viewer2DActions.updateCeilHeight(_value3);
+            props.viewer3DActions.update3DCeilHeight(_value3);
+          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE) {
+            props.viewer2DActions.changeWallLengthMeasure(_value3);
+          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE) {
+            props.viewer2DActions.changeBaseCabinetMeasure(_value3);
+          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE) {
+            props.viewer2DActions.changeWallCabinetMeasure(_value3);
+          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
+            props.viewer2DActions.changeWindowDoorMeasure(_value3);
+          }
+          return _context5.abrupt("continue", 30);
+        case 30:
         case "end":
           return _context5.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "1.0.0-clark.71",
+  "version": "1.0.0-clark.90",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",