iticket-seatingplan-dev 2.0.0 → 2.0.1

package/dist/components/Controls.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Controls;
-var _Control = _interopRequireDefault(require("./Control"));
+var _reactLeafletCustomControl = _interopRequireDefault(require("react-leaflet-custom-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(_Control.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, preventOrphanedSeats && /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.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(_Control.default, {
+  })))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.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(_Control.default, {
+  }), /*#__PURE__*/_react.default.createElement("p", null, "membership seats"))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null)))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.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(_Control.default, {
+  })))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.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(_Control.default, {
+  })))), canMultiSelect && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.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(_Control.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.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 && mode === _utils.modes.SINGLE;
+  const isOrphanMode = (seats === null || seats === void 0 ? void 0 : seats.preventOrphanedSeats) && desiredSeatQuantity > 0;
   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.some(s => s.ssId === seat.ssId) && seat.s === _utils.statuses.USER_PENDING) {
+            if (!seatsToRemove.find(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.some(s => s.ssId === seat.ssId) && seat.s === _utils.statuses.UNSOLD) {
+      if (boxBounds.contains(latlng) && !seatsToBook.find(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.some(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.find(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.some(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.find(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 && mode === _utils.modes.SINGLE) {
+          if ((highlightedSeats === null || highlightedSeats === void 0 ? void 0 : highlightedSeats.length) > 0) {
             setHighlightedSeats([]);
           }
         }, 400);
@@ -423,7 +423,12 @@ function SeatMap(_ref) {
   }), (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
+    zIndex: 10,
+    eventHandlers: {
+      error: i => {
+        i.target.remove();
+      }
+    }
   }), seats && seats.seats && seats.seats.map((s, i) => {
     var _seatsMap$get2, _seats$pricing3, _chosenSeat$seat, _chosenSeat$seat2, _chosenSeat$seat3;
     const seatCenter = ((_seatsMap$get2 = seatsMap.get(s.sId)) === null || _seatsMap$get2 === void 0 ? void 0 : _seatsMap$get2.center) || {
@@ -473,7 +478,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)) && (isOrphanMode ? isHoveringOnSeat : true), 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)) && isHoveringOnSeat, 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,15 +44,7 @@ const SeatingPlan = _ref => {
     connectedShowings,
     areaName,
     promoCode,
-    bookingMode = _utils.bookingModes.SHOPSITE,
-    theme = {
-      accent: "#6366f1",
-      accentDark: "#3730a3",
-      accentLight: "#e0e7ff",
-      flexiAccent: "#e32664",
-      flexiAccentDark: "#ffd3e2",
-      flexiAccentLight: "#be003f"
-    }
+    bookingMode = _utils.bookingModes.SHOPSITE
   } = _ref;
   const [initialiseMessage, setInitialiseMessage] = (0, _react.useState)("Initialising seating plan...");
   const [isReloading, setIsReloading] = (0, _react.useState)(false);
@@ -504,15 +496,19 @@ const SeatingPlan = _ref => {
           setSelectQuantityPopupOpen(true);
         }
       };
+      const fallbackHeight = 800;
+      const fallbackWidth = 800;
       if (data.background) {
         img.src = data.background;
+        img.onerror = () => {
+          setupSeats(fallbackHeight, fallbackWidth);
+          img.src = "";
+        };
         img.onload = () => {
           setupSeats(img.height, img.width);
         };
       } else {
-        const estHeight = 800;
-        const estWidth = 800;
-        setupSeats(estHeight, estWidth);
+        setupSeats(fallbackHeight, fallbackWidth);
       }
       setIsReloading(false);
     } catch (error) {
@@ -540,28 +536,19 @@ 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);
-  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 seating plan
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "seating-plan-root",
-    id: "seating-plan-root",
-    style: themeStyles
+    id: "seating-plan-root"
   }, 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),
-    style: themeStyles
+    onClick: () => setIsFullScreen(false)
   }), backdropContainer), mapContainer && /*#__PURE__*/(0, _reactDom.createPortal)(/*#__PURE__*/_react.default.createElement("div", {
     className: "seating-plan-container ".concat(isFullScreen ? "full-screen" : ""),
-    "data-mode": mode,
-    style: themeStyles
+    "data-mode": mode
   }, 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,7 +42,6 @@ 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": "2.0.0",
+  "version": "2.0.1",
   "private": false,
   "keywords": [
     "iticket",

package/dist/components/Control.js

@@ -1,75 +0,0 @@
-"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;