iticket-seatingplan-dev 1.8.6 → 1.8.8

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/Controls.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Controls;
-var _reactLeafletCustomControl = _interopRequireDefault(require("react-leaflet-custom-control"));
+var _Control = _interopRequireDefault(require("./Control"));
 var _reactLeafletDraw = require("react-leaflet-draw");
 var _reactLeaflet = require("react-leaflet");
 var _react = _interopRequireWildcard(require("react"));
@@ -35,7 +35,7 @@ function Controls(_ref) {
   } = _ref;
   const [isLegendOpen, setIsLegendOpen] = (0, _react.useState)(true);
   const map = (0, _reactLeaflet.useMap)();
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, preventOrphanedSeats && /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, preventOrphanedSeats && /*#__PURE__*/_react.default.createElement(_Control.default, {
     position: "topright"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "extra-controls seat-quantity-control"
@@ -49,7 +49,7 @@ function Controls(_ref) {
     height: "16px",
     width: "16px",
     strokeWidth: "2"
-  })))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
+  })))), /*#__PURE__*/_react.default.createElement(_Control.default, {
     position: "bottomright"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "legendBox"
@@ -90,7 +90,7 @@ function Controls(_ref) {
     src: _encodedSvgs.userIcon,
     width: 15,
     height: 15
-  }), /*#__PURE__*/_react.default.createElement("p", null, "membership seats"))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null)))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
+  }), /*#__PURE__*/_react.default.createElement("p", null, "membership seats"))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null)))), /*#__PURE__*/_react.default.createElement(_Control.default, {
     position: "topleft"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "extra-controls"
@@ -120,7 +120,7 @@ function Controls(_ref) {
     style: {
       height: "17px"
     }
-  })))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
+  })))), /*#__PURE__*/_react.default.createElement(_Control.default, {
     position: "topleft"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "extra-controls full-screen-control"
@@ -135,7 +135,7 @@ function Controls(_ref) {
     style: {
       height: "24px"
     }
-  })))), canMultiSelect && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
+  })))), canMultiSelect && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Control.default, {
     position: "bottomleft"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "extra-controls multi-select-control"
@@ -215,7 +215,7 @@ function Controls(_ref) {
     onMounted: drawInstance => {
       drawRef.current = drawInstance;
     }
-  }))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_Control.default, {
     position: "topright"
   }, /*#__PURE__*/_react.default.createElement("button", {
     title: "Close full screen",

package/dist/components/Map.js

@@ -91,7 +91,7 @@ function SeatMap(_ref) {
       center: seatCenter
     })];
   })), [seats.seats, height, priceSectionIds]);
-  const isOrphanMode = (seats === null || seats === void 0 ? void 0 : seats.preventOrphanedSeats) && desiredSeatQuantity > 0;
+  const isOrphanMode = (seats === null || seats === void 0 ? void 0 : seats.preventOrphanedSeats) && desiredSeatQuantity > 0 && mode === _utils.modes.SINGLE;
   const isTouchScreen = (0, _utils.getIsTouchScreen)();
 
   // L.drawLocal.draw.toolbar.buttons.rectangle = "Box select";
@@ -123,7 +123,7 @@ function SeatMap(_ref) {
         } else if (mode === _utils.modes.REMOVE) {
           const seatsToRemove = [];
           selectedSeats.forEach(seat => {
-            if (!seatsToRemove.find(s => s.ssId === seat.ssId) && seat.s === _utils.statuses.USER_PENDING) {
+            if (!seatsToRemove.some(s => s.ssId === seat.ssId) && seat.s === _utils.statuses.USER_PENDING) {
               seatsToRemove.push(seat);
             }
           });
@@ -227,7 +227,7 @@ function SeatMap(_ref) {
         lng: seat.x
       };
       const latlng = [seatCenter.lat, seatCenter.lng];
-      if (boxBounds.contains(latlng) && !seatsToBook.find(s => s.ssId === seat.ssId) && seat.s === _utils.statuses.UNSOLD) {
+      if (boxBounds.contains(latlng) && !seatsToBook.some(s => s.ssId === seat.ssId) && seat.s === _utils.statuses.UNSOLD) {
         seatsToBook.push(seat);
       }
     });
@@ -328,7 +328,7 @@ function SeatMap(_ref) {
     }
   };
   const onMouseDown = (0, _react.useCallback)((s, hasSeatPrices) => {
-    if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && canMultiSelect && hasSeatPrices && !selectedSeats.find(seat => seat.ssId === s.ssId) && s.s === (mode === _utils.modes.DRAG ? _utils.statuses.UNSOLD : _utils.statuses.USER_PENDING)) {
+    if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && canMultiSelect && hasSeatPrices && !selectedSeats.some(seat => seat.ssId === s.ssId) && s.s === (mode === _utils.modes.DRAG ? _utils.statuses.UNSOLD : _utils.statuses.USER_PENDING)) {
       setSelectedSeats(prev => [...prev, s]);
     }
   }, [mode, canMultiSelect, selectedSeats, setSelectedSeats]);
