@crystaldesign/web-planner-logic 26.14.0-beta.11 → 26.14.0-beta.13

package/build/cjs/{DivaBoxPlanner-15215da3.js → DivaBoxPlanner-18f7c428.js}

@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-37e192f8.js');
+var PlannerHandler2D = require('./PlannerHandler2D-d8896477.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@babel/runtime/helpers/typeof');

package/build/cjs/{DivaStandardPlanner-83a30b9c.js → DivaStandardPlanner-4d7fbb34.js}

@@ -7,10 +7,10 @@ var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var plannerCore = require('@crystaldesign/planner-core');
-var PlannerHandler2D = require('./PlannerHandler2D-37e192f8.js');
+var PlannerHandler2D = require('./PlannerHandler2D-d8896477.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@babel/runtime/helpers/typeof');
@@ -83,6 +83,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) {
@@ -1694,13 +1703,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,
@@ -1719,12 +1729,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);
-      index.moveGroupRigidly([].concat(_toConsumableArray__default["default"](drag.members), _toConsumableArray__default["default"](drag.followers)), drag.current, wanted);
+      var group = [].concat(_toConsumableArray__default["default"](drag.members), _toConsumableArray__default["default"](drag.followers));
+      index.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;
+      index.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.
@@ -1737,6 +1754,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__default["default"](drag.members), _toConsumableArray__default["default"](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;
+      index.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__default["default"](PlannerHandler2D.dockingPointHandlerInst.searchDockableElementsInArea(member, others, DOCK_CONTACT_DISTANCE).values()).map(function (pair) {
+          return pair.targetDP.ElementId;
+        });
+      }));
+      index.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).
   }, {
@@ -3491,7 +3546,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/cjs/{DoorPlanner-3fc953fb.js → DoorPlanner-034aaee6.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('./index-95cacf5a.js');
+require('./index-aa0daf1a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-05c335b5.js → Host3DSignalR-57683aed.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-d14c9c94.js → LiviqueWWSHandler-3c716ed4.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-95cacf5a.js');
+require('./index-aa0daf1a.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{PfisterWWSHandler-67f01d01.js → PfisterWWSHandler-5c576069.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{PlannerHandler2D-37e192f8.js → PlannerHandler2D-d8896477.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _get = require('@babel/runtime/helpers/get');

package/build/cjs/{SeriousBasketHandler-44c2c22a.js → SeriousBasketHandler-5520760a.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-e9159968.js → ShelfPlanner-18fbf9be.js}

@@ -6,7 +6,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-95cacf5a.js');
+var index = require('./index-aa0daf1a.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');

package/build/cjs/{StandardWWSHandler-4306e241.js → StandardWWSHandler-ebb247f4.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-95cacf5a.js');
+require('./index-aa0daf1a.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');