kitchen-simulator 2.0.7-unselected-drag.1 → 2.0.11
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/LiteRenderer.js +1 -3
- package/es/actions/items-actions.js +1 -1
- package/es/actions/project-actions.js +3 -1
- package/es/catalog/utils/exporter.js +0 -2
- package/es/class/item.js +3 -1
- package/es/class/project.js +40 -17
- package/es/components/viewer2d/viewer2d.js +2 -2
- package/es/components/viewer3d/viewer3d.js +2 -2
- package/es/constants.js +11 -4
- package/es/devLiteRenderer.js +57 -6
- package/es/models.js +1 -2
- package/es/reducers/items-reducer.js +1 -5
- package/es/reducers/project-reducer.js +1 -1
- package/es/utils/isolate-event-handler.js +247 -193
- package/lib/LiteRenderer.js +1 -3
- package/lib/actions/project-actions.js +3 -1
- package/lib/catalog/utils/exporter.js +0 -2
- package/lib/class/item.js +3 -1
- package/lib/class/project.js +40 -17
- package/lib/components/viewer2d/viewer2d.js +2 -2
- package/lib/components/viewer3d/viewer3d.js +2 -2
- package/lib/constants.js +16 -9
- package/lib/devLiteRenderer.js +56 -5
- package/lib/models.js +1 -2
- package/lib/reducers/items-reducer.js +0 -4
- package/lib/reducers/project-reducer.js +1 -1
- package/lib/utils/isolate-event-handler.js +246 -192
- package/package.json +1 -1
- package/es/assets/Window.hdr +0 -2100
- package/es/assets/brown_photostudio_02_1k.hdr +0 -0
- package/es/assets/gltf/door_sliding.bin +0 -0
- package/es/assets/img/1.jpg +0 -0
- package/es/assets/img/png/helper/video_preview_start.png +0 -0
- package/lib/assets/Window.hdr +0 -2100
- package/lib/assets/brown_photostudio_02_1k.hdr +0 -0
- package/lib/assets/gltf/door_sliding.bin +0 -0
- package/lib/assets/img/1.jpg +0 -0
- package/lib/assets/img/png/helper/video_preview_start.png +0 -0
package/es/LiteRenderer.js
CHANGED
|
@@ -7,7 +7,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
|
7
7
|
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
8
8
|
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
9
9
|
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
10
|
-
var _excluded = ["width", "height", "
|
|
10
|
+
var _excluded = ["width", "height", "configData", "options", "user", "auth", "featureFlags", "sentry", "analytics", "externalEvent", "onInternalEvent", "onError"];
|
|
11
11
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
12
12
|
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; }
|
|
13
13
|
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) { _defineProperty(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; }
|
|
@@ -139,7 +139,6 @@ var ToolErrorBoundary = /*#__PURE__*/function (_React$Component) {
|
|
|
139
139
|
export default function LiteRenderer(props) {
|
|
140
140
|
var width = props.width,
|
|
141
141
|
height = props.height,
|
|
142
|
-
projectElement = props.projectElement,
|
|
143
142
|
configData = props.configData,
|
|
144
143
|
options = props.options,
|
|
145
144
|
user = props.user,
|
|
@@ -351,7 +350,6 @@ export default function LiteRenderer(props) {
|
|
|
351
350
|
LiteRenderer.propTypes = {
|
|
352
351
|
width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
|
|
353
352
|
height: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
|
|
354
|
-
projectElement: PropTypes.arrayOf(PropTypes.object),
|
|
355
353
|
configData: PropTypes.any,
|
|
356
354
|
catalog: PropTypes.oneOfType([PropTypes.object, PropTypes.instanceOf(Models.Catalog)]),
|
|
357
355
|
logoImg: PropTypes.any,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TOGGLE_LOADING_CABINET, SELECT_ITEM, SELECT_TOOL_DRAWING_ITEM, UPDATE_DRAWING_ITEM, END_DRAWING_ITEM, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_ROTATING_ITEM_CHANGED, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, UPDATE_ROTATING_ITEM, UPDATE_ROTATING, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, REPLACE_SUBMODULE, ANIMATE_OBJECT, REMOVE_REPLACE_SUBMODULE, ITEM_MOVE_UP, SELECT_TOOL_DRAWING_ITEM_3D, SET_DOOR_STYLE,
|
|
1
|
+
import { TOGGLE_LOADING_CABINET, SELECT_ITEM, SELECT_TOOL_DRAWING_ITEM, UPDATE_DRAWING_ITEM, END_DRAWING_ITEM, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_ROTATING_ITEM_CHANGED, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, UPDATE_ROTATING_ITEM, UPDATE_ROTATING, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, REPLACE_SUBMODULE, ANIMATE_OBJECT, REMOVE_REPLACE_SUBMODULE, ITEM_MOVE_UP, SELECT_TOOL_DRAWING_ITEM_3D, SET_DOOR_STYLE, SET_HANDLE_MATERIAL, SET_INITIAL_DOOR_STYLE, SET_DISTANT, SET_DOOR_HANDLE, SET_WALL_COLOR, END_CREATING_CABINET, UPDATE_POPUP_OPEN, SET_MODELLING, SET_COUNTER_TOP, SET_BACKSPLASH, SET_BACKSPLASH_VISIBLE, SET_APPLIANCE_MATERIAL, DUPLICATE_SELECTED, EDIT_WIDTH, END_LOADING, STORE_DIST_ARRAY, SET_MOLDING, UPDATE_MOLDING, VALIDATE_ITEM_POSTIONS, REPLACE_ITEM, SET_MOVE_STATUS, SET_ROTATE_STATUS } from "../constants";
|
|
2
2
|
export function storeDistArray(layerID, itemID, distArray) {
|
|
3
3
|
return {
|
|
4
4
|
type: STORE_DIST_ARRAY,
|
|
@@ -98,8 +98,10 @@ export function setHolesAttributes(holesAttributes) {
|
|
|
98
98
|
};
|
|
99
99
|
}
|
|
100
100
|
export function remove() {
|
|
101
|
+
var delObject = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
101
102
|
return {
|
|
102
|
-
type: REMOVE
|
|
103
|
+
type: REMOVE,
|
|
104
|
+
delObject: delObject
|
|
103
105
|
};
|
|
104
106
|
}
|
|
105
107
|
export function undo() {
|
|
@@ -20,7 +20,6 @@ export default function (_ref) {
|
|
|
20
20
|
alti = _ref.alti,
|
|
21
21
|
obj_property = _ref.obj_property,
|
|
22
22
|
outlineSVGData = _ref.outlineSVGData,
|
|
23
|
-
customer_property = _ref.customer_property,
|
|
24
23
|
cds = _ref.cds;
|
|
25
24
|
var _length = alti || 0;
|
|
26
25
|
// const length = convert(_length).from("in").to("cm");
|
|
@@ -137,7 +136,6 @@ export default function (_ref) {
|
|
|
137
136
|
img: base,
|
|
138
137
|
obj: obj_property,
|
|
139
138
|
cds: cds,
|
|
140
|
-
customer_property: customer_property,
|
|
141
139
|
render2D: function render2D(element, layer, scene) {
|
|
142
140
|
return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
|
|
143
141
|
},
|
package/es/class/item.js
CHANGED
|
@@ -71,7 +71,9 @@ var Item = /*#__PURE__*/function () {
|
|
|
71
71
|
}
|
|
72
72
|
var setSizeOfItemByDoorStyle = function setSizeOfItemByDoorStyle() {
|
|
73
73
|
var doorStyle = item.get('doorStyle').toJS();
|
|
74
|
-
var euroCDS = state.catalog.getIn(['elements', type, '
|
|
74
|
+
var euroCDS = state.catalog.getIn(['elements', type, 'cds']).data.filter(function (element) {
|
|
75
|
+
return element && element.is_euro_cds;
|
|
76
|
+
});
|
|
75
77
|
if (doorStyle.door_style_name === 'Euro & Frameless' && euroCDS.length > 0) {
|
|
76
78
|
var newProperties = item.get('properties').toJS();
|
|
77
79
|
if (newProperties.hasOwnProperty('depth')) {
|
package/es/class/project.js
CHANGED
|
@@ -294,29 +294,52 @@ var Project = /*#__PURE__*/function () {
|
|
|
294
294
|
}
|
|
295
295
|
}, {
|
|
296
296
|
key: "remove",
|
|
297
|
-
value: function remove(state) {
|
|
297
|
+
value: function remove(state, delObject) {
|
|
298
298
|
var selectedLayer = state.getIn(['scene', 'selectedLayer']);
|
|
299
299
|
var _state$getIn = state.getIn(['scene', 'layers', selectedLayer, 'selected']),
|
|
300
300
|
selectedLines = _state$getIn.lines,
|
|
301
301
|
selectedHoles = _state$getIn.holes,
|
|
302
302
|
selectedItems = _state$getIn.items;
|
|
303
|
-
var allVertices = state.getIn(['scene', 'layers', selectedLayer, 'vertices']).toJS();
|
|
304
|
-
var selLines = state.getIn(['scene', 'layers', selectedLayer, 'selected', 'lines']).toJS();
|
|
305
|
-
var lineID = selLines[0];
|
|
306
|
-
var delLine = !isEmpty(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
|
|
307
|
-
var allLines = state.getIn(['scene', 'layers', selectedLayer, 'lines']).toJS();
|
|
308
303
|
var relatedLines = [];
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
}
|
|
319
|
-
|
|
304
|
+
|
|
305
|
+
// if deleting element is line then get the related lines that to update walls
|
|
306
|
+
if (delObject && delObject.prototype === constants.ELEMENT_LINE || isEmpty(delObject) && !isEmpty(selectedLines)) {
|
|
307
|
+
var allVertices = state.getIn(['scene', 'layers', selectedLayer, 'vertices']).toJS();
|
|
308
|
+
var selLines = state.getIn(['scene', 'layers', selectedLayer, 'selected', constants.ELEMENT_LINE]).toJS();
|
|
309
|
+
var curSelLineID = (delObject === null || delObject === void 0 ? void 0 : delObject.prototype) === constants.ELEMENT_LINE ? delObject.id : selLines[0];
|
|
310
|
+
var delLine = !isEmpty(curSelLineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', curSelLineID]).toJS();
|
|
311
|
+
var allLines = state.getIn(['scene', 'layers', selectedLayer, 'lines']).toJS();
|
|
312
|
+
!isEmpty(delLine) && GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
|
|
313
|
+
}
|
|
314
|
+
|
|
315
|
+
// delete element
|
|
316
|
+
if (delObject) {
|
|
317
|
+
switch (delObject.prototype) {
|
|
318
|
+
case constants.ELEMENT_LINE:
|
|
319
|
+
state = Line.remove(state, selectedLayer, delObject.id).updatedState;
|
|
320
|
+
break;
|
|
321
|
+
case constants.ELEMENT_HOLE:
|
|
322
|
+
state = Hole.remove(state, selectedLayer, delObject.id).updatedState;
|
|
323
|
+
break;
|
|
324
|
+
case constants.ELEMENT_ITEM:
|
|
325
|
+
state = Item.remove(state, selectedLayer, delObject.id).updatedState;
|
|
326
|
+
break;
|
|
327
|
+
}
|
|
328
|
+
} else {
|
|
329
|
+
// no specified object, then remove all selected elements
|
|
330
|
+
selectedLines.forEach(function (lineID) {
|
|
331
|
+
state = Line.remove(state, selectedLayer, lineID).updatedState;
|
|
332
|
+
});
|
|
333
|
+
selectedHoles.forEach(function (holeID) {
|
|
334
|
+
state = Hole.remove(state, selectedLayer, holeID).updatedState;
|
|
335
|
+
});
|
|
336
|
+
selectedItems.forEach(function (itemID) {
|
|
337
|
+
state = Item.remove(state, selectedLayer, itemID).updatedState;
|
|
338
|
+
});
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
// update wall if line removed
|
|
342
|
+
if (!isEmpty(relatedLines)) {
|
|
320
343
|
state = state.setIn(['mode'], MODE_DRAWING_LINE);
|
|
321
344
|
relatedLines.forEach(function (relLine, index) {
|
|
322
345
|
state = Line.select(state, selectedLayer, relLine.id).updatedState;
|
|
@@ -820,7 +820,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
820
820
|
var currentObject = state.getIn(['scene', 'layers', layerID, elementData.prototype, elementData.id]);
|
|
821
821
|
onInternalEvent === null || onInternalEvent === void 0 || onInternalEvent({
|
|
822
822
|
type: INTERNAL_EVENT_SELECT_ELEMENT,
|
|
823
|
-
value: currentObject.toJS()
|
|
823
|
+
value: currentObject === null || currentObject === void 0 ? void 0 : currentObject.toJS()
|
|
824
824
|
});
|
|
825
825
|
} else {
|
|
826
826
|
sPoint.x = x;
|
|
@@ -1243,7 +1243,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1243
1243
|
var _currentObject = state.getIn(['scene', 'layers', layerID, elementPrototype, elementID]);
|
|
1244
1244
|
onInternalEvent === null || onInternalEvent === void 0 || onInternalEvent({
|
|
1245
1245
|
type: internalType,
|
|
1246
|
-
value: _currentObject.toJS()
|
|
1246
|
+
value: _currentObject === null || _currentObject === void 0 ? void 0 : _currentObject.toJS()
|
|
1247
1247
|
});
|
|
1248
1248
|
}
|
|
1249
1249
|
event.stopPropagation();
|
|
@@ -1628,10 +1628,10 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1628
1628
|
}
|
|
1629
1629
|
}
|
|
1630
1630
|
if (!isEmpty(internalType)) {
|
|
1631
|
-
var _this2$props$onIntern, _this2$props;
|
|
1631
|
+
var _this2$props$onIntern, _this2$props, _selectedElement;
|
|
1632
1632
|
(_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
|
|
1633
1633
|
type: internalType,
|
|
1634
|
-
value: selectedElement.toJS()
|
|
1634
|
+
value: (_selectedElement = selectedElement) === null || _selectedElement === void 0 ? void 0 : _selectedElement.toJS()
|
|
1635
1635
|
});
|
|
1636
1636
|
}
|
|
1637
1637
|
};
|
package/es/constants.js
CHANGED
|
@@ -103,7 +103,6 @@ export var ANIMATE_OBJECT = 'ANIMATE_OBJECT';
|
|
|
103
103
|
export var REMOVE_REPLACE_SUBMODULE = 'REMOVE_REPLACE_SUBMODULE';
|
|
104
104
|
export var ITEM_MOVE_UP = 'ITEM_MOVE_UP';
|
|
105
105
|
export var SET_DOOR_STYLE = 'SET_DOOR_STYLE';
|
|
106
|
-
export var CHANGE_DISTANCE = 'CHANGE_DISTANCE';
|
|
107
106
|
export var SET_HANDLE_MATERIAL = 'SET_HANDLE_MATERIAL';
|
|
108
107
|
export var SET_INITIAL_DOOR_STYLE = 'SET_INITIAL_DOOR_STYLE';
|
|
109
108
|
export var UPDATE_ITEM_POSITION = 'UPDATE_ITEM_POSITION';
|
|
@@ -171,7 +170,6 @@ export var END_DRAGGING_HOLE = 'END_DRAGGING_HOLE';
|
|
|
171
170
|
export var END_DRAGGING_HOLE_3D = 'END_DRAGGING_HOLE_3D';
|
|
172
171
|
export var UPDATE_DRAGGING_HOLE_3D = 'UPDATE_DRAGGING_HOLE_3D';
|
|
173
172
|
export var SET_RELATED_LINE = 'SET_RELATED_LINE';
|
|
174
|
-
export var EXTERNAL_EVENT_CHANGE_DISTANCE = 'EXTERNAL_EVENT_CHANGE_DISTANCE';
|
|
175
173
|
|
|
176
174
|
//ACTIONS vertices
|
|
177
175
|
export var BEGIN_DRAGGING_VERTEX = 'BEGIN_DRAGGING_VERTEX';
|
|
@@ -315,8 +313,7 @@ export var ITEMS_ACTIONS = {
|
|
|
315
313
|
END_LOADING: END_LOADING,
|
|
316
314
|
STORE_DIST_ARRAY: STORE_DIST_ARRAY,
|
|
317
315
|
VALIDATE_ITEM_POSTIONS: VALIDATE_ITEM_POSTIONS,
|
|
318
|
-
REPLACE_ITEM: REPLACE_ITEM
|
|
319
|
-
CHANGE_DISTANCE: CHANGE_DISTANCE
|
|
316
|
+
REPLACE_ITEM: REPLACE_ITEM
|
|
320
317
|
};
|
|
321
318
|
export var HOLE_ACTIONS = {
|
|
322
319
|
SELECT_HOLE: SELECT_HOLE,
|
|
@@ -678,6 +675,12 @@ export var RIGHT_DIST_ANG = 180;
|
|
|
678
675
|
export var BACK_DIST_ANG = 90;
|
|
679
676
|
export var FRONT_DIST_ANG = -90;
|
|
680
677
|
|
|
678
|
+
// element prototype
|
|
679
|
+
export var ELEMENT_LINE = 'lines';
|
|
680
|
+
export var ELEMENT_HOLE = 'holes';
|
|
681
|
+
export var ELEMENT_ITEM = 'items';
|
|
682
|
+
export var ELEMENT_AREA = 'areas';
|
|
683
|
+
export var ELEMENT_VERTEX = 'vertices';
|
|
681
684
|
// element attributes
|
|
682
685
|
export var ATT_ITEM_POS = 'pos';
|
|
683
686
|
export var ATT_ITEM_ROTATION = 'rotation';
|
|
@@ -689,6 +692,7 @@ export var ATT_HOLE_OFFSET_B = 'offsetB';
|
|
|
689
692
|
// element properties
|
|
690
693
|
export var PROP_FLIP_DOOR_HANDLE = 'flip_doorhandle';
|
|
691
694
|
export var PROP_OPEN_DOORS = 'open_doors';
|
|
695
|
+
export var PROP_ALTITUDE = 'altitude';
|
|
692
696
|
|
|
693
697
|
// external event type
|
|
694
698
|
export var EXTERNAL_EVENT_SYNC_SCENE = 'EXTERNAL_EVENT_SYNC_SCENE'; // Host request the scene data to 3DTool for sync : Host -> 3DTool
|
|
@@ -714,6 +718,9 @@ export var EXTERNAL_EVENT_UNDO = 'EXTERNAL_EVENT_UNDO';
|
|
|
714
718
|
export var EXTERNAL_EVENT_REDO = 'EXTERNAL_EVENT_REDO';
|
|
715
719
|
export var EXTERNAL_EVENT_SET_MOLDING = 'EXTERNAL_EVENT_SET_MOLDING';
|
|
716
720
|
export var EXTERNAL_EVENT_PROJECT_SETTING = 'EXTERNAL_EVENT_PROJECT_SETTING'; // project setting event
|
|
721
|
+
export var EXTERNAL_EVENT_CENTERING_2D = 'EXTERNAL_EVENT_CENTERING_2D';
|
|
722
|
+
export var EXTERNAL_EVENT_DUPLICATE_ELEMENT = 'EXTERNAL_EVENT_DUPLICATE_ELEMENT';
|
|
723
|
+
export var EXTERNAL_EVENT_DELETE_ELEMENT = 'EXTERNAL_EVENT_DELETE_ELEMENT';
|
|
717
724
|
export var EXTERNAL_EVENT_UPDATE_ATTRIBUTE = 'EXTERNAL_EVENT_UPDATE_ATTRIBUTE'; // update the element's attributes (distance, rotation...) in the property window
|
|
718
725
|
export var EXTERNAL_EVENT_UPDATE_PROPERTY = 'EXTERNAL_EVENT_UPDATE_PROPERTY'; // update the element's property (flip_doorhandle, open_doors...) in the property window
|
|
719
726
|
|
package/es/devLiteRenderer.js
CHANGED
|
@@ -2,6 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
|
|
3
3
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
4
4
|
import React, { useState, useEffect } from 'react';
|
|
5
|
+
import { Map } from 'immutable';
|
|
5
6
|
import ContainerDimensions from 'react-container-dimensions';
|
|
6
7
|
import projectItemsCatalog from "./mocks/projectItemsCatalog.json";
|
|
7
8
|
import mockProps from "./mocks/mockProps.json";
|
|
@@ -11,11 +12,10 @@ import doorStylePaylod2 from "./mocks/doorStylePayload2.json";
|
|
|
11
12
|
import itemCDSPayload from "./mocks/itemCDSPayload.json";
|
|
12
13
|
import rectangleData from "./mocks/rectangleShape.json";
|
|
13
14
|
import moldingPayload from "./mocks/moldingPayload.json";
|
|
14
|
-
import distancePayload from "./mocks/distancePayload.json";
|
|
15
15
|
import ReactDOM from 'react-dom';
|
|
16
16
|
import LiteRenderer from "./LiteRenderer";
|
|
17
17
|
import { Button } from 'antd';
|
|
18
|
-
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_SET_INITIAL_DATA, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, HOLE_NAMES } from "./constants";
|
|
18
|
+
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_SET_INITIAL_DATA, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, HOLE_NAMES, EXTERNAL_EVENT_CENTERING_2D, PROP_ALTITUDE, EXTERNAL_EVENT_DUPLICATE_ELEMENT, ELEMENT_ITEM, EXTERNAL_EVENT_DELETE_ELEMENT } from "./constants";
|
|
19
19
|
|
|
20
20
|
// --- renderer props ---
|
|
21
21
|
var options = {
|
|
@@ -174,7 +174,7 @@ function WorkSpace(props) {
|
|
|
174
174
|
actionType: "primary",
|
|
175
175
|
onClick: function onClick() {
|
|
176
176
|
var evt = {
|
|
177
|
-
type:
|
|
177
|
+
type: EXTERNAL_EVENT_ZOOM_OUT,
|
|
178
178
|
payload: {}
|
|
179
179
|
};
|
|
180
180
|
setExternalEvent(evt);
|
|
@@ -185,7 +185,7 @@ function WorkSpace(props) {
|
|
|
185
185
|
actionType: "primary",
|
|
186
186
|
onClick: function onClick() {
|
|
187
187
|
var evt = {
|
|
188
|
-
type:
|
|
188
|
+
type: EXTERNAL_EVENT_ZOOM_IN,
|
|
189
189
|
payload: {}
|
|
190
190
|
};
|
|
191
191
|
setExternalEvent(evt);
|
|
@@ -372,6 +372,49 @@ function WorkSpace(props) {
|
|
|
372
372
|
setExternalEvent(evt);
|
|
373
373
|
}
|
|
374
374
|
}, "Open Doors"), /*#__PURE__*/React.createElement(Button, {
|
|
375
|
+
actionType: "danger",
|
|
376
|
+
onClick: function onClick() {
|
|
377
|
+
var evt = {
|
|
378
|
+
type: EXTERNAL_EVENT_UPDATE_PROPERTY,
|
|
379
|
+
payload: {
|
|
380
|
+
propertyName: PROP_ALTITUDE,
|
|
381
|
+
// this property should be Map
|
|
382
|
+
value: new Map({
|
|
383
|
+
length: 25.399999187200024,
|
|
384
|
+
// cm
|
|
385
|
+
_length: 10,
|
|
386
|
+
// inch
|
|
387
|
+
_unit: 'in'
|
|
388
|
+
})
|
|
389
|
+
}
|
|
390
|
+
};
|
|
391
|
+
setExternalEvent(evt);
|
|
392
|
+
}
|
|
393
|
+
}, "Distance from floor 10\""), /*#__PURE__*/React.createElement(Button, {
|
|
394
|
+
actionType: "danger",
|
|
395
|
+
onClick: function onClick() {
|
|
396
|
+
var evt = {
|
|
397
|
+
type: EXTERNAL_EVENT_DUPLICATE_ELEMENT,
|
|
398
|
+
payload: {
|
|
399
|
+
elementPrototype: ELEMENT_ITEM,
|
|
400
|
+
elementId: '' // id of current operating element
|
|
401
|
+
}
|
|
402
|
+
};
|
|
403
|
+
setExternalEvent(evt);
|
|
404
|
+
}
|
|
405
|
+
}, "Duplicate Item"), /*#__PURE__*/React.createElement(Button, {
|
|
406
|
+
actionType: "danger",
|
|
407
|
+
onClick: function onClick() {
|
|
408
|
+
var evt = {
|
|
409
|
+
type: EXTERNAL_EVENT_DELETE_ELEMENT,
|
|
410
|
+
payload: {
|
|
411
|
+
elementPrototype: ELEMENT_ITEM,
|
|
412
|
+
elementId: '' // id of current operating element
|
|
413
|
+
}
|
|
414
|
+
};
|
|
415
|
+
setExternalEvent(evt);
|
|
416
|
+
}
|
|
417
|
+
}, "Delete Item"), /*#__PURE__*/React.createElement(Button, {
|
|
375
418
|
actionType: "danger",
|
|
376
419
|
onClick: function onClick() {
|
|
377
420
|
var evt = {
|
|
@@ -402,10 +445,18 @@ function WorkSpace(props) {
|
|
|
402
445
|
};
|
|
403
446
|
setExternalEvent(evt);
|
|
404
447
|
}
|
|
405
|
-
}, "Add Appliance (30 Bottom Freezer)")
|
|
448
|
+
}, "Add Appliance (30 Bottom Freezer)"), /*#__PURE__*/React.createElement(Button, {
|
|
449
|
+
actionType: "danger",
|
|
450
|
+
onClick: function onClick() {
|
|
451
|
+
var evt = {
|
|
452
|
+
type: EXTERNAL_EVENT_CENTERING_2D,
|
|
453
|
+
payload: {}
|
|
454
|
+
};
|
|
455
|
+
setExternalEvent(evt);
|
|
456
|
+
}
|
|
457
|
+
}, "Centering Viewer2D")), /*#__PURE__*/React.createElement(LiteRenderer, {
|
|
406
458
|
width: props.width,
|
|
407
459
|
height: props.height,
|
|
408
|
-
projectElement: mockProps.projectElement,
|
|
409
460
|
configData: mockProps.configData,
|
|
410
461
|
options: options,
|
|
411
462
|
logoImg: "/assets/logo.png",
|
package/es/models.js
CHANGED
|
@@ -339,8 +339,7 @@ export var CatalogElement = /*#__PURE__*/function (_Record1) {
|
|
|
339
339
|
properties: new Map(),
|
|
340
340
|
obj: new Map(),
|
|
341
341
|
type: '',
|
|
342
|
-
cds: new Map()
|
|
343
|
-
customer_property: new Map()
|
|
342
|
+
cds: new Map()
|
|
344
343
|
}, 'CatalogElement'));
|
|
345
344
|
export var Catalog = /*#__PURE__*/function (_Record10) {
|
|
346
345
|
function Catalog() {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Item, Area } from "../class/export";
|
|
2
2
|
import { history } from "../utils/export";
|
|
3
|
-
import { TOGGLE_LOADING_CABINET, SELECT_TOOL_DRAWING_ITEM, UPDATE_DRAWING_ITEM, END_DRAWING_ITEM, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, UPDATE_ROTATING, UPDATE_ROTATING_ITEM, UPDATE_ROTATING_ITEM_CHANGED, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, REPLACE_SUBMODULE, SELECT_ITEM, ANIMATE_OBJECT, REMOVE_REPLACE_SUBMODULE, ITEM_MOVE_UP, SELECT_TOOL_DRAWING_ITEM_3D, SET_DOOR_STYLE,
|
|
3
|
+
import { TOGGLE_LOADING_CABINET, SELECT_TOOL_DRAWING_ITEM, UPDATE_DRAWING_ITEM, END_DRAWING_ITEM, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, UPDATE_ROTATING, UPDATE_ROTATING_ITEM, UPDATE_ROTATING_ITEM_CHANGED, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, REPLACE_SUBMODULE, SELECT_ITEM, ANIMATE_OBJECT, REMOVE_REPLACE_SUBMODULE, ITEM_MOVE_UP, SELECT_TOOL_DRAWING_ITEM_3D, SET_DOOR_STYLE, SET_HANDLE_MATERIAL, SET_INITIAL_DOOR_STYLE, UPDATE_ITEM_POSITION, SET_DOOR_HANDLE, SET_WALL_COLOR, END_CREATING_CABINET, UPDATE_POPUP_OPEN, SET_MODELLING, SET_COUNTER_TOP, SET_BACKSPLASH, SET_BACKSPLASH_VISIBLE, SET_APPLIANCE_MATERIAL, DUPLICATE_SELECTED, EDIT_WIDTH, END_LOADING, SET_MOLDING, UPDATE_MOLDING, STORE_DIST_ARRAY, VALIDATE_ITEM_POSTIONS, REPLACE_ITEM
|
|
4
4
|
// SET_MOVE_STATUS,
|
|
5
5
|
// SET_ROTATE_STATUS
|
|
6
6
|
} from "../constants";
|
|
@@ -106,10 +106,6 @@ export default function (state, action) {
|
|
|
106
106
|
return Item.selectToolDrawingItem3D(state, action.sceneComponentType).updatedState;
|
|
107
107
|
case SET_DOOR_STYLE:
|
|
108
108
|
return Item.setDoorStyle(state, action.doorStyle, action.itemCDS, action.isAll).updatedState;
|
|
109
|
-
case CHANGE_DISTANCE:
|
|
110
|
-
{
|
|
111
|
-
return Item.changeDistance(state, action.distancePayload).updatedState;
|
|
112
|
-
}
|
|
113
109
|
case SET_HANDLE_MATERIAL:
|
|
114
110
|
return Item.setHandleMaterial(state, action.material).updatedState;
|
|
115
111
|
case SET_DOOR_HANDLE:
|
|
@@ -43,7 +43,7 @@ export default function (state, action) {
|
|
|
43
43
|
state = state.merge({
|
|
44
44
|
sceneHistory: history.historyPush(state.sceneHistory, state.scene)
|
|
45
45
|
});
|
|
46
|
-
return Project.remove(state).updatedState;
|
|
46
|
+
return Project.remove(state, action.delObject).updatedState;
|
|
47
47
|
case UNDO:
|
|
48
48
|
return Project.undo(state).updatedState;
|
|
49
49
|
case REDO:
|