@escapenavigator/hooks 1.10.104 → 1.10.106

package/dist/index.d.ts

@@ -1,3 +1,3 @@
+export * from './players-and-variation-picker';
 export * from './use-localstore-state';
 export * from './use-players-and-variation-picker';
-export * from './players-and-variation-picker';

package/dist/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./players-and-variation-picker"), exports);
 __exportStar(require("./use-localstore-state"), exports);
 __exportStar(require("./use-players-and-variation-picker"), exports);
-__exportStar(require("./players-and-variation-picker"), exports);

package/dist/players-and-variation-picker/index.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import { ProfileCurrencyEnum } from '@escapenavigator/types/dist/profile/enum/profile-currency';
+import React from 'react';
 import { usePlayersAndVariationPicker } from '../use-players-and-variation-picker';
 import { PickerSlotDetails, PickerSlotInfo, PickerSlotVariation, PickerVariationChange } from '../use-players-and-variation-picker/types';
 type LoadSlotDetailsApi = Parameters<typeof usePlayersAndVariationPicker>[0]['loadSlotDetails'];

package/dist/players-and-variation-picker/index.js

@@ -1,4 +1,7 @@
 "use strict";
+/* eslint-disable complexity */
+/* eslint-disable no-underscore-dangle */
+/* eslint-disable @typescript-eslint/naming-convention */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -15,24 +18,40 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlayersAndVariationPicker = void 0;
-/* eslint-disable complexity */
-/* eslint-disable no-underscore-dangle */
-/* eslint-disable @typescript-eslint/naming-convention */
-const react_1 = __importStar(require("react"));
-const icons_1 = require("@alphakits/icons");
-const dist_1 = require("@alphakits/ui/dist");
+const InfoMarkS_1 = __importDefault(require("@alphakits/icons/dist/InfoMarkS"));
+const button_1 = require("@alphakits/ui/dist/button");
+const flex_1 = require("@alphakits/ui/dist/flex");
+const flex_columns_1 = require("@alphakits/ui/dist/flex-columns");
+const skeleton_1 = require("@alphakits/ui/dist/skeleton");
+const tag_1 = require("@alphakits/ui/dist/tag");
+const toast_plate_1 = require("@alphakits/ui/dist/toast-plate");
+const typography_1 = require("@alphakits/ui/dist/typography");
 const format_amount_1 = require("@escapenavigator/utils/dist/format-amount");
 const get_players_price_1 = require("@escapenavigator/utils/dist/get-players-price");
 const get_prices_1 = require("@escapenavigator/utils/dist/get-prices");
