kitchen-simulator 2.0.44 → 2.0.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/class/item.js +2 -2
  2. package/es/class/project.js +9 -7
  3. package/lib/class/item.js +2 -2
  4. package/lib/class/project.js +9 -7
  5. package/package.json +1 -1
package/es/class/item.js CHANGED
@@ -1098,11 +1098,12 @@ var Item = /*#__PURE__*/function () {
1098
1098
  state = state.merge({
1099
1099
  doorStyle: doorStyle
1100
1100
  });
1101
- console.log('doorStyle =>', doorStyle);
1102
1101
  var _state8 = state,
1103
1102
  scene = _state8.scene;
1104
1103
  var layerID = scene.get('selectedLayer');
1105
1104
  var layers = scene.layers.get(layerID);
1105
+ layers.mergeIn(['doorStyle'], fromJS(doorStyle));
1106
+ console.log('state =>', state.toJS());
1106
1107
  var items = layers.items;
1107
1108
  items.forEach(function (data) {
1108
1109
  {
@@ -1119,7 +1120,6 @@ var Item = /*#__PURE__*/function () {
1119
1120
  });
1120
1121
  }
1121
1122
  });
1122
- console.log('state =>', state.toJS());
1123
1123
  return {
1124
1124
  updatedState: state
1125
1125
  };
package/es/class/project.js CHANGED
@@ -59,7 +59,6 @@ var Project = /*#__PURE__*/function () {
59
59
  }, {
60
60
  key: "loadProject",
61
61
  value: function loadProject(state, sceneJSON) {
62
- var _sceneJSON$layers$lay;
63
62
  var doorStyle = state.doorStyle;
64
63
  var layerID = state.scene.selectedLayer;
65
64
  var _viewer2D = state.viewer2D;
@@ -94,12 +93,15 @@ var Project = /*#__PURE__*/function () {
94
93
  }
95
94
 
96
95
  // making layer's doorStyle when changing room shape
97
- if (isEmpty(sceneJSON === null || sceneJSON === void 0 || (_sceneJSON$layers$lay = sceneJSON.layers[layerID]) === null || _sceneJSON$layers$lay === void 0 ? void 0 : _sceneJSON$layers$lay.doorStyle)) {
98
- var newlayer = _objectSpread(_objectSpread({}, sceneJSON === null || sceneJSON === void 0 ? void 0 : sceneJSON.layers[layerID]), {}, {
99
- doorStyle: doorStyle.toJS()
100
- });
101
- sceneJSON && (sceneJSON.layers[layerID] = newlayer);
102
- }
96
+ // THIS LOGIC WAS MOVED TO SET INITIAL DOOR STYLE
97
+ // if (isEmpty(sceneJSON?.layers[layerID]?.doorStyle)) {
98
+ // let newlayer = {
99
+ // ...sceneJSON?.layers[layerID],
100
+ // doorStyle: doorStyle.toJS()
101
+ // };
102
+ // sceneJSON && (sceneJSON.layers[layerID] = newlayer);
103
+ // }
104
+
103
105
  var newScene = new Scene(sceneJSON);
104
106
  state = new State({
105
107
  scene: newScene.toJS(),
package/lib/class/item.js CHANGED
@@ -1105,11 +1105,12 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1105
1105
  state = state.merge({
1106
1106
  doorStyle: doorStyle
1107
1107
  });
1108
- console.log('doorStyle =>', doorStyle);
1109
1108
  var _state8 = state,
1110
1109
  scene = _state8.scene;
1111
1110
  var layerID = scene.get('selectedLayer');
1112
1111
  var layers = scene.layers.get(layerID);
1112
+ layers.mergeIn(['doorStyle'], (0, _immutable.fromJS)(doorStyle));
1113
+ console.log('state =>', state.toJS());
1113
1114
  var items = layers.items;
1114
1115
  items.forEach(function (data) {
1115
1116
  {
@@ -1126,7 +1127,6 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1126
1127
  });
1127
1128
  }
1128
1129
  });
1129
- console.log('state =>', state.toJS());
1130
1130
  return {
1131
1131
  updatedState: state
1132
1132
  };
package/lib/class/project.js CHANGED
@@ -68,7 +68,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
68
68
  }, {
69
69
  key: "loadProject",
70
70
  value: function loadProject(state, sceneJSON) {
71
- var _sceneJSON$layers$lay;
72
71
  var doorStyle = state.doorStyle;
73
72
  var layerID = state.scene.selectedLayer;
74
73
  var _viewer2D = state.viewer2D;
@@ -103,12 +102,15 @@ var Project = exports["default"] = /*#__PURE__*/function () {
103
102
  }
104
103
 
105
104
  // making layer's doorStyle when changing room shape
106
- if ((0, _helper.isEmpty)(sceneJSON === null || sceneJSON === void 0 || (_sceneJSON$layers$lay = sceneJSON.layers[layerID]) === null || _sceneJSON$layers$lay === void 0 ? void 0 : _sceneJSON$layers$lay.doorStyle)) {
107
- var newlayer = _objectSpread(_objectSpread({}, sceneJSON === null || sceneJSON === void 0 ? void 0 : sceneJSON.layers[layerID]), {}, {
108
- doorStyle: doorStyle.toJS()
109
- });
110
- sceneJSON && (sceneJSON.layers[layerID] = newlayer);
111
- }
105
+ // THIS LOGIC WAS MOVED TO SET INITIAL DOOR STYLE
106
+ // if (isEmpty(sceneJSON?.layers[layerID]?.doorStyle)) {
107
+ // let newlayer = {
108
+ // ...sceneJSON?.layers[layerID],
109
+ // doorStyle: doorStyle.toJS()
110
+ // };
111
+ // sceneJSON && (sceneJSON.layers[layerID] = newlayer);
112
+ // }
113
+
112
114
  var newScene = new _models.Scene(sceneJSON);
113
115
  state = new _models.State({
114
116
  scene: newScene.toJS(),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kitchen-simulator",
3
- "version": "2.0.44",
3
+ "version": "2.0.46",
4
4
  "description": "It is a kitchen simulator (self-contained micro-frontend).",
5
5
  "license": "MIT",
6
6
  "main": "lib/index.js",