kitchen-simulator 1.0.0-alin.51 → 1.0.0-alin.52

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 (19) hide show
  1. package/es/LiteRenderer.js +0 -1
  2. package/es/actions/items-actions.js +4 -4
  3. package/es/catalog/utils/exporter.js +3 -1
  4. package/es/class/item.js +57 -120
  5. package/es/class/project.js +0 -4
  6. package/es/devLiteRenderer.js +7 -6
  7. package/es/models.js +2 -1
  8. package/es/reducers/items-reducer.js +3 -3
  9. package/es/utils/isolate-event-handler.js +4 -6
  10. package/lib/LiteRenderer.js +0 -1
  11. package/lib/actions/items-actions.js +4 -4
  12. package/lib/catalog/utils/exporter.js +3 -1
  13. package/lib/class/item.js +57 -120
  14. package/lib/class/project.js +0 -4
  15. package/lib/devLiteRenderer.js +7 -6
  16. package/lib/models.js +2 -1
  17. package/lib/reducers/items-reducer.js +3 -3
  18. package/lib/utils/isolate-event-handler.js +4 -6
  19. package/package.json +1 -1
package/es/LiteRenderer.js CHANGED
@@ -33,7 +33,6 @@ import { render2DItem, render3DApplianceItem, render3DItem, render3DLightingItem
33
33
  import { ConsoleDebugger, Keyboard } from "./plugins/export";
34
34
  import { Map } from 'immutable';
35
35
  import * as Sentry from '@sentry/react';
36
- import { initCatalog, loadProject, rename } from "./actions/project-actions";
37
36
  import exporter from "./catalog/utils/exporter";
38
37
  import * as THREE from 'three';
39
38
  import LiteKitchenConfigurator from "./LiteKitchenConfigurator";
package/es/actions/items-actions.js CHANGED
@@ -223,10 +223,11 @@ export function updateItemsAltitude(layerID, itemID, value) {
223
223
  value: value
224
224
  };
225
225
  }
226
- export function setDoorStyle(doorStyle, isAll) {
226
+ export function setDoorStyle(doorStyle, itemCDS, isAll) {
227
227
  return {
228
228
  type: SET_DOOR_STYLE,
229
229
  doorStyle: doorStyle,
230
+ itemCDS: itemCDS,
230
231
  isAll: isAll
231
232
  };
232
233
  }
@@ -291,11 +292,10 @@ export function setModelling(model) {
291
292
  model: model
292
293
  };
293
294
  }
294
- export function setInitialDoorStyle(doorStyle, oStyle) {
295
+ export function setInitialDoorStyle(doorStyle) {
295
296
  return {
296
297
  type: SET_INITIAL_DOOR_STYLE,
297
- doorStyle: doorStyle,
298
- oStyle: oStyle
298
+ doorStyle: doorStyle
299
299
  };
300
300
  }
301
301
  export function setMoveStatus(status) {
package/es/catalog/utils/exporter.js CHANGED
@@ -19,7 +19,8 @@ export default function (_ref) {
19
19
  is_corner = _ref.is_corner,
20
20
  alti = _ref.alti,
21
21
  obj_property = _ref.obj_property,
22
- outlineSVGData = _ref.outlineSVGData;
22
+ outlineSVGData = _ref.outlineSVGData,
23
+ cds = _ref.cds;
23
24
  var _length = alti || 0;
24
25
  // const length = convert(_length).from("in").to("cm");
25
26
  var length = _length;
@@ -134,6 +135,7 @@ export default function (_ref) {
134
135
  }),
135
136
  img: base,
136
137
  obj: obj_property,
138
+ cds: cds,
137
139
  render2D: function render2D(element, layer, scene) {
138
140
  return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
139
141
  },
package/es/class/item.js CHANGED
@@ -48,65 +48,19 @@ var Item = /*#__PURE__*/function () {
48
48
  isDuplication: isDuplication
49
49
  }, null, state);
50
50
  if (item.category === 'cabinet') {
51
+ var _state$doorStyle;
51
52
  var layer = state.getIn(['scene', 'layers', layerID]);
52
- if (state.doorStyle !== null && state.doorStyle !== undefined) {
53
- var _state$doorStyle, _temp$doorStyles;
54
- var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
55
- var cds = temp === null || temp === void 0 || (_temp$doorStyles = temp.doorStyles) === null || _temp$doorStyles === void 0 || (_temp$doorStyles = _temp$doorStyles.cds) === null || _temp$doorStyles === void 0 ? void 0 : _temp$doorStyles.find(function (elem) {
56
- return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
53
+ var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
54
+ var cds = state.catalog.getIn(['elements', type, 'cds']);
55
+ if (cds) {
56
+ var updatedDoorStyles = _objectSpread(_objectSpread({}, temp.doorStyles), {}, {
57
+ cds: [cds]
58
+ });
59
+ item = item.merge({
60
+ doorStyle: fromJS(_objectSpread(_objectSpread({}, temp), {}, {
61
+ doorStyles: updatedDoorStyles
62
+ }))
57
63
  });
58
- if (cds) {
59
- var updatedDoorStyles = _objectSpread(_objectSpread(_objectSpread({}, temp.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
60
- cabinet_door_style_id: cds.cabinet_door_style_id
61
- });
62
- item = item.merge({
63
- doorStyle: fromJS(_objectSpread(_objectSpread({}, temp), {}, {
64
- doorStyles: updatedDoorStyles
65
- }))
66
- });
67
- } else {
68
- var _state$oStyle;
69
- var styleObj = (_state$oStyle = state.oStyle) === null || _state$oStyle === void 0 || (_state$oStyle = _state$oStyle.toJS()) === null || _state$oStyle === void 0 ? void 0 : _state$oStyle.oStyle;
70
- if (styleObj) {
71
- for (var _x in styleObj) {
72
- cds = styleObj[_x].data.doorStyles.cds.find(function (elem) {
73
- return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
74
- });
75
- if (cds) {
76
- var tmpDS = styleObj[_x].data;
77
- tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, tmpDS.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
78
- cabinet_door_style_id: cds.cabinet_door_style_id
79
- });
80
- item = item.merge({
81
- doorStyle: fromJS(tmpDS)
82
- });
83
- break;
84
- }
85
- }
86
- }
87
- }
88
- } else {
89
- var _state$oStyle2;
90
- var _styleObj = (_state$oStyle2 = state.oStyle) === null || _state$oStyle2 === void 0 || (_state$oStyle2 = _state$oStyle2.toJS()) === null || _state$oStyle2 === void 0 ? void 0 : _state$oStyle2.oStyle;
91
- if (_styleObj) {
92
- for (var _x2 in _styleObj) {
93
- var _styleObj$_x;
94
- var _cds = (_styleObj$_x = _styleObj[_x2]) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.data) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.doorStyles) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.cds) === null || _styleObj$_x === void 0 ? void 0 : _styleObj$_x.find(function (elem) {
95
- return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
96
- });
97
- if (_cds) {
98
- var _styleObj$_x2;
99
- var _tmpDS = (_styleObj$_x2 = _styleObj[_x2]) === null || _styleObj$_x2 === void 0 ? void 0 : _styleObj$_x2.data;
100
- _tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, _tmpDS.doorStyles), _cds.data && _cds.data[0] ? _cds.data[0] : {}), {}, {
101
- cabinet_door_style_id: _cds.cabinet_door_style_id
102
- });
103
- item = item.merge({
104
- doorStyle: fromJS(_tmpDS)
105
- });
106
- break;
107
- }
108
- }
109
- }
110
64
  }