+const react_1 = __importStar(require("react"));
 const use_players_and_variation_picker_1 = require("../use-players-and-variation-picker");
 /**
  * Single shared component that renders the "Variation + Players" picker used
@@ -44,8 +63,8 @@ const use_players_and_variation_picker_1 = require("../use-players-and-variation
  * places with subtle drift. This component is the single source of truth.
  */
 const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loadSlotDetails, onVariationChange, onVariationResolved, onDetailsLoaded, players = 0, child = 0, tariff: tariffOverride, currency, minPlayers, maxPlayersLimit, slotDiscount, error, t, onChange, onSave, orderId, }) => {
-    var _a, _b;
-    const { loading, options: pickerOptions, selectedOptionId, selectedVariation, buildVariationChange, selectVariation, details, } = (0, use_players_and_variation_picker_1.usePlayersAndVariationPicker)({
+    var _a, _b, _c;
+    const { options: pickerOptions, selectedOptionId, selectedVariation, buildVariationChange, selectVariation, details, } = (0, use_players_and_variation_picker_1.usePlayersAndVariationPicker)({
         slot,
         currentTariffId,
         currentDuration,
@@ -56,12 +75,18 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
     (0, react_1.useEffect)(() => {
         onDetailsLoaded === null || onDetailsLoaded === void 0 ? void 0 : onDetailsLoaded(details);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [details === null || details === void 0 ? void 0 : details.slotId, details === null || details === void 0 ? void 0 : details.isFlex, (_a = details === null || details === void 0 ? void 0 : details.variations) === null || _a === void 0 ? void 0 : _a.length]);
+    }, [details === null || details === void 0 ? void 0 : details.slotId, details === null || details === void 0 ? void 0 : details.isFlex, (_a = details === null || details === void 0 ? void 0 : details.variations) === null || _a === void 0 ? void 0 : _a.length, details, onDetailsLoaded]);
     const tariff = (0, react_1.useMemo)(() => (tariffOverride || (selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.tariff) || {}), [tariffOverride, selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.tariff]);
     (0, react_1.useEffect)(() => {
         onVariationResolved === null || onVariationResolved === void 0 ? void 0 : onVariationResolved(selectedVariation);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.id, selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.tariffId, selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.duration]);
+    }, [
+        selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.id,
+        selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.tariffId,
+        selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.duration,
+        selectedVariation,
+        onVariationResolved,
+    ]);
     const [_players, setPlayers] = (0, react_1.useState)(players);
     const [_children, setChildren] = (0, react_1.useState)(child);
     (0, react_1.useEffect)(() => {
@@ -116,49 +141,59 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
             return;
         onVariationChange === null || onVariationChange === void 0 ? void 0 : onVariationChange(change);
     };
-    if (loading && !details) {
-        return (react_1.default.createElement(dist_1.FlexColumns, { columns: 1, gr: 16 },
-            react_1.default.createElement(dist_1.Skeleton, { visible: true, animate: true },
+    // Show the loader whenever a slot is provided but enriched details are
+    // not yet available (initial render before fetch starts, in-flight fetch,
+    // or backend returned no details). This prevents the brief flash of an
+    // empty picker UI between "slot prop arrived" and "loading=true".
+    if (slot && !details) {
+        return (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 16 },
+            react_1.default.createElement(skeleton_1.Skeleton, { visible: true, animate: true },
                 react_1.default.createElement("div", { style: { height: 80 } })),
-            react_1.default.createElement(dist_1.Skeleton, { visible: true, animate: true },
+            react_1.default.createElement(skeleton_1.Skeleton, { visible: true, animate: true },
                 react_1.default.createElement("div", { style: { height: 60 } }))));
     }
-    return (react_1.default.createElement(dist_1.FlexColumns, { columns: 1, gr: 16 },
-        showVariations && (react_1.default.createElement(dist_1.FlexColumns, { columns: 1, gr: 8 },
-            react_1.default.createElement(dist_1.Typography.Text, { view: "title", color: "secondary" }, t('prices:variation')),
-            react_1.default.createElement(dist_1.Flex, { gap: "xs", wrap: true, justify: "start" }, pickerOptions.map((option) => (react_1.default.createElement("div", { key: option.id, style: option.isFree
+    return (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 16 },
+        showVariations && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, t('prices:variation')),
+            react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, pickerOptions.map((option) => (react_1.default.createElement("div", { key: option.id, style: option.isFree
                     ? undefined
                     : { opacity: 0.4, pointerEvents: 'none' } },
-                react_1.default.createElement(dist_1.Tag, { view: selectedOptionId === option.id
+                react_1.default.createElement(tag_1.Tag, { view: selectedOptionId === option.id
                         ? 'primary-inverted'
                         : 'primary', text: option.label, onClick: () => handleVariationClick(option.id, option.isFree) }))))),
-            !!variationDescription && (react_1.default.createElement(dist_1.Typography.Text, { view: "caps", color: "secondary" }, variationDescription)))),
-        react_1.default.createElement(dist_1.FlexColumns, { columns: 1, gr: 8 },
-            react_1.default.createElement(dist_1.Typography.Text, { view: "title", color: "secondary" },
+            !!variationDescription && (react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, variationDescription)))),
+        react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' },
                 tariff.child ? t('prices:adults') : t('prices:choosePlayersAmount'),
                 ' ',
-                !!_players && tariff[_players] != null && (`(${(0, format_amount_1.formatAmount)(tariff[_players], currency)})`)),
-            react_1.default.createElement(dist_1.Flex, { gap: "xs", wrap: true, justify: "start" }, playersOptions
+                !!_players &&
+                    tariff[_players] != null &&
+                    `(${(0, format_amount_1.formatAmount)(tariff[_players], currency)})`),
+            react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, playersOptions
                 .filter((p) => p.key + (_children || 0) <= effectiveMax)
-                .map((p) => (react_1.default.createElement(dist_1.Button, { key: `adult-${p.key}`, size: "xs", style: { width: 40, minWidth: 40 }, onClick: () => handleChangePlayers(p.key), view: _players === p.key ? 'primary' : 'outlined' }, p.key))))),
-        !!childrenOptions.length && (react_1.default.createElement(dist_1.FlexColumns, { columns: 1, gr: 8 },
-            react_1.default.createElement(dist_1.Typography.Text, { view: "title", color: "secondary" },
+                .map((p) => (react_1.default.createElement(button_1.Button, { key: `adult-${p.key}`, size: 'xs', style: { width: 40, minWidth: 40 }, onClick: () => handleChangePlayers(p.key), view: _players === p.key ? 'primary' : 'outlined' }, p.key))))),
+        !!childrenOptions.length && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' },
                 t('prices:kids'),
                 ' ',
-                !!_children && tariff.child != null && (`(${(0, format_amount_1.formatAmount)(_children * tariff.child, currency)})`)),
-            react_1.default.createElement(dist_1.Flex, { gap: "xs", wrap: true, justify: "start" }, childrenOptions
+                !!_children &&
+                    tariff.child != null &&
+                    `(${(0, format_amount_1.formatAmount)(_children * tariff.child, currency)})`),
+            !!((_c = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.childPriceDescription) === null || _c === void 0 ? void 0 : _c.trim()) && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
+                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, selectedVariation.childPriceDescription))),
+            react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, childrenOptions
                 .filter((count) => _players + count <= effectiveMax)
                 .map((count) => {
                 const isActive = _children === count;
-                return (react_1.default.createElement(dist_1.Button, { key: `child-${count}`, size: "xs", style: { width: 40, minWidth: 40 }, onClick: () => handleChangeChildren(isActive ? 0 : count), view: isActive ? 'primary' : 'outlined' }, count));
+                return (react_1.default.createElement(button_1.Button, { key: `child-${count}`, size: 'xs', style: { width: 40, minWidth: 40 }, onClick: () => handleChangeChildren(isActive ? 0 : count), view: isActive ? 'primary' : 'outlined' }, count));
             })))),
-        !!totalHeads && (react_1.default.createElement(dist_1.Flex, { justify: "start", gap: "xs" },
-            react_1.default.createElement(icons_1.InfoMarkS, { style: { fill: 'var(--color-text-secondary)' } }),
-            react_1.default.createElement(dist_1.Typography.Text, { view: "caps", color: "secondary" }, t('prices:totalPriceDescription', {
+        !!totalHeads && (react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
+            react_1.default.createElement(InfoMarkS_1.default, { style: { fill: 'var(--color-text-secondary)' } }),
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, t('prices:totalPriceDescription', {
                 teamPrice: (0, format_amount_1.formatAmount)(teamPrice, currency),
                 personPrice: (0, format_amount_1.formatAmount)(personPrice, currency),
             })))),
-        !!error && (react_1.default.createElement(dist_1.ToastPlate, { view: "negative" }, error || t('prices:playersError', { minPlayers, maxPlayers: effectiveMax }))),
-        !!onSave && (react_1.default.createElement(dist_1.Button, { onClick: () => onSave({ players: _players, children: _children }), view: "primary", size: "xs" }, t('common:save')))));
+        !!error && (react_1.default.createElement(toast_plate_1.ToastPlate, { view: 'negative' }, error || t('prices:playersError', { minPlayers, maxPlayers: effectiveMax }))),
+        !!onSave && (react_1.default.createElement(button_1.Button, { onClick: () => onSave({ players: _players, children: _children }), view: 'primary', size: 'xs' }, t('common:save')))));
 };
 exports.PlayersAndVariationPicker = PlayersAndVariationPicker;

package/dist/use-localstore-state/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useLocalstoreState = void 0;
+exports.useLocalstoreState = useLocalstoreState;
 const react_1 = require("react");
 function readFromLocalstore(token, defaultValue) {
     if (typeof window === 'undefined') {
@@ -52,4 +52,3 @@ function useLocalstoreState(token, defaultValue) {
     }, [token]);
     return [value, setStoredValue];
 }
-exports.useLocalstoreState = useLocalstoreState;

package/dist/use-players-and-variation-picker/index.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable no-nested-ternary */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -15,9 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.usePlayersAndVariationPicker = void 0;
-/* eslint-disable no-nested-ternary */
-const react_1 = require("react");
 const use_api_method_1 = require("@escapenavigator/services/dist/hooks/use-api-method");
+const react_1 = require("react");
 __exportStar(require("./types"), exports);
 const variationKey = (variation) => { var _a; return (_a = variation.id) !== null && _a !== void 0 ? _a : `${variation.tariffId}-${variation.duration}`; };
 /**
@@ -48,7 +48,7 @@ const usePlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration,
             orderId,
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [slot === null || slot === void 0 ? void 0 : slot.id, slot === null || slot === void 0 ? void 0 : slot.questroomId, slot === null || slot === void 0 ? void 0 : slot.date, slot === null || slot === void 0 ? void 0 : slot.start, orderId]);
+    }, [slot === null || slot === void 0 ? void 0 : slot.id, slot === null || slot === void 0 ? void 0 : slot.questroomId, slot === null || slot === void 0 ? void 0 : slot.date, slot === null || slot === void 0 ? void 0 : slot.start, orderId, slot, fetch]);
     const variations = (0, react_1.useMemo)(() => (data === null || data === void 0 ? void 0 : data.variations) || [], [data === null || data === void 0 ? void 0 : data.variations]);
     const isFlex = !!(data === null || data === void 0 ? void 0 : data.isFlex);
     const findCurrentVariation = (rows) => {
@@ -58,8 +58,7 @@ const usePlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration,
             // Match by (tariffId, duration) when both are known; fall back to
             // duration-only or tariff-only when one is missing.
             if (currentTariffId != null && currentDuration != null) {
-                const exact = rows.find((row) => row.tariffId === currentTariffId
-                    && row.duration === currentDuration);
+                const exact = rows.find((row) => row.tariffId === currentTariffId && row.duration === currentDuration);
                 if (exact)
                     return exact;
             }
@@ -84,7 +83,7 @@ const usePlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration,
     };
     const propsSelectedVariation = (0, react_1.useMemo)(() => findCurrentVariation(variations), 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [variations, isFlex, currentTariffId, currentDuration]);
+    [variations, findCurrentVariation]);
     const propsSelectedOptionId = propsSelectedVariation
         ? variationKey(propsSelectedVariation)
         : undefined;
@@ -96,7 +95,7 @@ const usePlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration,
     const [clickedOptionId, setClickedOptionId] = (0, react_1.useState)(undefined);
     (0, react_1.useEffect)(() => {
         setClickedOptionId(undefined);
-    }, [propsSelectedOptionId, data === null || data === void 0 ? void 0 : data.slotId]);
+    }, []);
     const selectedOptionId = clickedOptionId !== null && clickedOptionId !== void 0 ? clickedOptionId : propsSelectedOptionId;
     const selectedVariation = (0, react_1.useMemo)(() => {
         var _a;
@@ -111,15 +110,15 @@ const usePlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration,
             const isCurrent = id === selectedOptionId;
             const label = isFlex
                 ? `${variation.duration} ${t('common:минут')}`
-                : (variation.isDefault
+                : variation.isDefault
                     ? 'Default'
-                    : variation.title || `Tariff ${variation.tariffId}`);
+                    : variation.title || `Tariff ${variation.tariffId}`;
             return {
                 id,
                 tariffId: variation.tariffId,
                 duration: variation.duration,
                 label,
-                description: !isFlex ? (_a = variation.description) !== null && _a !== void 0 ? _a : null : null,
+                description: !isFlex ? ((_a = variation.description) !== null && _a !== void 0 ? _a : null) : null,
                 isCurrent,
                 isFree: !!variation.isFree,
             };

package/dist/use-players-and-variation-picker/types.d.ts

@@ -22,6 +22,7 @@ export type PickerSlotVariation = {
     tariff: {
         [k: string]: number;
     };
+    childPriceDescription?: string | null;
     minPlayers: number;
     maxPlayers: number;
     numSeatsAvailable: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/hooks",
-  "version": "1.10.104",
+  "version": "1.10.106",
   "publishConfig": {
     "access": "public"
   },
@@ -14,10 +14,10 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/services": "^1.10.112",
-    "@escapenavigator/types": "^1.10.103",
-    "@escapenavigator/utils": "^1.10.107",
-    "react": "^18.3.1"
+    "@escapenavigator/services": "^1.10.114",
+    "@escapenavigator/types": "^1.10.105",
+    "@escapenavigator/utils": "^1.10.109",
+    "react": "19.2.6"
   },
   "peerDependencies": {
     "@alphakits/icons": "*",
@@ -25,28 +25,10 @@
     "react-i18next": "*"
   },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^13.0.0",
-    "@rollup/plugin-replace": "^2.4.2",
-    "@rollup/plugin-typescript": "^8.2.1",
     "@types/jest": "^29.5.10",
-    "@wessberg/rollup-plugin-ts": "^1.3.14",
-    "alphakit-presets-lint": "^1.0.0",
-    "babel-jest": "^26.6.3",
     "jest": "^29.7.0",
-    "rollup-plugin-auto-external": "^2.0.0",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-multi-input": "1.3.1",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-terser": "^7.0.2",
     "ts-jest": "^29.1.1",
-    "ts-loader": "^6.2.1",
-    "typescript": "^4.5.4"
+    "typescript": "^5.6"
   },
-  "perDependencies": {
-    "react": "^18.3.1",
-    "axios": "^0.21.1"
-  },
-  "gitHead": "0e41f6e541edd14685f9dd242e17207d1b8f6660"
+  "gitHead": "7817557aa218ca9409972a254082d278f9ae9575"
 }