@crystaldesign/web-planner-logic 26.14.0-beta.3 → 26.14.0-beta.30

package/build/cjs/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-00160b1a.js');
+var index = require('./index-03575eb4.js');
 var plannerCore = require('@crystaldesign/planner-core');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
@@ -41,24 +41,33 @@ exports.OptionCatalogData = index.OptionCatalogData;
 exports.PROPERTY_SCHEMAS = index.PROPERTY_SCHEMAS;
 exports.PlannerElementData = index.PlannerElementData;
 exports.Rendering = index.Rendering;
+exports.SET_IMAGES_CAPTURED_EVENT = index.SET_IMAGES_CAPTURED_EVENT;
 exports.Vector2 = index.Vector2;
 exports.Vector3 = index.Vector3;
 exports.Vector4 = index.Vector4;
+exports.applyArtifactsToBasketJson = index.applyArtifactsToBasketJson;
 exports.bootMark = index.bootMark;
 exports.bootMarksEnabled = index.bootMarksEnabled;
 exports.bootNetworkMark = index.bootNetworkMark;
 exports.bootNow = index.bootNow;
 exports.bootRequestName = index.bootRequestName;
 exports.canSwitchTo = index.canSwitchTo;
+exports.choosableValueCount = index.choosableValueCount;
 exports.collectStructureStepKeys = index.collectStructureStepKeys;
 exports.creatRenderOrders = index.creatRenderOrders;
+exports.createHeadlessPreviewRenderer = index.createHeadlessPreviewRenderer;
 exports["default"] = index.DivaWebPlanner;
+exports.describeMeasurePrice = index.describeMeasurePrice;
 exports.dockingFiltersMatch = index.dockingFiltersMatch;
+exports.findOptionValue = index.findOptionValue;
+exports.getElementPartDefinitions = index.getElementPartDefinitions;
 exports.getOrigProductId = index.getOrigProductId;
 exports.getSeriousSetNamePlaceholder = index.getSeriousSetNamePlaceholder;
 exports.getViewerStateToggles = index.getViewerStateToggles;
 exports.headlessSession = index.headlessSession;
 exports.loadAndRepairBasket = index.loadAndRepairBasket;
+exports.loadElementPartStepValues = index.loadElementPartStepValues;
+exports.measureWithUnit = index.measureWithUnit;
 exports.propertyEncodingOf = index.propertyEncodingOf;
 exports.runHeadlessArtifactPass = index.runHeadlessArtifactPass;
 exports.runHeadlessArtifactPassBatch = index.runHeadlessArtifactPassBatch;

package/build/esm/{DivaBoxPlanner-e93a8a11.js → DivaBoxPlanner-b5817973.js}

@@ -3,11 +3,11 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { u as Vector2, V as Vector3, P as PlannerElementData, J as BoundingBox } from './index-7c0351f5.js';
+import { u as Vector2, V as Vector3, P as PlannerElementData, J as BoundingBox } from './index-51900283.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-400364fb.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-2bf51f9b.js';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
 import '@babel/runtime/helpers/typeof';

package/build/esm/{DivaStandardPlanner-54024d74.js → DivaStandardPlanner-2084715b.js}

