iticket-seatingplan-dev 1.6.6 → 1.6.7

package/dist/components/Map.js

@@ -11,7 +11,7 @@ var _reactLeaflet = require("react-leaflet");
 var L = _interopRequireWildcard(require("leaflet"));
 var _reactLeafletDraw = require("react-leaflet-draw");
 var _gestureHandling2 = require("./gestureHandling");
-var _Control = _interopRequireDefault(require("./Control"));
+var _reactLeafletCustomControl = _interopRequireDefault(require("react-leaflet-custom-control"));
 var _encodedSvgs = require("./assets/encodedSvgs");
 var _utils = require("../utils");
 var _PriceButton = _interopRequireDefault(require("./PriceButton"));
@@ -195,7 +195,7 @@ function Map(_ref) {
       map.dragging.disable();
     }
   }, [mode, map]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Control.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactLeafletCustomControl.default, {
     position: "bottomright"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "legendBox"
@@ -236,7 +236,7 @@ function Map(_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"
@@ -266,7 +266,7 @@ function Map(_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"
@@ -281,7 +281,7 @@ function Map(_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"
@@ -361,7 +361,7 @@ function Map(_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",
@@ -381,6 +381,7 @@ function Map(_ref) {
     const isIcon = (!priceSectionIds || priceSectionIds.includes(s.psId)) && (s.s === _utils.statuses.WHEELCHAIR_ACCESS || s.s === _utils.statuses.USER_PENDING && s.m);
     const seatCenter = getSeatCenterLatLng(s, isIcon);
     const seatPrices = seats.pricing.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;
     return /*#__PURE__*/_react.default.createElement("div", {
       key: i
@@ -399,7 +400,7 @@ function Map(_ref) {
       zIndex: 10
     }) : /*#__PURE__*/_react.default.createElement(_reactLeaflet.Circle, {
       center: [s.r.includes("NORTH") ? getNorthSeatLat(s) : seatCenter.lat, seatCenter.lng],
-      pathOptions: (0, _utils.getInitialColor)(s, price
+      pathOptions: (0, _utils.getInitialColor)(s, price, !hasSeatPrices
       // TEST selected state for multiselect
       // !!selectedSeats.find(
       //   (selectedSeat) => selectedSeat.ssId === s.ssId
@@ -408,7 +409,7 @@ function Map(_ref) {
       radius: 12000,
       eventHandlers: {
         click: e => {
-          if (mode === _utils.modes.SINGLE) {
+          if (mode === _utils.modes.SINGLE && hasSeatPrices) {
             handleClickSeat(e, s);
           }
         },
@@ -421,14 +422,14 @@ function Map(_ref) {
           popupRef.current = null;
         },
         mousedown: () => {
-          if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && canMultiSelect) {
+          if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && canMultiSelect && hasSeatPrices) {
             if (!selectedSeats.find(seat => seat.ssId === s.ssId) && s.s === (mode === _utils.modes.DRAG ? _utils.statuses.UNSOLD : _utils.statuses.USER_PENDING)) {
               setSelectedSeats(prev => [...prev, s]);
             }
           }
         },
         mouseover: () => {
-          if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && isDragging && canMultiSelect) {
+          if ((mode === _utils.modes.DRAG || mode === _utils.modes.REMOVE) && isDragging && canMultiSelect && hasSeatPrices) {
             if (!selectedSeats.find(seat => seat.ssId === s.ssId) && s.s === (mode === _utils.modes.DRAG ? _utils.statuses.UNSOLD : _utils.statuses.USER_PENDING)) {
               setSelectedSeats(prev => [...prev, s]);
             }
@@ -440,7 +441,7 @@ function Map(_ref) {
       className: "seatname-tooltip",
       direction: "top",
       offset: [0, height * 0.03 + -30]
-    }, s.r + "-" + s.c), s.s === _utils.statuses.UNSOLD && /*#__PURE__*/_react.default.createElement(_reactLeaflet.Popup, {
+    }, s.r + "-" + s.c), 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"
@@ -488,7 +489,7 @@ function Map(_ref) {
       className: "heading"
     }, "Select option:"), /*#__PURE__*/_react.default.createElement("div", {
       className: "priceages"
-    }, seats.pricing.filter(price => (!priceSectionIds || priceSectionIds.includes(price.psId)) && price.psId === s.psId).map(price => /*#__PURE__*/_react.default.createElement(_PriceButton.default, {
+    }, seatPrices.map(price => /*#__PURE__*/_react.default.createElement(_PriceButton.default, {
       key: price.paId,
       price: price,
       addToCart: amount => addTicketToCart(s, _objectSpread(_objectSpread({}, price), {}, {
@@ -506,6 +507,6 @@ function Map(_ref) {
           }
         }
       }
-    }))))))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
+    })))))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null));
   }));
 }

package/dist/components/SeatingPlan.js

@@ -39,15 +39,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);
@@ -469,30 +461,19 @@ const SeatingPlan = _ref => {
     setPricingPopupOpen(false);
     setSelectedSeats([]);
   };
-  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 && canMultiSelect && /*#__PURE__*/_react.default.createElement(_PricingPopup.default, {
     cancelPriceSelect: cancelPriceSelect,
     groupedSelectedSeats: groupedSelectedSeats,

package/dist/components/styles/index.css

@@ -27,12 +27,12 @@ button {
 }
 
 .seating-plan-container {
-  /* --accent: #6366f1;
-  --accent-dark: #3730a3;
-  --accent-light: #e0e7ff;
-  --flexi-accent: #e32664;
-  --flexi-accent-light: #ffd3e2;
-  --flexi-accent-dark: #be003f; */
+  --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);
   font-family: inherit;
 }
 
@@ -41,7 +41,6 @@ button {
   padding: 0.5rem 0.8rem;
   border-radius: 3px;
   text-align: left;
-  color: #333;
 }
 
 .legend-header {

package/dist/utils/helpers.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getInitialColor = exports.calculateCenterOfMap = exports.NZDollar = void 0;
 var _enums = require("./enums");
-const getInitialColor = (s, price, selected) => {
+const getInitialColor = (s, price, disabled, selected) => {
   // TEST selected state for multiselect
   // if (selected) {
   //   return {
@@ -16,7 +16,7 @@ const getInitialColor = (s, price, selected) => {
   // }
 
   return {
-    fillColor: s.s === _enums.statuses.UNSOLD ? _enums.statusColors.available : s.s === _enums.statuses.USER_PENDING ? s.bookedPrice === price ? _enums.statusColors.booked : _enums.statusColors.bookedWithDifferentPrice : _enums.statusColors.sold,
+    fillColor: s.s === _enums.statuses.UNSOLD && !disabled ? _enums.statusColors.available : s.s === _enums.statuses.USER_PENDING ? s.bookedPrice === price ? _enums.statusColors.booked : _enums.statusColors.bookedWithDifferentPrice : _enums.statusColors.sold,
     color: "none",
     fillOpacity: s.loading ? 0 : 1,
     stroke: false

package/package.json

@@ -2,7 +2,7 @@
   "name": "iticket-seatingplan-dev",
   "description": "Seating plan with FLEXi pricing",
   "author": "gedwyne",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "private": false,
   "keywords": [
     "iticket",
@@ -20,9 +20,10 @@
     "@types/leaflet-draw": "^1.0.11",
     "leaflet": "^1.9.3",
     "leaflet-draw": "^1.0.4",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-leaflet": "^5.0.0-rc.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-leaflet": "^4.2.1",
+    "react-leaflet-custom-control": "^1.3.5",
     "react-leaflet-draw": "^0.20.4",
     "react-scripts": "^5.0.1"
   },

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;