kitchen-simulator 1.0.0-alin.8 → 1.0.0-clark.54
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.
- package/es/LiteKitchenConfigurator.js +15 -156
- package/es/LiteRenderer.js +25 -113
- package/es/actions/items-actions.js +4 -5
- package/es/actions/project-actions.js +2 -3
- package/es/catalog/catalog.js +1 -4
- package/es/catalog/utils/exporter.js +3 -1
- package/es/class/item.js +57 -120
- package/es/class/project.js +9 -23
- package/es/components/viewer2d/item.js +10 -10
- package/es/components/viewer2d/layer.js +1 -1
- package/es/components/viewer2d/line.js +20 -17
- package/es/components/viewer2d/viewer2d.js +20 -56
- package/es/components/viewer3d/viewer3d.js +5 -17
- package/es/constants.js +10 -1
- package/es/devLiteRenderer.js +116 -9
- package/es/index.js +23 -3
- package/es/models.js +2 -1
- package/es/reducers/items-reducer.js +3 -3
- package/es/reducers/project-reducer.js +1 -1
- package/es/utils/geometry.js +6 -6
- package/es/utils/isolate-event-handler.js +97 -17
- package/lib/LiteKitchenConfigurator.js +16 -157
- package/lib/LiteRenderer.js +25 -113
- package/lib/actions/items-actions.js +4 -5
- package/lib/actions/project-actions.js +2 -3
- package/lib/catalog/catalog.js +1 -4
- package/lib/catalog/utils/exporter.js +3 -1
- package/lib/class/item.js +57 -120
- package/lib/class/project.js +9 -23
- package/lib/components/viewer2d/item.js +10 -10
- package/lib/components/viewer2d/layer.js +1 -1
- package/lib/components/viewer2d/line.js +19 -16
- package/lib/components/viewer2d/viewer2d.js +19 -55
- package/lib/components/viewer3d/viewer3d.js +5 -17
- package/lib/constants.js +14 -5
- package/lib/devLiteRenderer.js +115 -8
- package/lib/index.js +23 -3
- package/lib/models.js +2 -1
- package/lib/reducers/items-reducer.js +3 -3
- package/lib/reducers/project-reducer.js +1 -1
- package/lib/utils/geometry.js +6 -6
- package/lib/utils/isolate-event-handler.js +96 -16
- package/package.json +3 -3
package/lib/devLiteRenderer.js
CHANGED
|
@@ -6,9 +6,13 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
6
6
|
var _react = _interopRequireWildcard(require("react"));
|
|
7
7
|
var _reactContainerDimensions = _interopRequireDefault(require("react-container-dimensions"));
|
|
8
8
|
var _mockProps = _interopRequireDefault(require("./mocks/mockProps.json"));
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
var
|
|
9
|
+
var _dataBundle = _interopRequireDefault(require("./mocks/dataBundle2.json"));
|
|
10
|
+
var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload2.json"));
|
|
11
|
+
var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload.json"));
|
|
12
|
+
var _doorStylePayload2 = _interopRequireDefault(require("./mocks/doorStylePayload2.json"));
|
|
13
|
+
var _itemCDSPayload = _interopRequireDefault(require("./mocks/itemCDSPayload.json"));
|
|
14
|
+
var _rectangleShape = _interopRequireDefault(require("./mocks/rectangleShape.json"));
|
|
15
|
+
var _moldingPayload = _interopRequireDefault(require("./mocks/moldingPayload.json"));
|
|
12
16
|
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
13
17
|
var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
|
|
14
18
|
var _antd = require("antd");
|
|
@@ -26,6 +30,17 @@ function WorkSpace(props) {
|
|
|
26
30
|
externalEvent = _useState2[0],
|
|
27
31
|
setExternalEvent = _useState2[1];
|
|
28
32
|
var offset = 5;
|
|
33
|
+
(0, _react.useEffect)(function () {
|
|
34
|
+
var evt = {
|
|
35
|
+
type: _constants.EXTERNAL_EVENT_SET_INITIAL_DATA,
|
|
36
|
+
payload: {
|
|
37
|
+
doorStyle: {
|
|
38
|
+
doorStyle: _doorStylePayload["default"]
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
setExternalEvent(evt);
|
|
43
|
+
}, []);
|
|
29
44
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
30
45
|
className: "flex gap-4"
|
|
31
46
|
}, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
@@ -111,6 +126,28 @@ function WorkSpace(props) {
|
|
|
111
126
|
}
|
|
112
127
|
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
113
128
|
src: "/assets/img/svg/bottombar/arrow-right.svg"
|
|
129
|
+
})), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
130
|
+
actionType: "primary",
|
|
131
|
+
onClick: function onClick() {
|
|
132
|
+
var evt = {
|
|
133
|
+
type: _constants.EXTERNAL_EVENT_ZOOM_IN,
|
|
134
|
+
payload: {}
|
|
135
|
+
};
|
|
136
|
+
setExternalEvent(evt);
|
|
137
|
+
}
|
|
138
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
139
|
+
src: "/assets/img/svg/bottombar/arrow-minus.svg"
|
|
140
|
+
})), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
141
|
+
actionType: "primary",
|
|
142
|
+
onClick: function onClick() {
|
|
143
|
+
var evt = {
|
|
144
|
+
type: _constants.EXTERNAL_EVENT_ZOOM_OUT,
|
|
145
|
+
payload: {}
|
|
146
|
+
};
|
|
147
|
+
setExternalEvent(evt);
|
|
148
|
+
}
|
|
149
|
+
}, /*#__PURE__*/_react["default"].createElement("img", {
|
|
150
|
+
src: "/assets/img/svg/bottombar/arrow-plus.svg"
|
|
114
151
|
})), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
115
152
|
actionType: "primary",
|
|
116
153
|
onClick: function onClick() {
|
|
@@ -138,11 +175,74 @@ function WorkSpace(props) {
|
|
|
138
175
|
};
|
|
139
176
|
setExternalEvent(evt);
|
|
140
177
|
}
|
|
141
|
-
}, "Add B12 Cabinet"), /*#__PURE__*/_react["default"].createElement(
|
|
142
|
-
|
|
143
|
-
|
|
178
|
+
}, "Add B12 Cabinet"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
179
|
+
actionType: "danger",
|
|
180
|
+
onClick: function onClick() {
|
|
181
|
+
var evt = {
|
|
182
|
+
type: _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE,
|
|
183
|
+
payload: {
|
|
184
|
+
doorStyle: _doorStylePayload2["default"],
|
|
185
|
+
itemCDS: _itemCDSPayload["default"],
|
|
186
|
+
isAll: true
|
|
187
|
+
}
|
|
188
|
+
};
|
|
189
|
+
setExternalEvent(evt);
|
|
190
|
+
}
|
|
191
|
+
}, "DoorStyle (Change into Midtown White Shaker)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
192
|
+
actionType: "danger",
|
|
193
|
+
onClick: function onClick() {
|
|
194
|
+
var evt = {
|
|
195
|
+
type: _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE,
|
|
196
|
+
payload: _rectangleShape["default"]
|
|
197
|
+
};
|
|
198
|
+
setExternalEvent(evt);
|
|
199
|
+
}
|
|
200
|
+
}, "Add Room shape(rectangle)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
201
|
+
actionType: "danger",
|
|
202
|
+
onClick: function onClick() {
|
|
203
|
+
var evt = {
|
|
204
|
+
type: _constants.EXTERNAL_EVENT_UNDO,
|
|
205
|
+
payload: {}
|
|
206
|
+
};
|
|
207
|
+
setExternalEvent(evt);
|
|
208
|
+
}
|
|
209
|
+
}, "Undo"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
210
|
+
actionType: "danger",
|
|
211
|
+
onClick: function onClick() {
|
|
212
|
+
var evt = {
|
|
213
|
+
type: _constants.EXTERNAL_EVENT_REDO,
|
|
214
|
+
payload: {}
|
|
215
|
+
};
|
|
216
|
+
setExternalEvent(evt);
|
|
217
|
+
}
|
|
218
|
+
}, "Redo"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
219
|
+
actionType: "danger",
|
|
220
|
+
onClick: function onClick() {
|
|
221
|
+
var evt = {
|
|
222
|
+
type: _constants.EXTERNAL_EVENT_SET_MOLDING,
|
|
223
|
+
payload: {
|
|
224
|
+
isGlobal: true,
|
|
225
|
+
moldingInfo: _moldingPayload["default"]
|
|
226
|
+
}
|
|
227
|
+
};
|
|
228
|
+
setExternalEvent(evt);
|
|
229
|
+
}
|
|
230
|
+
}, "Global Molding (FBM)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
|
|
231
|
+
actionType: "danger",
|
|
232
|
+
onClick: function onClick() {
|
|
233
|
+
var evt = {
|
|
234
|
+
type: _constants.EXTERNAL_EVENT_SET_MOLDING,
|
|
235
|
+
payload: {
|
|
236
|
+
isGlobal: false,
|
|
237
|
+
moldingInfo: _moldingPayload["default"]
|
|
238
|
+
}
|
|
239
|
+
};
|
|
240
|
+
setExternalEvent(evt);
|
|
241
|
+
}
|
|
242
|
+
}, "Individual Molding (FBM)"), /*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], {
|
|
243
|
+
width: props.width,
|
|
244
|
+
height: props.height,
|
|
144
245
|
projectElement: _mockProps["default"].projectElement,
|
|
145
|
-
categoryData: _categoryData["default"],
|
|
146
246
|
dataBundle: _dataBundle["default"],
|
|
147
247
|
configData: _mockProps["default"].configData,
|
|
148
248
|
options: options,
|
|
@@ -162,4 +262,11 @@ function WorkSpace(props) {
|
|
|
162
262
|
}
|
|
163
263
|
}));
|
|
164
264
|
}
|
|
165
|
-
_reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(
|
|
265
|
+
_reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_reactContainerDimensions["default"], null, function (_ref) {
|
|
266
|
+
var width = _ref.width,
|
|
267
|
+
height = _ref.height;
|
|
268
|
+
return /*#__PURE__*/_react["default"].createElement(WorkSpace, {
|
|
269
|
+
width: width,
|
|
270
|
+
height: height
|
|
271
|
+
});
|
|
272
|
+
}), document.getElementById('app'));
|
package/lib/index.js
CHANGED
|
@@ -6,10 +6,30 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports["default"] = void 0;
|
|
8
8
|
exports.renderKitchenSimulator = renderKitchenSimulator;
|
|
9
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
+
var _reactDom = _interopRequireDefault(require("react-dom"));
|
|
9
11
|
var _react = _interopRequireDefault(require("react"));
|
|
10
12
|
var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
|
|
11
|
-
function
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
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; }
|
|
14
|
+
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; }
|
|
15
|
+
function renderKitchenSimulator(container) {
|
|
16
|
+
var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
17
|
+
var currentProps = props;
|
|
18
|
+
|
|
19
|
+
// Initial render
|
|
20
|
+
var root = _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], props), container);
|
|
21
|
+
return {
|
|
22
|
+
root: root,
|
|
23
|
+
updateExternalEvent: function updateExternalEvent(newExternalEvent) {
|
|
24
|
+
var prevEvent = currentProps.externalEvent;
|
|
25
|
+
var isSameEvent = prevEvent && newExternalEvent && prevEvent.type === newExternalEvent.type && JSON.stringify(prevEvent.payload) === JSON.stringify(newExternalEvent.payload);
|
|
26
|
+
if (!isSameEvent) {
|
|
27
|
+
currentProps = _objectSpread(_objectSpread({}, currentProps), {}, {
|
|
28
|
+
externalEvent: newExternalEvent
|
|
29
|
+
});
|
|
30
|
+
_reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], currentProps), container);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
14
34
|
}
|
|
15
35
|
var _default = exports["default"] = renderKitchenSimulator;
|
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() {
|
|
@@ -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
|
|
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.
|
|
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
|
|
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:
|
|
@@ -12,7 +12,7 @@ function _default(state, action) {
|
|
|
12
12
|
case _constants.NEW_PROJECT:
|
|
13
13
|
return _export2.Project.newProject(state).updatedState;
|
|
14
14
|
case _constants.LOAD_PROJECT:
|
|
15
|
-
return _export2.Project.loadProject(state, action.sceneJSON
|
|
15
|
+
return _export2.Project.loadProject(state, action.sceneJSON).updatedState;
|
|
16
16
|
case _constants.OPEN_CATALOG:
|
|
17
17
|
return _export2.Project.openCatalog(state).updatedState;
|
|
18
18
|
case _constants.CHANGE_CATALOG_PAGE:
|
package/lib/utils/geometry.js
CHANGED
|
@@ -972,18 +972,18 @@ function getAllItemSnap(allItemRects) {
|
|
|
972
972
|
var snap4 = itemrectInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
|
|
973
973
|
var sizeinfo = otherItems[index].cat && otherItems[index].cat.info.sizeinfo;
|
|
974
974
|
if (sizeinfo) {
|
|
975
|
-
var
|
|
976
|
-
|
|
977
|
-
if (
|
|
978
|
-
var vx =
|
|
975
|
+
var left_blind_length = sizeinfo.left_blind_length,
|
|
976
|
+
right_blind_length = sizeinfo.right_blind_length;
|
|
977
|
+
if (left_blind_length > 0) {
|
|
978
|
+
var vx = left_blind_length - ch;
|
|
979
979
|
var vy = cw;
|
|
980
980
|
var dx = vx * cos + vy * sin;
|
|
981
981
|
var dy = vx * sin - vy * cos;
|
|
982
982
|
var snap6 = itemrectInfo(rect.rect[0].x + dx, rect.rect[0].y + dy, rect.rotRad + Math.PI / 2, cur && cur.size, rect.layoutpos, rect.is_corner);
|
|
983
983
|
allItemSnap.push(snap6);
|
|
984
984
|
}
|
|
985
|
-
if (
|
|
986
|
-
var _vx = ch -
|
|
985
|
+
if (right_blind_length > 0) {
|
|
986
|
+
var _vx = ch - right_blind_length;
|
|
987
987
|
var _vy = cw;
|
|
988
988
|
var _dx = _vx * cos + _vy * sin;
|
|
989
989
|
var _dy = _vx * sin - _vy * cos;
|
|
@@ -69,42 +69,46 @@ var loadSVGsByItem = /*#__PURE__*/function () {
|
|
|
69
69
|
return _ref.apply(this, arguments);
|
|
70
70
|
};
|
|
71
71
|
}();
|
|
72
|
-
function
|
|
72
|
+
var compareSVGRect = function compareSVGRect(value) {
|
|
73
|
+
return value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight ? true : false;
|
|
74
|
+
};
|
|
75
|
+
function handleExternalEvent(_x2) {
|
|
73
76
|
return _handleExternalEvent.apply(this, arguments);
|
|
74
77
|
}
|
|
75
78
|
function _handleExternalEvent() {
|
|
76
|
-
_handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(
|
|
77
|
-
var state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _t2, _t3;
|
|
79
|
+
_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, itemCDS, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _evt$payload3, moldingInfo, isGlobal, _t2, _t3;
|
|
78
81
|
return _regenerator["default"].wrap(function (_context2) {
|
|
79
82
|
while (1) switch (_context2.prev = _context2.next) {
|
|
80
83
|
case 0:
|
|
81
|
-
|
|
84
|
+
evt = props.externalEvent;
|
|
85
|
+
state = props.state.get('KitchenConfigurator');
|
|
82
86
|
_t2 = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
83
|
-
_context2.next = _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t2 === _constants.EXTERNAL_EVENT_ADD_WALL ? 4 : _t2 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 5 : _t2 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 9 : _t2 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 15 : 16;
|
|
87
|
+
_context2.next = _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t2 === _constants.EXTERNAL_EVENT_ADD_WALL ? 4 : _t2 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 5 : _t2 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 9 : _t2 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 15 : _t2 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 16 : _t2 === _constants.EXTERNAL_EVENT_SET_INITIAL_DATA ? 17 : _t2 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 18 : _t2 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 19 : _t2 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 22 : _t2 === _constants.EXTERNAL_EVENT_UNDO ? 25 : _t2 === _constants.EXTERNAL_EVENT_REDO ? 26 : _t2 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 27 : 28;
|
|
84
88
|
break;
|
|
85
89
|
case 1:
|
|
86
90
|
props.projectActions.setMode(_constants.MODE_IDLE_3D);
|
|
87
|
-
return _context2.abrupt("continue",
|
|
91
|
+
return _context2.abrupt("continue", 28);
|
|
88
92
|
case 2:
|
|
89
93
|
props.projectActions.setMode(_constants.MODE_IDLE);
|
|
90
|
-
return _context2.abrupt("continue",
|
|
94
|
+
return _context2.abrupt("continue", 28);
|
|
91
95
|
case 3:
|
|
92
|
-
sLineCnt = state.getIn(['
|
|
96
|
+
sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
|
|
93
97
|
if (sLineCnt > 0) props.projectActions.setMode(_constants.MODE_ELEVATION_VIEW);
|
|
94
|
-
return _context2.abrupt("continue",
|
|
98
|
+
return _context2.abrupt("continue", 28);
|
|
95
99
|
case 4:
|
|
96
100
|
if (state.mode === _constants.MODE_IDLE || state.mode === _constants.MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
|
|
97
101
|
props.projectActions.setMode(_constants.MODE_IDLE);
|
|
98
102
|
props.linesActions.selectToolDrawingLine('wall');
|
|
99
103
|
}
|
|
100
|
-
return _context2.abrupt("continue",
|
|
104
|
+
return _context2.abrupt("continue", 28);
|
|
101
105
|
case 5:
|
|
102
106
|
if ((0, _helper.isEmpty)(evt === null || evt === void 0 ? void 0 : evt.payload)) {
|
|
103
107
|
_context2.next = 8;
|
|
104
108
|
break;
|
|
105
109
|
}
|
|
106
110
|
element = evt.payload;
|
|
107
|
-
catalog = state.getIn(['
|
|
111
|
+
catalog = state.getIn(['catalog']).toJS(); // add item to catalog of state
|
|
108
112
|
if (!(0, _helper.isEmpty)(catalog === null || catalog === void 0 ? void 0 : catalog.elements[element.name])) {
|
|
109
113
|
_context2.next = 7;
|
|
110
114
|
break;
|
|
@@ -121,6 +125,7 @@ function _handleExternalEvent() {
|
|
|
121
125
|
render3DItem: _itemLoader.render3DItem
|
|
122
126
|
}));
|
|
123
127
|
if (catalogInstance !== null && catalogInstance !== void 0 && catalogInstance.validateElement(elementJs)) {
|
|
128
|
+
catalogInstance.registerElement(elementJs);
|
|
124
129
|
props.projectActions.addElementToCatalog(elementJs);
|
|
125
130
|
}
|
|
126
131
|
case 7:
|
|
@@ -129,10 +134,10 @@ function _handleExternalEvent() {
|
|
|
129
134
|
props.projectActions.pushLastSelectedCatalogElementToHistory(element);
|
|
130
135
|
props.projectActions.setIsCabinetDrawing(true);
|
|
131
136
|
case 8:
|
|
132
|
-
return _context2.abrupt("continue",
|
|
137
|
+
return _context2.abrupt("continue", 28);
|
|
133
138
|
case 9:
|
|
134
139
|
_evt$payload = evt.payload, moveType = _evt$payload.moveType, moveValue = _evt$payload.moveValue;
|
|
135
|
-
value = state.getIn(['
|
|
140
|
+
value = state.getIn(['viewer2D']).toJS();
|
|
136
141
|
_t3 = moveType;
|
|
137
142
|
_context2.next = _t3 === _constants.TOP ? 10 : _t3 === _constants.BOTTOM ? 11 : _t3 === _constants.RIGHT ? 12 : _t3 === _constants.LEFT ? 13 : 14;
|
|
138
143
|
break;
|
|
@@ -149,14 +154,89 @@ function _handleExternalEvent() {
|
|
|
149
154
|
value.e -= moveValue;
|
|
150
155
|
return _context2.abrupt("continue", 14);
|
|
151
156
|
case 14:
|
|
152
|
-
if (value
|
|
153
|
-
return _context2.abrupt("continue",
|
|
157
|
+
if (compareSVGRect(value)) props.viewer2DActions.updateCameraView(value);
|
|
158
|
+
return _context2.abrupt("continue", 28);
|
|
154
159
|
case 15:
|
|
155
160
|
defaulTitle = 'Untitle';
|
|
156
161
|
props.projectActions.newProject();
|
|
157
162
|
props.projectActions.rename(defaulTitle);
|
|
158
|
-
return _context2.abrupt("continue",
|
|
163
|
+
return _context2.abrupt("continue", 28);
|
|
159
164
|
case 16:
|
|
165
|
+
_evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, itemCDS = _evt$payload2.itemCDS, isAll = _evt$payload2.isAll;
|
|
166
|
+
props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
167
|
+
return _context2.abrupt("continue", 28);
|
|
168
|
+
case 17:
|
|
169
|
+
_doorStyle = evt.payload.doorStyle;
|
|
170
|
+
props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
|
|
171
|
+
return _context2.abrupt("continue", 28);
|
|
172
|
+
case 18:
|
|
173
|
+
props.projectActions.loadProject(evt.payload);
|
|
174
|
+
return _context2.abrupt("continue", 28);
|
|
175
|
+
case 19:
|
|
176
|
+
_value = state.getIn(['viewer2D']).toJS();
|
|
177
|
+
_value.a -= 0.1;
|
|
178
|
+
_value.d -= 0.1;
|
|
179
|
+
_value.e += _value.SVGWidth * 0.1 / 2;
|
|
180
|
+
_value.f += _value.SVGHeight * 0.1 / 2;
|
|
181
|
+
_zoomValue = parseInt((_value.a - 0.5) / _constants.ZOOM_VARIABLE);
|
|
182
|
+
if (!(_zoomValue > 404)) {
|
|
183
|
+
_context2.next = 20;
|
|
184
|
+
break;
|
|
185
|
+
}
|
|
186
|
+
return _context2.abrupt("return");
|
|
187
|
+
case 20:
|
|
188
|
+
if (!(_zoomValue < 35 || Number.isNaN(_zoomValue))) {
|
|
189
|
+
_context2.next = 21;
|
|
190
|
+
break;
|
|
191
|
+
}
|
|
192
|
+
return _context2.abrupt("return");
|
|
193
|
+
case 21:
|
|
194
|
+
while (!(_value.e <= 10)) {
|
|
195
|
+
_value.e -= 0.1;
|
|
196
|
+
}
|
|
197
|
+
while (!(_value.e + _value.a * _value.SVGWidth + 10 >= _value.viewerWidth)) {
|
|
198
|
+
_value.e += 0.1;
|
|
199
|
+
}
|
|
200
|
+
while (!(_value.f <= 80)) {
|
|
201
|
+
_value.f -= 0.1;
|
|
202
|
+
}
|
|
203
|
+
while (!(_value.f + _value.a * _value.SVGHeight + 10 >= _value.viewerHeight)) {
|
|
204
|
+
_value.f += 0.1;
|
|
205
|
+
}
|
|
206
|
+
if (compareSVGRect(_value)) props.viewer2DActions.updateCameraView(_value);
|
|
207
|
+
return _context2.abrupt("continue", 28);
|
|
208
|
+
case 22:
|
|
209
|
+
_value2 = state.getIn(['viewer2D']).toJS();
|
|
210
|
+
_value2.a += 0.1;
|
|
211
|
+
_value2.d += 0.1;
|
|
212
|
+
_value2.e -= _value2.SVGWidth * 0.1 / 2;
|
|
213
|
+
_value2.f -= _value2.SVGHeight * 0.1 / 2;
|
|
214
|
+
_zoomValue2 = parseInt((_value2.a - 0.5) / _constants.ZOOM_VARIABLE);
|
|
215
|
+
if (!(_zoomValue2 > 404)) {
|
|
216
|
+
_context2.next = 23;
|
|
217
|
+
break;
|
|
218
|
+
}
|
|
219
|
+
return _context2.abrupt("return");
|
|
220
|
+
case 23:
|
|
221
|
+
if (!(_zoomValue2 < 35 || Number.isNaN(_zoomValue2))) {
|
|
222
|
+
_context2.next = 24;
|
|
223
|
+
break;
|
|
224
|
+
}
|
|
225
|
+
return _context2.abrupt("return");
|
|
226
|
+
case 24:
|
|
227
|
+
if (compareSVGRect(_value2)) props.viewer2DActions.updateCameraView(_value2);
|
|
228
|
+
return _context2.abrupt("continue", 28);
|
|
229
|
+
case 25:
|
|
230
|
+
props.projectActions.undo();
|
|
231
|
+
return _context2.abrupt("continue", 28);
|
|
232
|
+
case 26:
|
|
233
|
+
props.projectActions.redo();
|
|
234
|
+
return _context2.abrupt("continue", 28);
|
|
235
|
+
case 27:
|
|
236
|
+
_evt$payload3 = evt.payload, moldingInfo = _evt$payload3.moldingInfo, isGlobal = _evt$payload3.isGlobal;
|
|
237
|
+
props.itemsActions.setMolding(moldingInfo, isGlobal);
|
|
238
|
+
return _context2.abrupt("continue", 28);
|
|
239
|
+
case 28:
|
|
160
240
|
case "end":
|
|
161
241
|
return _context2.stop();
|
|
162
242
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "kitchen-simulator",
|
|
3
|
-
"version": "1.0.0-
|
|
3
|
+
"version": "1.0.0-clark.54",
|
|
4
4
|
"description": "It is a kitchen simulator (self-contained micro-frontend).",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -82,13 +82,13 @@
|
|
|
82
82
|
"react-hotjar": "^1.0.11",
|
|
83
83
|
"react-icons": "3.5.0",
|
|
84
84
|
"react-redux": "5.0.7",
|
|
85
|
-
"react-svg-pan-zoom": "
|
|
85
|
+
"react-svg-pan-zoom": "2.18.0",
|
|
86
86
|
"redux": "4.0.1",
|
|
87
87
|
"three": "0.166.0",
|
|
88
88
|
"moment": "^2.30.1",
|
|
89
89
|
"jwt-decode": "^2.2.0",
|
|
90
90
|
"react-ga4": "^1.4.1",
|
|
91
|
-
"styled-components": "^
|
|
91
|
+
"styled-components": "^5.2.0"
|
|
92
92
|
},
|
|
93
93
|
"devDependencies": {
|
|
94
94
|
"localstorage-slim": "^1.3.0",
|