kitchen-simulator 4.0.6-react-18 → 4.0.7-measurement-unit-payload

package/lib/catalog/properties/property-read-only.js

@@ -0,0 +1,34 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = PropertyReadOnly;
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _export = require("../../components/style/export");
+var _sharedPropertyStyle = _interopRequireDefault(require("./shared-property-style"));
+function PropertyReadOnly(_ref) {
+  var value = _ref.value,
+    onUpdate = _ref.onUpdate,
+    configs = _ref.configs,
+    sourceElement = _ref.sourceElement,
+    internalState = _ref.internalState,
+    state = _ref.state;
+  return /*#__PURE__*/_react["default"].createElement("table", {
+    className: "PropertyReadOnly",
+    style: _sharedPropertyStyle["default"].tableStyle
+  }, /*#__PURE__*/_react["default"].createElement("tbody", null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", {
+    style: _sharedPropertyStyle["default"].firstTdStyle
+  }, /*#__PURE__*/_react["default"].createElement(_export.FormLabel, null, configs.label)), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement("div", null, value)))));
+}
+PropertyReadOnly.propTypes = {
+  value: _propTypes["default"].any.isRequired,
+  onUpdate: _propTypes["default"].func.isRequired,
+  configs: _propTypes["default"].object.isRequired,
+  sourceElement: _propTypes["default"].object,
+  internalState: _propTypes["default"].object,
+  state: _propTypes["default"].object.isRequired
+};
+module.exports = exports.default;

package/lib/catalog/properties/property-string.js

@@ -0,0 +1,56 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = PropertyString;
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _export = require("../../components/style/export");
+var _sharedPropertyStyle = _interopRequireDefault(require("./shared-property-style"));
+var tableStyle = {
+  width: '100%',
+  borderSpacing: '2px 0',
+  marginBottom: '2px'
+};
+var firstTdStyle = {
+  width: '6em',
+  textTransform: 'capitalize'
+};
+function PropertyString(_ref) {
+  var value = _ref.value,
+    onUpdate = _ref.onUpdate,
+    configs = _ref.configs,
+    sourceElement = _ref.sourceElement,
+    internalState = _ref.internalState,
+    state = _ref.state;
+  var update = function update(val) {
+    if (configs.hook) {
+      return configs.hook(val, sourceElement, internalState, state).then(function (_val) {
+        return onUpdate(_val);
+      });
+    }
+    return onUpdate(val);
+  };
+  return /*#__PURE__*/_react["default"].createElement("table", {
+    className: "PropertyString",
+    style: _sharedPropertyStyle["default"].tableStyle
+  }, /*#__PURE__*/_react["default"].createElement("tbody", null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", {
+    style: _sharedPropertyStyle["default"].firstTdStyle
+  }, /*#__PURE__*/_react["default"].createElement(_export.FormLabel, null, configs.label)), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_export.FormTextInput, {
+    value: value,
+    onChange: function onChange(event) {
+      return update(event.target.value);
+    }
+  })))));
+}
+PropertyString.propTypes = {
+  value: _propTypes["default"].any.isRequired,
+  onUpdate: _propTypes["default"].func.isRequired,
+  configs: _propTypes["default"].object.isRequired,
+  sourceElement: _propTypes["default"].object,
+  internalState: _propTypes["default"].object,
+  state: _propTypes["default"].object.isRequired
+};
+module.exports = exports.default;

package/lib/catalog/properties/property-toggle.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = PropertyToggle;
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _export = require("../../components/style/export");
+var _sharedPropertyStyle = _interopRequireDefault(require("./shared-property-style"));
+function PropertyToggle(_ref) {
+  var value = _ref.value,
+    onUpdate = _ref.onUpdate,
+    configs = _ref.configs,
+    sourceElement = _ref.sourceElement,
+    internalState = _ref.internalState,
+    state = _ref.state;
+  var update = function update(val) {
+    if (configs.hook) {
+      return configs.hook(val, sourceElement, internalState, state).then(function (_val) {
+        return onUpdate(_val);
+      });
+    }
+    return onUpdate(val);
+  };
+  return /*#__PURE__*/_react["default"].createElement("table", {
+    className: "PropertyToggle",
+    style: _sharedPropertyStyle["default"].tableStyle
+  }, /*#__PURE__*/_react["default"].createElement("tbody", null, /*#__PURE__*/_react["default"].createElement("tr", null, /*#__PURE__*/_react["default"].createElement("td", {
+    style: _sharedPropertyStyle["default"].firstTdStyle
+  }, /*#__PURE__*/_react["default"].createElement(_export.FormLabel, null, configs.label)), /*#__PURE__*/_react["default"].createElement("td", null, /*#__PURE__*/_react["default"].createElement(_export.Button, {
+    onClick: function onClick(e) {
+      return update(!value);
+    },
+    size: "small"
+  }, configs.actionName)))));
+}
+PropertyToggle.propTypes = {
+  value: _propTypes["default"].any.isRequired,
+  onUpdate: _propTypes["default"].func.isRequired,
+  configs: _propTypes["default"].object.isRequired,
+  sourceElement: _propTypes["default"].object,
+  internalState: _propTypes["default"].object,
+  state: _propTypes["default"].object.isRequired
+};
+module.exports = exports.default;

