kitchen-simulator 3.15.0 → 3.16.0-test-renderer-fix

package/lib/constants.js

@@ -764,6 +764,7 @@ var INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_START_DRAW_WALL = 'I
 
 // room shape type
 var ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_TYPE = {
+  CUSTOM: 'custom',
   RECTANGLE: 'rectangle',
   TWO_WALLS_LEFT_TOP: '2wLeftTop',
   TWO_WALLS_RIGHT_TOP: '2wRightTop',

package/lib/devLiteRenderer.js

@@ -339,6 +339,104 @@ function WorkSpace(props) {
       setExternalEvent(evt);
     }
   }, "Add Room shape(rectangle)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+    actionType: "danger",
+    onClick: function onClick() {
+      var evt = {
+        type: _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE,
+        payload: {
+          roomShapeType: 'custom',
+          width: 0,
+          height: 0,
+          doorStyle: {
+            id: 36,
+            type: 'door',
+            name: 'Brilliant White Shaker',
+            thumbnail: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/thumbnail/Brilliant%20White%20Shaker%20-%20RTA.jpg',
+            texture: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+            color: '#ffffff',
+            glossness: 1,
+            door_style_id: 42,
+            brightness: 1,
+            sku: 'SW',
+            color_family: ',10,',
+            color_sku_alias: 'SW',
+            door_style_name: 'Shaker',
+            install: '',
+            doorStyles: {
+              base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
+              interior: 'http://127.0.0.1:4002/uploads/assets/default/maple.jpg',
+              base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_1: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_2: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_2: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_3: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_3: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_4: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_4: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_5: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_5: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_6: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_6: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_7: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_7: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_8: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_8: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              base_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_fixed_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              base_drawer_door_9: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
+              door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              fixed_drawer_door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg',
+              drawer_door_handle_9: 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg'
+            },
+            installation_types: [125, 124]
+          }
+        }
+      };
+      setExternalEvent(evt);
+    }
+  }, "Add Room shape(custom)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {

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

@@ -736,6 +736,7 @@ function initPropData(element, catalog) {
 function updateAttributeOfSelectedElement(element, attrPayload, state, layer, catalog, projectActions) {
   var _attributesFormData;
   var callback = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
+  var layerUnit = state.getIn(['scene', 'layers', 'layer-1', 'unit']);
   var attributesFormData = initAttrData(element, layer, state);
   var value = attrPayload.value;
   var attributeName = attrPayload.attributeName;
@@ -743,28 +744,8 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
   if (attributeName === _constants.ATT_ITEM_POS) {
     // calculate the new position of movement
     var rotRad = (value.directionAng + element.rotation) / 180 * Math.PI;
-    var newX = element.x + (0, _convertUnitsLite.convert)((value.oldDistance - value.newDistance) * Math.cos(rotRad)).from('in').to('cm');
-    var newY = element.y + (0, _convertUnitsLite.convert)((value.oldDistance - value.newDistance) * Math.sin(rotRad)).from('in').to('cm');
-    // const reversedDirection =
-    //   value.directionAng === LEFT_DIST_ANG
-    //     ? RIGHT_DIST_ANG
-    //     : value.directionAng === RIGHT_DIST_ANG
-    //     ? LEFT_DIST_ANG
-    //     : value.directionAng === BACK_DIST_ANG
-    //     ? FRONT_DIST_ANG
-    //     : BACK_DIST_ANG;
-    // let dist = convert(
-    //   element.distArray?.find(v => v[1] === reversedDirection)
-    //     ? element.distArray?.find(v => v[1] === reversedDirection)[0]
-    //     : 0
-    // )
-    //   .from('cm')
-    //   .to('in');
-    // if (dist + (value.oldDistance - value.newDistance) <= 0 || value.newDistance < 0) {
-    //   // confirm "The item will be placed outside the floor plan. Are you sure?"
-    //   setPopupOpen(true);
-    //   return;
-    // }
+    var newX = element.x + (0, _convertUnitsLite.convert)((value.oldDistance - value.newDistance) * Math.cos(rotRad)).from(layerUnit).to('cm');
+    var newY = element.y + (0, _convertUnitsLite.convert)((value.oldDistance - value.newDistance) * Math.sin(rotRad)).from(layerUnit).to('cm');
     value = {
       x: newX,
       y: newY
@@ -773,8 +754,8 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
     var att = attributesFormData.has(attributeName) ? attributesFormData.get(attributeName) : element[attributeName];
     if (att) value = att.merge({
       _length: value,
-      _unit: _constants.UNIT_INCH,
-      length: (0, _convertUnitsLite.convert)(value).from(_constants.UNIT_INCH).to(_constants.UNIT_CENTIMETER)
+      _unit: layerUnit,
+      length: (0, _convertUnitsLite.convert)(value).from(layerUnit).to(_constants.UNIT_CENTIMETER)
     });
   }
   // make the new attrivutes
@@ -1186,9 +1167,16 @@ function _handleExternalEvent() {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
                   it = evt === null || evt === void 0 || (_evt$payload2 = evt.payload) === null || _evt$payload2 === void 0 || (_evt$payload2 = _evt$payload2.layers['layer-1']) === null || _evt$payload2 === void 0 ? void 0 : _evt$payload2.items[itemKeys[i]]; //////// check altitude of item property and change length from _length (convert length from 'in' fo 'cm')
-                  if (it.properties.altitude.length !== (0, _convertUnitsLite.convert)(it.properties.altitude._length).from('in').to('cm')) {
-                    it.properties.altitude.length = (0, _convertUnitsLite.convert)(it.properties.altitude._length).from('in').to('cm');
-                  }
+                  // if (
+                  //   it.properties.altitude.length !==
+                  //   convert(it.properties.altitude._length).from('in').to('cm')
+                  // ) {
+                  //   it.properties.altitude.length = convert(
+                  //     it.properties.altitude._length
+                  //   )
+                  //     .from('in')
+                  //     .to('cm');
+                  // }
                   /////////
                   if (!cdsItems.some(function (v) {
                     var _it$doorStyle;
@@ -1261,7 +1249,7 @@ function _handleExternalEvent() {
                 return _ref2.apply(this, arguments);
               };
             }());
-          }
+          } else props.projectActions.loadProject(evt.payload);
         case 5:
           return _context1.abrupt("continue", 44);
         case 6:
@@ -1408,7 +1396,7 @@ function _handleExternalEvent() {
           } else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
           return _context1.abrupt("continue", 44);
         case 20:
-          _evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle; // console.log('****', layer);
+          _evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
           props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
           return _context1.abrupt("continue", 44);
         case 21:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "3.15.0",
+  "version": "3.16.0-test-renderer-fix",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",