iticket-seatingplan-dev 1.7.5 → 1.7.7

package/dist/components/Control.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _leaflet = _interopRequireDefault(require("leaflet"));
+var _react = _interopRequireDefault(require("react"));
+var _reactLeaflet = require("react-leaflet");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+const POSITION_CLASSES = {
+  bottomleft: "leaflet-bottom leaflet-left",
+  bottomright: "leaflet-bottom leaflet-right",
+  topleft: "leaflet-top leaflet-left",
+  topright: "leaflet-top leaflet-right"
+};
+const Control = props => {
+  var _props$container;
+  const [portalRoot, setPortalRoot] = _react.default.useState(document.createElement("div"));
+  const positionClass = props.position && POSITION_CLASSES[props.position] || POSITION_CLASSES.topright;
+  const controlContainerRef = /*#__PURE__*/_react.default.createRef();
+  const map = (0, _reactLeaflet.useMap)();
+
+  /**
+   * Whenever the control container ref is created,
+   * Ensure the click / scroll propagation is removed
+   * This way click/scroll events do not bubble down to the map
+   */
+  _react.default.useEffect(() => {
+    if (controlContainerRef.current !== null) {
+      _leaflet.default.DomEvent.disableClickPropagation(controlContainerRef.current);
+      _leaflet.default.DomEvent.disableScrollPropagation(controlContainerRef.current);
+    }
+  }, [controlContainerRef]);
+
+  /**
+   * Whenever the position is changed, go ahead and get the container of the map and the first
+   * instance of the position class in that map container
+   * Fixes #17
+   */
+  _react.default.useEffect(() => {
+    const mapContainer = map.getContainer();
+    const targetDiv = mapContainer.getElementsByClassName(positionClass);
+    setPortalRoot(targetDiv[0]);
+  }, [positionClass]);
+
+  /**
+   * Whenever the portal root is complete,
+   * append or prepend the control container to the portal root
+   */
+  _react.default.useEffect(() => {
+    if (portalRoot !== null) {
+      if (props.prepend !== undefined && props.prepend === true) {
+        portalRoot.prepend(controlContainerRef.current);
+      } else {
+        portalRoot.append(controlContainerRef.current);
+      }
+    }
+  }, [portalRoot, props.prepend, controlContainerRef]);
+
+  /**
+   * Concatenate the props.container className to the class of the control div
+   */
+  const className = (((_props$container = props.container) === null || _props$container === void 0 || (_props$container = _props$container.className) === null || _props$container === void 0 ? void 0 : _props$container.concat(" ")) || "") + "leaflet-control";
+
+  /**
+   * Render
+   */
+  return /*#__PURE__*/_react.default.createElement("div", _extends({}, props.container, {
+    ref: controlContainerRef,
+    className: className
+  }), props.children);
+};
+var _default = exports.default = Control;

package/dist/components/Map.js

@@ -61,7 +61,8 @@ function SeatMap(_ref) {
     desiredSeatQuantity,
     setSeatsToRemove,
     setRemoveMultipleSeatsPopupOpen,
-    setInvalidSeatsPopupOpen
+    setInvalidSeatsPopupOpen,
+    batchAddTicketsToCart
   } = _ref;
   const [isLegendOpen, setIsLegendOpen] = (0, _react.useState)(false);
   const [isDragging, setIsDragging] = (0, _react.useState)(false);
@@ -429,6 +430,7 @@ function SeatMap(_ref) {
     const seatPrices = ((_seats$pricing3 = seats.pricing) === null || _seats$pricing3 === void 0 ? void 0 : _seats$pricing3.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && price.psId === s.psId)) || [];
     const hasSeatPrices = (seatPrices === null || seatPrices === void 0 ? void 0 : seatPrices.length) > 0;
     const isSingleFlexi = seatPrices.length === 1 && !!seatPrices[0].pMax && !!seatPrices[0].pMin && seatPrices[0].pMax > seatPrices[0].pMin;