package/lib/catalog/properties/shared-property-style.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var tableStyle = {
+  width: '100%',
+  borderSpacing: '2px 0',
+  marginBottom: '2px'
+};
+var firstTdStyle = {
+  width: '6em',
+  textTransform: 'capitalize'
+};
+var PropertyStyle = {
+  tableStyle: tableStyle,
+  firstTdStyle: firstTdStyle
+};
+var _default = exports["default"] = PropertyStyle;
+module.exports = exports.default;

package/lib/catalog/utils/exporter.js

@@ -27,9 +27,18 @@ function _default(_ref) {
     alti = _ref.alti,
     obj_property = _ref.obj_property,
     outlineSVGData = _ref.outlineSVGData,
-    cds = _ref.cds;
+    cds = _ref.cds,
+    _ref$width_unit = _ref.width_unit,
+    width_unit = _ref$width_unit === void 0 ? 'in' : _ref$width_unit,
+    _ref$height_unit = _ref.height_unit,
+    height_unit = _ref$height_unit === void 0 ? 'in' : _ref$height_unit,
+    _ref$length_unit = _ref.length_unit,
+    length_unit = _ref$length_unit === void 0 ? 'in' : _ref$length_unit;
+  var widthUnit = width_unit === 'inch' ? 'in' : width_unit;
+  var heightUnit = height_unit === 'inch' ? 'in' : height_unit;
+  var lengthUnit = length_unit === 'inch' ? 'in' : length_unit;
   var _length = alti || 0;
-  var length = (0, _convertUnitsLite.convert)(_length).from('in').to('cm');
+  var length = (0, _convertUnitsLite.convert)(_length).from(lengthUnit).to('cm');
   // const length = _length;
 
   var additional_props = [];
@@ -40,8 +49,8 @@ function _default(_ref) {
         type: 'length-measure',
         defaultValue: {
           _length: sizeinfo.width,
-          _unit: 'in',
-          length: (0, _convertUnitsLite.convert)(sizeinfo.width).from('in').to('cm')
+          _unit: widthUnit,
+          length: (0, _convertUnitsLite.convert)(sizeinfo.width).from(widthUnit).to('cm')
         }
       }
     };