@@ -339,7 +339,7 @@ function SeatMap(_ref) {
     if (hideTooltipTimeoutRef.current) {
       clearTimeout(hideTooltipTimeoutRef.current);
     }
-    if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && isDragging && canMultiSelect && hasSeatPrices && !selectedSeats.find(seat => seat.ssId === s.ssId) && s.s === (mode === _utils.modes.DRAG ? _utils.statuses.UNSOLD : _utils.statuses.USER_PENDING)) {
+    if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && isDragging && canMultiSelect && hasSeatPrices && !selectedSeats.some(seat => seat.ssId === s.ssId) && s.s === (mode === _utils.modes.DRAG ? _utils.statuses.UNSOLD : _utils.statuses.USER_PENDING)) {
       setSelectedSeats(prev => [...prev, s]);
       return;
     }
@@ -371,7 +371,7 @@ function SeatMap(_ref) {
               infoVisible: false
             }));
           }
-          if ((highlightedSeats === null || highlightedSeats === void 0 ? void 0 : highlightedSeats.length) > 0) {
+          if ((highlightedSeats === null || highlightedSeats === void 0 ? void 0 : highlightedSeats.length) > 0 && mode === _utils.modes.SINGLE) {
             setHighlightedSeats([]);
           }
         }, 400);