111
65
  }
112
66
  if (item.get('type') === 'cabinet' && item.get('doorStyle').size === 0) {
@@ -116,15 +70,11 @@ var Item = /*#__PURE__*/function () {
116
70
  };
117
71
  }
118
72
  var setSizeOfItemByDoorStyle = function setSizeOfItemByDoorStyle() {
119
- var _doorStyle$doorStyles, _cds$data;
120
73
  var doorStyle = item.get('doorStyle').toJS();
121
- var cds = doorStyle === null || doorStyle === void 0 || (_doorStyle$doorStyles = doorStyle.doorStyles) === null || _doorStyle$doorStyles === void 0 || (_doorStyle$doorStyles = _doorStyle$doorStyles.cds) === null || _doorStyle$doorStyles === void 0 ? void 0 : _doorStyle$doorStyles.find(function (elem) {
122
- return elem.itemID === item.itemID;
123
- });
124
- var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
74
+ var euroCDS = state.catalog.getIn(['elements', type, 'cds']).data.filter(function (element) {
125
75
  return element && element.is_euro_cds;
126
- })) || [];
127
- if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
76
+ });
77
+ if (doorStyle.door_style_name === 'Euro & Frameless' && euroCDS.length > 0) {
128
78
  var newProperties = item.get('properties').toJS();
129
79
  if (newProperties.hasOwnProperty('depth')) {
130
80
  if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -135,8 +85,8 @@ var Item = /*#__PURE__*/function () {
135
85
  });
136
86
  }
137
87
  newProperties['depth'] = new Map({
138
- length: convert(euro_cds[0].euro_length).from('in').to('cm'),
139
- _length: euro_cds[0].euro_length,
88
+ length: convert(euroCDS[0].euro_length).from('in').to('cm'),
89
+ _length: euroCDS[0].euro_length,
140
90
  _unit: 'in'
141
91
  });
142
92
  }
@@ -149,8 +99,8 @@ var Item = /*#__PURE__*/function () {
149
99
  });
150
100
  }
151
101
  newProperties['height'] = new Map({
152
- length: convert(euro_cds[0].euro_height).from('in').to('cm'),
153
- _length: euro_cds[0].euro_height,
102
+ length: convert(euroCDS[0].euro_height).from('in').to('cm'),
103
+ _length: euroCDS[0].euro_height,
154
104
  _unit: 'in'
155
105
  });
156
106
  }
@@ -163,8 +113,8 @@ var Item = /*#__PURE__*/function () {
163
113
  });
164
114
  }
165
115
  newProperties['width'] = new Map({
166
- length: convert(euro_cds[0].euro_width).from('in').to('cm') - 10,
167
- _length: euro_cds[0].euro_width,
116
+ length: convert(euroCDS[0].euro_width).from('in').to('cm') - 10,
117
+ _length: euroCDS[0].euro_width,
168
118
  _unit: 'in'
169
119
  });
170
120
  }
@@ -1123,48 +1073,37 @@ var Item = /*#__PURE__*/function () {
1123
1073
  }
1124
1074
  }, {
1125
1075
  key: "setInitialDoorStyle",
1126
- value: function setInitialDoorStyle(state, doorStyle, oStyle) {
1127
- if (doorStyle === undefined) {
1128
- state = state.merge({
1129
- oStyle: new Map({
1130
- oStyle: oStyle
1131
- })
1132
- });
1133
- } else {
1134
- state = state.merge({
1135
- doorStyle: doorStyle,
1136
- oStyle: new Map({
1137
- oStyle: oStyle
1138
- })
1139
- });
1140
- var _state8 = state,
1141
- scene = _state8.scene;
1142
- var layerID = scene.get('selectedLayer');
1143
- var layers = scene.layers.get(layerID);
1144
- var items = layers.items;
1145
- items.forEach(function (data) {
1146
- {
1147
- var itemID = data.id;
1148
- var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
1149
- doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
1150
- counttop: doorStyle.doorStyles.counttop
1151
- })
1152
- });
1153
- data = data.mergeIn(['doorStyle'], fromJS(tmpDS));
1154
- layers = layers.mergeIn(['items', itemID], data);
1155
- state = state.merge({
1156
- scene: scene.mergeIn(['layers', layerID], layers)
1157
- });
1158
- }
1159
- });
1160
- }
1076
+ value: function setInitialDoorStyle(state, doorStyle) {
1077
+ state = state.merge({
1078
+ doorStyle: doorStyle
1079
+ });
1080
+ var _state8 = state,
1081
+ scene = _state8.scene;
1082
+ var layerID = scene.get('selectedLayer');
1083
+ var layers = scene.layers.get(layerID);
1084
+ var items = layers.items;
1085
+ items.forEach(function (data) {
1086
+ {
1087
+ var itemID = data.id;
1088
+ var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
1089
+ doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
1090
+ counttop: doorStyle.doorStyles.counttop
1091
+ })
1092
+ });
1093
+ data = data.mergeIn(['doorStyle'], fromJS(tmpDS));
1094
+ layers = layers.mergeIn(['items', itemID], data);
1095
+ state = state.merge({
1096
+ scene: scene.mergeIn(['layers', layerID], layers)
1097
+ });
1098
+ }
1099
+ });
1161
1100
  return {
1162
1101
  updatedState: state
1163
1102
  };
