kitchen-simulator 1.1.1-test.71 → 1.1.1-test.72
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 +5 -2
- package/es/AppContext.js +6 -3
- package/es/KitchenConfigurator.js +86 -87
- package/es/KitchenConfiguratorApp.js +128 -135
- package/es/actions/area-actions.js +8 -5
- package/es/actions/export.js +24 -12
- package/es/actions/groups-actions.js +41 -27
- package/es/actions/holes-actions.js +51 -34
- package/es/actions/items-actions.js +141 -94
- package/es/actions/lines-actions.js +32 -21
- package/es/actions/project-actions.js +141 -94
- package/es/actions/scene-actions.js +17 -11
- package/es/actions/vertices-actions.js +11 -7
- package/es/actions/viewer2d-actions.js +32 -21
- package/es/actions/viewer3d-actions.js +14 -9
- package/es/catalog/areas/area/planner-element.js +5 -2
- package/es/catalog/catalog.js +17 -15
- package/es/catalog/factories/area-factory-3d.js +26 -22
- package/es/catalog/factories/area-factory.js +15 -13
- package/es/catalog/factories/export.js +10 -6
- package/es/catalog/factories/wall-factory-3d.js +36 -31
- package/es/catalog/factories/wall-factory.js +26 -21
- package/es/catalog/holes/door-closet/planner-element.js +19 -15
- package/es/catalog/holes/door-double/planner-element.js +19 -15
- package/es/catalog/holes/door-exterior/planner-element.js +20 -16
- package/es/catalog/holes/door-interior/planner-element.js +20 -16
- package/es/catalog/holes/door-panic/planner-element.js +11 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +19 -15
- package/es/catalog/holes/door-sliding/planner-element.js +21 -17
- package/es/catalog/holes/doorway-framed/planner-element.js +15 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +11 -7
- package/es/catalog/holes/export.js +29 -13
- package/es/catalog/holes/window-clear/planner-element.js +14 -10
- package/es/catalog/holes/window-cross/planner-element.js +14 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +14 -10
- package/es/catalog/holes/window-vertical/planner-element.js +14 -10
- package/es/catalog/lines/wall/planner-element.js +5 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +9 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +9 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +9 -5
- package/es/catalog/properties/export.js +31 -20
- package/es/catalog/properties/property-checkbox.js +29 -28
- package/es/catalog/properties/property-color.js +19 -16
- package/es/catalog/properties/property-enum.js +27 -24
- package/es/catalog/properties/property-hidden.js +12 -9
- package/es/catalog/properties/property-lenght-measure.js +41 -38
- package/es/catalog/properties/property-length-measure.js +39 -36
- package/es/catalog/properties/property-length-measure_hole.js +41 -38
- package/es/catalog/properties/property-number.js +20 -17
- package/es/catalog/properties/property-read-only.js +19 -16
- package/es/catalog/properties/property-string.js +19 -16
- package/es/catalog/properties/property-toggle.js +19 -16
- package/es/catalog/properties/shared-property-style.js +3 -1
- package/es/catalog/utils/FuseUtils.js +13 -12
- package/es/catalog/utils/exporter.js +11 -10
- package/es/catalog/utils/geom-utils.js +24 -13
- package/es/catalog/utils/item-loader.js +92 -86
- package/es/catalog/utils/load-obj.js +24 -20
- package/es/catalog/utils/mtl-loader.js +4 -3
- package/es/catalog/utils/obj-loader.js +4 -3
- package/es/class/FuseUtils.js +13 -12
- package/es/class/area.js +24 -24
- package/es/class/export.js +36 -23
- package/es/class/group.js +55 -53
- package/es/class/guide.js +17 -15
- package/es/class/hole.js +85 -83
- package/es/class/item.js +155 -155
- package/es/class/layer.js +61 -59
- package/es/class/line.js +138 -135
- package/es/class/project.js +94 -93
- package/es/class/vertex.js +31 -29
- package/es/components/content.js +23 -19
- package/es/components/disclaimer/disclaimer.js +13 -10
- package/es/components/export.js +13 -8
- package/es/components/style/button.js +25 -25
- package/es/components/style/cancel-button.js +10 -7
- package/es/components/style/content-container.js +12 -11
- package/es/components/style/content-title.js +15 -13
- package/es/components/style/delete-button.js +12 -8
- package/es/components/style/export.js +46 -30
- package/es/components/style/form-block.js +11 -10
- package/es/components/style/form-color-input.js +10 -7
- package/es/components/style/form-label.js +11 -10
- package/es/components/style/form-number-input.js +43 -45
- package/es/components/style/form-number-input_2.js +39 -41
- package/es/components/style/form-select.js +20 -19
- package/es/components/style/form-slider.js +13 -10
- package/es/components/style/form-submit-button.js +12 -8
- package/es/components/style/form-text-input.js +28 -30
- package/es/components/viewer2d/area.js +20 -17
- package/es/components/viewer2d/export.js +46 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +13 -10
- package/es/components/viewer2d/grids/grids.js +14 -10
- package/es/components/viewer2d/group.js +19 -15
- package/es/components/viewer2d/item.js +65 -61
- package/es/components/viewer2d/layer.js +26 -23
- package/es/components/viewer2d/line.js +106 -101
- package/es/components/viewer2d/ruler.js +25 -22
- package/es/components/viewer2d/rulerDist.js +24 -21
- package/es/components/viewer2d/rulerX.js +44 -46
- package/es/components/viewer2d/rulerY.js +42 -44
- package/es/components/viewer2d/scene.js +34 -35
- package/es/components/viewer2d/snap.js +17 -13
- package/es/components/viewer2d/state.js +22 -18
- package/es/components/viewer2d/utils.js +33 -24
- package/es/components/viewer2d/vertex.js +12 -8
- package/es/components/viewer2d/viewer2d.js +159 -156
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +19 -21
- package/es/components/viewer3d/dcm.js +3 -1
- package/es/components/viewer3d/fbm.js +3 -1
- package/es/components/viewer3d/front3D.js +16 -12
- package/es/components/viewer3d/grid-creator.js +12 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +9 -6
- package/es/components/viewer3d/grids/grid-streak.js +8 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +9 -6
- package/es/components/viewer3d/libs/first-person-controls.js +5 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +3 -1
- package/es/components/viewer3d/libs/mtl-loader.js +3 -1
- package/es/components/viewer3d/libs/obj-loader.js +3 -1
- package/es/components/viewer3d/libs/orbit-controls.js +4 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +4 -2
- package/es/components/viewer3d/lrm.js +3 -1
- package/es/components/viewer3d/model.js +3 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +6 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +21 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +62 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +43 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +13 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +7 -4
- package/es/components/viewer3d/scene-creator.js +223 -197
- package/es/components/viewer3d/three-memory-cleaner.js +7 -3
- package/es/components/viewer3d/viewer3d-first-person.js +42 -42
- package/es/components/viewer3d/viewer3d.js +198 -200
- package/es/constants.js +354 -349
- package/es/index.js +11 -7
- package/es/models.js +191 -193
- package/es/plugins/SVGLoader.js +49 -48
- package/es/plugins/autosave.js +5 -3
- package/es/plugins/console-debugger.js +7 -6
- package/es/plugins/export.js +13 -8
- package/es/plugins/keyboard.js +31 -29
- package/es/reducers/areas-reducer.js +9 -7
- package/es/reducers/export.js +37 -24
- package/es/reducers/groups-reducer.js +33 -31
- package/es/reducers/holes-reducer.js +45 -43
- package/es/reducers/items-reducer.js +108 -106
- package/es/reducers/lines-reducer.js +30 -28
- package/es/reducers/project-reducer.js +107 -105
- package/es/reducers/reducer.js +19 -16
- package/es/reducers/scene-reducer.js +17 -15
- package/es/reducers/user-reducer.js +7 -5
- package/es/reducers/vertices-reducer.js +13 -11
- package/es/reducers/viewer2d-reducer.js +20 -18
- package/es/reducers/viewer3d-reducer.js +18 -16
- package/es/shared-style.js +12 -10
- package/es/styles/export.js +6 -3
- package/es/translator/en.js +3 -1
- package/es/translator/it.js +3 -1
- package/es/translator/ru.js +3 -1
- package/es/translator/translator.js +15 -13
- package/es/utils/browser.js +5 -2
- package/es/utils/convert-units-lite.js +3 -1
- package/es/utils/email-validator.js +3 -1
- package/es/utils/export.js +29 -15
- package/es/utils/geometry.js +280 -190
- package/es/utils/get-edges-of-subgraphs.js +5 -2
- package/es/utils/graph-cycles.js +7 -8
- package/es/utils/graph-inner-cycles.js +14 -10
- package/es/utils/graph.js +13 -9
- package/es/utils/helper.js +58 -41
- package/es/utils/history.js +11 -8
- package/es/utils/id-broker.js +11 -8
- package/es/utils/logger.js +3 -1
- package/es/utils/math.js +8 -5
- package/es/utils/molding.js +146 -130
- package/es/utils/name-generator.js +9 -7
- package/es/utils/objects-utils.js +14 -7
- package/es/utils/phone-validator.js +3 -1
- package/es/utils/process-black-list.js +6 -5
- package/es/utils/react-if.js +9 -7
- package/es/utils/snap-scene.js +30 -27
- package/es/utils/snap.js +57 -53
- package/es/utils/summarizeCart.js +3 -1
- package/es/utils/threeCSG.es6.js +17 -13
- package/es/version.js +3 -1
- package/package.json +1 -1
package/es/class/item.js
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
1
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports["default"] = void 0;
|
|
4
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
|
|
5
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
6
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
7
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
8
|
+
var _convertUnitsLite = require("../utils/convert-units-lite");
|
|
9
|
+
var _export = require("./export");
|
|
10
|
+
var _export2 = require("../utils/export");
|
|
11
|
+
var _immutable = require("immutable");
|
|
12
|
+
var _constants = require("../constants");
|
|
13
|
+
var _helper = require("../utils/helper");
|
|
14
|
+
var _molding = require("../utils/molding");
|
|
15
|
+
var _utils = require("../components/viewer2d/utils");
|
|
15
16
|
var allItemRect;
|
|
16
17
|
var allItemSnap;
|
|
17
18
|
var allLines;
|
|
@@ -20,19 +21,19 @@ var allLineSnap;
|
|
|
20
21
|
var allRect;
|
|
21
22
|
var time1;
|
|
22
23
|
var time2;
|
|
23
|
-
var Item = /*#__PURE__*/function () {
|
|
24
|
+
var Item = exports["default"] = /*#__PURE__*/function () {
|
|
24
25
|
function Item() {
|
|
25
|
-
|
|
26
|
+
(0, _classCallCheck2["default"])(this, Item);
|
|
26
27
|
}
|
|
27
|
-
return
|
|
28
|
+
return (0, _createClass2["default"])(Item, null, [{
|
|
28
29
|
key: "create",
|
|
29
30
|
value: function create(state, layerID, type, x, y, width, height, rotation, isDuplication) {
|
|
30
31
|
var molding = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : [];
|
|
31
|
-
var itemID = IDBroker.acquireID();
|
|
32
|
+
var itemID = _export2.IDBroker.acquireID();
|
|
32
33
|
var item = state.catalog.factoryElement(type, {
|
|
33
34
|
id: itemID,
|
|
34
35
|
itemID: state.catalog.getIn(['elements', type, 'itemID']),
|
|
35
|
-
name: NameGenerator.generateName('items', state.catalog.getIn(['elements', type, 'info', 'title'])),
|
|
36
|
+
name: _export2.NameGenerator.generateName('items', state.catalog.getIn(['elements', type, 'info', 'title'])),
|
|
36
37
|
sku_number: state.catalog.getIn(['elements', type, 'obj']).toJS().sku_number,
|
|
37
38
|
//style: state.catalog.getIn(['elements', type, 'info', 'door']),
|
|
38
39
|
category: state.catalog.getIn(['elements', type, 'type']),
|
|
@@ -55,11 +56,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
55
56
|
return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
|
|
56
57
|
});
|
|
57
58
|
if (cds) {
|
|
58
|
-
var updatedDoorStyles =
|
|
59
|
+
var updatedDoorStyles = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, temp.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
|
|
59
60
|
cabinet_door_style_id: cds.cabinet_door_style_id
|
|
60
61
|
});
|
|
61
62
|
item = item.merge({
|
|
62
|
-
doorStyle: fromJS(
|
|
63
|
+
doorStyle: (0, _immutable.fromJS)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, temp), {}, {
|
|
63
64
|
doorStyles: updatedDoorStyles
|
|
64
65
|
}))
|
|
65
66
|
});
|
|
@@ -73,11 +74,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
73
74
|
});
|
|
74
75
|
if (cds) {
|
|
75
76
|
var tmpDS = styleObj[_x].data;
|
|
76
|
-
tmpDS.doorStyles =
|
|
77
|
+
tmpDS.doorStyles = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, tmpDS.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
|
|
77
78
|
cabinet_door_style_id: cds.cabinet_door_style_id
|
|
78
79
|
});
|
|
79
80
|
item = item.merge({
|
|
80
|
-
doorStyle: fromJS(tmpDS)
|
|
81
|
+
doorStyle: (0, _immutable.fromJS)(tmpDS)
|
|
81
82
|
});
|
|
82
83
|
break;
|
|
83
84
|
}
|
|
@@ -96,11 +97,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
96
97
|
if (_cds) {
|
|
97
98
|
var _styleObj$_x2;
|
|
98
99
|
var _tmpDS = (_styleObj$_x2 = _styleObj[_x2]) === null || _styleObj$_x2 === void 0 ? void 0 : _styleObj$_x2.data;
|
|
99
|
-
_tmpDS.doorStyles =
|
|
100
|
+
_tmpDS.doorStyles = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _tmpDS.doorStyles), _cds.data && _cds.data[0] ? _cds.data[0] : {}), {}, {
|
|
100
101
|
cabinet_door_style_id: _cds.cabinet_door_style_id
|
|
101
102
|
});
|
|
102
103
|
item = item.merge({
|
|
103
|
-
doorStyle: fromJS(_tmpDS)
|
|
104
|
+
doorStyle: (0, _immutable.fromJS)(_tmpDS)
|
|
104
105
|
});
|
|
105
106
|
break;
|
|
106
107
|
}
|
|
@@ -127,74 +128,74 @@ var Item = /*#__PURE__*/function () {
|
|
|
127
128
|
var newProperties = item.get('properties').toJS();
|
|
128
129
|
if (newProperties.hasOwnProperty('depth')) {
|
|
129
130
|
if (!newProperties.hasOwnProperty('oldDepth')) {
|
|
130
|
-
newProperties['oldDepth'] = new Map({
|
|
131
|
+
newProperties['oldDepth'] = new _immutable.Map({
|
|
131
132
|
length: newProperties.depth.length,
|
|
132
133
|
_length: newProperties.depth._length,
|
|
133
134
|
_unit: newProperties.depth._unit
|
|
134
135
|
});
|
|
135
136
|
}
|
|
136
|
-
newProperties['depth'] = new Map({
|
|
137
|
-
length: convert(euro_cds[0].euro_length).from('in').to('cm'),
|
|
137
|
+
newProperties['depth'] = new _immutable.Map({
|
|
138
|
+
length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_length).from('in').to('cm'),
|
|
138
139
|
_length: euro_cds[0].euro_length,
|
|
139
140
|
_unit: 'in'
|
|
140
141
|
});
|
|
141
142
|
}
|
|
142
143
|
if (newProperties.hasOwnProperty('height')) {
|
|
143
144
|
if (!newProperties.hasOwnProperty('oldHeight')) {
|
|
144
|
-
newProperties['oldHeight'] = new Map({
|
|
145
|
+
newProperties['oldHeight'] = new _immutable.Map({
|
|
145
146
|
length: newProperties.height.length,
|
|
146
147
|
_length: newProperties.height._length,
|
|
147
148
|
_unit: newProperties.height._unit
|
|
148
149
|
});
|
|
149
150
|
}
|
|
150
|
-
newProperties['height'] = new Map({
|
|
151
|
-
length: convert(euro_cds[0].euro_height).from('in').to('cm'),
|
|
151
|
+
newProperties['height'] = new _immutable.Map({
|
|
152
|
+
length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_height).from('in').to('cm'),
|
|
152
153
|
_length: euro_cds[0].euro_height,
|
|
153
154
|
_unit: 'in'
|
|
154
155
|
});
|
|
155
156
|
}
|
|
156
157
|
if (newProperties.hasOwnProperty('width')) {
|
|
157
158
|
if (!newProperties.hasOwnProperty('oldWidth')) {
|
|
158
|
-
newProperties['oldWidth'] = new Map({
|
|
159
|
+
newProperties['oldWidth'] = new _immutable.Map({
|
|
159
160
|
length: newProperties.width.length,
|
|
160
161
|
_length: newProperties.width._length,
|
|
161
162
|
_unit: newProperties.width._unit
|
|
162
163
|
});
|
|
163
164
|
}
|
|
164
|
-
newProperties['width'] = new Map({
|
|
165
|
-
length: convert(euro_cds[0].euro_width).from('in').to('cm') - 10,
|
|
165
|
+
newProperties['width'] = new _immutable.Map({
|
|
166
|
+
length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_width).from('in').to('cm') - 10,
|
|
166
167
|
_length: euro_cds[0].euro_width,
|
|
167
168
|
_unit: 'in'
|
|
168
169
|
});
|
|
169
170
|
}
|
|
170
171
|
item = item.merge({
|
|
171
|
-
properties: fromJS(newProperties)
|
|
172
|
+
properties: (0, _immutable.fromJS)(newProperties)
|
|
172
173
|
});
|
|
173
174
|
} else {
|
|
174
175
|
var properties = item.get('properties').toJS();
|
|
175
176
|
if (properties.hasOwnProperty('oldDepth')) {
|
|
176
|
-
properties['depth'] = new Map({
|
|
177
|
+
properties['depth'] = new _immutable.Map({
|
|
177
178
|
length: properties.oldDepth.length,
|
|
178
179
|
_length: properties.oldDepth._length,
|
|
179
180
|
_unit: properties.oldDepth._unit
|
|
180
181
|
});
|
|
181
182
|
}
|
|
182
183
|
if (properties.hasOwnProperty('oldHeight')) {
|
|
183
|
-
properties['height'] = new Map({
|
|
184
|
+
properties['height'] = new _immutable.Map({
|
|
184
185
|
length: properties.oldHeight.length,
|
|
185
186
|
_length: properties.oldHeight._length,
|
|
186
187
|
_unit: properties.oldHeight._unit
|
|
187
188
|
});
|
|
188
189
|
}
|
|
189
190
|
if (properties.hasOwnProperty('oldWidth')) {
|
|
190
|
-
properties['width'] = new Map({
|
|
191
|
+
properties['width'] = new _immutable.Map({
|
|
191
192
|
length: properties.oldWidth.length,
|
|
192
193
|
_length: properties.oldWidth._length,
|
|
193
194
|
_unit: properties.oldWidth._unit
|
|
194
195
|
});
|
|
195
196
|
}
|
|
196
197
|
item = item.merge({
|
|
197
|
-
properties: fromJS(properties)
|
|
198
|
+
properties: (0, _immutable.fromJS)(properties)
|
|
198
199
|
});
|
|
199
200
|
}
|
|
200
201
|
};
|
|
@@ -204,16 +205,16 @@ var Item = /*#__PURE__*/function () {
|
|
|
204
205
|
if (item.type.includes('Light')) {
|
|
205
206
|
var ceilHeight = state.getIn(['scene', 'layers', layerID, 'ceilHeight']);
|
|
206
207
|
var ceilUnit = state.getIn(['scene', 'layers', layerID, 'unit']);
|
|
207
|
-
ceilHeight = convert(ceilHeight).from(ceilUnit).to('cm');
|
|
208
|
+
ceilHeight = (0, _convertUnitsLite.convert)(ceilHeight).from(ceilUnit).to('cm');
|
|
208
209
|
var newAltitude = ceilHeight - item.properties.getIn(['height', 'length']);
|
|
209
|
-
newAltitude = convert(newAltitude).from('cm').to(ceilUnit);
|
|
210
|
+
newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from('cm').to(ceilUnit);
|
|
210
211
|
item = item.setIn(['properties', 'altitude', '_length'], newAltitude);
|
|
211
212
|
state = state.setIn(['scene', 'layers', layerID, 'items', item.id], item);
|
|
212
213
|
}
|
|
213
214
|
if (item.category === 'cabinet') {
|
|
214
215
|
// If create a copied object, copied object has original object's molding property.And if create a object, it has a layer's molding property.
|
|
215
216
|
var layerMolding = state.getIn(['scene', 'layers', layerID, 'molding']).filter(function (md) {
|
|
216
|
-
return hasMoldingLayout(md, item.layoutpos);
|
|
217
|
+
return (0, _molding.hasMoldingLayout)(md, item.layoutpos);
|
|
217
218
|
});
|
|
218
219
|
state = state.setIn(['scene', 'layers', layerID, 'items', itemID, 'molding'], layerMolding.length ? layerMolding : molding);
|
|
219
220
|
}
|
|
@@ -230,7 +231,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
230
231
|
var dataJSON = item.toJS();
|
|
231
232
|
var itemID = dataJSON.id;
|
|
232
233
|
var doorStyle = dataJSON.doorStyle;
|
|
233
|
-
var tmpDS =
|
|
234
|
+
var tmpDS = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, doorStyle), {}, {
|
|
234
235
|
handle_gltf: doorHandle,
|
|
235
236
|
metalness: 0.2,
|
|
236
237
|
roughness: 0.1
|
|
@@ -244,16 +245,16 @@ var Item = /*#__PURE__*/function () {
|
|
|
244
245
|
tmpDS['doorStyles']['drawer_door_handle_' + i + '_gltf'] = doorHandle;
|
|
245
246
|
}
|
|
246
247
|
}
|
|
247
|
-
item = item.mergeIn(['doorStyle'], fromJS(tmpDS));
|
|
248
|
+
item = item.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
|
|
248
249
|
return item;
|
|
249
250
|
}
|
|
250
251
|
}, {
|
|
251
252
|
key: "select",
|
|
252
253
|
value: function select(state, layerID, itemID) {
|
|
253
|
-
state = Layer.select(state, layerID).updatedState;
|
|
254
|
-
state = Layer.selectElement(state, layerID, 'items', itemID).updatedState;
|
|
254
|
+
state = _export.Layer.select(state, layerID).updatedState;
|
|
255
|
+
state = _export.Layer.selectElement(state, layerID, 'items', itemID).updatedState;
|
|
255
256
|
state = state.merge({
|
|
256
|
-
replacingSupport: new Map({
|
|
257
|
+
replacingSupport: new _immutable.Map({
|
|
257
258
|
layerID: layerID,
|
|
258
259
|
itemID: itemID
|
|
259
260
|
})
|
|
@@ -265,8 +266,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
265
266
|
}, {
|
|
266
267
|
key: "selectHole",
|
|
267
268
|
value: function selectHole(state, layerID, holeID) {
|
|
268
|
-
state = Layer.select(state, layerID).updatedState;
|
|
269
|
-
state = Layer.selectElement(state, layerID, 'holes', holeID).updatedState;
|
|
269
|
+
state = _export.Layer.select(state, layerID).updatedState;
|
|
270
|
+
state = _export.Layer.selectElement(state, layerID, 'holes', holeID).updatedState;
|
|
270
271
|
return {
|
|
271
272
|
updatedState: state
|
|
272
273
|
};
|
|
@@ -282,10 +283,10 @@ var Item = /*#__PURE__*/function () {
|
|
|
282
283
|
updatedState: state
|
|
283
284
|
};
|
|
284
285
|
}
|
|
285
|
-
var width = new Map({
|
|
286
|
+
var width = new _immutable.Map({
|
|
286
287
|
_length: newWidth,
|
|
287
288
|
_unit: 'in',
|
|
288
|
-
length: convert(newWidth).from('in').to('cm')
|
|
289
|
+
length: (0, _convertUnitsLite.convert)(newWidth).from('in').to('cm')
|
|
289
290
|
});
|
|
290
291
|
properties = properties.set('width', width);
|
|
291
292
|
state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'properties'], properties);
|
|
@@ -299,14 +300,14 @@ var Item = /*#__PURE__*/function () {
|
|
|
299
300
|
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
300
301
|
var scene = state.get('scene');
|
|
301
302
|
var catalog = state.catalog.toJS();
|
|
302
|
-
allLines = GeometryUtils.getAllLines(layer);
|
|
303
|
-
allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
304
|
-
allItemRect = GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
305
|
-
allItemSnap = GeometryUtils.getAllItemSnap(allItemRect);
|
|
306
|
-
allLineSnap = GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
303
|
+
allLines = _export2.GeometryUtils.getAllLines(layer);
|
|
304
|
+
allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
305
|
+
allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
306
|
+
allItemSnap = _export2.GeometryUtils.getAllItemSnap(allItemRect);
|
|
307
|
+
allLineSnap = _export2.GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
307
308
|
allRect = allItemRect.others.concat(allLineRects);
|
|
308
|
-
allItemSnap = GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
309
|
-
allLineSnap = GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
309
|
+
allItemSnap = _export2.GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
310
|
+
allLineSnap = _export2.GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
310
311
|
}
|
|
311
312
|
}, {
|
|
312
313
|
key: "duplicateSelected",
|
|
@@ -336,7 +337,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
336
337
|
val.size = allItemRect.cur.size;
|
|
337
338
|
val.layoutpos = allItemRect.cur.layoutpos;
|
|
338
339
|
val.is_corner = allItemRect.cur.is_corner;
|
|
339
|
-
var isrectSect = GeometryUtils.validInterSect(allRect, val);
|
|
340
|
+
var isrectSect = _export2.GeometryUtils.validInterSect(allRect, val);
|
|
340
341
|
if (isrectSect) {
|
|
341
342
|
// Duplicated object has a original object's molding property
|
|
342
343
|
var _this$create = this.create(state, layerID, sceneComponentType, x + width * Math.cos(rotRad), y + width * Math.sin(rotRad), 200, 100, rotRad * 180 / Math.PI, true, myObject.molding),
|
|
@@ -345,8 +346,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
345
346
|
if (item === null) {
|
|
346
347
|
alert('There are no Door Colors in this cabinet.');
|
|
347
348
|
state = state.merge({
|
|
348
|
-
mode: MODE_IDLE,
|
|
349
|
-
drawingSupport: new Map()
|
|
349
|
+
mode: _constants.MODE_IDLE,
|
|
350
|
+
drawingSupport: new _immutable.Map()
|
|
350
351
|
});
|
|
351
352
|
} else {
|
|
352
353
|
state = Item.select(stateI, layerID, item.id).updatedState;
|
|
@@ -363,7 +364,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
363
364
|
_val.size = allItemRect.cur.size;
|
|
364
365
|
_val.layoutpos = allItemRect.cur.layoutpos;
|
|
365
366
|
_val.is_corner = allItemRect.cur.is_corner;
|
|
366
|
-
var isRect = GeometryUtils.validInterSect(allRect, _val);
|
|
367
|
+
var isRect = _export2.GeometryUtils.validInterSect(allRect, _val);
|
|
367
368
|
if (isRect) {
|
|
368
369
|
var _this$create2 = this.create(state, layerID, sceneComponentType, x - width * Math.cos(rotRad), y - width * Math.sin(rotRad), 200, 100, rotRad * 180 / Math.PI, true, myObject.molding),
|
|
369
370
|
_stateI = _this$create2.updatedState,
|
|
@@ -371,8 +372,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
371
372
|
if (_item === null) {
|
|
372
373
|
alert('There are no Door Colors in this cabinet.');
|
|
373
374
|
state = state.merge({
|
|
374
|
-
mode: MODE_IDLE,
|
|
375
|
-
drawingSupport: new Map()
|
|
375
|
+
mode: _constants.MODE_IDLE,
|
|
376
|
+
drawingSupport: new _immutable.Map()
|
|
376
377
|
});
|
|
377
378
|
} else {
|
|
378
379
|
state = Item.select(_stateI, layerID, _item.id).updatedState;
|
|
@@ -389,7 +390,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
389
390
|
_val2.size = allItemRect.cur.size;
|
|
390
391
|
_val2.layoutpos = allItemRect.cur.layoutpos;
|
|
391
392
|
_val2.is_corner = allItemRect.cur.is_corner;
|
|
392
|
-
var isRectDown = GeometryUtils.validInterSect(allRect, _val2);
|
|
393
|
+
var isRectDown = _export2.GeometryUtils.validInterSect(allRect, _val2);
|
|
393
394
|
if (isRectDown) {
|
|
394
395
|
var _this$create3 = this.create(state, layerID, sceneComponentType, x - depth * Math.sin(rotRad), y - depth * Math.cos(rotRad), 200, 100, rotRad * 180 / Math.PI, true, myObject.molding),
|
|
395
396
|
_stateI2 = _this$create3.updatedState,
|
|
@@ -397,8 +398,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
397
398
|
if (_item2 === null) {
|
|
398
399
|
alert('There are no Door Colors in this cabinet.');
|
|
399
400
|
state = state.merge({
|
|
400
|
-
mode: MODE_IDLE,
|
|
401
|
-
drawingSupport: new Map()
|
|
401
|
+
mode: _constants.MODE_IDLE,
|
|
402
|
+
drawingSupport: new _immutable.Map()
|
|
402
403
|
});
|
|
403
404
|
} else {
|
|
404
405
|
state = Item.select(_stateI2, layerID, _item2.id).updatedState;
|
|
@@ -415,7 +416,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
415
416
|
_val3.size = allItemRect.cur.size;
|
|
416
417
|
_val3.layoutpos = allItemRect.cur.layoutpos;
|
|
417
418
|
_val3.is_corner = allItemRect.cur.is_corner;
|
|
418
|
-
var isRectUp = GeometryUtils.validInterSect(allRect, _val3);
|
|
419
|
+
var isRectUp = _export2.GeometryUtils.validInterSect(allRect, _val3);
|
|
419
420
|
if (isRectUp) {
|
|
420
421
|
var _this$create4 = this.create(state, layerID, sceneComponentType, x + depth * Math.sin(rotRad), y + depth * Math.cos(rotRad), 200, 100, rotRad * 180 / Math.PI, true, myObject.molding),
|
|
421
422
|
_stateI3 = _this$create4.updatedState,
|
|
@@ -423,8 +424,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
423
424
|
if (_item3 === null) {
|
|
424
425
|
alert('There are no Door Colors in this cabinet.');
|
|
425
426
|
state = state.merge({
|
|
426
|
-
mode: MODE_IDLE,
|
|
427
|
-
drawingSupport: new Map()
|
|
427
|
+
mode: _constants.MODE_IDLE,
|
|
428
|
+
drawingSupport: new _immutable.Map()
|
|
428
429
|
});
|
|
429
430
|
} else {
|
|
430
431
|
state = Item.select(_stateI3, layerID, _item3.id).updatedState;
|
|
@@ -447,7 +448,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
447
448
|
var myOffset = myObject.offset;
|
|
448
449
|
var v0 = layer.getIn(['vertices', line.vertices.get(0)]);
|
|
449
450
|
var v1 = layer.getIn(['vertices', line.vertices.get(1)]);
|
|
450
|
-
var lineLength = GeometryUtils.pointsDistance(v0.x, v0.y, v1.x, v1.y);
|
|
451
|
+
var lineLength = _export2.GeometryUtils.pointsDistance(v0.x, v0.y, v1.x, v1.y);
|
|
451
452
|
var delta = width / 2 / lineLength + 0.00001;
|
|
452
453
|
var allHoles = state.getIn(['scene', 'layers', layerID, 'holes']);
|
|
453
454
|
var rightAble = true;
|
|
@@ -542,9 +543,9 @@ var Item = /*#__PURE__*/function () {
|
|
|
542
543
|
key: "remove",
|
|
543
544
|
value: function remove(state, layerID, itemID) {
|
|
544
545
|
state = this.unselect(state, layerID, itemID).updatedState;
|
|
545
|
-
state = Layer.removeElement(state, layerID, 'items', itemID).updatedState;
|
|
546
|
+
state = _export.Layer.removeElement(state, layerID, 'items', itemID).updatedState;
|
|
546
547
|
state.getIn(['scene', 'groups']).forEach(function (group) {
|
|
547
|
-
return state = Group.removeElement(state, group.id, layerID, 'items', itemID).updatedState;
|
|
548
|
+
return state = _export.Group.removeElement(state, group.id, layerID, 'items', itemID).updatedState;
|
|
548
549
|
});
|
|
549
550
|
return {
|
|
550
551
|
updatedState: state
|
|
@@ -563,7 +564,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
563
564
|
}, {
|
|
564
565
|
key: "unselect",
|
|
565
566
|
value: function unselect(state, layerID, itemID) {
|
|
566
|
-
state = Layer.unselect(state, layerID, 'items', itemID).updatedState;
|
|
567
|
+
state = _export.Layer.unselect(state, layerID, 'items', itemID).updatedState;
|
|
567
568
|
return {
|
|
568
569
|
updatedState: state
|
|
569
570
|
};
|
|
@@ -572,8 +573,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
572
573
|
key: "selectToolDrawingItem",
|
|
573
574
|
value: function selectToolDrawingItem(state, sceneComponentType) {
|
|
574
575
|
state = state.merge({
|
|
575
|
-
mode: MODE_DRAWING_ITEM,
|
|
576
|
-
drawingSupport: new Map({
|
|
576
|
+
mode: _constants.MODE_DRAWING_ITEM,
|
|
577
|
+
drawingSupport: new _immutable.Map({
|
|
577
578
|
type: sceneComponentType
|
|
578
579
|
})
|
|
579
580
|
});
|
|
@@ -585,8 +586,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
585
586
|
key: "selectToolDrawingItem3D",
|
|
586
587
|
value: function selectToolDrawingItem3D(state, sceneComponentType) {
|
|
587
588
|
state = state.merge({
|
|
588
|
-
mode: MODE_DRAWING_ITEM_3D,
|
|
589
|
-
drawingSupport: new Map({
|
|
589
|
+
mode: _constants.MODE_DRAWING_ITEM_3D,
|
|
590
|
+
drawingSupport: new _immutable.Map({
|
|
590
591
|
type: sceneComponentType
|
|
591
592
|
})
|
|
592
593
|
});
|
|
@@ -621,7 +622,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
621
622
|
value: function updateDrawingItem(state, layerID, x, y) {
|
|
622
623
|
if (state.hasIn(['drawingSupport', 'currentID'])) {
|
|
623
624
|
var mode = state.get('mode');
|
|
624
|
-
if ([MODE_DRAWING_ITEM_3D].includes(mode)) {
|
|
625
|
+
if ([_constants.MODE_DRAWING_ITEM_3D].includes(mode)) {
|
|
625
626
|
state = state.updateIn(['scene', 'layers', layerID, 'items', state.getIn(['drawingSupport', 'currentID'])], function (item) {
|
|
626
627
|
return item && item.merge({
|
|
627
628
|
x: x,
|
|
@@ -629,12 +630,12 @@ var Item = /*#__PURE__*/function () {
|
|
|
629
630
|
});
|
|
630
631
|
});
|
|
631
632
|
state = state.merge({
|
|
632
|
-
mode: MODE_IDLE_3D
|
|
633
|
+
mode: _constants.MODE_IDLE_3D
|
|
633
634
|
});
|
|
634
635
|
}
|
|
635
|
-
if ([MODE_DRAWING_ITEM].includes(mode)) {
|
|
636
|
+
if ([_constants.MODE_DRAWING_ITEM].includes(mode)) {
|
|
636
637
|
state = state.merge({
|
|
637
|
-
mode: MODE_IDLE
|
|
638
|
+
mode: _constants.MODE_IDLE
|
|
638
639
|
});
|
|
639
640
|
state = state.updateIn(['scene', 'layers', layerID, 'items', state.getIn(['drawingSupport', 'currentID'])], function (item) {
|
|
640
641
|
return item && item.merge({
|
|
@@ -650,8 +651,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
650
651
|
if (item === null) {
|
|
651
652
|
alert('There are no Door Colors in this cabinet.');
|
|
652
653
|
state = state.merge({
|
|
653
|
-
mode: MODE_IDLE,
|
|
654
|
-
drawingSupport: new Map()
|
|
654
|
+
mode: _constants.MODE_IDLE,
|
|
655
|
+
drawingSupport: new _immutable.Map()
|
|
655
656
|
});
|
|
656
657
|
} else {
|
|
657
658
|
state = Item.select(stateI, layerID, item.id).updatedState;
|
|
@@ -685,7 +686,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
685
686
|
state = state.merge({
|
|
686
687
|
scene: scene.mergeIn(['layers', layerID, 'items', itemID], item)
|
|
687
688
|
});
|
|
688
|
-
time2 = debugUtil();
|
|
689
|
+
time2 = (0, _helper.debugUtil)();
|
|
689
690
|
false && console.log('FPS:', Math.round(1000 / (time2 - time1)), ' Delta Time:', (time2 - time1) / 1000, '(s)');
|
|
690
691
|
return {
|
|
691
692
|
updatedState: state
|
|
@@ -696,15 +697,15 @@ var Item = /*#__PURE__*/function () {
|
|
|
696
697
|
value: function endDrawingItem(state, layerID, x, y) {
|
|
697
698
|
var catalog = state.catalog;
|
|
698
699
|
state = this.updateDrawingItem(state, layerID, x, y, catalog).updatedState;
|
|
699
|
-
state = Layer.unselectAll(state, layerID).updatedState;
|
|
700
|
+
state = _export.Layer.unselectAll(state, layerID).updatedState;
|
|
700
701
|
var popup = state.get('popup');
|
|
701
702
|
state = state.merge({
|
|
702
|
-
drawingSupport: Map({
|
|
703
|
+
drawingSupport: (0, _immutable.Map)({
|
|
703
704
|
type: state.drawingSupport.get('type')
|
|
704
705
|
}),
|
|
705
706
|
isOpen: !popup
|
|
706
707
|
});
|
|
707
|
-
state = Layer.unselectAll(state, layerID).updatedState;
|
|
708
|
+
state = _export.Layer.unselectAll(state, layerID).updatedState;
|
|
708
709
|
this.updateMolding(state);
|
|
709
710
|
return {
|
|
710
711
|
updatedState: state
|
|
@@ -714,11 +715,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
714
715
|
key: "beginDraggingItem",
|
|
715
716
|
value: function beginDraggingItem(state, layerID, itemID, x, y) {
|
|
716
717
|
var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
|
|
717
|
-
time1 = debugUtil();
|
|
718
|
+
time1 = (0, _helper.debugUtil)();
|
|
718
719
|
if (!item) return;
|
|
719
720
|
state = state.merge({
|
|
720
|
-
mode: MODE_DRAGGING_ITEM,
|
|
721
|
-
draggingSupport: Map({
|
|
721
|
+
mode: _constants.MODE_DRAGGING_ITEM,
|
|
722
|
+
draggingSupport: (0, _immutable.Map)({
|
|
722
723
|
layerID: layerID,
|
|
723
724
|
itemID: itemID,
|
|
724
725
|
startPointX: x,
|
|
@@ -740,8 +741,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
740
741
|
updatedState: state
|
|
741
742
|
};
|
|
742
743
|
state = state.merge({
|
|
743
|
-
mode: MODE_DRAGGING_ITEM_3D,
|
|
744
|
-
draggingSupport: Map({
|
|
744
|
+
mode: _constants.MODE_DRAGGING_ITEM_3D,
|
|
745
|
+
draggingSupport: (0, _immutable.Map)({
|
|
745
746
|
layerID: layerID,
|
|
746
747
|
itemID: itemID,
|
|
747
748
|
startPointX: x,
|
|
@@ -836,7 +837,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
836
837
|
value: function endDraggingItem(state, x, y) {
|
|
837
838
|
state = this.updateDraggingItem(state, x, y).updatedState;
|
|
838
839
|
state = state.merge({
|
|
839
|
-
mode: MODE_IDLE
|
|
840
|
+
mode: _constants.MODE_IDLE
|
|
840
841
|
});
|
|
841
842
|
return {
|
|
842
843
|
updatedState: state
|
|
@@ -847,7 +848,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
847
848
|
value: function endDraggingItem3D(state) {
|
|
848
849
|
// state = this.updateDraggingItem(state, x, y).updatedState;
|
|
849
850
|
state = state.merge({
|
|
850
|
-
mode: MODE_IDLE_3D
|
|
851
|
+
mode: _constants.MODE_IDLE_3D
|
|
851
852
|
});
|
|
852
853
|
state = state.setIn(['scene', 'isEndDragging'], true);
|
|
853
854
|
return {
|
|
@@ -860,8 +861,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
860
861
|
var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
|
|
861
862
|
var originRotation = item.get('rotation');
|
|
862
863
|
state = state.merge({
|
|
863
|
-
mode: MODE_ROTATING_ITEM,
|
|
864
|
-
rotatingSupport: Map({
|
|
864
|
+
mode: _constants.MODE_ROTATING_ITEM,
|
|
865
|
+
rotatingSupport: (0, _immutable.Map)({
|
|
865
866
|
layerID: layerID,
|
|
866
867
|
itemID: itemID,
|
|
867
868
|
x: x,
|
|
@@ -879,8 +880,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
879
880
|
var item = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
|
|
880
881
|
var originRotation = item.get('rotation');
|
|
881
882
|
state = state.merge({
|
|
882
|
-
mode: MODE_ROTATING_ITEM_3D,
|
|
883
|
-
rotatingSupport: Map({
|
|
883
|
+
mode: _constants.MODE_ROTATING_ITEM_3D,
|
|
884
|
+
rotatingSupport: (0, _immutable.Map)({
|
|
884
885
|
layerID: layerID,
|
|
885
886
|
itemID: itemID,
|
|
886
887
|
x: x,
|
|
@@ -960,7 +961,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
960
961
|
value: function endRotatingItem(state, x, y) {
|
|
961
962
|
//state = this.updateRotatingItem(state, x, y).updatedState;
|
|
962
963
|
state = state.merge({
|
|
963
|
-
mode: MODE_IDLE
|
|
964
|
+
mode: _constants.MODE_IDLE
|
|
964
965
|
});
|
|
965
966
|
return {
|
|
966
967
|
updatedState: state
|
|
@@ -971,7 +972,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
971
972
|
value: function endRotatingItem3D(state, x, y) {
|
|
972
973
|
state = this.updateRotatingItem(state, x, y).updatedState;
|
|
973
974
|
state = state.merge({
|
|
974
|
-
mode: MODE_IDLE_3D
|
|
975
|
+
mode: _constants.MODE_IDLE_3D
|
|
975
976
|
});
|
|
976
977
|
return {
|
|
977
978
|
updatedState: state
|
|
@@ -1032,7 +1033,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1032
1033
|
scene: scene.mergeIn(['layers', layerID, 'items', itemID], item)
|
|
1033
1034
|
});
|
|
1034
1035
|
state = state.merge({
|
|
1035
|
-
mode: MODE_IDLE_3D
|
|
1036
|
+
mode: _constants.MODE_IDLE_3D
|
|
1036
1037
|
});
|
|
1037
1038
|
return {
|
|
1038
1039
|
updatedState: state
|
|
@@ -1049,7 +1050,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1049
1050
|
}, {
|
|
1050
1051
|
key: "setJsProperties",
|
|
1051
1052
|
value: function setJsProperties(state, layerID, itemID, properties) {
|
|
1052
|
-
return this.setProperties(state, layerID, itemID, fromJS(properties));
|
|
1053
|
+
return this.setProperties(state, layerID, itemID, (0, _immutable.fromJS)(properties));
|
|
1053
1054
|
}
|
|
1054
1055
|
}, {
|
|
1055
1056
|
key: "updateProperties",
|
|
@@ -1064,7 +1065,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1064
1065
|
}, {
|
|
1065
1066
|
key: "updateJsProperties",
|
|
1066
1067
|
value: function updateJsProperties(state, layerID, itemID, properties) {
|
|
1067
|
-
return this.updateProperties(state, layerID, itemID, fromJS(properties));
|
|
1068
|
+
return this.updateProperties(state, layerID, itemID, (0, _immutable.fromJS)(properties));
|
|
1068
1069
|
}
|
|
1069
1070
|
}, {
|
|
1070
1071
|
key: "setAttributes",
|
|
@@ -1077,7 +1078,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1077
1078
|
}, {
|
|
1078
1079
|
key: "setJsAttributes",
|
|
1079
1080
|
value: function setJsAttributes(state, layerID, itemID, itemAttributes) {
|
|
1080
|
-
itemAttributes = fromJS(itemAttributes);
|
|
1081
|
+
itemAttributes = (0, _immutable.fromJS)(itemAttributes);
|
|
1081
1082
|
return this.setAttributes(state, layerID, itemID, itemAttributes);
|
|
1082
1083
|
}
|
|
1083
1084
|
}, {
|
|
@@ -1099,7 +1100,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1099
1100
|
scene: scene.mergeIn(['layers', layerID, 'items', itemID], item)
|
|
1100
1101
|
});
|
|
1101
1102
|
state = state.merge({
|
|
1102
|
-
mode: MODE_IDLE_3D
|
|
1103
|
+
mode: _constants.MODE_IDLE_3D
|
|
1103
1104
|
});
|
|
1104
1105
|
}
|
|
1105
1106
|
return {
|
|
@@ -1110,7 +1111,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1110
1111
|
key: "removeReplacingSupport",
|
|
1111
1112
|
value: function removeReplacingSupport(state) {
|
|
1112
1113
|
state = state.merge({
|
|
1113
|
-
replacingSupport: new Map()
|
|
1114
|
+
replacingSupport: new _immutable.Map()
|
|
1114
1115
|
});
|
|
1115
1116
|
return {
|
|
1116
1117
|
updatedState: state
|
|
@@ -1121,14 +1122,14 @@ var Item = /*#__PURE__*/function () {
|
|
|
1121
1122
|
value: function setInitialDoorStyle(state, doorStyle, oStyle) {
|
|
1122
1123
|
if (doorStyle === undefined) {
|
|
1123
1124
|
state = state.merge({
|
|
1124
|
-
oStyle: new Map({
|
|
1125
|
+
oStyle: new _immutable.Map({
|
|
1125
1126
|
oStyle: oStyle
|
|
1126
1127
|
})
|
|
1127
1128
|
});
|
|
1128
1129
|
} else {
|
|
1129
1130
|
state = state.merge({
|
|
1130
1131
|
doorStyle: doorStyle,
|
|
1131
|
-
oStyle: new Map({
|
|
1132
|
+
oStyle: new _immutable.Map({
|
|
1132
1133
|
oStyle: oStyle
|
|
1133
1134
|
})
|
|
1134
1135
|
});
|
|
@@ -1140,12 +1141,12 @@ var Item = /*#__PURE__*/function () {
|
|
|
1140
1141
|
items.forEach(function (data) {
|
|
1141
1142
|
{
|
|
1142
1143
|
var itemID = data.id;
|
|
1143
|
-
var tmpDS =
|
|
1144
|
-
doorStyles:
|
|
1144
|
+
var tmpDS = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data.doorStyle), {}, {
|
|
1145
|
+
doorStyles: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data.doorStyle.doorStyles), {}, {
|
|
1145
1146
|
counttop: doorStyle.doorStyles.counttop
|
|
1146
1147
|
})
|
|
1147
1148
|
});
|
|
1148
|
-
data = data.mergeIn(['doorStyle'], fromJS(tmpDS));
|
|
1149
|
+
data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
|
|
1149
1150
|
layers = layers.mergeIn(['items', itemID], data);
|
|
1150
1151
|
state = state.merge({
|
|
1151
1152
|
scene: scene.mergeIn(['layers', layerID], layers)
|
|
@@ -1188,15 +1189,15 @@ var Item = /*#__PURE__*/function () {
|
|
|
1188
1189
|
var itemID = data.id;
|
|
1189
1190
|
var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
|
|
1190
1191
|
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
1191
|
-
var tmpMolding =
|
|
1192
|
-
var temp_item_molding =
|
|
1192
|
+
var tmpMolding = (0, _toConsumableArray2["default"])(curItem.molding);
|
|
1193
|
+
var temp_item_molding = (0, _toConsumableArray2["default"])(curItem.molding);
|
|
1193
1194
|
temp_item_molding = temp_item_molding.filter(function (md) {
|
|
1194
1195
|
return doorStyle.doorStyles.cds.some(function (ds) {
|
|
1195
1196
|
return ds.itemID === md.itemID;
|
|
1196
1197
|
});
|
|
1197
1198
|
});
|
|
1198
1199
|
tmpMolding.forEach(function (md) {
|
|
1199
|
-
var itemGroup = MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
|
|
1200
|
+
var itemGroup = _export2.MoldingUtils.getItemGroupFromMolding(layer, curItem, md);
|
|
1200
1201
|
itemGroup.forEach(function (it) {
|
|
1201
1202
|
state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
|
|
1202
1203
|
});
|
|
@@ -1209,74 +1210,74 @@ var Item = /*#__PURE__*/function () {
|
|
|
1209
1210
|
})) || [];
|
|
1210
1211
|
var cds_data;
|
|
1211
1212
|
if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
|
|
1212
|
-
cds_data = cds ?
|
|
1213
|
+
cds_data = cds ? (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, euro_cds[0]), {}, {
|
|
1213
1214
|
cabinet_door_style_id: cds.cabinet_door_style_id
|
|
1214
1215
|
}) : {};
|
|
1215
1216
|
var newProperties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
|
|
1216
1217
|
if (newProperties.hasOwnProperty('depth')) {
|
|
1217
1218
|
if (!newProperties.hasOwnProperty('oldDepth')) {
|
|
1218
|
-
newProperties['oldDepth'] = new Map({
|
|
1219
|
+
newProperties['oldDepth'] = new _immutable.Map({
|
|
1219
1220
|
length: newProperties.depth.length,
|
|
1220
1221
|
_length: newProperties.depth._length,
|
|
1221
1222
|
_unit: newProperties.depth._unit
|
|
1222
1223
|
});
|
|
1223
1224
|
}
|
|
1224
|
-
newProperties['depth'] = new Map({
|
|
1225
|
-
length: convert(euro_cds[0].euro_length).from('in').to('cm'),
|
|
1225
|
+
newProperties['depth'] = new _immutable.Map({
|
|
1226
|
+
length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_length).from('in').to('cm'),
|
|
1226
1227
|
_length: euro_cds[0].euro_length,
|
|
1227
1228
|
_unit: 'in'
|
|
1228
1229
|
});
|
|
1229
1230
|
}
|
|
1230
1231
|
if (newProperties.hasOwnProperty('height')) {
|
|
1231
1232
|
if (!newProperties.hasOwnProperty('oldHeight')) {
|
|
1232
|
-
newProperties['oldHeight'] = new Map({
|
|
1233
|
+
newProperties['oldHeight'] = new _immutable.Map({
|
|
1233
1234
|
length: newProperties.height.length,
|
|
1234
1235
|
_length: newProperties.height._length,
|
|
1235
1236
|
_unit: newProperties.height._unit
|
|
1236
1237
|
});
|
|
1237
1238
|
}
|
|
1238
|
-
newProperties['height'] = new Map({
|
|
1239
|
-
length: convert(euro_cds[0].euro_height).from('in').to('cm'),
|
|
1239
|
+
newProperties['height'] = new _immutable.Map({
|
|
1240
|
+
length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_height).from('in').to('cm'),
|
|
1240
1241
|
_length: euro_cds[0].euro_height,
|
|
1241
1242
|
_unit: 'in'
|
|
1242
1243
|
});
|
|
1243
1244
|
}
|
|
1244
1245
|
if (newProperties.hasOwnProperty('width')) {
|
|
1245
1246
|
if (!newProperties.hasOwnProperty('oldWidth')) {
|
|
1246
|
-
newProperties['oldWidth'] = new Map({
|
|
1247
|
+
newProperties['oldWidth'] = new _immutable.Map({
|
|
1247
1248
|
length: newProperties.width.length,
|
|
1248
1249
|
_length: newProperties.width._length,
|
|
1249
1250
|
_unit: newProperties.width._unit
|
|
1250
1251
|
});
|
|
1251
1252
|
}
|
|
1252
|
-
newProperties['width'] = new Map({
|
|
1253
|
-
length: convert(euro_cds[0].euro_width).from('in').to('cm') - 10,
|
|
1253
|
+
newProperties['width'] = new _immutable.Map({
|
|
1254
|
+
length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_width).from('in').to('cm') - 10,
|
|
1254
1255
|
_length: euro_cds[0].euro_width,
|
|
1255
1256
|
_unit: 'in'
|
|
1256
1257
|
});
|
|
1257
1258
|
}
|
|
1258
1259
|
state = _this2.setJsProperties(state, layerID, itemID, newProperties).updatedState;
|
|
1259
1260
|
} else {
|
|
1260
|
-
cds_data = cds ?
|
|
1261
|
+
cds_data = cds ? (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
|
|
1261
1262
|
cabinet_door_style_id: cds.cabinet_door_style_id
|
|
1262
1263
|
}) : {};
|
|
1263
1264
|
var properties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
|
|
1264
1265
|
if (properties.hasOwnProperty('oldDepth')) {
|
|
1265
|
-
properties['depth'] = new Map({
|
|
1266
|
+
properties['depth'] = new _immutable.Map({
|
|
1266
1267
|
length: properties.oldDepth.length,
|
|
1267
1268
|
_length: properties.oldDepth._length,
|
|
1268
1269
|
_unit: properties.oldDepth._unit
|
|
1269
1270
|
});
|
|
1270
1271
|
}
|
|
1271
1272
|
if (properties.hasOwnProperty('oldHeight')) {
|
|
1272
|
-
properties['height'] = new Map({
|
|
1273
|
+
properties['height'] = new _immutable.Map({
|
|
1273
1274
|
length: properties.oldHeight.length,
|
|
1274
1275
|
_length: properties.oldHeight._length,
|
|
1275
1276
|
_unit: properties.oldHeight._unit
|
|
1276
1277
|
});
|
|
1277
1278
|
}
|
|
1278
1279
|
if (properties.hasOwnProperty('oldWidth')) {
|
|
1279
|
-
properties['width'] = new Map({
|
|
1280
|
+
properties['width'] = new _immutable.Map({
|
|
1280
1281
|
length: properties.oldWidth.length,
|
|
1281
1282
|
_length: properties.oldWidth._length,
|
|
1282
1283
|
_unit: properties.oldWidth._unit
|
|
@@ -1297,10 +1298,10 @@ var Item = /*#__PURE__*/function () {
|
|
|
1297
1298
|
sku: doorStyle.sku,
|
|
1298
1299
|
color_sku_alias: doorStyle.color_sku_alias,
|
|
1299
1300
|
// alias name of color_sku for the current dealer
|
|
1300
|
-
install: getInstallationSuffix(INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
|
|
1301
|
-
doorStyles:
|
|
1301
|
+
install: (0, _utils.getInstallationSuffix)(_constants.INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
|
|
1302
|
+
doorStyles: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, tmp), cds_data)
|
|
1302
1303
|
};
|
|
1303
|
-
state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], fromJS(tmpDS));
|
|
1304
|
+
state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], (0, _immutable.fromJS)(tmpDS));
|
|
1304
1305
|
};
|
|
1305
1306
|
if (isAll) {
|
|
1306
1307
|
var items = state.scene.layers.get(layerID).items;
|
|
@@ -1342,7 +1343,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1342
1343
|
var dataJSON = data.toJS();
|
|
1343
1344
|
var itemID = dataJSON.id;
|
|
1344
1345
|
var newCounter = dataJSON.counterTop;
|
|
1345
|
-
newCounter =
|
|
1346
|
+
newCounter = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newCounter), counterTop);
|
|
1346
1347
|
data = data.mergeIn(['counterTop'], newCounter);
|
|
1347
1348
|
layers = layers.mergeIn(['items', itemID], data);
|
|
1348
1349
|
state = state.merge({
|
|
@@ -1407,11 +1408,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
1407
1408
|
var dataJSON = data.toJS();
|
|
1408
1409
|
var itemID = dataJSON.id;
|
|
1409
1410
|
var doorStyle = dataJSON.doorStyle;
|
|
1410
|
-
var tmpDS =
|
|
1411
|
+
var tmpDS = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, doorStyle), {}, {
|
|
1411
1412
|
metalness: material.metalness,
|
|
1412
1413
|
roughness: material.roughness
|
|
1413
1414
|
});
|
|
1414
|
-
data = data.mergeIn(['doorStyle'], fromJS(tmpDS));
|
|
1415
|
+
data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
|
|
1415
1416
|
layers = layers.mergeIn(['items', itemID], data);
|
|
1416
1417
|
state = state.merge({
|
|
1417
1418
|
scene: scene.mergeIn(['layers', layerID], layers)
|
|
@@ -1461,13 +1462,13 @@ var Item = /*#__PURE__*/function () {
|
|
|
1461
1462
|
// if backsplash is already set
|
|
1462
1463
|
if (layer.getIn(['backsplash']).uri === backsplash.uri) {
|
|
1463
1464
|
// unselect
|
|
1464
|
-
newBack =
|
|
1465
|
+
newBack = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newBack), {}, {
|
|
1465
1466
|
uri: ''
|
|
1466
1467
|
});
|
|
1467
1468
|
flag = false;
|
|
1468
1469
|
}
|
|
1469
1470
|
// else then, set backsplash
|
|
1470
|
-
else newBack =
|
|
1471
|
+
else newBack = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newBack), backsplash);
|
|
1471
1472
|
layer = layer.mergeIn(['backsplash'], newBack);
|
|
1472
1473
|
layer = layer.set('backsplashApplied', flag);
|
|
1473
1474
|
state = state.merge({
|
|
@@ -1508,7 +1509,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1508
1509
|
scene: scene.mergeIn(['layers', layerID], layer)
|
|
1509
1510
|
});
|
|
1510
1511
|
layer.items.toArray().forEach(function (item) {
|
|
1511
|
-
if (MoldingUtils.isEnableItemForMolding(layer, item, molding)) {
|
|
1512
|
+
if (_export2.MoldingUtils.isEnableItemForMolding(layer, item, molding)) {
|
|
1512
1513
|
var tempItemMolding = item.molding;
|
|
1513
1514
|
if (flag) {
|
|
1514
1515
|
if (tempItemMolding.some(function (mol) {
|
|
@@ -1533,8 +1534,8 @@ var Item = /*#__PURE__*/function () {
|
|
|
1533
1534
|
});
|
|
1534
1535
|
} else {
|
|
1535
1536
|
var selectedItem = layer.getIn(['items', layer.selected.toJS().items[0]]);
|
|
1536
|
-
if (MoldingUtils.isEnableItemForMolding(layer, selectedItem, molding)) {
|
|
1537
|
-
var moldingGroup = MoldingUtils.getItemGroupFromMolding(layer, selectedItem, molding);
|
|
1537
|
+
if (_export2.MoldingUtils.isEnableItemForMolding(layer, selectedItem, molding)) {
|
|
1538
|
+
var moldingGroup = _export2.MoldingUtils.getItemGroupFromMolding(layer, selectedItem, molding);
|
|
1538
1539
|
var tempSelItemMolding = selectedItem.molding;
|
|
1539
1540
|
var _flag = tempSelItemMolding.some(function (mol) {
|
|
1540
1541
|
return mol.name === molding.name;
|
|
@@ -1580,16 +1581,16 @@ var Item = /*#__PURE__*/function () {
|
|
|
1580
1581
|
var itemGroups = [];
|
|
1581
1582
|
layer.items.toArray().forEach(function (curItem) {
|
|
1582
1583
|
if (selectedItem.id !== curItem.id && curItem.category === 'cabinet') {
|
|
1583
|
-
if (MoldingUtils.isItemSnappedItem(selectedItem, curItem)) {
|
|
1584
|
+
if (_export2.MoldingUtils.isItemSnappedItem(selectedItem, curItem)) {
|
|
1584
1585
|
snappedItemGroup.push(curItem); // add the snapped item.
|
|
1585
1586
|
// add the snapped item that has same molding location type, layoutpos and height to itemGroups.
|
|
1586
1587
|
if (curItem.molding.length) {
|
|
1587
1588
|
curItem.molding.forEach(function (md) {
|
|
1588
1589
|
// This code check whether the curItem can be grouped with selected Item in molding.
|
|
1589
|
-
if (MoldingUtils.tryMergeMDItem(layer, selectedItem, curItem, [selectedItem], md)) {
|
|
1590
|
+
if (_export2.MoldingUtils.tryMergeMDItem(layer, selectedItem, curItem, [selectedItem], md)) {
|
|
1590
1591
|
itemGroups.push({
|
|
1591
1592
|
base_item: curItem,
|
|
1592
|
-
group: MoldingUtils.getItemGroupFromMolding(layer, curItem, md),
|
|
1593
|
+
group: _export2.MoldingUtils.getItemGroupFromMolding(layer, curItem, md),
|
|
1593
1594
|
molding: md
|
|
1594
1595
|
});
|
|
1595
1596
|
}
|
|
@@ -1601,11 +1602,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
1601
1602
|
var updateSelectItemMolding = function updateSelectItemMolding() {
|
|
1602
1603
|
var _loop2 = function _loop2() {
|
|
1603
1604
|
// check whether snapped item is same as selected item in layoutpos(Wall, Tall, Base)
|
|
1604
|
-
if (MoldingUtils.isSameMoldingLayoutpos(selectedItem, snappedItemGroup[i])) {
|
|
1605
|
+
if (_export2.MoldingUtils.isSameMoldingLayoutpos(selectedItem, snappedItemGroup[i])) {
|
|
1605
1606
|
// check whether snapped item is same in location(same location type and height).
|
|
1606
1607
|
var delMoldings = [];
|
|
1607
1608
|
for (var k = 0; k < selectedItem.molding.length; k++) {
|
|
1608
|
-
if (MoldingUtils.isItemSameItemByLocation(selectedItem, snappedItemGroup[i], selectedItem.molding[k].location_type)) {
|
|
1609
|
+
if (_export2.MoldingUtils.isItemSameItemByLocation(selectedItem, snappedItemGroup[i], selectedItem.molding[k].location_type)) {
|
|
1609
1610
|
delMoldings.push(selectedItem.molding[k].itemID);
|
|
1610
1611
|
}
|
|
1611
1612
|
}
|
|
@@ -1656,13 +1657,13 @@ var Item = /*#__PURE__*/function () {
|
|
|
1656
1657
|
return it.molding.location_type === location;
|
|
1657
1658
|
}).sort(function (a, b) {
|
|
1658
1659
|
if (a.group.length === b.group.length) {
|
|
1659
|
-
return GeometryUtils.pointsDistance(a.base_item.x, a.base_item.y, selectedItem.x, selectedItem.y) - GeometryUtils.pointsDistance(b.base_item.x, b.base_item.y, selectedItem.x, selectedItem.y);
|
|
1660
|
+
return _export2.GeometryUtils.pointsDistance(a.base_item.x, a.base_item.y, selectedItem.x, selectedItem.y) - _export2.GeometryUtils.pointsDistance(b.base_item.x, b.base_item.y, selectedItem.x, selectedItem.y);
|
|
1660
1661
|
} else {
|
|
1661
1662
|
return a.group.length - b.group.length;
|
|
1662
1663
|
}
|
|
1663
1664
|
});
|
|
1664
1665
|
if (locationMolding.length) {
|
|
1665
|
-
var locationMoldingItems = MoldingUtils.getItemGroupFromMolding(layer, selectedItem, locationMolding[0].molding);
|
|
1666
|
+
var locationMoldingItems = _export2.MoldingUtils.getItemGroupFromMolding(layer, selectedItem, locationMolding[0].molding);
|
|
1666
1667
|
locationMoldingItems.forEach(function (item) {
|
|
1667
1668
|
var tempMoldings = state.getIn(['scene', 'layers', layerID, 'items', item.id, 'molding']);
|
|
1668
1669
|
if (!tempMoldings.some(function (mol) {
|
|
@@ -1673,11 +1674,11 @@ var Item = /*#__PURE__*/function () {
|
|
|
1673
1674
|
}
|
|
1674
1675
|
};
|
|
1675
1676
|
if (itemGroups.length && layer.items.some(function (it) {
|
|
1676
|
-
return MoldingUtils.isItemSnappedItem(selectedItem, it) && it.category === 'cabinet';
|
|
1677
|
+
return _export2.MoldingUtils.isItemSnappedItem(selectedItem, it) && it.category === 'cabinet';
|
|
1677
1678
|
})) {
|
|
1678
1679
|
emptyMoldingArray();
|
|
1679
|
-
for (var i = 0; i < MOLDING_LOCATIONS.length; i++) {
|
|
1680
|
-
setLocationMolding(MOLDING_LOCATIONS[i]);
|
|
1680
|
+
for (var i = 0; i < _constants.MOLDING_LOCATIONS.length; i++) {
|
|
1681
|
+
setLocationMolding(_constants.MOLDING_LOCATIONS[i]);
|
|
1681
1682
|
}
|
|
1682
1683
|
} else if (!itemGroups.length && selectedItem.molding.length) {
|
|
1683
1684
|
// Delete the selected Item's molding property if selItem attached the group that has no molding.
|
|
@@ -1778,7 +1779,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1778
1779
|
length = 0;
|
|
1779
1780
|
_length = 0;
|
|
1780
1781
|
}
|
|
1781
|
-
state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'properties', 'altitude'], new Map({
|
|
1782
|
+
state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'properties', 'altitude'], new _immutable.Map({
|
|
1782
1783
|
length: length,
|
|
1783
1784
|
_length: _length,
|
|
1784
1785
|
_unit: _unit
|
|
@@ -1790,7 +1791,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1790
1791
|
}, {
|
|
1791
1792
|
key: "createHole",
|
|
1792
1793
|
value: function createHole(state, layerID, type, lineID, offset, properties) {
|
|
1793
|
-
var holeID = IDBroker.acquireID();
|
|
1794
|
+
var holeID = _export2.IDBroker.acquireID();
|
|
1794
1795
|
var hole = state.catalog.factoryElement(type, {
|
|
1795
1796
|
id: holeID,
|
|
1796
1797
|
url: state.catalog.getIn(['elements', type, 'info', 'url']),
|
|
@@ -1840,7 +1841,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1840
1841
|
if (properties.hasOwnProperty('flip_horizontal')) {
|
|
1841
1842
|
properties['flip_horizontal'] = true;
|
|
1842
1843
|
}
|
|
1843
|
-
state = Hole.setJsProperties(state, layerID, holeID, properties).updatedState;
|
|
1844
|
+
state = _export.Hole.setJsProperties(state, layerID, holeID, properties).updatedState;
|
|
1844
1845
|
return {
|
|
1845
1846
|
updatedState: state,
|
|
1846
1847
|
hole: hole
|
|
@@ -1870,5 +1871,4 @@ var Item = /*#__PURE__*/function () {
|
|
|
1870
1871
|
};
|
|
1871
1872
|
}
|
|
1872
1873
|
}]);
|
|
1873
|
-
}();
|
|
1874
|
-
export { Item as default };
|
|
1874
|
+
}();
|