kitchen-simulator 2.0.11 → 2.0.12

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 (7) hide show
  1. package/es/class/project.js +13 -4
  2. package/es/devLiteRenderer.js +5 -3
  3. package/es/utils/isolate-event-handler.js +14 -4
  4. package/lib/class/project.js +13 -4
  5. package/lib/devLiteRenderer.js +5 -3
  6. package/lib/utils/isolate-event-handler.js +14 -4
  7. package/package.json +1 -1
package/es/class/project.js CHANGED
@@ -58,6 +58,7 @@ var Project = /*#__PURE__*/function () {
58
58
  }, {
59
59
  key: "loadProject",
60
60
  value: function loadProject(state, sceneJSON) {
61
+ var _sceneJSON$layers$lay;
61
62
  var doorStyle = state.doorStyle;
62
63
  var layerID = state.scene.selectedLayer;
63
64
  var _viewer2D = state.viewer2D;
@@ -90,6 +91,14 @@ var Project = /*#__PURE__*/function () {
90
91
  for (var x in json_items) {
91
92
  _loop(x);
92
93
  }
94
+
95
+ // making layer's doorStyle when changing room shape
96
+ 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)) {
97
+ var newlayer = _objectSpread(_objectSpread({}, sceneJSON === null || sceneJSON === void 0 ? void 0 : sceneJSON.layers[layerID]), {}, {
98
+ doorStyle: doorStyle.toJS()
99
+ });
100
+ sceneJSON && (sceneJSON.layers[layerID] = newlayer);
101
+ }
93
102
  var newScene = new Scene(sceneJSON);
94
103
  state = new State({
95
104
  scene: newScene.toJS(),
@@ -151,10 +160,10 @@ var Project = /*#__PURE__*/function () {
151
160
  f: f
152
161
  });
153
162
  }
154
- if (!doorStyle) {
155
- if (state.getIn(['scene', 'layers', layerID, 'doorStyle'])) {
156
- doorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
157
- }
163
+
164
+ // Matching state.doorStyle with layer.doorStyle
165
+ if (state.getIn(['scene', 'layers', layerID, 'doorStyle'])) {
166
+ doorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
158
167
  }
159
168
  state = state.merge({
160
169
  doorStyle: doorStyle,
package/es/devLiteRenderer.js CHANGED
@@ -58,9 +58,7 @@ function WorkSpace(props) {
58
58
  var evt = {
59
59
  type: EXTERNAL_EVENT_SET_INITIAL_DATA,
60
60
  payload: {
61
- doorStyle: {
62
- doorStyle: doorStylePaylod2
63
- }
61
+ doorStyle: doorStylePaylod2
64
62
  }
65
63
  };
66
64
  setExternalEvent(evt);
@@ -319,6 +317,10 @@ function WorkSpace(props) {
319
317
  oldDistance: 0,
320
318
  newDistance: 10
321
319
  }
320
+ },
321
+ callback: function callback(updatedAttributeForm) {
322
+ console.log(updatedAttributeForm);
323
+ // Do something here with new attributes
322
324
  }
323
325
  };
324
326
  setExternalEvent(evt);
package/es/utils/isolate-event-handler.js CHANGED
@@ -675,6 +675,8 @@ function initPropData(element, catalog) {
675
675
  return new Map(mapped);
676
676
  }
677
677
  function updateAttributeOfSelectedElement(element, attrPayload, state, layer, projectActions) {
678
+ var _attributesFormData;
679
+ var callback = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
678
680
  var attributesFormData = initAttrData(element, layer, state);
679
681
  var value = attrPayload.value;
680
682
  var attributeName = attrPayload.attributeName;
@@ -874,10 +876,15 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, pr
874
876
  break;
875
877
  }
876
878
  }
879
+
880
+ // invoke callback
881
+ if (callback) callback((_attributesFormData = attributesFormData) === null || _attributesFormData === void 0 ? void 0 : _attributesFormData.toJS());
877
882
  }
878
883
  function updatePropertyOfSelectedElement(element, propertyPayload, catalog,
879
884
  // class instance of Catalog, get from props
880
885
  projectActions) {
886
+ var _propertiesFormData;
887
+ var callback = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
881
888
  var propertiesFormData = initPropData(element, catalog);
882
889
  var value = propertyPayload.value;
883
890
  var propertyName = propertyPayload.propertyName;
@@ -895,6 +902,9 @@ projectActions) {
895
902
  });