+    const isOrphanMode = seats.preventOrphanedSeats && desiredSeatQuantity > 0;
     return /*#__PURE__*/_react.default.createElement("div", {
       key: i
     }, (s.loading || ticketPopupOpen && (chosenSeat === null || chosenSeat === void 0 || (_chosenSeat$seat = chosenSeat.seat) === null || _chosenSeat$seat === void 0 ? void 0 : _chosenSeat$seat.ssId) === s.ssId) && /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
@@ -450,9 +452,14 @@ function SeatMap(_ref) {
       radius: 12000,
       eventHandlers: {
         click: e => {
+          // pos multi-select mode
           if (mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE || mode === _utils.modes.DRAW || selectedSeats.length > 0) {
             map.closePopup();
-          } else if (seats.preventOrphanedSeats && desiredSeatQuantity > 0) {
+            return;
+          }
+
+          // orphan multi-select mode
+          if (isOrphanMode) {
             map.closePopup();
             if (s.s === _utils.statuses.USER_PENDING) {
               const newSeatsToRemove = (0, _utils.getAdjacentBookedSeats)(s, seatsMap);
@@ -462,18 +469,36 @@ function SeatMap(_ref) {
                 setSeatsToRemove(newSeatsToRemove);
                 setRemoveMultipleSeatsPopupOpen(true);
               }
-            } else if (highlightedSeats.length > 0 && highlightedSeats.length === desiredSeatQuantity) {
+              return;
+            }
+            if (highlightedSeats.length > 0 && highlightedSeats.length === desiredSeatQuantity) {
               if ((0, _utils.isTouchScreen)() && clickedSeat !== s.ssId) {
                 setClickedSeat(s.ssId);
               } else {
-                setSelectedSeats([...highlightedSeats]);
-                setPricingPopupOpen(true);
+                const groupedSeats = (0, _utils.groupSeatsByPriceSection)(highlightedSeats, seats.pricing, priceSectionIds);
+                const priceages = Object.values(groupedSeats).flatMap(group => group.priceages.map(pa => pa.priceage));
+                if (priceages.length === 1 && (priceages[0].q === null || priceages[0].q >= desiredSeatQuantity) && !isSingleFlexi) {
+                  batchAddTicketsToCart(highlightedSeats.map(s => ({
+                    seat: s,
+                    priceage: priceages[0]
+                  })));
+                } else {
+                  setSelectedSeats([...highlightedSeats]);
+                  setPricingPopupOpen(true);
+                }
               }
-            } else if (greyedOutSeats.some(gs => gs.ssId === s.ssId)) {
+              return;
+            }
+            if (greyedOutSeats.some(gs => gs.ssId === s.ssId)) {
               setInvalidSeatsPopupOpen(true);
             }
-          } else if (mode === _utils.modes.SINGLE && hasSeatPrices) {
+            return;
+          }
+
+          // single select mode
+          if (mode === _utils.modes.SINGLE && hasSeatPrices) {
             handleClickSeat(e, s);
+            return;
           }
         },
         popupopen: popup => {
@@ -499,7 +524,8 @@ function SeatMap(_ref) {
           } else {
             setIsHoveringOnSeat(true);
             setHoveredSeat(s);
-            if (seats.preventOrphanedSeats && desiredSeatQuantity > 0 && s.s === _utils.statuses.UNSOLD) {
+            setClickedSeat(s.ssId);
+            if (isOrphanMode && s.s === _utils.statuses.UNSOLD && mode === _utils.modes.SINGLE) {
               const seatsToBook = (0, _utils.getValidSeats)(s, seatsMap, desiredSeatQuantity);
               if (seatsToBook.valid) {
                 setHighlightedSeats(seatsToBook.seats);
@@ -537,11 +563,11 @@ function SeatMap(_ref) {
           });
         }
       }
-    }, (0, _utils.isTouchScreen)() && /*#__PURE__*/_react.default.createElement(_reactLeaflet.Tooltip, {
+    }, (0, _utils.isTouchScreen)() && !isSingleFlexi && (seatPrices.length === 1 || isOrphanMode && highlightedSeats.length > 1) ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.Tooltip, {
       className: "mobile-tooltip",
       direction: "top",
       offset: [0, height * 0.03 + -60]
-    }, "Tap again to select these seats"), s.s === _utils.statuses.UNSOLD && hasSeatPrices ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, {
+    }, "Tap again to select", " ", isOrphanMode && (highlightedSeats === null || highlightedSeats === void 0 ? void 0 : highlightedSeats.length) > 1 ? "these seats" : "this seat") : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), s.s === _utils.statuses.UNSOLD && hasSeatPrices ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, {
       className: "ticket-popup popup-".concat(s.sId)
     }, isSingleFlexi ? /*#__PURE__*/_react.default.createElement("div", {
       className: "single-flexi"

package/dist/components/PricingPopup.js

@@ -212,48 +212,7 @@ function PricingPopup(_ref4) {
     pricing,
     priceSectionIds
   } = _ref4;
-  const [seatGroupsToBook, setSeatGroupsToBook] = (0, _react.useState)(selectedSeats.reduce((acc, curr) => {
-    if (curr.psId) {
-      const priceages = pricing.filter(price => price.psId === curr.psId && (!priceSectionIds || priceSectionIds.includes(price.psId)));
-      const availablePriceages = priceages.filter(p => p.q === null || p.q > 0);
-      const soldOutPriceages = priceages.filter(p => p.q === 0);
-      const numSeats = selectedSeats.filter(s => s.psId === curr.psId).length;
-      if (!acc[curr.psId]) {
-        let qtyFilled = 0;
-        acc[curr.psId] = {
-          seats: [],
-          priceages: [...availablePriceages.map(pa => {
-            let qty = 0;
-            if (qtyFilled < numSeats) {
-              var _pa$q;
-              qty = Math.min(numSeats - qtyFilled, (_pa$q = pa.q) !== null && _pa$q !== void 0 ? _pa$q : numSeats);
-              qtyFilled += qty;
-            }
-            return {
-              priceage: pa,
-              qty
-            };
-          }), ...soldOutPriceages.map(pa => ({
-            priceage: pa,
-            qty: 0
-          }))]
-        };
-      }
-      const availablePriceage = availablePriceages.find(pa => {
-        var _pa$q2;
-        const qtyFilled = acc[curr.psId].seats.filter(s => {
-          var _s$priceage2;
-          return ((_s$priceage2 = s.priceage) === null || _s$priceage2 === void 0 ? void 0 : _s$priceage2.paId) === pa.paId;
-        }).length;
-        return qtyFilled < ((_pa$q2 = pa.q) !== null && _pa$q2 !== void 0 ? _pa$q2 : numSeats);
-      });
-      acc[curr.psId].seats.push({
-        seat: curr,
-        priceage: availablePriceage
-      });
-    }
-    return acc;
-  }, {}));
+  const [seatGroupsToBook, setSeatGroupsToBook] = (0, _react.useState)(() => (0, _utils.groupSeatsByPriceSection)(selectedSeats, pricing, priceSectionIds));
   const updateSeatGroupPriceage = (priceage, qty) => {
     const newSeatGroupsToBook = _objectSpread({}, seatGroupsToBook);
     const group = newSeatGroupsToBook[priceage.psId];

package/dist/components/SeatingPlan.js

@@ -647,7 +647,8 @@ const SeatingPlan = _ref => {
     desiredSeatQuantity: desiredSeatQuantity,
     setSeatsToRemove: setSeatsToRemove,
     setRemoveMultipleSeatsPopupOpen: setRemoveMultipleSeatsPopupOpen,
-    setInvalidSeatsPopupOpen: setInvalidSeatsPopupOpen
+    setInvalidSeatsPopupOpen: setInvalidSeatsPopupOpen,
+    batchAddTicketsToCart: batchAddTicketsToCart
   }))), mapContainer)) : /*#__PURE__*/_react.default.createElement("div", {
     className: "loading"
   }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("svg", {

package/dist/utils/helpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTouchScreen = exports.getValidSeats = exports.getRowSection = exports.getRetryDelay = exports.getInitialColor = exports.getAdjacentBookedSeats = exports.createsOrphan = exports.canSelectSingleSeatGivenOrphanRules = exports.calculateCenterOfMap = exports.NZDollar = void 0;
+exports.isTouchScreen = exports.groupSeatsByPriceSection = exports.getValidSeats = exports.getRowSection = exports.getRetryDelay = exports.getInitialColor = exports.getAdjacentBookedSeats = exports.createsOrphan = exports.canSelectSingleSeatGivenOrphanRules = exports.calculateCenterOfMap = exports.NZDollar = void 0;
 var _enums = require("./enums");
 const isTouchScreen = () => {
   let hasTouchScreen = false;
@@ -242,4 +242,50 @@ const getRetryDelay = (response, attempt) => {
   // adds jitter
   return attempt + Math.random() * 1000;
 };
-exports.getRetryDelay = getRetryDelay;
+exports.getRetryDelay = getRetryDelay;
+const groupSeatsByPriceSection = (seats, pricing, priceSectionIds) => {
+  const groupedSeats = seats.reduce((acc, curr) => {
+    if (curr.psId) {
+      const priceages = pricing.filter(price => price.psId === curr.psId && (!priceSectionIds || priceSectionIds.includes(price.psId)));
+      const availablePriceages = priceages.filter(p => p.q === null || p.q > 0);
+      const soldOutPriceages = priceages.filter(p => p.q === 0);
+      const numSeats = seats.filter(s => s.psId === curr.psId).length;
+      if (!acc[curr.psId]) {
+        let qtyFilled = 0;
+        acc[curr.psId] = {
+          seats: [],
+          priceages: [...availablePriceages.map(pa => {
+            let qty = 0;
+            if (qtyFilled < numSeats) {
+              var _pa$q;
+              qty = Math.min(numSeats - qtyFilled, (_pa$q = pa.q) !== null && _pa$q !== void 0 ? _pa$q : numSeats);
+              qtyFilled += qty;
+            }
+            return {
+              priceage: pa,
+              qty
+            };
+          }), ...soldOutPriceages.map(pa => ({
+            priceage: pa,
+            qty: 0
+          }))]
+        };
+      }
+      const availablePriceage = availablePriceages.find(pa => {
+        var _pa$q2;
+        const qtyFilled = acc[curr.psId].seats.filter(s => {
+          var _s$priceage;
+          return ((_s$priceage = s.priceage) === null || _s$priceage === void 0 ? void 0 : _s$priceage.paId) === pa.paId;
+        }).length;
+        return qtyFilled < ((_pa$q2 = pa.q) !== null && _pa$q2 !== void 0 ? _pa$q2 : numSeats);
+      });
+      acc[curr.psId].seats.push({
+        seat: curr,
+        priceage: availablePriceage
+      });
+    }
+    return acc;
+  }, {});
+  return groupedSeats;
+};
+exports.groupSeatsByPriceSection = groupSeatsByPriceSection;

package/package.json

@@ -2,7 +2,7 @@
   "name": "iticket-seatingplan-dev",
   "description": "Seating plan with FLEXi pricing",
   "author": "gedwyne",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "private": false,
   "keywords": [
     "iticket",