kitchen-simulator 11.22.0 → 11.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/LiteKitchenConfigurator.js +4 -2
- package/es/LiteRenderer.js +3 -1
- package/es/catalog/cabinet/cabinet-texture-resolver.js +8 -0
- package/es/constants.js +1 -1
- package/es/devLiteRenderer.js +3 -3
- package/es/events/external/handleExternalEvent.js +1 -1
- package/es/mappings/external-events/mapExternalEventPayload.js +3 -3
- package/es/mappings/external-events/mappers/changeDoorStyleMapper.js +3 -3
- package/es/mappings/external-events/mappers/loadProjectMapper.js +5 -5
- package/es/utils/geometry.js +17 -0
- package/lib/LiteKitchenConfigurator.js +4 -2
- package/lib/LiteRenderer.js +3 -1
- package/lib/catalog/cabinet/cabinet-texture-resolver.js +14 -0
- package/lib/constants.js +2 -2
- package/lib/devLiteRenderer.js +2 -2
- package/lib/events/external/handleExternalEvent.js +1 -1
- package/lib/mappings/external-events/mapExternalEventPayload.js +3 -3
- package/lib/mappings/external-events/mappers/changeDoorStyleMapper.js +3 -3
- package/lib/mappings/external-events/mappers/loadProjectMapper.js +5 -5
- package/lib/utils/geometry.js +17 -0
- package/package.json +1 -1
|
@@ -35,7 +35,7 @@ var wrapperStyle = {
|
|
|
35
35
|
display: 'flex',
|
|
36
36
|
flexFlow: 'row nowrap'
|
|
37
37
|
};
|
|
38
|
-
var WarningItem = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n opacity: 0.8;\n position: absolute;\n border-radius: 6px;\n z-index: 11;\n background-color: #ff7400;\n width: max-content;\n align-items: center;\n padding: 10px;\n display: none;\n box-shadow
|
|
38
|
+
var WarningItem = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n opacity: 0.8;\n position: absolute;\n border-radius: 6px;\n z-index: 11;\n background-color: #ff7400;\n width: max-content;\n align-items: center;\n padding: 10px;\n display: none;\n box-shadow: 0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n 0px 6px 10px 0px rgba(0, 0, 0, 0.39), 0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n top: -50px;\n left: 5px;\n color: white;\n"])));
|
|
39
39
|
var SubCategoryItemImage = styled.img(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n background-color: ", ";\n height: 30px;\n width: 30px;\n -webkit-mask-image: url(", ");\n -webkit-mask-size: calc(100% - 2px) calc(100% - 2px);\n -webkit-mask-repeat: no-repeat;\n -webkit-mask-position: 1px 1px;\n"])), constants.SECONDARY_PURPLE_COLOR, function (props) {
|
|
40
40
|
return props.maskImage + '?nocache=2025';
|
|
41
41
|
});
|
|
@@ -472,6 +472,7 @@ LiteKitchenConfigurator.propTypes = {
|
|
|
472
472
|
height: PropTypes.number.isRequired,
|
|
473
473
|
stateExtractor: PropTypes.func.isRequired,
|
|
474
474
|
configData: PropTypes.object,
|
|
475
|
+
defaultTextures: PropTypes.object,
|
|
475
476
|
onInternalEvent: PropTypes.func,
|
|
476
477
|
extractedState: PropTypes.object,
|
|
477
478
|
// ✅ injected by connect
|
|
@@ -495,7 +496,8 @@ LiteKitchenConfigurator.defaultProps = {
|
|
|
495
496
|
sidebarComponents: [],
|
|
496
497
|
footerbarComponents: [],
|
|
497
498
|
customContents: {},
|
|
498
|
-
configData: {}
|
|
499
|
+
configData: {},
|
|
500
|
+
defaultTextures: {}
|
|
499
501
|
};
|
|
500
502
|
|
|
501
503
|
// ✅ Only select the slice you actually use.
|
package/es/LiteRenderer.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
3
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
4
|
-
var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError", "holes"];
|
|
4
|
+
var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "defaultTextures", "onError", "holes"];
|
|
5
5
|
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; }
|
|
6
6
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
7
7
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
@@ -121,6 +121,7 @@ export default function LiteRenderer(props) {
|
|
|
121
121
|
configData = props.configData,
|
|
122
122
|
externalEvent = props.externalEvent,
|
|
123
123
|
onInternalEvent = props.onInternalEvent,
|
|
124
|
+
defaultTextures = props.defaultTextures,
|
|
124
125
|
onError = props.onError,
|
|
125
126
|
holes = props.holes,
|
|
126
127
|
passThrough = _objectWithoutProperties(props, _excluded);
|
|
@@ -287,6 +288,7 @@ export default function LiteRenderer(props) {
|
|
|
287
288
|
return state.get('KitchenConfigurator');
|
|
288
289
|
},
|
|
289
290
|
configData: configData,
|
|
291
|
+
defaultTextures: defaultTextures,
|
|
290
292
|
externalEvent: externalEvent,
|
|
291
293
|
onInternalEvent: onInternalEvent
|
|
292
294
|
}, passThrough))));
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { isEmpty } from "../../components/viewer2d/utils";
|
|
2
|
+
import { DEFAULT_INTERIOR_TEXTURE } from "../../constants";
|
|
3
|
+
export function getDefaultInteriorTexture(defaultTextures) {
|
|
4
|
+
var _defaultTextures$find;
|
|
5
|
+
if (!isEmpty(defaultTextures)) return defaultTextures === null || defaultTextures === void 0 || (_defaultTextures$find = defaultTextures.find(function (t) {
|
|
6
|
+
return t.type === 'interior' && t.name === DEFAULT_INTERIOR_TEXTURE;
|
|
7
|
+
})) === null || _defaultTextures$find === void 0 ? void 0 : _defaultTextures$find.image;else return undefined;
|
|
8
|
+
}
|
package/es/constants.js
CHANGED
|
@@ -777,5 +777,5 @@ export var DOORSTYLE_SCOPE_MULTIPLE = 'multiple';
|
|
|
777
777
|
export var DEFAULT_MOLDING_PIECE_LENGTH = 96; // in inch, 8 feet, standard length for molding pieces
|
|
778
778
|
// default urls
|
|
779
779
|
|
|
780
|
-
export var
|
|
780
|
+
export var DEFAULT_INTERIOR_TEXTURE = 'Maple';
|
|
781
781
|
export var DEFAULT_DOOR_HANDLE_TEXTURE_URL = '/assets/img/default/steel.jpg';
|
package/es/devLiteRenderer.js
CHANGED
|
@@ -6,6 +6,7 @@ import { Map } from 'immutable';
|
|
|
6
6
|
import ContainerDimensions from 'react-container-dimensions';
|
|
7
7
|
import ccdfPayload from "./mocks/getCCDFPayload.json";
|
|
8
8
|
import configData from "./mocks/configData.json";
|
|
9
|
+
import defaultTextures from "./mocks/defaultTexturesPayload.json";
|
|
9
10
|
import projectJson from "./mocks/project.json";
|
|
10
11
|
import cabinetPaylod from "./mocks/cabinetPayload.json";
|
|
11
12
|
import appliancePaylod from "./mocks/appliancePayload.json";
|
|
@@ -20,7 +21,7 @@ import holesPayload from "./mocks/holesPayload.json";
|
|
|
20
21
|
import ReactDOM from 'react-dom';
|
|
21
22
|
import LiteRenderer from "./LiteRenderer";
|
|
22
23
|
import { Button } from 'antd';
|
|
23
|
-
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, EXTERNAL_EVENT_CENTERING_2D, PROP_ALTITUDE, EXTERNAL_EVENT_DUPLICATE_ELEMENT, ELEMENT_ITEM, EXTERNAL_EVENT_DELETE_ELEMENT, PROP_RESIZE_WIDTH, EXTERNAL_EVENT_REPLACE_CABINET, EXTERNAL_EVENT_SET_FINISHING, FINISHING_TYPE, EXTERNAL_EVENT_ROTATE_PAN, DOORSTYLE_SCOPE_ALL, ATT_HOLE_OFFSET_A, ATT_HOLE_OFFSET_B,
|
|
24
|
+
import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, EXTERNAL_EVENT_CENTERING_2D, PROP_ALTITUDE, EXTERNAL_EVENT_DUPLICATE_ELEMENT, ELEMENT_ITEM, EXTERNAL_EVENT_DELETE_ELEMENT, PROP_RESIZE_WIDTH, EXTERNAL_EVENT_REPLACE_CABINET, EXTERNAL_EVENT_SET_FINISHING, FINISHING_TYPE, EXTERNAL_EVENT_ROTATE_PAN, DOORSTYLE_SCOPE_ALL, ATT_HOLE_OFFSET_A, ATT_HOLE_OFFSET_B, DEFAULT_DOOR_HANDLE_TEXTURE_URL } from "./constants";
|
|
24
25
|
import { convert } from "./utils/convert-units-lite";
|
|
25
26
|
|
|
26
27
|
// --- renderer props ---
|
|
@@ -268,7 +269,6 @@ function WorkSpace(props) {
|
|
|
268
269
|
doorStyles: {
|
|
269
270
|
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
270
271
|
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
271
|
-
interior: DEFAULT_INTERIOR_URL,
|
|
272
272
|
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
273
273
|
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
274
274
|
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
@@ -366,7 +366,6 @@ function WorkSpace(props) {
|
|
|
366
366
|
doorStyles: {
|
|
367
367
|
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
368
368
|
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
369
|
-
interior: DEFAULT_INTERIOR_URL,
|
|
370
369
|
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
371
370
|
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
372
371
|
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
@@ -884,6 +883,7 @@ function WorkSpace(props) {
|
|
|
884
883
|
width: props.width,
|
|
885
884
|
height: props.height,
|
|
886
885
|
configData: configData,
|
|
886
|
+
defaultTextures: defaultTextures,
|
|
887
887
|
options: options,
|
|
888
888
|
logoImg: "/assets/logo.png",
|
|
889
889
|
companyUrl: "https://example.com",
|
|
@@ -42,7 +42,7 @@ function _handleExternalEvent() {
|
|
|
42
42
|
}
|
|
43
43
|
return _context.abrupt("return");
|
|
44
44
|
case 1:
|
|
45
|
-
evt = mapExternalEventPayload(props.externalEvent, state);
|
|
45
|
+
evt = mapExternalEventPayload(props.externalEvent, state, props.defaultTextures);
|
|
46
46
|
layerId = state.getIn(['scene', 'selectedLayer']);
|
|
47
47
|
layer = state.getIn(['scene', 'layers', layerId]);
|
|
48
48
|
_t = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
@@ -9,7 +9,7 @@ import { mapLoadProjectEvent } from "./mappers/loadProjectMapper";
|
|
|
9
9
|
* Converts new API formats into legacy internal formats (e.g. assets3d -> structure_json)
|
|
10
10
|
* without changing the behavior of the existing 3D tool.
|
|
11
11
|
*/
|
|
12
|
-
export function mapExternalEventPayload(evt, state) {
|
|
12
|
+
export function mapExternalEventPayload(evt, state, defaultTextures) {
|
|
13
13
|
if (isEmpty(evt)) return null;
|
|
14
14
|
switch (evt.type) {
|
|
15
15
|
case EXTERNAL_EVENT_REPLACE_CABINET:
|
|
@@ -19,9 +19,9 @@ export function mapExternalEventPayload(evt, state) {
|
|
|
19
19
|
evt.payload = mapAddItemEvent(evt.payload, state);
|
|
20
20
|
return evt;
|
|
21
21
|
case EXTERNAL_EVENT_CHANGE_DOORSTYLE:
|
|
22
|
-
return mapChangeDoorStyleEvent(evt, state);
|
|
22
|
+
return mapChangeDoorStyleEvent(evt, state, defaultTextures);
|
|
23
23
|
case EXTERNAL_EVENT_LOAD_PROJECT:
|
|
24
|
-
return mapLoadProjectEvent(evt, state);
|
|
24
|
+
return mapLoadProjectEvent(evt, state, defaultTextures);
|
|
25
25
|
default:
|
|
26
26
|
return evt;
|
|
27
27
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
2
|
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; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
-
import {
|
|
4
|
+
import { getDefaultInteriorTexture } from "../../../catalog/cabinet/cabinet-texture-resolver";
|
|
5
5
|
import { isEmpty } from "../../../utils/helper";
|
|
6
|
-
export function mapChangeDoorStyleEvent(evt, state) {
|
|
6
|
+
export function mapChangeDoorStyleEvent(evt, state, defaultTextures) {
|
|
7
7
|
var _evt$payload, _layer$toJS;
|
|
8
8
|
if (isEmpty(evt)) return null;
|
|
9
9
|
var targetDoorStyle = evt === null || evt === void 0 || (_evt$payload = evt.payload) === null || _evt$payload === void 0 ? void 0 : _evt$payload.doorStyle;
|
|
@@ -19,7 +19,7 @@ export function mapChangeDoorStyleEvent(evt, state) {
|
|
|
19
19
|
var doorStyles = {
|
|
20
20
|
base: targetDoorStyle.texture,
|
|
21
21
|
counttop: counterToptexture,
|
|
22
|
-
interior:
|
|
22
|
+
interior: getDefaultInteriorTexture(defaultTextures)
|
|
23
23
|
};
|
|
24
24
|
for (var i = 1; i <= Max_PH; i++) {
|
|
25
25
|
doorStyles['base_door_' + i] = targetDoorStyle.texture;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
2
|
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; }
|
|
3
3
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
-
import {
|
|
4
|
+
import { getDefaultInteriorTexture } from "../../../catalog/cabinet/cabinet-texture-resolver";
|
|
5
5
|
import { isEmpty } from "../../../utils/helper";
|
|
6
|
-
export function mapLoadProjectEvent(evt, state) {
|
|
6
|
+
export function mapLoadProjectEvent(evt, state, defaultTextures) {
|
|
7
7
|
// preprocessing for loading project
|
|
8
8
|
// this function make doorStyles using item's doorStyle
|
|
9
9
|
if (isEmpty(evt)) return null;
|
|
@@ -11,8 +11,8 @@ export function mapLoadProjectEvent(evt, state) {
|
|
|
11
11
|
var layer = evt.payload.layers;
|
|
12
12
|
var itemKeys = Object.keys(layer[layerId].items);
|
|
13
13
|
if (isEmpty(layer)) return evt;
|
|
14
|
-
var handleTexture =
|
|
15
|
-
var counterToptexture = layer.counterTop;
|
|
14
|
+
var handleTexture = layer[layerId].doorHandle;
|
|
15
|
+
var counterToptexture = layer[layerId].counterTop;
|
|
16
16
|
// make doorStyles and update the doorStyle payload
|
|
17
17
|
var Max_PH = 9;
|
|
18
18
|
for (var i = 0; i < itemKeys.length; i++) {
|
|
@@ -21,7 +21,7 @@ export function mapLoadProjectEvent(evt, state) {
|
|
|
21
21
|
var doorStyles = {
|
|
22
22
|
base: doorStyle.texture,
|
|
23
23
|
counttop: counterToptexture,
|
|
24
|
-
interior:
|
|
24
|
+
interior: getDefaultInteriorTexture(defaultTextures)
|
|
25
25
|
};
|
|
26
26
|
for (var _i = 1; _i <= Max_PH; _i++) {
|
|
27
27
|
doorStyles['base_door_' + _i] = doorStyle.texture;
|
package/es/utils/geometry.js
CHANGED
|
@@ -1547,6 +1547,23 @@ export function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, a
|
|
|
1547
1547
|
}
|
|
1548
1548
|
});
|
|
1549
1549
|
}
|
|
1550
|
+
if (getSnap === true) {
|
|
1551
|
+
allItemSnap.filter(function (e) {
|
|
1552
|
+
return e.isSnappedLine;
|
|
1553
|
+
}).forEach(function (snap) {
|
|
1554
|
+
var dist = (snap.pos.x - nx) * (snap.pos.x - nx) + (snap.pos.y - ny) * (snap.pos.y - ny);
|
|
1555
|
+
//console.log("dist", snap)
|
|
1556
|
+
if (isPointInArea(allArea, snap.pos) || !allArea.length) if (dist < 100) {
|
|
1557
|
+
ndist = dist;
|
|
1558
|
+
nx = snap.pos.x;
|
|
1559
|
+
ny = snap.pos.y;
|
|
1560
|
+
rotRad = snap.rotRad;
|
|
1561
|
+
getSnap = true;
|
|
1562
|
+
|
|
1563
|
+
//console.log("SUCCESS!!!!");
|
|
1564
|
+
}
|
|
1565
|
+
});
|
|
1566
|
+
}
|
|
1550
1567
|
if (getSnap === false) {
|
|
1551
1568
|
var nearRect = null;
|
|
1552
1569
|
var minDist = Infinity;
|
|
@@ -43,7 +43,7 @@ var wrapperStyle = {
|
|
|
43
43
|
display: 'flex',
|
|
44
44
|
flexFlow: 'row nowrap'
|
|
45
45
|
};
|
|
46
|
-
var WarningItem = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n opacity: 0.8;\n position: absolute;\n border-radius: 6px;\n z-index: 11;\n background-color: #ff7400;\n width: max-content;\n align-items: center;\n padding: 10px;\n display: none;\n box-shadow
|
|
46
|
+
var WarningItem = _styledComponents["default"].div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n opacity: 0.8;\n position: absolute;\n border-radius: 6px;\n z-index: 11;\n background-color: #ff7400;\n width: max-content;\n align-items: center;\n padding: 10px;\n display: none;\n box-shadow: 0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n 0px 6px 10px 0px rgba(0, 0, 0, 0.39), 0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n top: -50px;\n left: 5px;\n color: white;\n"])));
|
|
47
47
|
var SubCategoryItemImage = _styledComponents["default"].img(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n background-color: ", ";\n height: 30px;\n width: 30px;\n -webkit-mask-image: url(", ");\n -webkit-mask-size: calc(100% - 2px) calc(100% - 2px);\n -webkit-mask-repeat: no-repeat;\n -webkit-mask-position: 1px 1px;\n"])), constants.SECONDARY_PURPLE_COLOR, function (props) {
|
|
48
48
|
return props.maskImage + '?nocache=2025';
|
|
49
49
|
});
|
|
@@ -480,6 +480,7 @@ LiteKitchenConfigurator.propTypes = {
|
|
|
480
480
|
height: _propTypes["default"].number.isRequired,
|
|
481
481
|
stateExtractor: _propTypes["default"].func.isRequired,
|
|
482
482
|
configData: _propTypes["default"].object,
|
|
483
|
+
defaultTextures: _propTypes["default"].object,
|
|
483
484
|
onInternalEvent: _propTypes["default"].func,
|
|
484
485
|
extractedState: _propTypes["default"].object,
|
|
485
486
|
// ✅ injected by connect
|
|
@@ -503,7 +504,8 @@ LiteKitchenConfigurator.defaultProps = {
|
|
|
503
504
|
sidebarComponents: [],
|
|
504
505
|
footerbarComponents: [],
|
|
505
506
|
customContents: {},
|
|
506
|
-
configData: {}
|
|
507
|
+
configData: {},
|
|
508
|
+
defaultTextures: {}
|
|
507
509
|
};
|
|
508
510
|
|
|
509
511
|
// ✅ Only select the slice you actually use.
|
package/lib/LiteRenderer.js
CHANGED
|
@@ -26,7 +26,7 @@ var Lines = _interopRequireWildcard(require("./catalog/lines/wall/planner-elemen
|
|
|
26
26
|
var _holesToCatalog = require("./mappings/holesToCatalog");
|
|
27
27
|
var _export = require("./plugins/export");
|
|
28
28
|
var _LiteKitchenConfigurator = _interopRequireDefault(require("./LiteKitchenConfigurator"));
|
|
29
|
-
var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError", "holes"]; // LiteRenderer.jsx
|
|
29
|
+
var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "defaultTextures", "onError", "holes"]; // LiteRenderer.jsx
|
|
30
30
|
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); }
|
|
31
31
|
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; }
|
|
32
32
|
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; }
|
|
@@ -129,6 +129,7 @@ function LiteRenderer(props) {
|
|
|
129
129
|
configData = props.configData,
|
|
130
130
|
externalEvent = props.externalEvent,
|
|
131
131
|
onInternalEvent = props.onInternalEvent,
|
|
132
|
+
defaultTextures = props.defaultTextures,
|
|
132
133
|
onError = props.onError,
|
|
133
134
|
holes = props.holes,
|
|
134
135
|
passThrough = (0, _objectWithoutProperties2["default"])(props, _excluded);
|
|
@@ -295,6 +296,7 @@ function LiteRenderer(props) {
|
|
|
295
296
|
return state.get('KitchenConfigurator');
|
|
296
297
|
},
|
|
297
298
|
configData: configData,
|
|
299
|
+
defaultTextures: defaultTextures,
|
|
298
300
|
externalEvent: externalEvent,
|
|
299
301
|
onInternalEvent: onInternalEvent
|
|
300
302
|
}, passThrough))));
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.getDefaultInteriorTexture = getDefaultInteriorTexture;
|
|
7
|
+
var _utils = require("../../components/viewer2d/utils");
|
|
8
|
+
var _constants = require("../../constants");
|
|
9
|
+
function getDefaultInteriorTexture(defaultTextures) {
|
|
10
|
+
var _defaultTextures$find;
|
|
11
|
+
if (!(0, _utils.isEmpty)(defaultTextures)) return defaultTextures === null || defaultTextures === void 0 || (_defaultTextures$find = defaultTextures.find(function (t) {
|
|
12
|
+
return t.type === 'interior' && t.name === _constants.DEFAULT_INTERIOR_TEXTURE;
|
|
13
|
+
})) === null || _defaultTextures$find === void 0 ? void 0 : _defaultTextures$find.image;else return undefined;
|
|
14
|
+
}
|
package/lib/constants.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.END_DRAGGING_VERTEX = exports.END_DRAGGING_LINE = exports.END_DRAGGING_ITEM_3D = exports.END_DRAGGING_ITEM = exports.END_DRAGGING_HOLE_3D = exports.END_DRAGGING_HOLE = exports.END_CREATING_HOLE = exports.END_CREATING_CABINET = exports.ELEVATION_VIEW_TITLE = exports.ELEVATION_VIEW_RIGHT = exports.ELEVATION_VIEW_LEFT = exports.ELEVATION_VIEW_KEYWORD = exports.ELEVATION_VIEW_FRONT = exports.ELEVATION_VIEW_BACK = exports.ELEVATION_VIEW = exports.ELEMENT_VERTEX = exports.ELEMENT_LINE = exports.ELEMENT_ITEM = exports.ELEMENT_HOLE = exports.ELEMENT_AREA = exports.EDIT_WIDTH = exports.EDIT = exports.DUPLICATE_SELECTED = exports.DOORSTYLE_SCOPE_SINGLE = exports.DOORSTYLE_SCOPE_MULTIPLE = exports.DOORSTYLE_SCOPE_ALL = exports.DISTANCE_MEASUREMENT_LINE_COLOR = exports.DISTANCE_EPSILON = exports.DIFFERENT_VALUES_PATH_LENGTH = exports.DELTA = exports.DEFAULT_MOLDING_PIECE_LENGTH = exports.
|
|
6
|
+
exports.END_DRAGGING_VERTEX = exports.END_DRAGGING_LINE = exports.END_DRAGGING_ITEM_3D = exports.END_DRAGGING_ITEM = exports.END_DRAGGING_HOLE_3D = exports.END_DRAGGING_HOLE = exports.END_CREATING_HOLE = exports.END_CREATING_CABINET = exports.ELEVATION_VIEW_TITLE = exports.ELEVATION_VIEW_RIGHT = exports.ELEVATION_VIEW_LEFT = exports.ELEVATION_VIEW_KEYWORD = exports.ELEVATION_VIEW_FRONT = exports.ELEVATION_VIEW_BACK = exports.ELEVATION_VIEW = exports.ELEMENT_VERTEX = exports.ELEMENT_LINE = exports.ELEMENT_ITEM = exports.ELEMENT_HOLE = exports.ELEMENT_AREA = exports.EDIT_WIDTH = exports.EDIT = exports.DUPLICATE_SELECTED = exports.DOORSTYLE_SCOPE_SINGLE = exports.DOORSTYLE_SCOPE_MULTIPLE = exports.DOORSTYLE_SCOPE_ALL = exports.DISTANCE_MEASUREMENT_LINE_COLOR = exports.DISTANCE_EPSILON = exports.DIFFERENT_VALUES_PATH_LENGTH = exports.DELTA = exports.DEFAULT_MOLDING_PIECE_LENGTH = exports.DEFAULT_INTERIOR_TEXTURE = exports.DEFAULT_FONT_FAMILY = exports.DEFAULT_DOOR_HANDLE_TEXTURE_URL = exports.DECIMAL_PLACES_3 = exports.DECIMAL_PLACES_2 = exports.DASH_LINE_COLOR = exports.CREATE_ROOM_WITH_SHAPE = exports.COPY_PROPERTIES = exports.CLIENTS_NAME = exports.CHANGE_WINDOW_DOOR_MEASURE = exports.CHANGE_WALL_LENGTH_MEASURE = exports.CHANGE_WALL_CABINET_MEASURE = exports.CHANGE_MEASUREMENT_UNIT = exports.CHANGE_CATALOG_PAGE = exports.CHANGE_BASE_CABINET_MEASURE = exports.CEIL_UNITS_LENGTH = exports.BROWN_COLOR = exports.BOTTOM_MOLDING_LOCATION = exports.BOTTOM = exports.BG_COLOR_OVERLAY = exports.BG_COLOR_HOVER = exports.BG_COLOR_1 = exports.BG_COLOR_0 = exports.BEGIN_UPLOADING_IMAGE = exports.BEGIN_ROTATING_ITEM_3D = exports.BEGIN_ROTATING_ITEM = exports.BEGIN_FITTING_IMAGE = exports.BEGIN_DRAWING_LINE = exports.BEGIN_DRAGGING_VERTEX = exports.BEGIN_DRAGGING_LINE = exports.BEGIN_DRAGGING_ITEM_3D = exports.BEGIN_DRAGGING_ITEM = exports.BEGIN_DRAGGING_HOLE_3D = exports.BEGIN_DRAGGING_HOLE = exports.BASE_ITEM_MEASUREMENT_LINE_COLOR = exports.BASE_CABINET_LAYOUTPOS = exports.BACK_DIST_ANG = exports.ATT_VERTEXT_TWO = exports.ATT_VERTEXT_ONE = exports.ATT_LINE_LENGTH = exports.ATT_ITEM_ROTATION = exports.ATT_ITEM_POS = exports.ATT_HOLE_OFFSET_B = exports.ATT_HOLE_OFFSET_A = exports.ARROW_TEXT_FORECOLOR = exports.ARROW_TEXT_FONTFACE = exports.ARROW_TEXT_BACKCOLOR = exports.ARROW_COLOR = exports.ARRAY_ELEVATION_VIEW_MODES = exports.ARRAY_3D_MODES = exports.AREA_ACTIONS = exports.API_SERVER_URL = exports.ANIMATE_STEP_MIN = exports.ANIMATE_STEP_MAX = exports.ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT = exports.ANIMATE_OBJECT = exports.ALTERATE_STATE = exports.ADD_VERTICAL_GUIDE = exports.ADD_TO_GROUP = exports.ADD_LAYER = exports.ADD_HORIZONTAL_GUIDE = exports.ADD_GROUP_FROM_SELECTED = exports.ADD_GROUP = exports.ADD_ELEMENT_TO_CATALOG = exports.ADD_CIRCULAR_GUIDE = exports.ADD_CABINETS = exports.ADD_APPLIANCES = exports.ACCESSORIES_LAYOUTPOS = exports.ACCENT_COLOR = void 0;
|
|
7
7
|
exports.MODE_DRAGGING_HOLE_3D = exports.MODE_DRAGGING_HOLE = exports.MODE_CONFIGURING_PROJECT = exports.MODE_BACK_ELEVATION_VIEW = exports.MODE_3D_VIEW = exports.MODE_3D_FIRST_PERSON = exports.MODE_2D_ZOOM_OUT = exports.MODE_2D_ZOOM_IN = exports.MODE_2D_PAN = exports.MODE = exports.MIN_ANGLE_DISALLOW_DRAW_WALL = exports.MIDDLE_MOLDING_LOCATION = exports.MEPSILON = exports.MAX_ZOOM_IN_SCALE = exports.MAX_ANGLE_SCALE = exports.MAKE_FLOOR_PLAN = exports.LOGOUT = exports.LOGIN_SUCCESS = exports.LOGIN_ERROR = exports.LOCAL_STORAGE_TOKEN_VALUE = exports.LOCAL_STORAGE_TOKEN_NAME = exports.LOCAL_STORAGE_ORIGINAL_TOKEN = exports.LOCAL_STORAGE_CUSTOMER_INFO = exports.LOCAL_STORAGE_CART_ACTION = exports.LOAD_PROJECT = exports.LIST_QUANTITIES = exports.LIST_PARTS = exports.LINE_THICKNESS = exports.LINE_ACTIONS = exports.LEFT_DIST_ANG = exports.LEFT = exports.LABEL_COLOR = exports.KITCHEN_KONFIGURATOR = exports.KEYBOARD_BUTTON_CODE = exports.ITEM_TYPE = exports.ITEM_MOVE_UP = exports.ITEMS_ACTIONS = exports.INVERT = exports.INTERNAL_EVENT_UNSELECT_ALL = exports.INTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.INTERNAL_EVENT_SYNC_SCENE = exports.INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_SELECT_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_ITEMS_CATALOG = exports.INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = exports.INSTALLATION_TYPE_SKU_SUFFIX = exports.INSTALLATION_TYPE_NAME = exports.INSTALLATION_SUFFIX_TYPE = exports.INIT_CATALOG = exports.HOLE_NAMES = exports.HOLE_ACTIONS = exports.HDR_URLS = exports.HAS_LOADINGBAR = exports.GROUP_TRANSLATE = exports.GROUP_ROTATE = exports.GROUP_ACTIONS = exports.GO_BACK_TO_CATALOG_PAGE = exports.FRONT_DIST_ANG = exports.FINISHING_TYPE = exports.FINISHING_TOUCH = exports.EXTERNAL_EVENT_ZOOM_OUT = exports.EXTERNAL_EVENT_ZOOM_IN = exports.EXTERNAL_EVENT_UPDATE_PROPERTY = exports.EXTERNAL_EVENT_UPDATE_ATTRIBUTE = exports.EXTERNAL_EVENT_UNDO = exports.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.EXTERNAL_EVENT_TOGGLE_TO_3D = exports.EXTERNAL_EVENT_TOGGLE_TO_2D = exports.EXTERNAL_EVENT_SYNC_SCENE = exports.EXTERNAL_EVENT_SET_MOLDING = exports.EXTERNAL_EVENT_SET_FINISHING = exports.EXTERNAL_EVENT_ROTATE_PAN = exports.EXTERNAL_EVENT_REPLACE_CABINET = exports.EXTERNAL_EVENT_REDO = exports.EXTERNAL_EVENT_PROJECT_SETTING = exports.EXTERNAL_EVENT_NEW_PROJECT = exports.EXTERNAL_EVENT_MOVE_PAN = exports.EXTERNAL_EVENT_LOAD_PROJECT = exports.EXTERNAL_EVENT_DUPLICATE_ELEMENT = exports.EXTERNAL_EVENT_DELETE_ELEMENT = exports.EXTERNAL_EVENT_CHANGE_DOORSTYLE = exports.EXTERNAL_EVENT_CENTERING_2D = exports.EXTERNAL_EVENT_ADD_WALL = exports.EXTERNAL_EVENT_ADD_ROOM_SHAPE = exports.EXTERNAL_EVENT_ADD_ITEM = exports.EXTERNAL_EVENT_ADD_HOLE = exports.ERROR_DATABASE = exports.EPSILON = exports.END_UPLOADING_IMAGE = exports.END_ROTATING_ITEM_3D = exports.END_ROTATING_ITEM = exports.END_LOADING = exports.END_FITTING_IMAGE = exports.END_DRAWING_LINE = exports.END_DRAWING_ITEM = exports.END_DRAWING_HOLE_3D = exports.END_DRAWING_HOLE = void 0;
|
|
8
8
|
exports.SELECT_TOOL_ZOOM_IN = exports.SELECT_TOOL_UPLOAD_IMAGE = exports.SELECT_TOOL_PAN = exports.SELECT_TOOL_EDIT = exports.SELECT_TOOL_DRAWING_LINE = exports.SELECT_TOOL_DRAWING_ITEM_3D = exports.SELECT_TOOL_DRAWING_ITEM = exports.SELECT_TOOL_DRAWING_HOLE_3D = exports.SELECT_TOOL_DRAWING_HOLE = exports.SELECT_TOOL_3D_VIEW = exports.SELECT_TOOL_3D_FIRST_PERSON = exports.SELECT_LINE = exports.SELECT_LAYER = exports.SELECT_ITEM = exports.SELECT_HOLE = exports.SELECT_GROUP = exports.SELECT_DOOR_STYLE = exports.SELECT_AREA = exports.SELECT_ALL = exports.SELECTALL = exports.SECONDARY_PURPLE_COLOR = exports.SECONDARY_BLUE_COLOR = exports.SCENE_ACTIONS = exports.SAVE_PROJECT = exports.SAVE_DESIGN = exports.ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_MEASUREMENT_LINE_COLOR = exports.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = exports.ROLLBACK = exports.RIGHT_DIST_ANG = exports.RIGHT = exports.REVIEW_AND_QUOTE = exports.REQUEST_ASSISTANCE = exports.REPLACE_SUBMODULE = exports.REPLACE_ITEM = exports.REMOVE_VERTICAL_GUIDE = exports.REMOVE_REPLACE_SUBMODULE = exports.REMOVE_LINEAR = exports.REMOVE_LAYER = exports.REMOVE_HORIZONTAL_GUIDE = exports.REMOVE_GROUP_AND_DELETE_ELEMENTS = exports.REMOVE_GROUP = exports.REMOVE_FROM_GROUP = exports.REMOVE_DRAWING_SUPPORT = exports.REMOVE_CIRCULAR_GUIDE = exports.REMOVE = exports.REDO = exports.RECREATE = exports.PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY = exports.PROP_RESIZE_WIDTH = exports.PROP_RESIZE_HEIGHT = exports.PROP_RESIZE_DEPTH = exports.PROP_OPEN_DOORS = exports.PROP_FLIP_DOOR_HANDLE = exports.PROP_ALTITUDE = exports.PROJECT_SETTING_OPTION = exports.PROJECT_RE_NAME = exports.PROJECT_NAME_LENGTH_LIMIT = exports.PROJECT_ACTIONS = exports.PRODUCT = exports.PRIMARY_GREEN_COLOR = exports.PASTE_PROPERTIES = exports.OVERLAP_SOME = exports.OVERLAP_SAME = exports.OVERLAP_NONE = exports.OVERLAP_LINK = exports.OVERLAP_INCLUDED = exports.OPEN_PROJECT_CONFIGURATOR = exports.OPEN_CATALOG = exports.OBJTYPE_MESH = exports.OBJTYPE_GROUP = exports.NO_DATA_DATABASE = exports.NEW_PROJECT_BTN = exports.NEW_PROJECT = exports.NEW_DESIGN = exports.MOVE_COMPONENT = exports.MOLDING_LOCATIONS = exports.MODE_WAITING_DRAWING_LINE = exports.MODE_VIEWING_CATALOG = exports.MODE_UPLOADING_IMAGE = exports.MODE_SNAPPING = exports.MODE_ROTATING_ITEM_3D = exports.MODE_ROTATING_ITEM = exports.MODE_RIGHT_ELEVATION_VIEW = exports.MODE_LEFT_ELEVATION_VIEW = exports.MODE_IDLE_3D = exports.MODE_IDLE = exports.MODE_FRONT_VIEW = exports.MODE_FRONT_ELEVATION_VIEW = exports.MODE_FITTING_IMAGE = exports.MODE_ELEVATION_VIEW = exports.MODE_DRAWING_LINE = exports.MODE_DRAWING_ITEM_3D = exports.MODE_DRAWING_ITEM = exports.MODE_DRAWING_HOLE_3D = exports.MODE_DRAWING_HOLE = exports.MODE_DRAGGING_VERTEX = exports.MODE_DRAGGING_LINE = exports.MODE_DRAGGING_ITEM_3D = exports.MODE_DRAGGING_ITEM = void 0;
|
|
9
9
|
exports.UPDATE_CEIL_HEIGHT = exports.UPDATE_3D_CEIL_HEIGHT_UNIT = exports.UPDATE_3D_CEIL_HEIGHT = exports.UPDATE_2D_CAMERA = exports.UNSELECT_GROUP = exports.UNSELECT_ALL = exports.UNIT_MILLIMETER = exports.UNIT_MILE = exports.UNIT_METER = exports.UNIT_INCH_LONG = exports.UNIT_INCH = exports.UNIT_FOOT = exports.UNIT_CENTIMETER = exports.UNIT_ANGLE = exports.UNITS_LENGTH = exports.UNDO = exports.UNCREATE = exports.TWO_D_FLOOR_PLAN = exports.TOP_MOLDING_LOCATION = exports.TOP = exports.TOGGLE_SNAP = exports.TOGGLE_LOADING_CABINET = exports.TOE_KICK_MOLDING = exports.TITLE_SMALL_COLOR = exports.TITLE_COLOR = exports.THROW_WARNING = exports.THROW_ERROR = exports.TEXT_COLOR_NEUTRAL_7 = exports.TEXT_COLOR_NEUTRAL_6 = exports.TEXT_COLOR_NEUTRAL_5 = exports.TEXT_COLOR_NEUTRAL_4 = exports.TEXT_COLOR_NEUTRAL_3 = exports.TEXT_COLOR_NEUTRAL_2 = exports.TEXT_COLOR_NEUTRAL_1 = exports.TEXT_COLOR_NEUTRAL_0 = exports.TEXT_COLOR = exports.TECHNICAL_VIEW = exports.TALL_CABINET_LAYOUTPOS = exports.TAKE_PICTURE = exports.SUBTOTAL = exports.SUBMIT_REQUEST_ASSIST = exports.SUBMIT_DESIGN = exports.SUBMIT_ADD_CART = exports.STORE_DIST_ARRAY = exports.STOP_DRAWING_LINE = exports.STEP_CABINET_CHOOSE_PRODUCT = exports.STATUS_WARNING_LIGHT_COLOR = exports.STATUS_WARNING_COLOR = exports.STATUS_POSITIVE_LIGHT_COLOR = exports.STATUS_POSITIVE_COLOR = exports.STATUS_OVERDUE_LIGHT_COLOR = exports.STATUS_OVERDUE_COLOR = exports.STATUS_NEGATIVE_LIGHT_COLOR = exports.STATUS_NEGATIVE_COLOR = exports.STATUS_INFO_LIGHT_COLOR = exports.STATUS_INFO_COLOR = exports.SHIFT2DON = exports.SHIFT2DOFF = exports.SHAPE_SVG_WIDTH = exports.SHAPE_SVG_PADDING = exports.SHAPE_SVG_DEPTH = exports.SHADE_LIGHT_PURPLE_COLOR = exports.SHADE_LIGHT_GREEN_COLOR = exports.SHADE_LIGHT_BLUE_COLOR = exports.SHADE_DARK_PURPLE_COLOR = exports.SHADE_DARK_GREEN_COLOR = exports.SHADE_DARK_BLUE_COLOR = exports.SET_WALL_COLOR = exports.SET_USER_DATA = exports.SET_STATE_PROPERTIES = exports.SET_ROTATE_STATUS = exports.SET_RELATED_LINE = exports.SET_PROPERTIES = exports.SET_PROJECT_PROPERTIES = exports.SET_PROJECT_ID = exports.SET_MOVE_STATUS = exports.SET_MOLDING = exports.SET_MODELLING = exports.SET_MODE = exports.SET_LINES_ATTRIBUTES = exports.SET_LAYER_PROPERTIES = exports.SET_ITEMS_CCDF = exports.SET_ITEMS_ATTRIBUTES = exports.SET_IS_HELP = exports.SET_IS_CABINET_DRAWING = exports.SET_INITIAL_DOOR_STYLE = exports.SET_HOLES_ATTRIBUTES = exports.SET_HANDLE_MATERIAL = exports.SET_GROUP_PROPERTIES = exports.SET_GROUP_BARYCENTER = exports.SET_GROUP_ATTRIBUTES = exports.SET_FLOOR_STYLES = exports.SET_DOOR_STYLE = exports.SET_DOOR_HANDLE = exports.SET_DISTANT = exports.SET_COUNTER_TOP = exports.SET_BACKSPLASH_VISIBLE = exports.SET_BACKSPLASH = exports.SET_APPLIANCE_MATERIAL = exports.SELECT_TOOL_ZOOM_OUT = void 0;
|
|
@@ -787,5 +787,5 @@ var DOORSTYLE_SCOPE_MULTIPLE = exports.DOORSTYLE_SCOPE_MULTIPLE = 'multiple';
|
|
|
787
787
|
var DEFAULT_MOLDING_PIECE_LENGTH = exports.DEFAULT_MOLDING_PIECE_LENGTH = 96; // in inch, 8 feet, standard length for molding pieces
|
|
788
788
|
// default urls
|
|
789
789
|
|
|
790
|
-
var
|
|
790
|
+
var DEFAULT_INTERIOR_TEXTURE = exports.DEFAULT_INTERIOR_TEXTURE = 'Maple';
|
|
791
791
|
var DEFAULT_DOOR_HANDLE_TEXTURE_URL = exports.DEFAULT_DOOR_HANDLE_TEXTURE_URL = '/assets/img/default/steel.jpg';
|
package/lib/devLiteRenderer.js
CHANGED
|
@@ -10,6 +10,7 @@ var _immutable = require("immutable");
|
|
|
10
10
|
var _reactContainerDimensions = _interopRequireDefault(require("react-container-dimensions"));
|
|
11
11
|
var _getCCDFPayload = _interopRequireDefault(require("./mocks/getCCDFPayload.json"));
|
|
12
12
|
var _configData = _interopRequireDefault(require("./mocks/configData.json"));
|
|
13
|
+
var _defaultTexturesPayload = _interopRequireDefault(require("./mocks/defaultTexturesPayload.json"));
|
|
13
14
|
var _project = _interopRequireDefault(require("./mocks/project.json"));
|
|
14
15
|
var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload.json"));
|
|
15
16
|
var _appliancePayload = _interopRequireDefault(require("./mocks/appliancePayload.json"));
|
|
@@ -272,7 +273,6 @@ function WorkSpace(props) {
|
|
|
272
273
|
doorStyles: {
|
|
273
274
|
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
274
275
|
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
275
|
-
interior: _constants.DEFAULT_INTERIOR_URL,
|
|
276
276
|
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
277
277
|
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
278
278
|
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
@@ -370,7 +370,6 @@ function WorkSpace(props) {
|
|
|
370
370
|
doorStyles: {
|
|
371
371
|
base: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
372
372
|
counttop: 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg',
|
|
373
|
-
interior: _constants.DEFAULT_INTERIOR_URL,
|
|
374
373
|
base_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
375
374
|
base_fixed_drawer_door_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
376
375
|
base_drawer_1: 'https://media.test.diydesignspace.com/uploads/DoorColor/202105065453_36/texture/White1px.jpeg',
|
|
@@ -888,6 +887,7 @@ function WorkSpace(props) {
|
|
|
888
887
|
width: props.width,
|
|
889
888
|
height: props.height,
|
|
890
889
|
configData: _configData["default"],
|
|
890
|
+
defaultTextures: _defaultTexturesPayload["default"],
|
|
891
891
|
options: options,
|
|
892
892
|
logoImg: "/assets/logo.png",
|
|
893
893
|
companyUrl: "https://example.com",
|
|
@@ -49,7 +49,7 @@ function _handleExternalEvent() {
|
|
|
49
49
|
}
|
|
50
50
|
return _context.abrupt("return");
|
|
51
51
|
case 1:
|
|
52
|
-
evt = (0, _mapExternalEventPayload.mapExternalEventPayload)(props.externalEvent, state);
|
|
52
|
+
evt = (0, _mapExternalEventPayload.mapExternalEventPayload)(props.externalEvent, state, props.defaultTextures);
|
|
53
53
|
layerId = state.getIn(['scene', 'selectedLayer']);
|
|
54
54
|
layer = state.getIn(['scene', 'layers', layerId]);
|
|
55
55
|
_t = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
@@ -14,7 +14,7 @@ var _loadProjectMapper = require("./mappers/loadProjectMapper");
|
|
|
14
14
|
* Converts new API formats into legacy internal formats (e.g. assets3d -> structure_json)
|
|
15
15
|
* without changing the behavior of the existing 3D tool.
|
|
16
16
|
*/
|
|
17
|
-
function mapExternalEventPayload(evt, state) {
|
|
17
|
+
function mapExternalEventPayload(evt, state, defaultTextures) {
|
|
18
18
|
if ((0, _helper.isEmpty)(evt)) return null;
|
|
19
19
|
switch (evt.type) {
|
|
20
20
|
case _constants.EXTERNAL_EVENT_REPLACE_CABINET:
|
|
@@ -24,9 +24,9 @@ function mapExternalEventPayload(evt, state) {
|
|
|
24
24
|
evt.payload = (0, _addItemMapper.mapAddItemEvent)(evt.payload, state);
|
|
25
25
|
return evt;
|
|
26
26
|
case _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE:
|
|
27
|
-
return (0, _changeDoorStyleMapper.mapChangeDoorStyleEvent)(evt, state);
|
|
27
|
+
return (0, _changeDoorStyleMapper.mapChangeDoorStyleEvent)(evt, state, defaultTextures);
|
|
28
28
|
case _constants.EXTERNAL_EVENT_LOAD_PROJECT:
|
|
29
|
-
return (0, _loadProjectMapper.mapLoadProjectEvent)(evt, state);
|
|
29
|
+
return (0, _loadProjectMapper.mapLoadProjectEvent)(evt, state, defaultTextures);
|
|
30
30
|
default:
|
|
31
31
|
return evt;
|
|
32
32
|
}
|
|
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.mapChangeDoorStyleEvent = mapChangeDoorStyleEvent;
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var
|
|
9
|
+
var _cabinetTextureResolver = require("../../../catalog/cabinet/cabinet-texture-resolver");
|
|
10
10
|
var _helper = require("../../../utils/helper");
|
|
11
11
|
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; }
|
|
12
12
|
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; }
|
|
13
|
-
function mapChangeDoorStyleEvent(evt, state) {
|
|
13
|
+
function mapChangeDoorStyleEvent(evt, state, defaultTextures) {
|
|
14
14
|
var _evt$payload, _layer$toJS;
|
|
15
15
|
if ((0, _helper.isEmpty)(evt)) return null;
|
|
16
16
|
var targetDoorStyle = evt === null || evt === void 0 || (_evt$payload = evt.payload) === null || _evt$payload === void 0 ? void 0 : _evt$payload.doorStyle;
|
|
@@ -26,7 +26,7 @@ function mapChangeDoorStyleEvent(evt, state) {
|
|
|
26
26
|
var doorStyles = {
|
|
27
27
|
base: targetDoorStyle.texture,
|
|
28
28
|
counttop: counterToptexture,
|
|
29
|
-
interior:
|
|
29
|
+
interior: (0, _cabinetTextureResolver.getDefaultInteriorTexture)(defaultTextures)
|
|
30
30
|
};
|
|
31
31
|
for (var i = 1; i <= Max_PH; i++) {
|
|
32
32
|
doorStyles['base_door_' + i] = targetDoorStyle.texture;
|
|
@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.mapLoadProjectEvent = mapLoadProjectEvent;
|
|
8
8
|
exports.updateProjectWithCDSList = updateProjectWithCDSList;
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
-
var
|
|
10
|
+
var _cabinetTextureResolver = require("../../../catalog/cabinet/cabinet-texture-resolver");
|
|
11
11
|
var _helper = require("../../../utils/helper");
|
|
12
12
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
13
13
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (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; }
|
|
14
|
-
function mapLoadProjectEvent(evt, state) {
|
|
14
|
+
function mapLoadProjectEvent(evt, state, defaultTextures) {
|
|
15
15
|
// preprocessing for loading project
|
|
16
16
|
// this function make doorStyles using item's doorStyle
|
|
17
17
|
if ((0, _helper.isEmpty)(evt)) return null;
|
|
@@ -19,8 +19,8 @@ function mapLoadProjectEvent(evt, state) {
|
|
|
19
19
|
var layer = evt.payload.layers;
|
|
20
20
|
var itemKeys = Object.keys(layer[layerId].items);
|
|
21
21
|
if ((0, _helper.isEmpty)(layer)) return evt;
|
|
22
|
-
var handleTexture =
|
|
23
|
-
var counterToptexture = layer.counterTop;
|
|
22
|
+
var handleTexture = layer[layerId].doorHandle;
|
|
23
|
+
var counterToptexture = layer[layerId].counterTop;
|
|
24
24
|
// make doorStyles and update the doorStyle payload
|
|
25
25
|
var Max_PH = 9;
|
|
26
26
|
for (var i = 0; i < itemKeys.length; i++) {
|
|
@@ -29,7 +29,7 @@ function mapLoadProjectEvent(evt, state) {
|
|
|
29
29
|
var doorStyles = {
|
|
30
30
|
base: doorStyle.texture,
|
|
31
31
|
counttop: counterToptexture,
|
|
32
|
-
interior:
|
|
32
|
+
interior: (0, _cabinetTextureResolver.getDefaultInteriorTexture)(defaultTextures)
|
|
33
33
|
};
|
|
34
34
|
for (var _i = 1; _i <= Max_PH; _i++) {
|
|
35
35
|
doorStyles['base_door_' + _i] = doorStyle.texture;
|
package/lib/utils/geometry.js
CHANGED
|
@@ -1651,6 +1651,23 @@ function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect,
|
|
|
1651
1651
|
}
|
|
1652
1652
|
});
|
|
1653
1653
|
}
|
|
1654
|
+
if (getSnap === true) {
|
|
1655
|
+
allItemSnap.filter(function (e) {
|
|
1656
|
+
return e.isSnappedLine;
|
|
1657
|
+
}).forEach(function (snap) {
|
|
1658
|
+
var dist = (snap.pos.x - nx) * (snap.pos.x - nx) + (snap.pos.y - ny) * (snap.pos.y - ny);
|
|
1659
|
+
//console.log("dist", snap)
|
|
1660
|
+
if (isPointInArea(allArea, snap.pos) || !allArea.length) if (dist < 100) {
|
|
1661
|
+
ndist = dist;
|
|
1662
|
+
nx = snap.pos.x;
|
|
1663
|
+
ny = snap.pos.y;
|
|
1664
|
+
rotRad = snap.rotRad;
|
|
1665
|
+
getSnap = true;
|
|
1666
|
+
|
|
1667
|
+
//console.log("SUCCESS!!!!");
|
|
1668
|
+
}
|
|
1669
|
+
});
|
|
1670
|
+
}
|
|
1654
1671
|
if (getSnap === false) {
|
|
1655
1672
|
var nearRect = null;
|
|
1656
1673
|
var minDist = Infinity;
|