1164
1103
  }
1165
1104
  }, {
1166
1105
  key: "setDoorStyle",
1167
- value: function setDoorStyle(state, doorStyle, isAll) {
1106
+ value: function setDoorStyle(state, doorStyle, itemCDS, isAll) {
1168
1107
  var _this2 = this;
1169
1108
  var keys = Object.keys(doorStyle.doorStyles);
1170
1109
  keys = keys.filter(function (elem) {
@@ -1181,14 +1120,14 @@ var Item = /*#__PURE__*/function () {
1181
1120
  var layerID = state.scene.get('selectedLayer');
1182
1121
  var temp_layer_molding = state.scene.getIn(['layers', layerID, 'molding']);
1183
1122
  temp_layer_molding = temp_layer_molding.filter(function (md) {
1184
- return doorStyle.doorStyles.cds.some(function (ds) {
1123
+ return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
1185
1124
  return md.itemID === ds.itemID;
1186
1125
  });
1187
1126
  });
1188
1127
  state = state.setIn(['scene', 'layers', layerID, 'molding'], temp_layer_molding);
1189
1128
  var itemIDs = state.scene.layers.getIn([layerID, 'selected', 'items']).toJS();
1190
1129
  var setDoorStyleOfItem = function setDoorStyleOfItem(data) {
1191
- var _cds$data2;
1130
+ var _cds$data;
1192
1131
  if (data.category !== 'cabinet') return; //CDS should effect to cabinets
1193
1132
  var itemID = data.id;
1194
1133
  var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
@@ -1196,7 +1135,7 @@ var Item = /*#__PURE__*/function () {
1196
1135
  var tmpMolding = _toConsumableArray(curItem.molding);
1197
1136
  var temp_item_molding = _toConsumableArray(curItem.molding);
1198
1137
  temp_item_molding = temp_item_molding.filter(function (md) {
1199
- return doorStyle.doorStyles.cds.some(function (ds) {
1138
+ return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
1200
1139
  return ds.itemID === md.itemID;
1201
1140
  });
1202
1141
  });
@@ -1206,17 +1145,16 @@ var Item = /*#__PURE__*/function () {
1206
1145
  state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
1207
1146
  });
1208
1147
  });
1209
- var cds = doorStyle.doorStyles.cds.find(function (elem) {
1148
+ var cds = itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.find(function (elem) {
1210
1149
  return elem.itemID === data.itemID;
1211
1150
  });
1212
- var euro_cds = (cds === null || cds === void 0 || (_cds$data2 = cds.data) === null || _cds$data2 === void 0 ? void 0 : _cds$data2.filter(function (element) {
1151
+ var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
1213
1152
  return element && element.is_euro_cds;
1214
1153
  })) || [];
1215
- var cds_data;
1216
- if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
1217
- cds_data = cds ? _objectSpread(_objectSpread({}, euro_cds[0]), {}, {
1218
- cabinet_door_style_id: cds.cabinet_door_style_id
1219
- }) : {};
1154
+ var cds_data = cds ? [cds] : [];
1155
+ if (
1156
+ // doorStyle.door_style_name === 'Euro & Frameless' &&
1157
+ euro_cds.length > 0) {
1220
1158
  var newProperties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
1221
1159
  if (newProperties.hasOwnProperty('depth')) {
1222
1160
  if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -1262,9 +1200,6 @@ var Item = /*#__PURE__*/function () {
1262
1200
  }
1263
1201
  state = _this2.setJsProperties(state, layerID, itemID, newProperties).updatedState;
1264
1202
  } else {
1265
- cds_data = cds ? _objectSpread(_objectSpread({}, cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
1266
- cabinet_door_style_id: cds.cabinet_door_style_id
1267
- }) : {};
1268
1203
  var properties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
1269
1204
  if (properties.hasOwnProperty('oldDepth')) {
1270
1205
  properties['depth'] = new Map({
@@ -1303,7 +1238,9 @@ var Item = /*#__PURE__*/function () {
1303
1238
  color_sku_alias: doorStyle.color_sku_alias,
1304
1239
  // alias name of color_sku for the current dealer
1305
1240
  install: getInstallationSuffix(INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
1306
- doorStyles: _objectSpread(_objectSpread({}, tmp), cds_data)
1241
+ doorStyles: _objectSpread(_objectSpread({}, tmp), {}, {
1242
+ cds: cds_data
1243
+ })
1307
1244
  };
1308
1245
  state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], fromJS(tmpDS));
1309
1246
  };
package/es/class/project.js CHANGED
@@ -34,7 +34,6 @@ var Project = /*#__PURE__*/function () {
34
34
  key: "newProject",
35
35
  value: function newProject(state) {
36
36
  var doorStyle = state.toJS().doorStyle === null ? null : state.toJS().doorStyle;
37
- var oStyle = state.oStyle;
38
37
  // let counterTop = state.getIn(['scene', 'layers', layerID, 'counterTop']);
39
38
  // let floorStyle = state.getIn(['scene', 'layers', layerID, 'floorStyle']);
40
39
  var _viewer2D = state.viewer2D;
@@ -48,7 +47,6 @@ var Project = /*#__PURE__*/function () {
48
47
  state = new State({});
49
48
  state = state.merge({
50
49
  doorStyle: doorStyle,
51
- oStyle: oStyle,
52
50
  viewer2D: _viewer2D
53
51
  });
54
52
  // state = Item.setCounterTop(state, counterTop).updatedState;
@@ -61,7 +59,6 @@ var Project = /*#__PURE__*/function () {
61
59
  key: "loadProject",
62
60
  value: function loadProject(state, sceneJSON, categoryData) {
63
61
  var doorStyle = state.doorStyle;
64
- var oStyle = state.oStyle;
65
62
  var layerID = state.scene.selectedLayer;
66
63
  var _viewer2D = state.viewer2D;
67
64
  var viewer = state.viewer2D.toJS();
@@ -161,7 +158,6 @@ var Project = /*#__PURE__*/function () {
161
158
  }
162
159
  state = state.merge({
163
160
  doorStyle: doorStyle,
164
- oStyle: oStyle,
165
161
  viewer2D: _viewer2D
166
162
  });
167
163
  state = Item.setCounterTop(state, counterTop).updatedState;
package/es/devLiteRenderer.js CHANGED
@@ -3,10 +3,11 @@ import React, { useState, useEffect } from 'react';
3
3
  import ContainerDimensions from 'react-container-dimensions';
4
4
  import mockProps from "./mocks/mockProps.json";
5
5
  import mockCategoryData from "./mocks/categoryData.json";
6
- import mockDataBundle from "./mocks/dataBundle.json";
7
- import cabinetPaylod from "./mocks/cabinetPayload.json";
6
+ import mockDataBundle from "./mocks/dataBundle2.json";
7
+ import cabinetPaylod from "./mocks/cabinetPayload2.json";
8
8
  import doorStylePaylod from "./mocks/doorStylePayload.json";
9
- import oStylePaylod from "./mocks/oStylePayload.json";
9
+ import doorStylePaylod2 from "./mocks/doorStylePayload2.json";
10
+ import itemCDSPayload from "./mocks/itemCDSPayload.json";
10
11
  import rectangleData from "./mocks/rectangleShape.json";
11
12
  import ReactDOM from 'react-dom';
12
13
  import LiteRenderer from "./LiteRenderer";
@@ -30,8 +31,7 @@ function WorkSpace(props) {
30
31
  type: EXTERNAL_EVENT_SET_INITIAL_DATA,
31
32
  payload: {
32
33
  doorStyle: {
33
- doorStyle: doorStylePaylod,
34
- oStyle: oStylePaylod
34
+ doorStyle: doorStylePaylod
35
35
  }
36
36
  }
37
37
  };
@@ -177,7 +177,8 @@ function WorkSpace(props) {
177
177
  var evt = {
178
178
  type: EXTERNAL_EVENT_CHANGE_DOORSTYLE,
179
179
  payload: {
180
- doorStyle: doorStylePaylod,
180
+ doorStyle: doorStylePaylod2,
181
+ itemCDS: itemCDSPayload,
181
182
  isAll: true
182
183
  }
183
184
  };
package/es/models.js CHANGED
@@ -338,7 +338,8 @@ export var CatalogElement = /*#__PURE__*/function (_Record1) {
338
338
  info: new Map(),
339
339
  properties: new Map(),
340
340
  obj: new Map(),
341
- type: ''
341
+ type: '',
342
+ cds: new Map()
342
343
  }, 'CatalogElement'));
343
344
  export var Catalog = /*#__PURE__*/function (_Record10) {
344
345
  function Catalog() {
package/es/reducers/items-reducer.js CHANGED
@@ -28,7 +28,7 @@ export default function (state, action) {
28
28
  state = state.merge({
29
29
  sceneHistory: history.historyPush(state.sceneHistory, state.scene)
30
30
  });
31
- return Item.selectToolDrawingItem(state, action.sceneComponentType, action.oStyle).updatedState;
31
+ return Item.selectToolDrawingItem(state, action.sceneComponentType).updatedState;
32
32
  case REPLACE_ITEM:
33
33
  return Item.replaceItem(state, action.selectedPos, action.currentObject, action.selectedObject).updatedState;
34
34
  case UPDATE_DRAWING_ITEM:
@@ -105,7 +105,7 @@ export default function (state, action) {
105
105
  case SELECT_TOOL_DRAWING_ITEM_3D:
106
106
  return Item.selectToolDrawingItem3D(state, action.sceneComponentType).updatedState;
107
107
  case SET_DOOR_STYLE:
108
- return Item.setDoorStyle(state, action.doorStyle, action.isAll).updatedState;
108
+ return Item.setDoorStyle(state, action.doorStyle, action.itemCDS, action.isAll).updatedState;
109
109
  case SET_HANDLE_MATERIAL:
110
110
  return Item.setHandleMaterial(state, action.material).updatedState;
111
111
  case SET_DOOR_HANDLE:
@@ -130,7 +130,7 @@ export default function (state, action) {
130
130
  case SET_APPLIANCE_MATERIAL:
131
131
  return Item.setApplianceMaterial(state, action.material).updatedState;
132
132
  case SET_INITIAL_DOOR_STYLE:
133
- return Item.setInitialDoorStyle(state, action.doorStyle, action.oStyle).updatedState;
133
+ return Item.setInitialDoorStyle(state, action.doorStyle).updatedState;
134
134
  case UPDATE_ITEM_POSITION:
135
135
  return Item.updateItemPosition(state, action.layerID, action.itemID, action.pos).updatedState;
136
136
  // case SET_MOVE_STATUS:
package/es/utils/isolate-event-handler.js CHANGED
@@ -8,8 +8,6 @@ import { EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TO
8
8
  import { isEmpty } from "./helper";
9
9
  import exporter from "../catalog/utils/exporter";
10
10
  import { render2DItem, render3DItem } from "../catalog/utils/item-loader";
11
- import Catalog from "../catalog/catalog";
12
- import { CatalogElement, safeLoadMapList } from "../models";
13
11
  var loadSVGsByItem = /*#__PURE__*/function () {
14
12
  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(item) {
15
13
  var _parsed$xml$viewBox, _parsed$xml$viewBox2, response, svgText, loader, parsed, _t;
@@ -70,7 +68,7 @@ export function handleExternalEvent(_x2) {
70
68
  }
71
69
  function _handleExternalEvent() {
72
70
  _handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(props) {
73
- var evt, state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _t2, _t3;
71
+ var evt, state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _t2, _t3;
74
72
  return _regeneratorRuntime.wrap(function (_context2) {
75
73
  while (1) switch (_context2.prev = _context2.next) {
76
74
  case 0:
@@ -155,12 +153,12 @@ function _handleExternalEvent() {
155
153
  props.projectActions.rename(defaulTitle);
156
154
  return _context2.abrupt("continue", 25);
157
155
  case 16:
158
- _evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, isAll = _evt$payload2.isAll;
159
- props.itemsActions.setDoorStyle(doorStyle, isAll);
156
+ _evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, itemCDS = _evt$payload2.itemCDS, isAll = _evt$payload2.isAll;
157
+ props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
160
158
  return _context2.abrupt("continue", 25);
161
159
  case 17:
162
160
  _doorStyle = evt.payload.doorStyle;
163
- props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle, _doorStyle.oStyle);
161
+ props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
164
162
  return _context2.abrupt("continue", 25);
165
163
  case 18:
166
164
  props.projectActions.loadProject(evt.payload, props.categoryData);
package/lib/LiteRenderer.js CHANGED
@@ -36,7 +36,6 @@ var _itemLoader = require("./catalog/utils/item-loader");
36
36
  var _export2 = require("./plugins/export");
37
37
  var _immutable = require("immutable");
38
38
  var Sentry = _interopRequireWildcard(require("@sentry/react"));
39
- var _projectActions = require("./actions/project-actions");
40
39
  var _exporter = _interopRequireDefault(require("./catalog/utils/exporter"));
41
40
  var THREE = _interopRequireWildcard(require("three"));
42
41
  var _LiteKitchenConfigurator = _interopRequireDefault(require("./LiteKitchenConfigurator"));
package/lib/actions/items-actions.js CHANGED
@@ -274,10 +274,11 @@ function updateItemsAltitude(layerID, itemID, value) {
274
274
  value: value
275
275
  };
276
276
  }
277
- function setDoorStyle(doorStyle, isAll) {
277
+ function setDoorStyle(doorStyle, itemCDS, isAll) {
278
278
  return {
279
279
  type: _constants.SET_DOOR_STYLE,
280
280
  doorStyle: doorStyle,
281
+ itemCDS: itemCDS,
281
282
  isAll: isAll
282
283
  };
283
284
  }
@@ -342,11 +343,10 @@ function setModelling(model) {
342
343
  model: model
343
344
  };
344
345
  }
345
- function setInitialDoorStyle(doorStyle, oStyle) {
346
+ function setInitialDoorStyle(doorStyle) {
346
347
  return {
347
348
  type: _constants.SET_INITIAL_DOOR_STYLE,
348
- doorStyle: doorStyle,
349
- oStyle: oStyle
349
+ doorStyle: doorStyle
350
350
  };
351
351
  }
352
352
  function setMoveStatus(status) {
package/lib/catalog/utils/exporter.js CHANGED
@@ -26,7 +26,8 @@ function _default(_ref) {
26
26
  is_corner = _ref.is_corner,
27
27
  alti = _ref.alti,
28
28
  obj_property = _ref.obj_property,
29
- outlineSVGData = _ref.outlineSVGData;
29
+ outlineSVGData = _ref.outlineSVGData,
30
+ cds = _ref.cds;
30
31
  var _length = alti || 0;
31
32
  // const length = convert(_length).from("in").to("cm");
32
33
  var length = _length;
@@ -141,6 +142,7 @@ function _default(_ref) {
141
142
  }),
142
143
  img: base,
143
144
  obj: obj_property,
145
+ cds: cds,
144
146
  render2D: function render2D(element, layer, scene) {
145
147
  return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
146
148
  },
package/lib/class/item.js CHANGED
@@ -55,65 +55,19 @@ var Item = exports["default"] = /*#__PURE__*/function () {
55
55
  isDuplication: isDuplication
56
56
  }, null, state);
57
57
  if (item.category === 'cabinet') {
58
+ var _state$doorStyle;
58
59
  var layer = state.getIn(['scene', 'layers', layerID]);
59
- if (state.doorStyle !== null && state.doorStyle !== undefined) {
60
- var _state$doorStyle, _temp$doorStyles;
61
- var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
62
- var cds = temp === null || temp === void 0 || (_temp$doorStyles = temp.doorStyles) === null || _temp$doorStyles === void 0 || (_temp$doorStyles = _temp$doorStyles.cds) === null || _temp$doorStyles === void 0 ? void 0 : _temp$doorStyles.find(function (elem) {
63
- return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
60
+ var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
61
+ var cds = state.catalog.getIn(['elements', type, 'cds']);
62
+ if (cds) {
63
+ var updatedDoorStyles = _objectSpread(_objectSpread({}, temp.doorStyles), {}, {
64
+ cds: [cds]
65
+ });
66
+ item = item.merge({
67
+ doorStyle: (0, _immutable.fromJS)(_objectSpread(_objectSpread({}, temp), {}, {
68
+ doorStyles: updatedDoorStyles
69
+ }))
64
70
  });
65
- if (cds) {
66
- var updatedDoorStyles = _objectSpread(_objectSpread(_objectSpread({}, temp.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
67
- cabinet_door_style_id: cds.cabinet_door_style_id
68
- });
69
- item = item.merge({
70
- doorStyle: (0, _immutable.fromJS)(_objectSpread(_objectSpread({}, temp), {}, {
71
- doorStyles: updatedDoorStyles
72
- }))
73
- });
74
- } else {
75
- var _state$oStyle;
76
- var styleObj = (_state$oStyle = state.oStyle) === null || _state$oStyle === void 0 || (_state$oStyle = _state$oStyle.toJS()) === null || _state$oStyle === void 0 ? void 0 : _state$oStyle.oStyle;
77
- if (styleObj) {
78
- for (var _x in styleObj) {
79
- cds = styleObj[_x].data.doorStyles.cds.find(function (elem) {
80
- return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
81
- });
82
- if (cds) {
83
- var tmpDS = styleObj[_x].data;
84
- tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, tmpDS.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
85
- cabinet_door_style_id: cds.cabinet_door_style_id
86
- });
87
- item = item.merge({
88
- doorStyle: (0, _immutable.fromJS)(tmpDS)
89
- });
90
- break;
91
- }
92
- }
93
- }
94
- }
95
- } else {
96
- var _state$oStyle2;
97
- var _styleObj = (_state$oStyle2 = state.oStyle) === null || _state$oStyle2 === void 0 || (_state$oStyle2 = _state$oStyle2.toJS()) === null || _state$oStyle2 === void 0 ? void 0 : _state$oStyle2.oStyle;
98
- if (_styleObj) {
99
- for (var _x2 in _styleObj) {
100
- var _styleObj$_x;
101
- var _cds = (_styleObj$_x = _styleObj[_x2]) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.data) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.doorStyles) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.cds) === null || _styleObj$_x === void 0 ? void 0 : _styleObj$_x.find(function (elem) {
102
- return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
103
- });
104
- if (_cds) {
105
- var _styleObj$_x2;
106
- var _tmpDS = (_styleObj$_x2 = _styleObj[_x2]) === null || _styleObj$_x2 === void 0 ? void 0 : _styleObj$_x2.data;
107
- _tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, _tmpDS.doorStyles), _cds.data && _cds.data[0] ? _cds.data[0] : {}), {}, {
108
- cabinet_door_style_id: _cds.cabinet_door_style_id
109
- });
110
- item = item.merge({
111
- doorStyle: (0, _immutable.fromJS)(_tmpDS)
112
- });
113
- break;
114
- }
115
- }
116
- }
117
71
  }
118
72
  }
119
73
  if (item.get('type') === 'cabinet' && item.get('doorStyle').size === 0) {
@@ -123,15 +77,11 @@ var Item = exports["default"] = /*#__PURE__*/function () {
123
77
  };
124
78
  }
125
79
  var setSizeOfItemByDoorStyle = function setSizeOfItemByDoorStyle() {
126
- var _doorStyle$doorStyles, _cds$data;
127
80
  var doorStyle = item.get('doorStyle').toJS();
128
- var cds = doorStyle === null || doorStyle === void 0 || (_doorStyle$doorStyles = doorStyle.doorStyles) === null || _doorStyle$doorStyles === void 0 || (_doorStyle$doorStyles = _doorStyle$doorStyles.cds) === null || _doorStyle$doorStyles === void 0 ? void 0 : _doorStyle$doorStyles.find(function (elem) {
129
- return elem.itemID === item.itemID;
130
- });
131
- var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
81
+ var euroCDS = state.catalog.getIn(['elements', type, 'cds']).data.filter(function (element) {
132
82
  return element && element.is_euro_cds;
133
- })) || [];
134
- if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
83
+ });
84
+ if (doorStyle.door_style_name === 'Euro & Frameless' && euroCDS.length > 0) {
135
85
  var newProperties = item.get('properties').toJS();
136
86
  if (newProperties.hasOwnProperty('depth')) {
137
87
  if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -142,8 +92,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
142
92
  });
143
93
  }
144
94
  newProperties['depth'] = new _immutable.Map({
145
- length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_length).from('in').to('cm'),
146
- _length: euro_cds[0].euro_length,
95
+ length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_length).from('in').to('cm'),
96
+ _length: euroCDS[0].euro_length,
147
97
  _unit: 'in'
148
98
  });
149
99
  }
@@ -156,8 +106,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
156
106
  });
157
107
  }
158
108
  newProperties['height'] = new _immutable.Map({
159
- length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_height).from('in').to('cm'),
160
- _length: euro_cds[0].euro_height,
109
+ length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_height).from('in').to('cm'),
110
+ _length: euroCDS[0].euro_height,
161
111
  _unit: 'in'
162
112
  });
163
113
  }
@@ -170,8 +120,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
170
120
  });
171
121
  }
172
122
  newProperties['width'] = new _immutable.Map({
173
- length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_width).from('in').to('cm') - 10,
174
- _length: euro_cds[0].euro_width,
123
+ length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_width).from('in').to('cm') - 10,
124
+ _length: euroCDS[0].euro_width,
175
125
  _unit: 'in'
176
126
  });
177
127
  }
@@ -1130,48 +1080,37 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1130
1080
  }
1131
1081
  }, {
1132
1082
  key: "setInitialDoorStyle",
1133
- value: function setInitialDoorStyle(state, doorStyle, oStyle) {
1134
- if (doorStyle === undefined) {
1135
- state = state.merge({
1136
- oStyle: new _immutable.Map({
1137
- oStyle: oStyle
1138
- })
1139
- });
1140
- } else {
1141
- state = state.merge({
1142
- doorStyle: doorStyle,
1143
- oStyle: new _immutable.Map({
1144
- oStyle: oStyle
1145
- })
1146
- });
1147
- var _state8 = state,
1148
- scene = _state8.scene;
1149
- var layerID = scene.get('selectedLayer');
1150
- var layers = scene.layers.get(layerID);
1151
- var items = layers.items;
1152
- items.forEach(function (data) {
1153
- {
1154
- var itemID = data.id;
1155
- var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
1156
- doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
1157
- counttop: doorStyle.doorStyles.counttop
1158
- })
1159
- });
1160
- data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
1161
- layers = layers.mergeIn(['items', itemID], data);
1162
- state = state.merge({
1163
- scene: scene.mergeIn(['layers', layerID], layers)
1164
- });
1165
- }
1166
- });
1167
- }
1083
+ value: function setInitialDoorStyle(state, doorStyle) {
1084
+ state = state.merge({
1085
+ doorStyle: doorStyle
1086
+ });
1087
+ var _state8 = state,
1088
+ scene = _state8.scene;
1089
+ var layerID = scene.get('selectedLayer');
1090
+ var layers = scene.layers.get(layerID);
1091
+ var items = layers.items;
1092
+ items.forEach(function (data) {
1093
+ {
1094
+ var itemID = data.id;
1095
+ var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
1096
+ doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
1097
+ counttop: doorStyle.doorStyles.counttop
1098
+ })
1099
+ });
1100
+ data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
1101
+ layers = layers.mergeIn(['items', itemID], data);
1102
+ state = state.merge({
1103
+ scene: scene.mergeIn(['layers', layerID], layers)
1104
+ });
1105
+ }
1106
+ });
1168
1107
  return {
1169
1108
  updatedState: state
1170
1109
  };
