@jotforminc/dnd-builder 3.1.0 → 3.2.0

package/lib/cjs/styles/_jfReportsSVG.scss

@@ -73,7 +73,7 @@
   }
 
   .icon-duplicateLine {
-    width: 10px;
+    width: 14px;
     height: 14px;
   }
 
@@ -83,7 +83,7 @@
   }
 
   .icon-trashLine {
-    width: 10px;
+    width: 14px;
     height: 14px;
   }
 
@@ -93,8 +93,8 @@
   }
 
   .icon-plus {
-    width: 12px;
-    height: 12px;
+    width: 14px;
+    height: 14px;
   }
 
   .icon-print {
@@ -118,8 +118,8 @@
   }
 
   .icon-close {
-    width: 12px;
-    height: 12px;
+    width: 16px;
+    height: 16px;
     fill: #fff;
   }
 

package/lib/cjs/styles/_jfSearchInput.scss

@@ -46,8 +46,6 @@
 
       &.delete {
         fill: #8586A6;
-        height: 10px;
-        width: 10px;
         stroke: none;
       }
     }

package/lib/cjs/utils/functions.js

@@ -28,6 +28,8 @@ require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/web.url.js');
 
+var _excluded = ["height", "left", "top", "width"];
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -53,18 +55,39 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-var getCorrectDroppedOffsetValue = function getCorrectDroppedOffsetValue(monitor, clientRect) {
-  var zoom = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-  var dropTargetPosition = clientRect;
-
-  var _monitor$getSourceCli = monitor.getSourceClientOffset(),
-      finalX = _monitor$getSourceCli.x,
-      finalY = _monitor$getSourceCli.y;
-
-  var _monitor$getInitialSo = monitor.getInitialSourceClientOffset(),
-      initialX = _monitor$getInitialSo.x,
-      initialY = _monitor$getInitialSo.y;
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+/**
+ * Rounds position/dimension values to integers before sending to service
+ * This prevents decimal values from being sent when zoom is not 1
+ * Should only be used at the final step before service calls
+ */
+
+var roundPositionValues = function roundPositionValues(_ref) {
+  var height = _ref.height,
+      left = _ref.left,
+      top = _ref.top,
+      width = _ref.width,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, rest), height !== undefined && {
+    height: Math.round(height)
+  }), left !== undefined && {
+    left: Math.round(left)
+  }), top !== undefined && {
+    top: Math.round(top)
+  }), width !== undefined && {
+    width: Math.round(width)
+  });
+};
+var getCorrectDroppedOffsetValue = function getCorrectDroppedOffsetValue(finalOffset, initialOffset, dropTargetPosition) {
+  var zoom = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+  var finalX = finalOffset.x,
+      finalY = finalOffset.y;
+  var initialX = initialOffset.x,
+      initialY = initialOffset.y;
   var newYposition = finalY > initialY ? initialY + (finalY - initialY) - dropTargetPosition.top : initialY - (initialY - finalY) - dropTargetPosition.top;
   var newXposition = finalX > initialX ? initialX + (finalX - initialX) - dropTargetPosition.left : initialX - (initialX - finalX) - dropTargetPosition.left;
   return {
@@ -82,8 +105,7 @@ var getStyles = function getStyles(left, top, isDragging) {
   };
 };
 var isSelectedItem = function isSelectedItem(id, activeElements) {
-  if (activeElements === null) return id === activeElements;
-  return activeElements.indexOf(id) !== -1;
+  return activeElements.includes(id);
 };
 var findItemById = function findItemById(itemID, pages) {
   var page = pages.find(function (p) {
@@ -96,17 +118,6 @@ var findItemById = function findItemById(itemID, pages) {
     return item.id === itemID;
   });
 };
-var getSelectedItems = function getSelectedItems(selectedItemsIds, pages) {
-  var page = pages.find(function (p) {
-    return p.items.find(function (item) {
-      return isSelectedItem(item.id, selectedItemsIds);
-    });
-  });
-  if (!page) return null;
-  return page.items.filter(function (item) {
-    return isSelectedItem(item.id, selectedItemsIds);
-  });
-};
 
 var traverse = function traverse(obj, condition) {
   return condition.split('.').reduce(function (cur, key) {
@@ -179,6 +190,7 @@ var getTabsWithElements = function getTabsWithElements(leftPanelConfig) {
 };
 var calculateGuidePositions = function calculateGuidePositions(dimensions, axis) {
   var zoom = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var direction = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   var isItem = dimensions && dimensions.id;
 
   if (axis === 'x') {
@@ -188,18 +200,43 @@ var calculateGuidePositions = function calculateGuidePositions(dimensions, axis)
 
     var _end = dimensions.left + dimensions.width;
 
-    if (isItem) return [_start, _middle, _end].map(function (p) {
-      return p * zoom;
-    });
+    if (isItem) {
+      var result = [_start, _middle, _end].map(function (p) {
+        return p * zoom;
+      });
+
+      if (direction) {
+        if (direction === 'bottom') return [];
+        if (direction === 'top') return [];
+        if (/left/i.test(direction)) return [result[0]];
+        if (/right/i.test(direction)) return [result[2]];
+      }
+
+      return result;
+    }
+
     return [_start, _middle, _end];
   }
 
   var start = dimensions.top;
   var middle = dimensions.top + parseInt(dimensions.height / 2, 10);
   var end = dimensions.top + dimensions.height;
-  if (isItem) return [start, middle, end].map(function (p) {
-    return p * zoom;
-  });
+
+  if (isItem) {
+    var _result = [start, middle, end].map(function (p) {
+      return p * zoom;
+    });
+
+    if (direction) {
+      if (direction === 'left') return [];
+      if (direction === 'right') return [];
+      if (/top/i.test(direction)) return [_result[0]];
+      if (/bottom/i.test(direction)) return [_result[2]];
+    }
+
+    return _result;
+  }
+
   return [start, middle, end];
 };
 var getAllGuidesForGivenAxisExceptActiveBox = function getAllGuidesForGivenAxisExceptActiveBox(allGuides, guidesForActiveBoxAlongGivenAxis, axis) {
@@ -277,16 +314,18 @@ var proximityListener = function proximityListener(active, allGuides) {
   return allMatchedGuides;
 };
 var getMatchesForItem = function getMatchesForItem(item, guides, zoom) {
+  var direction = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   var pageGuides = guides[item.pageID];
 
   var _guides = _objectSpread(_objectSpread({}, pageGuides), {}, _defineProperty({}, item.id, _objectSpread(_objectSpread({}, pageGuides[item.id]), {}, {
-    x: calculateGuidePositions(item, 'x', zoom),
-    y: calculateGuidePositions(item, 'y', zoom)
+    x: calculateGuidePositions(item, 'x', zoom, direction),
+    y: calculateGuidePositions(item, 'y', zoom, direction)
   })));
 
   return proximityListener(item.id, _guides);
 };
 var getCoordinatesFromMatches = function getCoordinatesFromMatches(item, matches) {
+  var zoom = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
   var newActiveBoxLeft = item.left;
   var newActiveBoxTop = item.top;
   Object.keys(matches).forEach(function (axis) {
@@ -295,18 +334,20 @@ var getCoordinatesFromMatches = function getCoordinatesFromMatches(item, matches
         matchedArray = _matches$axis.matchedArray,
         proximity = _matches$axis.proximity;
     var activeBoxProximityIndex = proximity.activeBoxIndex;
-    var matchedBoxProximityIndex = proximity.matchedBoxIndex;
+    var matchedBoxProximityIndex = proximity.matchedBoxIndex; // proximity.value is in zoomed pixels, divide by zoom to get canvas coordinates
+
+    var adjustedValue = proximity.value / zoom;
 
     if (axis === 'x') {
       if (activeBoxGuides[activeBoxProximityIndex] > matchedArray[matchedBoxProximityIndex]) {
-        newActiveBoxLeft = item.left - proximity.value;
+        newActiveBoxLeft = item.left - adjustedValue;
       } else {
-        newActiveBoxLeft = item.left + proximity.value;
+        newActiveBoxLeft = item.left + adjustedValue;
       }
     } else if (activeBoxGuides[activeBoxProximityIndex] > matchedArray[matchedBoxProximityIndex]) {
-      newActiveBoxTop = item.top - proximity.value;
+      newActiveBoxTop = item.top - adjustedValue;
     } else {
-      newActiveBoxTop = item.top + proximity.value;
+      newActiveBoxTop = item.top + adjustedValue;
     }
   });
   return {
@@ -314,10 +355,6 @@ var getCoordinatesFromMatches = function getCoordinatesFromMatches(item, matches
     top: newActiveBoxTop
   };
 };
-var getCorrectDroppedOffsetValueBySnap = function getCorrectDroppedOffsetValueBySnap(item, guides, zoom) {
-  var matches = getMatchesForItem(item, guides, zoom);
-  return getCoordinatesFromMatches(item, matches);
-};
 var getPosition = function getPosition(e) {
   var posx = 0;
   var posy = 0;
@@ -566,9 +603,9 @@ var closeFullscreen = function closeFullscreen() {
 
   return Promise.resolve();
 };
-var imageSizeUpdater = function imageSizeUpdater(item, _ref, updateFunc) {
-  var objectURL = _ref.objectURL,
-      url = _ref.url;
+var imageSizeUpdater = function imageSizeUpdater(item, _ref2, updateFunc) {
+  var objectURL = _ref2.objectURL,
+      url = _ref2.url;
   var MAX_WIDTH = 700;
   var MAX_HEIGHT = 600;
   var image = new global.Image();
@@ -696,12 +733,12 @@ var arrayMove = function arrayMove(array, from, to) {
   arrayMoveMutate(newArray, from, to);
   return newArray;
 };
-var getZoomValue = function getZoomValue(_ref2) {
-  var isFullscreen = _ref2.isFullscreen,
-      limitZoom = _ref2.limitZoom,
-      settings = _ref2.settings,
-      useFixedPresentationBar = _ref2.useFixedPresentationBar,
-      useProgressBar = _ref2.useProgressBar;
+var getZoomValue = function getZoomValue(_ref3) {
+  var isFullscreen = _ref3.isFullscreen,
+      limitZoom = _ref3.limitZoom,
+      settings = _ref3.settings,
+      useFixedPresentationBar = _ref3.useFixedPresentationBar,
+      useProgressBar = _ref3.useProgressBar;
   var _settings$reportLayou = settings.reportLayoutHeight,
       reportLayoutHeight = _settings$reportLayou === void 0 ? 794 : _settings$reportLayou,
       _settings$reportLayou2 = settings.reportLayoutWidth,
@@ -750,11 +787,11 @@ var throttle = function throttle(fn, delay) {
 var roundForDecimalPart = function roundForDecimalPart(num) {
   return +"".concat(Math.round("".concat(num, "e+2")), "e-2");
 };
-var changePage = function changePage(_ref3) {
-  var action = _ref3.action,
-      currentPage = _ref3.currentPage,
-      pageCount = _ref3.pageCount,
-      setCurrentPage = _ref3.setCurrentPage;
+var changePage = function changePage(_ref4) {
+  var action = _ref4.action,
+      currentPage = _ref4.currentPage,
+      pageCount = _ref4.pageCount,
+      setCurrentPage = _ref4.setCurrentPage;
   return function () {
     if (currentPage + action > pageCount) {
       setCurrentPage(1);
@@ -820,6 +857,39 @@ function isValidHexColor(value) {
 var emptyFunction = function emptyFunction(f) {
   return f;
 };
+var isItemInSelectionBox = function isItemInSelectionBox(selectionBox, item) {
+  var zoom = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var boxLeft = Math.min(selectionBox.startX, selectionBox.endX);
+  var boxTop = Math.min(selectionBox.startY, selectionBox.endY);
+  var boxRight = Math.max(selectionBox.startX, selectionBox.endX);
+  var boxBottom = Math.max(selectionBox.startY, selectionBox.endY);
+  var itemLeft = item.left * zoom;
+  var itemTop = item.top * zoom;
+  var itemRight = (item.left + item.width) * zoom;
+  var itemBottom = (item.top + item.height) * zoom; // Check if rectangles intersect
+
+  return !(boxRight < itemLeft || boxLeft > itemRight || boxBottom < itemTop || boxTop > itemBottom);
+};
+var getItemsInSelectionBox = function getItemsInSelectionBox(selectionBox, items) {
+  var zoom = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  return items.filter(function (item) {
+    return !item.isLocked && isItemInSelectionBox(selectionBox, item, zoom);
+  }).map(function (item) {
+    return item.id;
+  });
+};
+var getDimensions = function getDimensions(_ref5) {
+  var height = _ref5.height,
+      left = _ref5.left,
+      top = _ref5.top,
+      width = _ref5.width;
+  return {
+    height: height,
+    left: left,
+    top: top,
+    width: width
+  };
+};
 
 exports.arrayMove = arrayMove;
 exports.calculateGuidePositions = calculateGuidePositions;
@@ -835,22 +905,23 @@ exports.getAvailableCoordinate = getAvailableCoordinate;
 exports.getContainerPositions = getContainerPositions;
 exports.getCoordinatesFromMatches = getCoordinatesFromMatches;
 exports.getCorrectDroppedOffsetValue = getCorrectDroppedOffsetValue;
-exports.getCorrectDroppedOffsetValueBySnap = getCorrectDroppedOffsetValueBySnap;
+exports.getDimensions = getDimensions;
 exports.getExactIconType = getExactIconType;
 exports.getFileName = getFileName;
 exports.getImageSizes = getImageSizes;
+exports.getItemsInSelectionBox = getItemsInSelectionBox;
 exports.getMatchesForItem = getMatchesForItem;
 exports.getMostVisiblePage = getMostVisiblePage;
 exports.getPosition = getPosition;
 exports.getScaleForPageThumbnail = getScaleForPageThumbnail;
 exports.getScaleForPageThumbnailLarge = getScaleForPageThumbnailLarge;
-exports.getSelectedItems = getSelectedItems;
 exports.getStyles = getStyles;
 exports.getTabsWithElements = getTabsWithElements;
 exports.getTabsWithSettings = getTabsWithSettings;
 exports.getVisibleHeightPx = getVisibleHeightPx;
 exports.getZoomValue = getZoomValue;
 exports.imageSizeUpdater = imageSizeUpdater;
+exports.isItemInSelectionBox = isItemInSelectionBox;
 exports.isSelectedItem = isSelectedItem;
 exports.isValidHexColor = isValidHexColor;
 exports.moveArrayItem = moveArrayItem;
@@ -860,6 +931,7 @@ exports.onChangeFunction = onChangeFunction;
 exports.openFullscreenHelper = openFullscreenHelper;
 exports.proximityListener = proximityListener;
 exports.roundForDecimalPart = roundForDecimalPart;
+exports.roundPositionValues = roundPositionValues;
 exports.safeJSONParse = safeJSONParse;
 exports.scrollToTarget = scrollToTarget;
 exports.throttle = throttle;