@@ -420,7 +420,7 @@ function SeatMap(_ref) {
     isReloading: isReloading,
     hasMembershipSeats: (seats === null || seats === void 0 || (_seats$seats2 = seats.seats) === null || _seats$seats2 === void 0 ? void 0 : _seats$seats2.filter(seat => seat.m).length) > 0,
     hasBookedSeats: (bookedSeats === null || bookedSeats === void 0 ? void 0 : bookedSeats.length) > 0
-  }), /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
+  }), (seats === null || seats === void 0 ? void 0 : seats.background) && /*#__PURE__*/_react.default.createElement(_reactLeaflet.ImageOverlay, {
     url: seats === null || seats === void 0 ? void 0 : seats.background,
     bounds: [[0, 0], [height * 0.03, width * 0.03]],
     zIndex: 10
@@ -473,7 +473,7 @@ function SeatMap(_ref) {
       zIndex: 10
     }) : /*#__PURE__*/_react.default.createElement(_reactLeaflet.Circle, {
       center: [seatCenter.lat, seatCenter.lng],
-      pathOptions: (0, _utils.getInitialColor)(s, price, s.loading || ticketPopupOpen && (chosenSeat === null || chosenSeat === void 0 || (_chosenSeat$seat3 = chosenSeat.seat) === null || _chosenSeat$seat3 === void 0 ? void 0 : _chosenSeat$seat3.ssId) === s.ssId, !hasSeatPrices, (selectedSeats.some(selectedSeat => selectedSeat.ssId === s.ssId) || highlightedSeats.some(hs => hs.ssId === s.ssId)) && isHoveringOnSeat, greyedOutSeats.some(gs => gs.ssId === s.ssId)),
+      pathOptions: (0, _utils.getInitialColor)(s, price, s.loading || ticketPopupOpen && (chosenSeat === null || chosenSeat === void 0 || (_chosenSeat$seat3 = chosenSeat.seat) === null || _chosenSeat$seat3 === void 0 ? void 0 : _chosenSeat$seat3.ssId) === s.ssId, !hasSeatPrices, (selectedSeats.some(selectedSeat => selectedSeat.ssId === s.ssId) || highlightedSeats.some(hs => hs.ssId === s.ssId)) && (isOrphanMode ? isHoveringOnSeat : true), greyedOutSeats.some(gs => gs.ssId === s.ssId)),
       radius: 12000,
       eventHandlers: eventHandlers
     }, s.s === _utils.statuses.UNSOLD && hasSeatPrices ? /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, {

package/dist/components/SeatingPlan.js

@@ -44,7 +44,15 @@ const SeatingPlan = _ref => {
     connectedShowings,
     areaName,
     promoCode,
-    bookingMode = _utils.bookingModes.SHOPSITE
+    bookingMode = _utils.bookingModes.SHOPSITE,
+    theme = {
+      accent: "#6366f1",
+      accentDark: "#3730a3",
+      accentLight: "#e0e7ff",
+      flexiAccent: "#e32664",
+      flexiAccentDark: "#ffd3e2",
+      flexiAccentLight: "#be003f"
+    }
   } = _ref;
   const [initialiseMessage, setInitialiseMessage] = (0, _react.useState)("Initialising seating plan...");
   const [isReloading, setIsReloading] = (0, _react.useState)(false);
@@ -473,8 +481,6 @@ const SeatingPlan = _ref => {
           throw new Error("Something went wrong. Please try again or contact support.");
         }
       }
-      const img = new Image();
-      img.src = data.background;
       setBookedSeats(data.seats.filter(s => s.s === _utils.statuses.USER_PENDING && s.bookedPrice === price).map(s => ({
         ssId: s.ssId,
         r: s.r,
@@ -485,18 +491,29 @@ const SeatingPlan = _ref => {
         pId: s.pId,
         paName: s.paName
       })));
-      img.onload = () => {
-        const imgSouthwest = [0, 0];
-        const imgNortheast = [img.height * 0.015, img.width * 0.015];
-        setBounds([imgSouthwest, imgNortheast]);
-        setPosition([img.height * 0.005, img.width * 0.005]);
-        setHeight(img.height * 0.5);
-        setWidth(img.width * 0.5);
+      const img = new Image();
+      const setupSeats = (height, width) => {
+        const southwest = [0, 0];
+        const northeast = [height * 0.015, width * 0.015];
+        setBounds([southwest, northeast]);
+        setPosition([height * 0.005, width * 0.005]);
+        setHeight(height * 0.5);
+        setWidth(width * 0.5);
         setSeats(data);
         if (data.preventOrphanedSeats && !isReload) {
           setSelectQuantityPopupOpen(true);
         }
       };
+      if (data.background) {
+        img.src = data.background;
+        img.onload = () => {
+          setupSeats(img.height, img.width);
+        };
+      } else {
+        const estHeight = 800;
+        const estWidth = 800;
+        setupSeats(estHeight, estWidth);
+      }
       setIsReloading(false);
     } catch (error) {
       var _error$message;
@@ -523,19 +540,28 @@ const SeatingPlan = _ref => {
   // in full screen mode, render the map in the body, otherwise render in the seating-plan-root div
   const mapContainer = mounted && (isFullScreen ? (_document = document) === null || _document === void 0 ? void 0 : _document.body : (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.getElementById("seating-plan-root"));
   const backdropContainer = mounted && ((_document3 = document) === null || _document3 === void 0 ? void 0 : _document3.body);
-
-  // return seating plan
+  const themeStyles = {
+    "--accent": theme.accent,
+    "--accent-dark": theme.accentDark,
+    "--accent-light": theme.accentLight,
+    "--flexi-accent": theme.flexiAccent,
+    "--flexi-accent-light": theme.flexiAccentLight,
+    "--flexi-accent-dark": theme.flexiAccentDark
+  };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "seating-plan-root",
-    id: "seating-plan-root"
+    id: "seating-plan-root",
+    style: themeStyles
   }, error ? /*#__PURE__*/_react.default.createElement("div", {
     className: "loading"
   }, /*#__PURE__*/_react.default.createElement("h1", null, "OOPS!"), /*#__PURE__*/_react.default.createElement("div", null, error.response.data.message)) : position && area === areaId ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, backdropContainer && /*#__PURE__*/(0, _reactDom.createPortal)(/*#__PURE__*/_react.default.createElement("div", {
     className: "seating-plan-backdrop ".concat(isFullScreen ? "full-screen" : ""),
-    onClick: () => setIsFullScreen(false)
+    onClick: () => setIsFullScreen(false),
+    style: themeStyles
   }), backdropContainer), mapContainer && /*#__PURE__*/(0, _reactDom.createPortal)(/*#__PURE__*/_react.default.createElement("div", {
     className: "seating-plan-container ".concat(isFullScreen ? "full-screen" : ""),
-    "data-mode": mode
+    "data-mode": mode,
+    style: themeStyles
   }, pricingPopupOpen && seats && seats.pricing && (canMultiSelect || seats.preventOrphanedSeats) ? /*#__PURE__*/_react.default.createElement(_PricingPopup.default, {
     onClose: () => {
       setPricingPopupOpen(false);

package/dist/components/styles/index.css

@@ -27,12 +27,12 @@ button {
 }
 
 .seating-plan-container {
-  --accent: rgb(99 102 241);
+  /* --accent: rgb(99 102 241);
   --accent-dark: rgb(55 48 163);
   --accent-light: rgb(224 231 255);
   --flexi-accent: rgb(227 38 100);
   --flexi-accent-light: rgb(255 211 226);
-  --flexi-accent-dark: rgb(190 0 63);
+  --flexi-accent-dark: rgb(190 0 63); */
   font-family: inherit;
 }
 
@@ -42,6 +42,7 @@ button {
   border-radius: 3px;
   text-align: left;
   backdrop-filter: blur(2px);
+  color: #333;
 }
 
 .legend-header {

package/package.json

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