@@ -5,10 +5,10 @@ import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { V as Vector3, p as poseOf, g as getSnapPlace, c as getDockingGroups, d as getElementShape, e as getCarrierSlots, h as getSlotPlaces, m as moveGroupRigidly, i as isSamePose, j as getGroupBlock, k as fitsInsideRoom, l as keepInsideRoom, n as bindToWalls, o as sameGeoExtent, q as getCornerEnd, r as getDoorClearanceRects, t as rectCorners, u as Vector2, M as MAX_GUEST_DEPTH, v as slotExempt, w as bodiesOverlap, x as getNearestMember, y as toPlacementOffset, z as getTurnDeg, A as moveSlotMember, B as moveShape, C as layersCollide, D as shapesCollide, P as PlannerElementData, E as parseGuestPlacement, F as saveElementArticleCodex, H as parseSetPlanData, I as isSavePlannerV2, J as BoundingBox, K as movePoints } from './index-7c0351f5.js';
+import { V as Vector3, p as poseOf, g as getSnapPlace, c as getDockingGroups, d as getElementShape, e as getCarrierSlots, h as getSlotPlaces, m as moveGroupRigidly, i as isSamePose, j as getGroupBlock, k as fitsInsideRoom, l as keepInsideRoom, n as bindToWalls, o as sameGeoExtent, q as getCornerEnd, r as getDoorClearanceRects, t as rectCorners, u as Vector2, M as MAX_GUEST_DEPTH, v as slotExempt, w as bodiesOverlap, x as getNearestMember, y as toPlacementOffset, z as getTurnDeg, A as moveSlotMember, B as moveShape, C as layersCollide, D as shapesCollide, P as PlannerElementData, E as parseGuestPlacement, F as saveElementArticleCodex, H as parseSetPlanData, I as isSavePlannerV2, J as BoundingBox, K as movePoints } from './index-51900283.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import { computeDockedTransform } from '@crystaldesign/planner-core';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-400364fb.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-2bf51f9b.js';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
 import '@babel/runtime/helpers/typeof';
@@ -70,6 +70,15 @@ var PATH_STEP = 2;
 var DEPTH_NOISE = 1e-6;
 /** cm within which a dragged guest snaps into a free place of a slot that takes it. */
 var SLOT_SNAP_DISTANCE = 20;
+/**
+ * cm within which a group dragged in a room docks (between the docking points), at least the viewer's own docking
+ * distance: as far as a slot snap reaches. The bodies block the drag at contact and a pointer moves several cm per event,
+ * so the group is mostly pushed into the element it docks to; it has to dock from such a pose, not only from the few cm
+ * before contact.
+ */
+var ROOM_DOCK_SNAP_DISTANCE = SLOT_SNAP_DISTANCE;
+/** cm between two docking points that meet at a dock pose (the float noise of the docked transform). */
+var DOCK_CONTACT_DISTANCE = 0.1;
 /** cm within which a drag counts as back at its start (the float noise of the summed moves). */
 var START_NOISE = 1e-6;
 var toFloorRect = function toFloorRect(block, pose) {
@@ -1681,13 +1690,14 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
       };
     }
 
