kitchen-simulator 1.1.1-test.64 → 1.1.1-test.65
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/@history.js +10 -2
- package/es/AppContext.js +10 -3
- package/es/KitchenConfigurator.js +79 -70
- package/es/KitchenConfiguratorApp.js +107 -98
- package/es/actions/area-actions.js +12 -5
- package/es/actions/export.js +29 -12
- package/es/actions/groups-actions.js +45 -27
- package/es/actions/holes-actions.js +55 -34
- package/es/actions/items-actions.js +145 -94
- package/es/actions/lines-actions.js +36 -21
- package/es/actions/project-actions.js +145 -94
- package/es/actions/scene-actions.js +21 -11
- package/es/actions/vertices-actions.js +15 -7
- package/es/actions/viewer2d-actions.js +36 -21
- package/es/actions/viewer3d-actions.js +18 -9
- package/es/catalog/areas/area/planner-element.js +9 -2
- package/es/catalog/catalog.js +21 -15
- package/es/catalog/factories/area-factory-3d.js +31 -22
- package/es/catalog/factories/area-factory.js +20 -11
- package/es/catalog/factories/export.js +24 -6
- package/es/catalog/factories/wall-factory-3d.js +41 -31
- package/es/catalog/factories/wall-factory.js +31 -21
- package/es/catalog/holes/door-closet/planner-element.js +24 -15
- package/es/catalog/holes/door-double/planner-element.js +24 -15
- package/es/catalog/holes/door-exterior/planner-element.js +25 -16
- package/es/catalog/holes/door-interior/planner-element.js +25 -16
- package/es/catalog/holes/door-panic/planner-element.js +16 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +24 -15
- package/es/catalog/holes/door-sliding/planner-element.js +25 -16
- package/es/catalog/holes/doorway-framed/planner-element.js +20 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +16 -7
- package/es/catalog/holes/export.js +97 -13
- package/es/catalog/holes/window-clear/planner-element.js +19 -10
- package/es/catalog/holes/window-cross/planner-element.js +19 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +19 -10
- package/es/catalog/holes/window-vertical/planner-element.js +19 -10
- package/es/catalog/lines/wall/planner-element.js +9 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +14 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +14 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +14 -5
- package/es/catalog/properties/export.js +80 -20
- package/es/catalog/properties/property-checkbox.js +31 -24
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +31 -24
- package/es/catalog/properties/property-hidden.js +16 -9
- package/es/catalog/properties/property-lenght-measure.js +45 -38
- package/es/catalog/properties/property-length-measure.js +43 -36
- package/es/catalog/properties/property-length-measure_hole.js +45 -38
- package/es/catalog/properties/property-number.js +24 -17
- package/es/catalog/properties/property-read-only.js +23 -16
- package/es/catalog/properties/property-string.js +23 -16
- package/es/catalog/properties/property-toggle.js +23 -16
- package/es/catalog/properties/shared-property-style.js +7 -1
- package/es/catalog/utils/FuseUtils.js +15 -8
- package/es/catalog/utils/exporter.js +15 -8
- package/es/catalog/utils/geom-utils.js +29 -13
- package/es/catalog/utils/item-loader.js +97 -84
- package/es/catalog/utils/load-obj.js +28 -20
- package/es/catalog/utils/mtl-loader.js +8 -3
- package/es/catalog/utils/obj-loader.js +8 -3
- package/es/class/FuseUtils.js +15 -8
- package/es/class/area.js +28 -22
- package/es/class/export.js +95 -23
- package/es/class/group.js +59 -53
- package/es/class/guide.js +21 -15
- package/es/class/hole.js +89 -83
- package/es/class/item.js +147 -141
- package/es/class/layer.js +65 -59
- package/es/class/line.js +143 -135
- package/es/class/project.js +98 -90
- package/es/class/vertex.js +35 -29
- package/es/components/content.js +28 -19
- package/es/components/disclaimer/disclaimer.js +18 -10
- package/es/components/export.js +32 -8
- package/es/components/style/button.js +31 -23
- package/es/components/style/cancel-button.js +14 -7
- package/es/components/style/content-container.js +16 -9
- package/es/components/style/content-title.js +20 -11
- package/es/components/style/delete-button.js +17 -8
- package/es/components/style/export.js +120 -30
- package/es/components/style/form-block.js +15 -8
- package/es/components/style/form-color-input.js +14 -7
- package/es/components/style/form-label.js +15 -8
- package/es/components/style/form-number-input.js +49 -41
- package/es/components/style/form-number-input_2.js +44 -36
- package/es/components/style/form-select.js +24 -17
- package/es/components/style/form-slider.js +17 -10
- package/es/components/style/form-submit-button.js +17 -8
- package/es/components/style/form-text-input.js +34 -26
- package/es/components/viewer2d/area.js +24 -17
- package/es/components/viewer2d/export.js +120 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +17 -10
- package/es/components/viewer2d/grids/grids.js +19 -10
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -61
- package/es/components/viewer2d/layer.js +30 -23
- package/es/components/viewer2d/line.js +111 -101
- package/es/components/viewer2d/ruler.js +29 -22
- package/es/components/viewer2d/rulerDist.js +28 -21
- package/es/components/viewer2d/rulerX.js +47 -39
- package/es/components/viewer2d/rulerY.js +45 -37
- package/es/components/viewer2d/scene.js +38 -30
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -18
- package/es/components/viewer2d/utils.js +37 -24
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +163 -153
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +23 -17
- package/es/components/viewer3d/dcm.js +7 -1
- package/es/components/viewer3d/fbm.js +7 -1
- package/es/components/viewer3d/front3D.js +21 -12
- package/es/components/viewer3d/grid-creator.js +17 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +14 -6
- package/es/components/viewer3d/grids/grid-streak.js +13 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +14 -6
- package/es/components/viewer3d/libs/first-person-controls.js +9 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +7 -1
- package/es/components/viewer3d/libs/mtl-loader.js +7 -1
- package/es/components/viewer3d/libs/obj-loader.js +7 -1
- package/es/components/viewer3d/libs/orbit-controls.js +8 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +8 -2
- package/es/components/viewer3d/lrm.js +7 -1
- package/es/components/viewer3d/model.js +7 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +10 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +25 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +66 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +46 -39
- package/es/components/viewer3d/ruler-utils/scene3D.js +17 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +11 -4
- package/es/components/viewer3d/scene-creator.js +226 -191
- package/es/components/viewer3d/three-memory-cleaner.js +12 -3
- package/es/components/viewer3d/viewer3d-first-person.js +46 -40
- package/es/components/viewer3d/viewer3d.js +202 -196
- package/es/constants.js +358 -349
- package/es/index.js +15 -7
- package/es/models.js +184 -177
- package/es/plugins/SVGLoader.js +53 -48
- package/es/plugins/autosave.js +9 -3
- package/es/plugins/console-debugger.js +12 -5
- package/es/plugins/export.js +32 -8
- package/es/plugins/keyboard.js +35 -29
- package/es/reducers/areas-reducer.js +13 -7
- package/es/reducers/export.js +96 -24
- package/es/reducers/groups-reducer.js +37 -31
- package/es/reducers/holes-reducer.js +49 -43
- package/es/reducers/items-reducer.js +112 -106
- package/es/reducers/lines-reducer.js +34 -28
- package/es/reducers/project-reducer.js +111 -105
- package/es/reducers/reducer.js +23 -16
- package/es/reducers/scene-reducer.js +21 -15
- package/es/reducers/user-reducer.js +11 -5
- package/es/reducers/vertices-reducer.js +17 -11
- package/es/reducers/viewer2d-reducer.js +24 -18
- package/es/reducers/viewer3d-reducer.js +22 -16
- package/es/shared-style.js +16 -10
- package/es/styles/export.js +11 -3
- package/es/translator/en.js +7 -1
- package/es/translator/it.js +7 -1
- package/es/translator/ru.js +7 -1
- package/es/translator/translator.js +19 -13
- package/es/utils/browser.js +9 -2
- package/es/utils/convert-units-lite.js +7 -1
- package/es/utils/email-validator.js +7 -1
- package/es/utils/export.js +46 -15
- package/es/utils/geometry.js +278 -181
- package/es/utils/get-edges-of-subgraphs.js +9 -2
- package/es/utils/graph-cycles.js +11 -8
- package/es/utils/graph-inner-cycles.js +18 -10
- package/es/utils/graph.js +17 -9
- package/es/utils/helper.js +63 -39
- package/es/utils/history.js +15 -8
- package/es/utils/id-broker.js +15 -8
- package/es/utils/logger.js +7 -1
- package/es/utils/math.js +12 -5
- package/es/utils/molding.js +144 -119
- package/es/utils/name-generator.js +13 -7
- package/es/utils/objects-utils.js +19 -7
- package/es/utils/phone-validator.js +7 -1
- package/es/utils/process-black-list.js +10 -3
- package/es/utils/react-if.js +12 -6
- package/es/utils/snap-scene.js +34 -27
- package/es/utils/snap.js +59 -45
- package/es/utils/summarizeCart.js +7 -1
- package/es/utils/threeCSG.es6.js +22 -13
- package/es/version.js +7 -1
- package/package.json +1 -1
package/es/class/project.js
CHANGED
|
@@ -1,21 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports["default"] = void 0;
|
|
9
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
10
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
11
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
12
|
+
var _immutable = require("immutable");
|
|
13
|
+
var _constants = _interopRequireWildcard(require("../constants"));
|
|
14
|
+
var constants = _constants;
|
|
15
|
+
var _models = require("../models");
|
|
16
|
+
var _export = require("../utils/export");
|
|
17
|
+
var _export2 = require("../class/export");
|
|
18
|
+
var viewer2DActions = _interopRequireWildcard(require("../actions/viewer2d-actions"));
|
|
19
|
+
var _helper = require("../utils/helper");
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
4
21
|
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; }
|
|
5
|
-
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) {
|
|
6
|
-
|
|
7
|
-
import * as constants from "../constants";
|
|
8
|
-
import { ARRAY_3D_MODES, END_DRAWING_LINE, MODE_CONFIGURING_PROJECT, MODE_DRAWING_HOLE, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_DRAWING_LINE, MODE_IDLE, MODE_IDLE_3D, MODE_VIEWING_CATALOG, MODE_WAITING_DRAWING_LINE } from "../constants";
|
|
9
|
-
import { Catalog, Scene, State } from "../models";
|
|
10
|
-
import { GeometryUtils, history } from "../utils/export";
|
|
11
|
-
import { Area, Group, Hole, HorizontalGuide, Item, Layer, Line, VerticalGuide } from "../class/export";
|
|
12
|
-
import * as viewer2DActions from "../actions/viewer2d-actions";
|
|
13
|
-
import { isEmpty } from "../utils/helper";
|
|
14
|
-
var Project = /*#__PURE__*/function () {
|
|
22
|
+
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; }
|
|
23
|
+
var Project = exports["default"] = /*#__PURE__*/function () {
|
|
15
24
|
function Project() {
|
|
16
|
-
|
|
25
|
+
(0, _classCallCheck2["default"])(this, Project);
|
|
17
26
|
}
|
|
18
|
-
return
|
|
27
|
+
return (0, _createClass2["default"])(Project, null, [{
|
|
19
28
|
key: "setAlterate",
|
|
20
29
|
value: function setAlterate(state) {
|
|
21
30
|
return {
|
|
@@ -25,7 +34,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
25
34
|
}, {
|
|
26
35
|
key: "openCatalog",
|
|
27
36
|
value: function openCatalog(state) {
|
|
28
|
-
state = this.setMode(state, MODE_VIEWING_CATALOG).updatedState;
|
|
37
|
+
state = this.setMode(state, _constants.MODE_VIEWING_CATALOG).updatedState;
|
|
29
38
|
return {
|
|
30
39
|
updatedState: state
|
|
31
40
|
};
|
|
@@ -45,7 +54,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
45
54
|
a: 0.99,
|
|
46
55
|
d: 0.99
|
|
47
56
|
});
|
|
48
|
-
state = new State({});
|
|
57
|
+
state = new _models.State({});
|
|
49
58
|
state = state.merge({
|
|
50
59
|
doorStyle: doorStyle,
|
|
51
60
|
oStyle: oStyle,
|
|
@@ -93,20 +102,20 @@ var Project = /*#__PURE__*/function () {
|
|
|
93
102
|
for (var x in json_items) {
|
|
94
103
|
_loop(x);
|
|
95
104
|
}
|
|
96
|
-
var newScene = new Scene(sceneJSON);
|
|
97
|
-
state = new State({
|
|
105
|
+
var newScene = new _models.Scene(sceneJSON);
|
|
106
|
+
state = new _models.State({
|
|
98
107
|
scene: newScene.toJS(),
|
|
99
108
|
catalog: state.catalog.toJS()
|
|
100
109
|
});
|
|
101
110
|
state = state.merge({
|
|
102
|
-
sceneHistory: history.historyPush(oldSceneHistory, oldScene)
|
|
111
|
+
sceneHistory: _export.history.historyPush(oldSceneHistory, oldScene)
|
|
103
112
|
});
|
|
104
113
|
if (state.scene.title === '') {
|
|
105
114
|
state = state.mergeIn(['scene', 'title'], oldScene.title);
|
|
106
115
|
}
|
|
107
116
|
|
|
108
117
|
//Validate item positions after loading project.
|
|
109
|
-
state = Item.validateItemPositions(state, layerID).updatedState;
|
|
118
|
+
state = _export2.Item.validateItemPositions(state, layerID).updatedState;
|
|
110
119
|
|
|
111
120
|
// get counterTop and floorStyle is after state created from sceneJSON
|
|
112
121
|
if (state.getIn(['scene', 'layers', layerID, 'counterTop']).uri) {
|
|
@@ -164,8 +173,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
164
173
|
oStyle: oStyle,
|
|
165
174
|
viewer2D: _viewer2D
|
|
166
175
|
});
|
|
167
|
-
state = Item.setCounterTop(state, counterTop).updatedState;
|
|
168
|
-
state = Area.setFloorStyles(state, floorStyle).updatedState;
|
|
176
|
+
state = _export2.Item.setCounterTop(state, counterTop).updatedState;
|
|
177
|
+
state = _export2.Area.setFloorStyles(state, floorStyle).updatedState;
|
|
169
178
|
if (state.getIn(['scene', 'layers', layerID, 'doorStyle']) && !state.getIn(['scene', 'layers', layerID, 'doorStyle', 'install'])) {
|
|
170
179
|
var layerDoorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
|
|
171
180
|
var install = '';
|
|
@@ -199,8 +208,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
199
208
|
updatedState: state
|
|
200
209
|
};
|
|
201
210
|
}
|
|
202
|
-
state = Layer.setPropertiesOnSelected(state, layerID, properties).updatedState;
|
|
203
|
-
state = Layer.updateMovingState(state, false).updatedState;
|
|
211
|
+
state = _export2.Layer.setPropertiesOnSelected(state, layerID, properties).updatedState;
|
|
212
|
+
state = _export2.Layer.updateMovingState(state, false).updatedState;
|
|
204
213
|
return {
|
|
205
214
|
updatedState: state
|
|
206
215
|
};
|
|
@@ -208,7 +217,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
208
217
|
}, {
|
|
209
218
|
key: "updateProperties",
|
|
210
219
|
value: function updateProperties(state, layerID, properties) {
|
|
211
|
-
state = Layer.updatePropertiesOnSelected(state, layerID, properties).updatedState;
|
|
220
|
+
state = _export2.Layer.updatePropertiesOnSelected(state, layerID, properties).updatedState;
|
|
212
221
|
return {
|
|
213
222
|
updatedState: state
|
|
214
223
|
};
|
|
@@ -217,9 +226,9 @@ var Project = /*#__PURE__*/function () {
|
|
|
217
226
|
key: "setItemsAttributes",
|
|
218
227
|
value: function setItemsAttributes(state, attributes) {
|
|
219
228
|
//TODO apply only to items
|
|
220
|
-
state = Layer.updateMovingState(state, false).updatedState;
|
|
229
|
+
state = _export2.Layer.updateMovingState(state, false).updatedState;
|
|
221
230
|
state.getIn(['scene', 'layers']).forEach(function (layer) {
|
|
222
|
-
state = Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
231
|
+
state = _export2.Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
223
232
|
});
|
|
224
233
|
return {
|
|
225
234
|
updatedState: state
|
|
@@ -231,12 +240,12 @@ var Project = /*#__PURE__*/function () {
|
|
|
231
240
|
//TODO apply only to lines
|
|
232
241
|
if (!isDirect) {
|
|
233
242
|
state.getIn(['scene', 'layers']).forEach(function (layer) {
|
|
234
|
-
state = Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
243
|
+
state = _export2.Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
235
244
|
});
|
|
236
245
|
} else if (isDirect && directData !== null) {
|
|
237
246
|
var layerID = directData.layerID,
|
|
238
247
|
lineID = directData.lineID;
|
|
239
|
-
if (layerID && lineID) state = Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
248
|
+
if (layerID && lineID) state = _export2.Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
240
249
|
}
|
|
241
250
|
return {
|
|
242
251
|
updatedState: state
|
|
@@ -247,7 +256,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
247
256
|
value: function setHolesAttributes(state, attributes) {
|
|
248
257
|
//TODO apply only to holes
|
|
249
258
|
state.getIn(['scene', 'layers']).forEach(function (layer) {
|
|
250
|
-
state = Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
259
|
+
state = _export2.Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
251
260
|
});
|
|
252
261
|
return {
|
|
253
262
|
updatedState: state
|
|
@@ -258,19 +267,19 @@ var Project = /*#__PURE__*/function () {
|
|
|
258
267
|
value: function unselectAll(state) {
|
|
259
268
|
state.getIn(['scene', 'layers']).forEach(function (_ref) {
|
|
260
269
|
var layerID = _ref.id;
|
|
261
|
-
state = Layer.unselectAll(state, layerID).updatedState;
|
|
270
|
+
state = _export2.Layer.unselectAll(state, layerID).updatedState;
|
|
262
271
|
});
|
|
263
272
|
state.getIn(['scene', 'groups']).forEach(function (group) {
|
|
264
|
-
state = Group.unselect(state, group.get('id')).updatedState;
|
|
273
|
+
state = _export2.Group.unselect(state, group.get('id')).updatedState;
|
|
265
274
|
});
|
|
266
275
|
var mode = state.getIn(['mode']);
|
|
267
276
|
if (mode === constants.MODE_DRAGGING_LINE || mode === constants.MODE_DRAGGING_VERTEX) {
|
|
268
277
|
if (mode.includes('3D')) {
|
|
269
|
-
state = state.setIn(['mode'], MODE_IDLE_3D);
|
|
270
|
-
} else state = state.setIn(['mode'], MODE_IDLE);
|
|
278
|
+
state = state.setIn(['mode'], _constants.MODE_IDLE_3D);
|
|
279
|
+
} else state = state.setIn(['mode'], _constants.MODE_IDLE);
|
|
271
280
|
state = state.merge({
|
|
272
281
|
activeSnapElement: null,
|
|
273
|
-
snapElements: new List()
|
|
282
|
+
snapElements: new _immutable.List()
|
|
274
283
|
});
|
|
275
284
|
}
|
|
276
285
|
return {
|
|
@@ -283,7 +292,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
283
292
|
if (value == null) {
|
|
284
293
|
state.getIn(['scene', 'layers']).forEach(function (_ref2) {
|
|
285
294
|
var layerID = _ref2.id;
|
|
286
|
-
state = Layer.selectAll(state, layerID).updatedState;
|
|
295
|
+
state = _export2.Layer.selectAll(state, layerID).updatedState;
|
|
287
296
|
});
|
|
288
297
|
} else {
|
|
289
298
|
var layerID = state.getIn(['scene', 'selectedLayer']);
|
|
@@ -324,33 +333,33 @@ var Project = /*#__PURE__*/function () {
|
|
|
324
333
|
var allVertices = state.getIn(['scene', 'layers', selectedLayer, 'vertices']).toJS();
|
|
325
334
|
var selLines = state.getIn(['scene', 'layers', selectedLayer, 'selected', 'lines']).toJS();
|
|
326
335
|
var lineID = selLines[0];
|
|
327
|
-
var delLine = !isEmpty(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
|
|
336
|
+
var delLine = !(0, _helper.isEmpty)(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
|
|
328
337
|
var allLines = state.getIn(['scene', 'layers', selectedLayer, 'lines']).toJS();
|
|
329
338
|
var relatedLines = [];
|
|
330
|
-
delLine && GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
|
|
339
|
+
delLine && _export.GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
|
|
331
340
|
selectedLines.forEach(function (lineID) {
|
|
332
|
-
state = Line.remove(state, selectedLayer, lineID).updatedState;
|
|
341
|
+
state = _export2.Line.remove(state, selectedLayer, lineID).updatedState;
|
|
333
342
|
});
|
|
334
343
|
selectedHoles.forEach(function (holeID) {
|
|
335
|
-
state = Hole.remove(state, selectedLayer, holeID).updatedState;
|
|
344
|
+
state = _export2.Hole.remove(state, selectedLayer, holeID).updatedState;
|
|
336
345
|
});
|
|
337
346
|
selectedItems.forEach(function (itemID) {
|
|
338
|
-
state = Item.remove(state, selectedLayer, itemID).updatedState;
|
|
347
|
+
state = _export2.Item.remove(state, selectedLayer, itemID).updatedState;
|
|
339
348
|
});
|
|
340
|
-
if (!isEmpty(relatedLines)) {
|
|
341
|
-
state = state.setIn(['mode'], MODE_DRAWING_LINE);
|
|
349
|
+
if (!(0, _helper.isEmpty)(relatedLines)) {
|
|
350
|
+
state = state.setIn(['mode'], _constants.MODE_DRAWING_LINE);
|
|
342
351
|
relatedLines.forEach(function (relLine, index) {
|
|
343
|
-
state = Line.select(state, selectedLayer, relLine.id).updatedState;
|
|
344
|
-
state = Line.applyWallChanges(state, END_DRAWING_LINE).updatedState;
|
|
352
|
+
state = _export2.Line.select(state, selectedLayer, relLine.id).updatedState;
|
|
353
|
+
state = _export2.Line.applyWallChanges(state, _constants.END_DRAWING_LINE).updatedState;
|
|
345
354
|
});
|
|
346
355
|
}
|
|
347
|
-
state = Layer.unselectAll(state, selectedLayer).updatedState;
|
|
356
|
+
state = _export2.Layer.unselectAll(state, selectedLayer).updatedState;
|
|
348
357
|
var mode = state.getIn(['mode']);
|
|
349
358
|
if (mode.includes('DRAWING') || mode.includes('DRAGGING') || mode.includes('ROTATING')) {
|
|
350
359
|
state = state.merge({
|
|
351
360
|
activeSnapElement: null
|
|
352
361
|
});
|
|
353
|
-
if (mode.endsWith('3D')) state = state.setIn(['mode'], MODE_IDLE_3D);else state = state.setIn(['mode'], MODE_IDLE);
|
|
362
|
+
if (mode.endsWith('3D')) state = state.setIn(['mode'], _constants.MODE_IDLE_3D);else state = state.setIn(['mode'], _constants.MODE_IDLE);
|
|
354
363
|
}
|
|
355
364
|
return {
|
|
356
365
|
updatedState: state
|
|
@@ -367,15 +376,15 @@ var Project = /*#__PURE__*/function () {
|
|
|
367
376
|
var forRedo = window.forRedo;
|
|
368
377
|
window.forRedo = forRedo;
|
|
369
378
|
if (state.scene === sceneHistory.last && sceneHistory.list.size > 1) {
|
|
370
|
-
sceneHistory = history.historyPop(sceneHistory);
|
|
379
|
+
sceneHistory = _export.history.historyPop(sceneHistory);
|
|
371
380
|
}
|
|
372
381
|
forRedo.push(state.scene);
|
|
373
382
|
var mode;
|
|
374
|
-
if (ARRAY_3D_MODES.includes(state.mode)) mode = MODE_IDLE_3D;else mode = MODE_IDLE;
|
|
383
|
+
if (_constants.ARRAY_3D_MODES.includes(state.mode)) mode = _constants.MODE_IDLE_3D;else mode = _constants.MODE_IDLE;
|
|
375
384
|
state = state.merge({
|
|
376
385
|
mode: mode,
|
|
377
386
|
scene: sceneHistory.last,
|
|
378
|
-
sceneHistory: history.historyPop(sceneHistory)
|
|
387
|
+
sceneHistory: _export.history.historyPop(sceneHistory)
|
|
379
388
|
});
|
|
380
389
|
return {
|
|
381
390
|
updatedState: state
|
|
@@ -390,11 +399,11 @@ var Project = /*#__PURE__*/function () {
|
|
|
390
399
|
};
|
|
391
400
|
var scene = forRedo.pop();
|
|
392
401
|
var mode;
|
|
393
|
-
if (ARRAY_3D_MODES.includes(state.mode)) mode = MODE_IDLE_3D;else mode = MODE_IDLE;
|
|
402
|
+
if (_constants.ARRAY_3D_MODES.includes(state.mode)) mode = _constants.MODE_IDLE_3D;else mode = _constants.MODE_IDLE;
|
|
394
403
|
state = state.merge({
|
|
395
404
|
mode: mode,
|
|
396
405
|
scene: scene,
|
|
397
|
-
sceneHistory: history.historyPush(state.sceneHistory, state.scene)
|
|
406
|
+
sceneHistory: _export.history.historyPush(state.sceneHistory, state.scene)
|
|
398
407
|
});
|
|
399
408
|
window.forRedo = forRedo;
|
|
400
409
|
return {
|
|
@@ -423,7 +432,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
423
432
|
key: "recreate",
|
|
424
433
|
value: function recreate(state) {
|
|
425
434
|
if (state.getIn(['drawingSupport', 'type']) !== undefined) state = state.merge({
|
|
426
|
-
mode: MODE_DRAWING_ITEM_3D,
|
|
435
|
+
mode: _constants.MODE_DRAWING_ITEM_3D,
|
|
427
436
|
popup: true
|
|
428
437
|
});
|
|
429
438
|
return {
|
|
@@ -445,10 +454,10 @@ var Project = /*#__PURE__*/function () {
|
|
|
445
454
|
value: function shift2doff(state) {
|
|
446
455
|
if (state.getIn(['drawingSupport', 'type']) !== undefined) {
|
|
447
456
|
if (state.get('selectedElementsHistory')._tail.array[0].prototype === 'holes') state = state.merge({
|
|
448
|
-
mode: MODE_DRAWING_HOLE,
|
|
457
|
+
mode: _constants.MODE_DRAWING_HOLE,
|
|
449
458
|
popup: true
|
|
450
459
|
});else state = state.merge({
|
|
451
|
-
mode: MODE_DRAWING_ITEM,
|
|
460
|
+
mode: _constants.MODE_DRAWING_ITEM,
|
|
452
461
|
popup: true
|
|
453
462
|
});
|
|
454
463
|
}
|
|
@@ -470,22 +479,22 @@ var Project = /*#__PURE__*/function () {
|
|
|
470
479
|
}
|
|
471
480
|
|
|
472
481
|
// ESC event doesn't need when mode = MODE_IDLE || MODE_IDLE_3D
|
|
473
|
-
if (state.mode == MODE_IDLE_3D || state.mode == MODE_IDLE) {
|
|
482
|
+
if (state.mode == _constants.MODE_IDLE_3D || state.mode == _constants.MODE_IDLE) {
|
|
474
483
|
return {
|
|
475
484
|
updatedState: state
|
|
476
485
|
};
|
|
477
486
|
}
|
|
478
487
|
var mode;
|
|
479
|
-
if (state.mode == MODE_DRAWING_ITEM_3D) {
|
|
480
|
-
mode = MODE_IDLE_3D;
|
|
481
|
-
if (state.drawingSupport.has('currentID')) state = Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
|
|
488
|
+
if (state.mode == _constants.MODE_DRAWING_ITEM_3D) {
|
|
489
|
+
mode = _constants.MODE_IDLE_3D;
|
|
490
|
+
if (state.drawingSupport.has('currentID')) state = _export2.Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
|
|
482
491
|
state = state.merge({
|
|
483
492
|
mode: mode,
|
|
484
|
-
snapElements: new List(),
|
|
493
|
+
snapElements: new _immutable.List(),
|
|
485
494
|
activeSnapElement: null,
|
|
486
|
-
drawingSupport: new Map(),
|
|
487
|
-
draggingSupport: new Map(),
|
|
488
|
-
rotatingSupport: new Map()
|
|
495
|
+
drawingSupport: new _immutable.Map(),
|
|
496
|
+
draggingSupport: new _immutable.Map(),
|
|
497
|
+
rotatingSupport: new _immutable.Map()
|
|
489
498
|
});
|
|
490
499
|
return {
|
|
491
500
|
updatedState: state
|
|
@@ -493,30 +502,30 @@ var Project = /*#__PURE__*/function () {
|
|
|
493
502
|
}
|
|
494
503
|
|
|
495
504
|
// when Add Walls button clicked
|
|
496
|
-
if (state.mode == MODE_WAITING_DRAWING_LINE) {
|
|
497
|
-
mode = MODE_IDLE;
|
|
505
|
+
if (state.mode == _constants.MODE_WAITING_DRAWING_LINE) {
|
|
506
|
+
mode = _constants.MODE_IDLE;
|
|
498
507
|
state = state.merge({
|
|
499
508
|
mode: mode,
|
|
500
|
-
snapElements: new List(),
|
|
509
|
+
snapElements: new _immutable.List(),
|
|
501
510
|
activeSnapElement: null,
|
|
502
|
-
drawingSupport: new Map(),
|
|
503
|
-
draggingSupport: new Map(),
|
|
504
|
-
rotatingSupport: new Map()
|
|
511
|
+
drawingSupport: new _immutable.Map(),
|
|
512
|
+
draggingSupport: new _immutable.Map(),
|
|
513
|
+
rotatingSupport: new _immutable.Map()
|
|
505
514
|
});
|
|
506
515
|
return {
|
|
507
516
|
updatedState: state
|
|
508
517
|
};
|
|
509
518
|
}
|
|
510
|
-
if (ARRAY_3D_MODES.includes(state.mode)) mode = MODE_IDLE_3D;else mode = MODE_IDLE;
|
|
519
|
+
if (_constants.ARRAY_3D_MODES.includes(state.mode)) mode = _constants.MODE_IDLE_3D;else mode = _constants.MODE_IDLE;
|
|
511
520
|
state = state.merge({
|
|
512
521
|
mode: mode,
|
|
513
522
|
scene: sceneHistory.last,
|
|
514
|
-
sceneHistory: history.historyPush(sceneHistory, sceneHistory.last),
|
|
515
|
-
snapElements: new List(),
|
|
523
|
+
sceneHistory: _export.history.historyPush(sceneHistory, sceneHistory.last),
|
|
524
|
+
snapElements: new _immutable.List(),
|
|
516
525
|
activeSnapElement: null,
|
|
517
|
-
drawingSupport: new Map(),
|
|
518
|
-
draggingSupport: new Map(),
|
|
519
|
-
rotatingSupport: new Map()
|
|
526
|
+
drawingSupport: new _immutable.Map(),
|
|
527
|
+
draggingSupport: new _immutable.Map(),
|
|
528
|
+
rotatingSupport: new _immutable.Map()
|
|
520
529
|
});
|
|
521
530
|
return {
|
|
522
531
|
updatedState: state
|
|
@@ -527,7 +536,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
527
536
|
value: function removeDrawingSupport(state) {
|
|
528
537
|
var sceneHistory = state.sceneHistory;
|
|
529
538
|
var mode = state.mode;
|
|
530
|
-
if (!sceneHistory.last && sceneHistory.list.isEmpty() || mode != MODE_DRAWING_ITEM_3D) {
|
|
539
|
+
if (!sceneHistory.last && sceneHistory.list.isEmpty() || mode != _constants.MODE_DRAWING_ITEM_3D) {
|
|
531
540
|
return {
|
|
532
541
|
updatedState: state
|
|
533
542
|
};
|
|
@@ -535,8 +544,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
535
544
|
state = this.unselectAll(state).updatedState;
|
|
536
545
|
state = state.merge({
|
|
537
546
|
scene: sceneHistory.last,
|
|
538
|
-
sceneHistory: history.historyPush(sceneHistory, sceneHistory.last),
|
|
539
|
-
drawingSupport: new Map()
|
|
547
|
+
sceneHistory: _export.history.historyPush(sceneHistory, sceneHistory.last),
|
|
548
|
+
drawingSupport: new _immutable.Map()
|
|
540
549
|
});
|
|
541
550
|
return {
|
|
542
551
|
updatedState: state
|
|
@@ -547,7 +556,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
547
556
|
value: function setProjectProperties(state, properties) {
|
|
548
557
|
var scene = state.scene.merge(properties);
|
|
549
558
|
state = state.merge({
|
|
550
|
-
mode: MODE_IDLE,
|
|
559
|
+
mode: _constants.MODE_IDLE,
|
|
551
560
|
scene: scene
|
|
552
561
|
});
|
|
553
562
|
return {
|
|
@@ -569,7 +578,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
569
578
|
key: "openProjectConfigurator",
|
|
570
579
|
value: function openProjectConfigurator(state) {
|
|
571
580
|
state = state.merge({
|
|
572
|
-
mode: MODE_CONFIGURING_PROJECT
|
|
581
|
+
mode: _constants.MODE_CONFIGURING_PROJECT
|
|
573
582
|
});
|
|
574
583
|
return {
|
|
575
584
|
updatedState: state
|
|
@@ -579,7 +588,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
579
588
|
key: "initCatalog",
|
|
580
589
|
value: function initCatalog(state, catalog) {
|
|
581
590
|
try {
|
|
582
|
-
state = state.set('catalog', new Catalog(catalog));
|
|
591
|
+
state = state.set('catalog', new _models.Catalog(catalog));
|
|
583
592
|
return {
|
|
584
593
|
updatedState: state
|
|
585
594
|
};
|
|
@@ -593,7 +602,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
593
602
|
}, {
|
|
594
603
|
key: "updateMouseCoord",
|
|
595
604
|
value: function updateMouseCoord(state, coords) {
|
|
596
|
-
state = state.set('mouse', new Map(coords));
|
|
605
|
+
state = state.set('mouse', new _immutable.Map(coords));
|
|
597
606
|
return {
|
|
598
607
|
updatedState: state
|
|
599
608
|
};
|
|
@@ -645,7 +654,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
645
654
|
updatedState: state
|
|
646
655
|
};else {
|
|
647
656
|
state = state.merge({
|
|
648
|
-
mode: MODE_WAITING_DRAWING_LINE,
|
|
657
|
+
mode: _constants.MODE_WAITING_DRAWING_LINE,
|
|
649
658
|
activeSnapElement: null
|
|
650
659
|
});
|
|
651
660
|
return {
|
|
@@ -711,7 +720,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
711
720
|
}, {
|
|
712
721
|
key: "addHorizontalGuide",
|
|
713
722
|
value: function addHorizontalGuide(state, coordinate) {
|
|
714
|
-
state = HorizontalGuide.create(state, coordinate).updatedState;
|
|
723
|
+
state = _export2.HorizontalGuide.create(state, coordinate).updatedState;
|
|
715
724
|
return {
|
|
716
725
|
updatedState: state
|
|
717
726
|
};
|
|
@@ -719,7 +728,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
719
728
|
}, {
|
|
720
729
|
key: "addVerticalGuide",
|
|
721
730
|
value: function addVerticalGuide(state, coordinate) {
|
|
722
|
-
state = VerticalGuide.create(state, coordinate).updatedState;
|
|
731
|
+
state = _export2.VerticalGuide.create(state, coordinate).updatedState;
|
|
723
732
|
return {
|
|
724
733
|
updatedState: state
|
|
725
734
|
};
|
|
@@ -735,7 +744,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
735
744
|
}, {
|
|
736
745
|
key: "removeHorizontalGuide",
|
|
737
746
|
value: function removeHorizontalGuide(state, guideID) {
|
|
738
|
-
state = HorizontalGuide.remove(state, guideID).updatedState;
|
|
747
|
+
state = _export2.HorizontalGuide.remove(state, guideID).updatedState;
|
|
739
748
|
return {
|
|
740
749
|
updatedState: state
|
|
741
750
|
};
|
|
@@ -743,7 +752,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
743
752
|
}, {
|
|
744
753
|
key: "removeVerticalGuide",
|
|
745
754
|
value: function removeVerticalGuide(state, guideID) {
|
|
746
|
-
state = VerticalGuide.remove(state, guideID).updatedState;
|
|
755
|
+
state = _export2.VerticalGuide.remove(state, guideID).updatedState;
|
|
747
756
|
return {
|
|
748
757
|
updatedState: state
|
|
749
758
|
};
|
|
@@ -785,5 +794,4 @@ var Project = /*#__PURE__*/function () {
|
|
|
785
794
|
};
|
|
786
795
|
}
|
|
787
796
|
}]);
|
|
788
|
-
}();
|
|
789
|
-
export { Project as default };
|
|
797
|
+
}();
|
package/es/class/vertex.js
CHANGED
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
var
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports["default"] = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
9
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
10
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
11
|
+
var _immutable = require("immutable");
|
|
12
|
+
var _models = require("../models");
|
|
13
|
+
var _export = require("../utils/export");
|
|
14
|
+
var _constants = require("../constants");
|
|
15
|
+
var _export2 = require("../class/export");
|
|
16
|
+
var _helper = require("../utils/helper");
|
|
17
|
+
var Vertex = exports["default"] = /*#__PURE__*/function () {
|
|
11
18
|
function Vertex() {
|
|
12
|
-
|
|
19
|
+
(0, _classCallCheck2["default"])(this, Vertex);
|
|
13
20
|
}
|
|
14
|
-
return
|
|
21
|
+
return (0, _createClass2["default"])(Vertex, null, [{
|
|
15
22
|
key: "add",
|
|
16
23
|
value: function add(state, layerID, x, y, relatedPrototype, relatedID) {
|
|
17
24
|
var vertex = state.getIn(['scene', 'layers', layerID, 'vertices']).find(function (vertex) {
|
|
18
|
-
return GeometryUtils.samePoints(vertex, {
|
|
25
|
+
return _export.GeometryUtils.samePoints(vertex, {
|
|
19
26
|
x: x,
|
|
20
27
|
y: y
|
|
21
28
|
});
|
|
@@ -25,12 +32,12 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
25
32
|
return related.push(relatedID);
|
|
26
33
|
});
|
|
27
34
|
} else {
|
|
28
|
-
vertex = new
|
|
29
|
-
id: IDBroker.acquireID(),
|
|
35
|
+
vertex = new _models.Vertex((0, _defineProperty2["default"])({
|
|
36
|
+
id: _export.IDBroker.acquireID(),
|
|
30
37
|
name: 'Vertex',
|
|
31
38
|
x: x,
|
|
32
39
|
y: y
|
|
33
|
-
}, relatedPrototype, new List([relatedID])));
|
|
40
|
+
}, relatedPrototype, new _immutable.List([relatedID])));
|
|
34
41
|
}
|
|
35
42
|
state = state.setIn(['scene', 'layers', layerID, 'vertices', vertex.id], vertex);
|
|
36
43
|
return {
|
|
@@ -120,11 +127,11 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
120
127
|
}, {
|
|
121
128
|
key: "beginDraggingVertex",
|
|
122
129
|
value: function beginDraggingVertex(state, layerID, vertexID, x, y) {
|
|
123
|
-
var snapElements = SnapSceneUtils.sceneSnapElements(state.scene, new List(), state.snapMask);
|
|
130
|
+
var snapElements = _export.SnapSceneUtils.sceneSnapElements(state.scene, new _immutable.List(), state.snapMask);
|
|
124
131
|
state = state.merge({
|
|
125
|
-
mode: MODE_DRAGGING_VERTEX,
|
|
132
|
+
mode: _constants.MODE_DRAGGING_VERTEX,
|
|
126
133
|
snapElements: snapElements,
|
|
127
|
-
draggingSupport: Map({
|
|
134
|
+
draggingSupport: (0, _immutable.Map)({
|
|
128
135
|
layerID: layerID,
|
|
129
136
|
vertexID: vertexID,
|
|
130
137
|
previousMode: state.get('mode')
|
|
@@ -143,7 +150,7 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
143
150
|
scene = _state.scene;
|
|
144
151
|
var snap = null;
|
|
145
152
|
if (state.snapMask && !state.snapMask.isEmpty()) {
|
|
146
|
-
snap = SnapUtils.nearestSnap(snapElements, x, y, state.snapMask);
|
|
153
|
+
snap = _export.SnapUtils.nearestSnap(snapElements, x, y, state.snapMask);
|
|
147
154
|
if (snap) {
|
|
148
155
|
var _snap$point = snap.point;
|
|
149
156
|
x = _snap$point.x;
|
|
@@ -174,12 +181,12 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
174
181
|
if (lines) {
|
|
175
182
|
state = lines.reduce(function (reducedState, lineID) {
|
|
176
183
|
var eachLine = reducedState.getIn(['scene', 'layers', layerID, 'lines', lineID]);
|
|
177
|
-
if (isEmpty(eachLine)) return reducedState;
|
|
178
|
-
reducedState = Layer.removeZeroLengthLines(reducedState, layerID).updatedState;
|
|
179
|
-
reducedState = Layer.mergeEqualsVertices(reducedState, layerID, vertexID).updatedState;
|
|
180
|
-
reducedState = Line.select(reducedState, layerID, eachLine.id).updatedState;
|
|
181
|
-
reducedState = reducedState.setIn(['mode'], MODE_DRAGGING_VERTEX);
|
|
182
|
-
reducedState = Line.applyWallChanges(reducedState, END_DRAGGING_VERTEX).updatedState;
|
|
184
|
+
if ((0, _helper.isEmpty)(eachLine)) return reducedState;
|
|
185
|
+
reducedState = _export2.Layer.removeZeroLengthLines(reducedState, layerID).updatedState;
|
|
186
|
+
reducedState = _export2.Layer.mergeEqualsVertices(reducedState, layerID, vertexID).updatedState;
|
|
187
|
+
reducedState = _export2.Line.select(reducedState, layerID, eachLine.id).updatedState;
|
|
188
|
+
reducedState = reducedState.setIn(['mode'], _constants.MODE_DRAGGING_VERTEX);
|
|
189
|
+
reducedState = _export2.Line.applyWallChanges(reducedState, _constants.END_DRAGGING_VERTEX).updatedState;
|
|
183
190
|
return reducedState;
|
|
184
191
|
}, state);
|
|
185
192
|
}
|
|
@@ -187,12 +194,11 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
187
194
|
mode: draggingSupport.get('previousMode'),
|
|
188
195
|
draggingSupport: null,
|
|
189
196
|
activeSnapElement: null,
|
|
190
|
-
snapElements: new List()
|
|
197
|
+
snapElements: new _immutable.List()
|
|
191
198
|
});
|
|
192
199
|
return {
|
|
193
200
|
updatedState: state
|
|
194
201
|
};
|
|
195
202
|
}
|
|
196
203
|
}]);
|
|
197
|
-
}();
|
|
198
|
-
export { Vertex as default };
|
|
204
|
+
}();
|