1171
1110
  }
1172
1111
  }, {
1173
1112
  key: "setDoorStyle",
1174
- value: function setDoorStyle(state, doorStyle, isAll) {
1113
+ value: function setDoorStyle(state, doorStyle, itemCDS, isAll) {
1175
1114
  var _this2 = this;
1176
1115
  var keys = Object.keys(doorStyle.doorStyles);
1177
1116
  keys = keys.filter(function (elem) {
@@ -1188,14 +1127,14 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1188
1127
  var layerID = state.scene.get('selectedLayer');
1189
1128
  var temp_layer_molding = state.scene.getIn(['layers', layerID, 'molding']);
1190
1129
  temp_layer_molding = temp_layer_molding.filter(function (md) {
1191
- return doorStyle.doorStyles.cds.some(function (ds) {
1130
+ return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
1192
1131
  return md.itemID === ds.itemID;
1193
1132
  });
1194
1133
  });
1195
1134
  state = state.setIn(['scene', 'layers', layerID, 'molding'], temp_layer_molding);
1196
1135
  var itemIDs = state.scene.layers.getIn([layerID, 'selected', 'items']).toJS();
1197
1136
  var setDoorStyleOfItem = function setDoorStyleOfItem(data) {
1198
- var _cds$data2;
1137
+ var _cds$data;
1199
1138
  if (data.category !== 'cabinet') return; //CDS should effect to cabinets
1200
1139
  var itemID = data.id;
1201
1140
  var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
@@ -1203,7 +1142,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1203
1142
  var tmpMolding = (0, _toConsumableArray2["default"])(curItem.molding);
1204
1143
  var temp_item_molding = (0, _toConsumableArray2["default"])(curItem.molding);
1205
1144
  temp_item_molding = temp_item_molding.filter(function (md) {
1206
- return doorStyle.doorStyles.cds.some(function (ds) {
1145
+ return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
1207
1146
  return ds.itemID === md.itemID;
1208
1147
  });
1209
1148
  });
@@ -1213,17 +1152,16 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1213
1152
  state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
1214
1153
  });
1215
1154
  });
1216
- var cds = doorStyle.doorStyles.cds.find(function (elem) {
1155
+ var cds = itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.find(function (elem) {
1217
1156
  return elem.itemID === data.itemID;
1218
1157
  });
1219
- var euro_cds = (cds === null || cds === void 0 || (_cds$data2 = cds.data) === null || _cds$data2 === void 0 ? void 0 : _cds$data2.filter(function (element) {
1158
+ var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
1220
1159
  return element && element.is_euro_cds;
1221
1160
  })) || [];
1222
- var cds_data;
1223
- if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
1224
- cds_data = cds ? _objectSpread(_objectSpread({}, euro_cds[0]), {}, {
1225
- cabinet_door_style_id: cds.cabinet_door_style_id
1226
- }) : {};
1161
+ var cds_data = cds ? [cds] : [];
1162
+ if (
1163
+ // doorStyle.door_style_name === 'Euro & Frameless' &&
1164
+ euro_cds.length > 0) {
1227
1165
  var newProperties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
1228
1166
  if (newProperties.hasOwnProperty('depth')) {
1229
1167
  if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -1269,9 +1207,6 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1269
1207
  }
1270
1208
  state = _this2.setJsProperties(state, layerID, itemID, newProperties).updatedState;
1271
1209
  } else {
1272
- cds_data = cds ? _objectSpread(_objectSpread({}, cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
1273
- cabinet_door_style_id: cds.cabinet_door_style_id
1274
- }) : {};
1275
1210
  var properties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
1276
1211
  if (properties.hasOwnProperty('oldDepth')) {
1277
1212
  properties['depth'] = new _immutable.Map({
@@ -1310,7 +1245,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
1310
1245
  color_sku_alias: doorStyle.color_sku_alias,
1311
1246
  // alias name of color_sku for the current dealer
1312
1247
  install: (0, _utils.getInstallationSuffix)(_constants.INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
1313
- doorStyles: _objectSpread(_objectSpread({}, tmp), cds_data)
1248
+ doorStyles: _objectSpread(_objectSpread({}, tmp), {}, {
1249
+ cds: cds_data
1250
+ })
1314
1251
  };
1315
1252
  state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], (0, _immutable.fromJS)(tmpDS));
1316
1253
  };
package/lib/class/project.js CHANGED
@@ -43,7 +43,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
43
43
  key: "newProject",
44
44
  value: function newProject(state) {
45
45
  var doorStyle = state.toJS().doorStyle === null ? null : state.toJS().doorStyle;
46
- var oStyle = state.oStyle;
47
46
  // let counterTop = state.getIn(['scene', 'layers', layerID, 'counterTop']);
48
47
  // let floorStyle = state.getIn(['scene', 'layers', layerID, 'floorStyle']);
49
48
  var _viewer2D = state.viewer2D;
@@ -57,7 +56,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
57
56
  state = new _models.State({});
58
57
  state = state.merge({
59
58
  doorStyle: doorStyle,
60
- oStyle: oStyle,
61
59
  viewer2D: _viewer2D
62
60
  });
63
61
  // state = Item.setCounterTop(state, counterTop).updatedState;
@@ -70,7 +68,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
70
68
  key: "loadProject",
71
69
  value: function loadProject(state, sceneJSON, categoryData) {
72
70
  var doorStyle = state.doorStyle;
73
- var oStyle = state.oStyle;
74
71
  var layerID = state.scene.selectedLayer;
75
72
  var _viewer2D = state.viewer2D;
76
73
  var viewer = state.viewer2D.toJS();
@@ -170,7 +167,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
170
167
  }
171
168
  state = state.merge({
172
169
  doorStyle: doorStyle,
173
- oStyle: oStyle,
174
170
  viewer2D: _viewer2D
175
171
  });
176
172
  state = _export2.Item.setCounterTop(state, counterTop).updatedState;
package/lib/devLiteRenderer.js CHANGED
@@ -7,10 +7,11 @@ var _react = _interopRequireWildcard(require("react"));
7
7
  var _reactContainerDimensions = _interopRequireDefault(require("react-container-dimensions"));
8
8
  var _mockProps = _interopRequireDefault(require("./mocks/mockProps.json"));
9
9
  var _categoryData = _interopRequireDefault(require("./mocks/categoryData.json"));
10
- var _dataBundle = _interopRequireDefault(require("./mocks/dataBundle.json"));
11
- var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload.json"));
10
+ var _dataBundle = _interopRequireDefault(require("./mocks/dataBundle2.json"));
11
+ var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload2.json"));
12
12
  var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload.json"));
13
- var _oStylePayload = _interopRequireDefault(require("./mocks/oStylePayload.json"));
13
+ var _doorStylePayload2 = _interopRequireDefault(require("./mocks/doorStylePayload2.json"));
14
+ var _itemCDSPayload = _interopRequireDefault(require("./mocks/itemCDSPayload.json"));
14
15
  var _rectangleShape = _interopRequireDefault(require("./mocks/rectangleShape.json"));
15
16
  var _reactDom = _interopRequireDefault(require("react-dom"));
16
17
  var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
@@ -34,8 +35,7 @@ function WorkSpace(props) {
34
35
  type: _constants.EXTERNAL_EVENT_SET_INITIAL_DATA,
35
36
  payload: {
36
37
  doorStyle: {
37
- doorStyle: _doorStylePayload["default"],
38
- oStyle: _oStylePayload["default"]
38
+ doorStyle: _doorStylePayload["default"]
39
39
  }
40
40
  }
41
41
  };
@@ -181,7 +181,8 @@ function WorkSpace(props) {
181
181
  var evt = {
182
182
  type: _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE,
183
183
  payload: {
184
- doorStyle: _doorStylePayload["default"],
184
+ doorStyle: _doorStylePayload2["default"],
185
+ itemCDS: _itemCDSPayload["default"],
185
186
  isAll: true
186
187
  }
187
188
  };
package/lib/models.js CHANGED
@@ -345,7 +345,8 @@ var CatalogElement = exports.CatalogElement = /*#__PURE__*/function (_Record1) {
345
345
  info: new _immutable.Map(),
346
346
  properties: new _immutable.Map(),
347
347
  obj: new _immutable.Map(),
348
- type: ''
348
+ type: '',
349
+ cds: new _immutable.Map()
349
350
  }, 'CatalogElement'));
350
351
  var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
351
352
  function Catalog() {
package/lib/reducers/items-reducer.js CHANGED
@@ -31,7 +31,7 @@ function _default(state, action) {
31
31
  state = state.merge({
32
32
  sceneHistory: _export2.history.historyPush(state.sceneHistory, state.scene)
33
33
  });
34
- return _export.Item.selectToolDrawingItem(state, action.sceneComponentType, action.oStyle).updatedState;
34
+ return _export.Item.selectToolDrawingItem(state, action.sceneComponentType).updatedState;
35
35
  case _constants.REPLACE_ITEM:
36
36
  return _export.Item.replaceItem(state, action.selectedPos, action.currentObject, action.selectedObject).updatedState;
37
37
  case _constants.UPDATE_DRAWING_ITEM:
@@ -108,7 +108,7 @@ function _default(state, action) {
108
108
  case _constants.SELECT_TOOL_DRAWING_ITEM_3D:
109
109
  return _export.Item.selectToolDrawingItem3D(state, action.sceneComponentType).updatedState;
110
110
  case _constants.SET_DOOR_STYLE:
111
- return _export.Item.setDoorStyle(state, action.doorStyle, action.isAll).updatedState;
111
+ return _export.Item.setDoorStyle(state, action.doorStyle, action.itemCDS, action.isAll).updatedState;
112
112
  case _constants.SET_HANDLE_MATERIAL:
113
113
  return _export.Item.setHandleMaterial(state, action.material).updatedState;
114
114
  case _constants.SET_DOOR_HANDLE:
@@ -133,7 +133,7 @@ function _default(state, action) {
133
133
  case _constants.SET_APPLIANCE_MATERIAL:
134
134
  return _export.Item.setApplianceMaterial(state, action.material).updatedState;
135
135
  case _constants.SET_INITIAL_DOOR_STYLE:
136
- return _export.Item.setInitialDoorStyle(state, action.doorStyle, action.oStyle).updatedState;
136
+ return _export.Item.setInitialDoorStyle(state, action.doorStyle).updatedState;
137
137
  case _constants.UPDATE_ITEM_POSITION:
138
138
  return _export.Item.updateItemPosition(state, action.layerID, action.itemID, action.pos).updatedState;
139
139
  // case SET_MOVE_STATUS:
package/lib/utils/isolate-event-handler.js CHANGED
@@ -13,8 +13,6 @@ var _constants = require("../constants");
13
13
  var _helper = require("./helper");
14
14
  var _exporter = _interopRequireDefault(require("../catalog/utils/exporter"));
15
15
  var _itemLoader = require("../catalog/utils/item-loader");
16
- var _catalog = _interopRequireDefault(require("../catalog/catalog"));
17
- var _models = require("../models");
18
16
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
19
17
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
20
18
  var loadSVGsByItem = /*#__PURE__*/function () {
@@ -77,7 +75,7 @@ function handleExternalEvent(_x2) {
77
75
  }
78
76
  function _handleExternalEvent() {
79
77
  _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(props) {
80
- var evt, state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _t2, _t3;
78
+ var evt, state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _t2, _t3;
81
79
  return _regenerator["default"].wrap(function (_context2) {
82
80
  while (1) switch (_context2.prev = _context2.next) {
83
81
  case 0:
@@ -162,12 +160,12 @@ function _handleExternalEvent() {
162
160
  props.projectActions.rename(defaulTitle);
163
161
  return _context2.abrupt("continue", 25);
164
162
  case 16:
165
- _evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, isAll = _evt$payload2.isAll;
166
- props.itemsActions.setDoorStyle(doorStyle, isAll);
163
+ _evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, itemCDS = _evt$payload2.itemCDS, isAll = _evt$payload2.isAll;
164
+ props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
167
165
  return _context2.abrupt("continue", 25);
168
166
  case 17:
169
167
  _doorStyle = evt.payload.doorStyle;
170
- props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle, _doorStyle.oStyle);
168
+ props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
171
169
  return _context2.abrupt("continue", 25);
172
170
  case 18:
173
171
  props.projectActions.loadProject(evt.payload, props.categoryData);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kitchen-simulator",
3
- "version": "1.0.0-alin.51",
3
+ "version": "1.0.0-alin.52",
4
4
  "description": "It is a kitchen simulator (self-contained micro-frontend).",
5
5
  "license": "MIT",
6
6
  "main": "lib/index.js",