896
903
  projectActions.setProperties(properties);
897
904
  }
905
+
906
+ // invoke callback
907
+ if (callback) callback((_propertiesFormData = propertiesFormData) === null || _propertiesFormData === void 0 ? void 0 : _propertiesFormData.toJS());
898
908
  }
899
909
  function getElement(objProps, state) {
900
910
  var layerID = state.scene.selectedLayer;
@@ -1105,7 +1115,7 @@ function _handleExternalEvent() {
1105
1115
  return _context8.abrupt("continue", 34);
1106
1116
  case 21:
1107
1117
  _doorStyle = evt.payload.doorStyle;
1108
- props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
1118
+ props.itemsActions.setInitialDoorStyle(_doorStyle);
1109
1119
  return _context8.abrupt("continue", 34);
1110
1120
  case 22:
1111
1121
  props.projectActions.loadProject(evt.payload);
@@ -1190,9 +1200,9 @@ function _handleExternalEvent() {
1190
1200
  layerId = state.getIn(['scene', 'selectedLayer']);
1191
1201
  _layer = state.getIn(['scene', 'layers', layerId]);
1192
1202
  _layer$getIn = _layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
1193
- for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, _layer, props.projectActions) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions);
1194
- for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, _layer, props.projectActions) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions);
1195
- for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, _layer, props.projectActions) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions);
1203
+ for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions, evt.callback);
1204
+ for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions, evt.callback);
1205
+ for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
1196
1206
  return _context8.abrupt("continue", 34);
1197
1207
  case 33:
1198
1208
  // send scene object from 3DTool to HostApp using internalEvent