-    // The group follows the grabbed element rigidly to the wall or inside-room pose of the raw centre, also where it runs
-    // into an obstacle: what it runs into there is kept as `blockedBy` (the viewer shows the drag blocked, a release there
-    // goes back to the start). A forced group that fits on no wall is kept inside the room like a free one. Back at the
-    // start (a cancel, a blocked release) it stands exactly where it started, nothing snaps.
+    // The group follows the grabbed element rigidly to the wall or inside-room pose of the raw centre, and from there onto
+    // a dock within ROOM_DOCK_SNAP_DISTANCE, also where it runs into an obstacle: what it runs into there is kept as
+    // `blockedBy` (the viewer shows the drag blocked, a release there goes back to the start). A forced group that fits on
+    // no wall is kept inside the room like a free one. Back at the start (a cancel, a blocked release) it stands exactly
+    // where it started, nothing snaps.
   }, {
     key: "updateRoomDrag",
-    value: function updateRoomDrag(room, drag, deltaMove) {
+    value: function updateRoomDrag(room, drag, deltaMove, autoDockingDistance) {
       drag.dx += deltaMove.x;
       drag.dz += deltaMove.z;
       var _drag$start2 = drag.start,
@@ -1706,12 +1716,19 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
         center: drag.start.center,
         rotDeg: rotDeg
       };
-      var wanted = atStart ? startPose : slotPose !== null && slotPose !== void 0 ? slotPose : wallPose && (drag.wallMode === 'forced' || snapsToWall) ? wallPose : insidePose(block, {
+      var placed = atStart ? startPose : slotPose !== null && slotPose !== void 0 ? slotPose : wallPose && (drag.wallMode === 'forced' || snapsToWall) ? wallPose : insidePose(block, {
         center: rawCenter,
         rotDeg: rotDeg
       }, room);
-      drag.blockedBy = this.blockersAt(drag, wanted);
-      moveGroupRigidly([].concat(_toConsumableArray(drag.members), _toConsumableArray(drag.followers)), drag.current, wanted);
+      var group = [].concat(_toConsumableArray(drag.members), _toConsumableArray(drag.followers));
+      moveGroupRigidly(group, drag.current, placed);
+      // Pushed against the element it docks to, the group touches it docked instead of standing blocked in it, so the
+      // release docks it (see snapToDock).
+      var reach = autoDockingDistance === 0 ? 0 : Math.max(autoDockingDistance, ROOM_DOCK_SNAP_DISTANCE);
+      var dock = atStart || slotPose ? undefined : this.getDockSnapPose(drag, placed, reach);
+      var wanted = dock !== null && dock !== void 0 ? dock : placed;
+      moveGroupRigidly(group, placed, wanted);
+      drag.blockedBy = dock ? [] : this.blockersAt(drag, wanted);
       drag.current = wanted;
       drag.slotSnapped = !!slotPose;
       // A pair that overlapped at the start may only come apart, never go back in.
@@ -1724,6 +1741,44 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
       });
     }
 
+    /**
+     * The pose of the group, standing at `pose`, where the grabbed element docks onto the nearest dock outside the group and
+     * its guests (see findDockSnap), where nothing blocks it; undefined when no dock is that near, or the room rule would
+     * move the docked group or something blocks it there that it does not dock to: then the group stays where the pointer
+     * has it. Docked elements may reach into each other as members of a group do (a side panel standing out of the
+     * outline), so every element the group docks to at that pose (both neighbours of a gap it fills) does not block.
+     */
+  }, {
+    key: "getDockSnapPose",
+    value: function getDockSnapPose(drag, pose, autoDockingDistance) {
+      var element = this.plannerElements.get(drag.elementId);
+      var group = [].concat(_toConsumableArray(drag.members), _toConsumableArray(drag.followers));
+      var unitIds = group.map(function (member) {
+        return member.ElementId;
+      });
+      var snap = element && this.findDockSnap(element, autoDockingDistance, unitIds);
+      if (!element || !snap) return undefined;
+      var _this$snapMove = this.snapMove(element, snap),
+        from = _this$snapMove.from,
+        to = _this$snapMove.to;
+      var docked = movePose(pose, from, to);
+      if (!this.getKeptPose(drag, docked)) return undefined;
+      moveGroupRigidly(group, pose, docked);
+      var others = this.getAllPlannerElements().filter(function (other) {
+        return !unitIds.includes(other.ElementId);
+      });
+      var dockedTo = new Set(group.flatMap(function (member) {
+        return _toConsumableArray(dockingPointHandlerInst.searchDockableElementsInArea(member, others, DOCK_CONTACT_DISTANCE).values()).map(function (pair) {
+          return pair.targetDP.ElementId;
+        });
+      }));
+      moveGroupRigidly(group, docked, pose);
+      var docksTo = function docksTo(obstacle) {
+        return obstacle.setId === undefined && obstacle.elementId !== undefined && dockedTo.has(obstacle.elementId);
+      };
+      return this.blockersAt(drag, docked).every(docksTo) ? docked : undefined;
+    }
+
     // The unit moved rigidly onto the nearest dock of `element` outside it (see findDockSnap), else with `slots` into the
     // nearest free slot place (see findSlotSnap).
   }, {
@@ -3478,7 +3533,7 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
       if (room && roomDrag && !roomDrag.rotating && transState == 'UPDATE' && roomDrag.members.some(function (member) {
         return member.ElementId == elementId;
       })) {
-        if (elementId == roomDrag.elementId) this.updateRoomDrag(room, roomDrag, deltaMove);
+        if (elementId == roomDrag.elementId) this.updateRoomDrag(room, roomDrag, deltaMove, autoDockingDistance);
         return false;
       }
       if (this.plannerElements.has(elementId)) {

package/build/esm/{DoorPlanner-de2fbac4.js → DoorPlanner-d2a5deac.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import './index-7c0351f5.js';
+import './index-51900283.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';

package/build/esm/{Host3DSignalR-c2e185b3.js → Host3DSignalR-ae4a5ae9.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { L as bootMark, R as Rendering, N as HQRenderScript } from './index-7c0351f5.js';
+import { L as bootMark, R as Rendering, N as HQRenderScript } from './index-51900283.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
 import io from 'socket.io-client';
@@ -371,6 +371,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
   }, {
     key: "request3D",
     value: function request3D(params) {
+      var _this3 = this;
       var that = this;
       if (!this.connectionIsReady() || !this.successfullyJoinedDivaNr) {
         //If connection is not ready or WebClient not successfully logged in - always force reload whole planning
@@ -396,11 +397,17 @@ var Host3DSignalR = /*#__PURE__*/function () {
         //Create options Request
         var options3DHost = this.create3DHostRequestOption(params);
         LOG.debug('request 3D (mediaType ' + ((_params$requestRender13 = params.requestRenderingParams) === null || _params$requestRender13 === void 0 ? void 0 : _params$requestRender13.mediaServiceSaveMode) + ') from 3D Host' + JSON.stringify(params));
+        // Closing the planner stops the connection and so cancels a pending request: expected, nothing to report.
+        var logUnlessClosed = function logUnlessClosed(err) {
+          if (!_this3.isClosed) LOG.error(new DivaError('Request to 3D Host failed. Message: ' + String(err), {
+            code: 'WC_0014'
+          }));
+        };
         if (params.doReloadWholePlanning) {
           LOG.debug('Host3DSignalR SaveProjectWithOptions');
-          this.signalRConnection.invoke('SaveProjectWithOptions', this.sessionID, params.divaNr, JSON.stringify(params.planningData), this.renderSettings.RenderGroup, JSON.stringify(options3DHost));
+          this.signalRConnection.invoke('SaveProjectWithOptions', this.sessionID, params.divaNr, JSON.stringify(params.planningData), this.renderSettings.RenderGroup, JSON.stringify(options3DHost))["catch"](logUnlessClosed);
         } else {
-          this.signalRConnection.invoke('RequestRenderingWithOptions', this.sessionID, params.divaNr, options3DHost.VPName, options3DHost.VPSize, params.renderHash, JSON.stringify(options3DHost));
+          this.signalRConnection.invoke('RequestRenderingWithOptions', this.sessionID, params.divaNr, options3DHost.VPName, options3DHost.VPSize, params.renderHash, JSON.stringify(options3DHost))["catch"](logUnlessClosed);
         }
         return {
           rendering: rendering,

package/build/esm/{LiviqueWWSHandler-accb6d18.js → LiviqueWWSHandler-7bfacb71.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-7c0351f5.js';
+import './index-51900283.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';

package/build/esm/{PfisterWWSHandler-326e6be1.js → PfisterWWSHandler-cc745e52.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import { a as articleHandlerInstance } from './index-7c0351f5.js';
+import { a as articleHandlerInstance } from './index-51900283.js';
 import { SAPOrderLineData } from '@crystaldesign/basket-model';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';

package/build/esm/{PlannerHandler2D-400364fb.js → PlannerHandler2D-2bf51f9b.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { u as Vector2, S as SVGUtils } from './index-7c0351f5.js';
+import { u as Vector2, S as SVGUtils } from './index-51900283.js';
 import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
 import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
 import _get from '@babel/runtime/helpers/get';

package/build/esm/{SeriousBasketHandler-a90650e7.js → SeriousBasketHandler-817d4898.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { s as summaryHandlerInstance } from './index-7c0351f5.js';
+import { s as summaryHandlerInstance } from './index-51900283.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';

package/build/esm/{ShelfPlanner-83981004.js → ShelfPlanner-e996961c.js}

@@ -4,7 +4,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { G as Grid, f as familyMembersOf, a as articleHandlerInstance, b as setHandlerInstance } from './index-7c0351f5.js';
+import { G as Grid, f as familyMembersOf, a as articleHandlerInstance, b as setHandlerInstance } from './index-51900283.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';

package/build/esm/{StandardWWSHandler-2dfbafa0.js → StandardWWSHandler-314f6b1f.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-7c0351f5.js';
+import './index-51900283.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';