@@ -53,8 +62,8 @@ function _default(_ref) {
         type: 'length-measure',
         defaultValue: {
           _length: sizeinfo.width,
-          _unit: 'in',
-          length: (0, _convertUnitsLite.convert)(sizeinfo.width).from('in').to('cm')
+          _unit: widthUnit,
+          length: (0, _convertUnitsLite.convert)(sizeinfo.width).from(widthUnit).to('cm')
         }
       },
       depth: {
@@ -62,8 +71,8 @@ function _default(_ref) {
         type: 'length-measure',
         defaultValue: {
           _length: sizeinfo.depth,
-          _unit: 'in',
-          length: (0, _convertUnitsLite.convert)(sizeinfo.depth).from('in').to('cm')
+          _unit: lengthUnit,
+          length: (0, _convertUnitsLite.convert)(sizeinfo.depth).from(lengthUnit).to('cm')
         }
       },
       height: {
@@ -71,8 +80,8 @@ function _default(_ref) {
         type: 'length-measure',
         defaultValue: {
           _length: sizeinfo.height,
-          _unit: 'in',
-          length: (0, _convertUnitsLite.convert)(sizeinfo.height).from('in').to('cm')
+          _unit: heightUnit,
+          length: (0, _convertUnitsLite.convert)(sizeinfo.height).from(heightUnit).to('cm')
         }
       }
     };
@@ -104,7 +113,7 @@ function _default(_ref) {
         type: 'length-measure',
         defaultValue: {
           _length: _length,
-          _unit: 'in',
+          _unit: lengthUnit,
           length: length
         }
       },
@@ -144,6 +153,10 @@ function _default(_ref) {
     img: base,
     obj: obj_property,
     cds: cds,
+    structure_json: structure_json,
+    width_unit: widthUnit,
+    length_unit: lengthUnit,
+    height_unit: heightUnit,
     render2D: function render2D(element, layer, scene) {
       return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
     },

package/lib/catalog/utils/item-loader.js

@@ -94,7 +94,7 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
     el_is_euro_cds = _element.doorStyle.doorStyles.is_euro_cds;
     el_euro_shape_svg = _element.doorStyle.doorStyles.euro_shape_svg;
   }
-  if (el_euro_length === undefined && el_euro_width === undefined) {
+  if ((0, _helper.isEmpty)(el_euro_length) && (0, _helper.isEmpty)(el_euro_width)) {
     el_DSN = 'el_DSN';
   }
   if (el_DSN === 'Euro & Frameless') {
@@ -221,12 +221,17 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
         transform: "translate(".concat(-transX, "px, ").concat(-transY, "px)")
       },
       onMouseEnter: function onMouseEnter(event) {
-        var bbox = event.target.getBoundingClientRect();
-        if (document.getElementById('warning_box_2d')) {
-          document.getElementById('warning_box_2d').style.display = 'flex';
-          document.getElementById('warning_box_2d').style.top = "".concat(bbox.top - 60, "px");
-          document.getElementById('warning_box_2d').style.left = "".concat(bbox.left, "px");
-        }
+        var target = event.currentTarget;
+        var tooltip = document.getElementById('warning_box_2d');
+        var parent = document.querySelector('#kitchen-simulator-container');
+        if (!tooltip || !parent) return;
+        var targetRect = target.getBoundingClientRect();
+        var parentRect = parent.getBoundingClientRect();
+        var left = targetRect.left - parentRect.left;
+        var top = targetRect.top - parentRect.top;
+        tooltip.style.display = 'flex';
+        tooltip.style.left = "".concat(left, "px");
+        tooltip.style.top = "".concat(top - 60, "px");
       },
       onMouseLeave: function onMouseLeave() {
         if (document.getElementById('warning_box_2d')) {
@@ -446,25 +451,28 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
     counterTop.uri = layer.toJS().counterTop.uri;
   }
   if ('name' in element.doorStyle) {
+    var _element2, _element3, _element4, _element5;
     doorStyles = new _immutable.Map(element.doorStyle.doorStyles);
-    color = element.doorStyle.color;
-    glossness = element.doorStyle.glossness;
-    handleMaterial.metalness = element.doorStyle.metalness;
-    handleMaterial.roughness = element.doorStyle.roughness;
+    color = (_element2 = element) === null || _element2 === void 0 || (_element2 = _element2.doorStyle) === null || _element2 === void 0 ? void 0 : _element2.color;
+    glossness = (_element3 = element) === null || _element3 === void 0 || (_element3 = _element3.doorStyle) === null || _element3 === void 0 ? void 0 : _element3.glossness;
+    handleMaterial.metalness = (_element4 = element) === null || _element4 === void 0 || (_element4 = _element4.doorStyle) === null || _element4 === void 0 ? void 0 : _element4.metalness;
+    handleMaterial.roughness = (_element5 = element) === null || _element5 === void 0 || (_element5 = _element5.doorStyle) === null || _element5 === void 0 ? void 0 : _element5.roughness;
   } else if (element.doorStyle != null && element.doorStyle) {
-    doorStyles = element.doorStyle.get('doorStyles');
-    color = element.doorStyle.get('color');
-    glossness = element.doorStyle.get('glossness');
-    handleMaterial.metalness = element.doorStyle.get('metalness');
-    handleMaterial.roughness = element.doorStyle.get('roughness');
+    var _element6, _element7, _element8, _element9, _element0;
+    doorStyles = (_element6 = element) === null || _element6 === void 0 || (_element6 = _element6.doorStyle) === null || _element6 === void 0 ? void 0 : _element6.get('doorStyles');
+    color = (_element7 = element) === null || _element7 === void 0 || (_element7 = _element7.doorStyle) === null || _element7 === void 0 ? void 0 : _element7.get('color');
+    glossness = (_element8 = element) === null || _element8 === void 0 || (_element8 = _element8.doorStyle) === null || _element8 === void 0 ? void 0 : _element8.get('glossness');
+    handleMaterial.metalness = (_element9 = element) === null || _element9 === void 0 || (_element9 = _element9.doorStyle) === null || _element9 === void 0 ? void 0 : _element9.get('metalness');
+    handleMaterial.roughness = (_element0 = element) === null || _element0 === void 0 || (_element0 = _element0.doorStyle) === null || _element0 === void 0 ? void 0 : _element0.get('roughness');
   }
-  if (color === undefined) color = '#ffffff';
-  if (glossness === undefined) glossness = 1;
+  if ((0, _helper.isEmpty)(color)) color = '#ffffff';
+  if ((0, _helper.isEmpty)(glossness)) glossness = 1;
   var tempDoorStyles = doorStyles.toJS();
   var tempPlaceholders = structure.tempPlaceholders;
   var tPlaceholders = tempPlaceholders.find(function (el) {
-    return el.id === tempDoorStyles.cabinet_door_style_id;
-    // return el.id === tempDoorStyles.cds[0].cabinet_door_style_id;
+    var _tempDoorStyles$cds, _tempDoorStyles$cds$;
+    if (tempDoorStyles !== null && tempDoorStyles !== void 0 && tempDoorStyles.cabinet_door_style_id) return el.id === (tempDoorStyles === null || tempDoorStyles === void 0 ? void 0 : tempDoorStyles.cabinet_door_style_id);else if ((tempDoorStyles === null || tempDoorStyles === void 0 || (_tempDoorStyles$cds = tempDoorStyles.cds) === null || _tempDoorStyles$cds === void 0 ? void 0 : _tempDoorStyles$cds.length) > 0) return el.id === (tempDoorStyles === null || tempDoorStyles === void 0 || (_tempDoorStyles$cds$ = tempDoorStyles.cds[0]) === null || _tempDoorStyles$cds$ === void 0 ? void 0 : _tempDoorStyles$cds$.cabinet_door_style_id);
+    return false;
   });
   if (tPlaceholders !== undefined) {
     placeholders = tPlaceholders.placeholders;
@@ -655,10 +663,10 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
       vLine3.material.depthTest = false;
       // translate vector to center of object
       var uVec = new Three.Vector3(-posVec.x / scalevec.x, -posVec.y / scalevec.y, -posVec.z / scalevec.z);
-      vLine.translateY(0.1);
-      vLine1.translateY(0.1);
-      vLine2.translateY(0.1);
-      vLine3.translateY(0.1);
+      vLine.translateY(_boundingBox.min.y + 0.1);
+      vLine1.translateY(_boundingBox.min.y + 0.1);
+      vLine2.translateY(_boundingBox.min.y + 0.1);
+      vLine3.translateY(_boundingBox.min.y + 0.1);
 
       //rotObj.translateOnAxis(uVec, 1);
       upObj.translateOnAxis(uVec, 1);
@@ -1005,19 +1013,15 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
     object.receiveShadow = true;
     objGroup = object;
     if (!(0, _helper.isEmpty)(doorStyles)) {
+      var _layer$toJS;
       var normalMap = doorStyles.get('base') || INITIAL_NORMAL_MAP;
-      if (counterTop.uri === undefined) {
-        try {
-          counterTop = counterTop.toJS();
-        } catch (error) {
-          //@todo THIS IS A TEMPORARY FIX FOR COUNTERTOP TEXTURE UNDEFINED ISSUE
-          counterTop.uri = 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg';
-          console.log(error);
-        }
-      }
-      if (counterTop.uri === undefined && layer.toJS().counterTop.uri !== undefined) {
+      if ((0, _helper.isEmpty)(counterTop.uri) && !(0, _helper.isEmpty)(layer === null || layer === void 0 || (_layer$toJS = layer.toJS()) === null || _layer$toJS === void 0 ? void 0 : _layer$toJS.counterTop.uri)) {
         counterTop.uri = layer.toJS().counterTop.uri;
       }
+      if ((0, _helper.isEmpty)(counterTop.uri)) {
+        //@todo THIS IS A TEMPORARY FIX FOR COUNTERTOP TEXTURE UNDEFINED ISSUE
+        counterTop.uri = 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg';
+      }
       var countTopMap = counterTop.uri;
       var interiorMap = doorStyles.get('interior');
       var countT = loadTexture(countTopMap);

package/lib/class/hole.js

@@ -783,11 +783,9 @@ var Hole = exports["default"] = /*#__PURE__*/function () {
         scene: scene.mergeIn(['layers', layerID, 'holes', holeID], hole)
       });
       state = state.updateIn(['scene', 'layers', layerID, 'lines', hole.line, 'holes'], function (holes) {
-        console.log(holes, 'holes');
         var index = holes.findIndex(function (ID) {
           return holeID === ID;
         });
-        console.log(index, 'index');
         return index === -1 ? holes.push(holeID) : holes;
       });
       return {