package/lib/class/project.js CHANGED
@@ -67,6 +67,7 @@ var Project = exports["default"] = /*#__PURE__*/function () {
67
67
  }, {
68
68
  key: "loadProject",
69
69
  value: function loadProject(state, sceneJSON) {
70
+ var _sceneJSON$layers$lay;
70
71
  var doorStyle = state.doorStyle;
71
72
  var layerID = state.scene.selectedLayer;
72
73
  var _viewer2D = state.viewer2D;
@@ -99,6 +100,14 @@ var Project = exports["default"] = /*#__PURE__*/function () {
99
100
  for (var x in json_items) {
100
101
  _loop(x);
101
102
  }
103
+
104
+ // making layer's doorStyle when changing room shape
105
+ 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)) {
106
+ var newlayer = _objectSpread(_objectSpread({}, sceneJSON === null || sceneJSON === void 0 ? void 0 : sceneJSON.layers[layerID]), {}, {
107
+ doorStyle: doorStyle.toJS()
108
+ });
109
+ sceneJSON && (sceneJSON.layers[layerID] = newlayer);
110
+ }
102
111
  var newScene = new _models.Scene(sceneJSON);
103
112
  state = new _models.State({
104
113
  scene: newScene.toJS(),
@@ -160,10 +169,10 @@ var Project = exports["default"] = /*#__PURE__*/function () {
160
169
  f: f
161
170
  });
162
171
  }
163
- if (!doorStyle) {
164
- if (state.getIn(['scene', 'layers', layerID, 'doorStyle'])) {
165
- doorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
166
- }
172
+
173
+ // Matching state.doorStyle with layer.doorStyle
174
+ if (state.getIn(['scene', 'layers', layerID, 'doorStyle'])) {
175
+ doorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
167
176
  }
168
177
  state = state.merge({
169
178
  doorStyle: doorStyle,
package/lib/devLiteRenderer.js CHANGED
@@ -62,9 +62,7 @@ function WorkSpace(props) {
62
62
  var evt = {
63
63
  type: _constants.EXTERNAL_EVENT_SET_INITIAL_DATA,
64
64
  payload: {
65
- doorStyle: {
66
- doorStyle: _doorStylePayload["default"]
67
- }
65
+ doorStyle: _doorStylePayload["default"]
68
66
  }
69
67
  };
70
68
  setExternalEvent(evt);
@@ -323,6 +321,10 @@ function WorkSpace(props) {
323
321
  oldDistance: 0,
324
322
  newDistance: 10
325
323
  }
324
+ },
325
+ callback: function callback(updatedAttributeForm) {
326
+ console.log(updatedAttributeForm);
327
+ // Do something here with new attributes
326
328
  }
327
329
  };
328
330
  setExternalEvent(evt);
package/lib/utils/isolate-event-handler.js CHANGED
@@ -682,6 +682,8 @@ function initPropData(element, catalog) {
682
682
  return new _immutable.Map(mapped);
683
683
  }
684
684
  function updateAttributeOfSelectedElement(element, attrPayload, state, layer, projectActions) {
685
+ var _attributesFormData;
686
+ var callback = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
685
687
  var attributesFormData = initAttrData(element, layer, state);
686
688
  var value = attrPayload.value;
687
689
  var attributeName = attrPayload.attributeName;
@@ -881,10 +883,15 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, pr
881
883
  break;
882
884
  }
883
885
  }
886
+
887
+ // invoke callback
888
+ if (callback) callback((_attributesFormData = attributesFormData) === null || _attributesFormData === void 0 ? void 0 : _attributesFormData.toJS());
884
889
  }
885
890
  function updatePropertyOfSelectedElement(element, propertyPayload, catalog,
886
891
  // class instance of Catalog, get from props
887
892
  projectActions) {
893
+ var _propertiesFormData;
894
+ var callback = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
888
895
  var propertiesFormData = initPropData(element, catalog);
889
896
  var value = propertyPayload.value;
890
897
  var propertyName = propertyPayload.propertyName;
@@ -902,6 +909,9 @@ projectActions) {
902
909
  });
903
910
  projectActions.setProperties(properties);
904
911
  }
912
+
913
+ // invoke callback
914
+ if (callback) callback((_propertiesFormData = propertiesFormData) === null || _propertiesFormData === void 0 ? void 0 : _propertiesFormData.toJS());
905
915
  }
906
916
  function getElement(objProps, state) {
907
917
  var layerID = state.scene.selectedLayer;
@@ -1112,7 +1122,7 @@ function _handleExternalEvent() {
1112
1122
  return _context8.abrupt("continue", 34);
1113
1123
  case 21:
1114
1124
  _doorStyle = evt.payload.doorStyle;
1115
- props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
1125
+ props.itemsActions.setInitialDoorStyle(_doorStyle);
1116
1126
  return _context8.abrupt("continue", 34);
1117
1127
  case 22:
1118
1128
  props.projectActions.loadProject(evt.payload);
@@ -1197,9 +1207,9 @@ function _handleExternalEvent() {
1197
1207
  layerId = state.getIn(['scene', 'selectedLayer']);
1198
1208
  _layer = state.getIn(['scene', 'layers', layerId]);
1199
1209
  _layer$getIn = _layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
1200
- for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, _layer, props.projectActions) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions);
1201
- for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, _layer, props.projectActions) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions);
1202
- for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, _layer, props.projectActions) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions);
1210
+ for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions, evt.callback);
1211
+ for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions, evt.callback);
1212
+ for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
1203
1213
  return _context8.abrupt("continue", 34);
1204
1214
  case 33:
1205
1215
  // send scene object from 3DTool to HostApp using internalEvent
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kitchen-simulator",
3
- "version": "2.0.11",
3
+ "version": "2.0.12",
4
4
  "description": "It is a kitchen simulator (self-contained micro-frontend).",
5
5
  "license": "MIT",
6
6
  "main": "lib/index.js",