@escapenavigator/hooks 1.10.174 → 2.0.0

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

@@ -91,6 +91,14 @@ export type PlayersAndVariationPickerProps = {
      * resolves (success or error).
      */
     onLoadingChange?: (loading: boolean) => void;
+    /**
+     * Прячет встроенные ценовые подсказки: цену в заголовке секции,
+     * правило по детям (`childPriceDescription`) и строку «стоимость за
+     * команду / за человека». Нужен консьюмерам, которые показывают эти
+     * данные консолидированно в своём месте (например виджет — в пунктирной
+     * сводке рядом с «Итого»). По умолчанию `false` — поведение не меняется.
+     */
+    hidePriceHints?: boolean;
 };
 /**
  * Single shared component that renders the "Variation + Players" picker used

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

@@ -62,7 +62,7 @@ const use_players_and_variation_picker_1 = require("../use-players-and-variation
  * buttons, kids row, price hint, save button) was reimplemented in three
  * 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, onLoadingChange, }) => {
+const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loadSlotDetails, onVariationChange, onVariationResolved, onDetailsLoaded, players = 0, child = 0, tariff: tariffOverride, currency, minPlayers, maxPlayersLimit, slotDiscount, error, t, onChange, onSave, orderId, onLoadingChange, hidePriceHints = false, }) => {
     var _a, _b;
     const { loading: pickerLoading, options: pickerOptions, selectedOptionId, selectedVariation, buildVariationChange, selectVariation, details, } = (0, use_players_and_variation_picker_1.usePlayersAndVariationPicker)({
         slot,
@@ -193,11 +193,15 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
         : teamPriceBase;
     const totalHeads = _players + (_children || 0);
     const personPrice = totalHeads > 0 ? Math.round(teamPrice / totalHeads / 100) * 100 : 0;
+    // Описание цены за детей показываем только когда дети реально выбраны.
+    const childDescription = _children
+        ? (_a = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.childPriceDescription) === null || _a === void 0 ? void 0 : _a.trim()
+        : undefined;
     const showVariations = pickerOptions.length > 1;
     // Клиентское описание показываем только для вариаций — у стандартного
     // (default) тарифа описание не выводим.
     const variationDescription = selectedVariation && !selectedVariation.isDefault
-        ? ((_a = selectedVariation.description) !== null && _a !== void 0 ? _a : null)
+        ? ((_b = selectedVariation.description) !== null && _b !== void 0 ? _b : null)
         : null;
     const handleVariationClick = (optionId, isFree) => {
         if (!isFree)
@@ -230,39 +234,50 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
                         : 'primary', text: option.label, onClick: () => handleVariationClick(option.id, option.isFree) }))))),
             !!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(flex_1.Flex, { gap: 'sm', align: 'center', justify: 'between' },
+                react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, tariff.child ? t('prices:adults') : t('prices:choosePlayersAmount')),
+                !!_children && !!_players && tariff[_players] != null && (react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, (0, format_amount_1.formatAmount)(tariff[_players], currency)))),
             react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, playersOptions
                 .filter((p) => {
                 const total = p.key + (_children || 0);
                 return total >= effectiveMin && total <= effectiveMax;
             })
-                .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))))),
+                .map((p) => (react_1.default.createElement(tag_1.Tag, { key: `adult-${p.key}`, text: `${p.key}`, onClick: () => handleChangePlayers(p.key), view: _players === p.key ? 'primary-inverted' : 'primary' }))))),
         !!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)})`),
-            !!((_b = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.childPriceDescription) === null || _b === void 0 ? void 0 : _b.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: 'sm', align: 'center', justify: 'between' },
+                react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, t('prices:kids')),
+                !!_children && tariff.child != null && (react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, (0, format_amount_1.formatAmount)(_children * tariff.child, currency)))),
+            !hidePriceHints && !!childDescription && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
+                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, childDescription))),
             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(button_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(tag_1.Tag, { key: `child-${count}`, text: count === 0 ? t('prices:noKids') : `${count}`, onClick: () => handleChangeChildren(isActive ? 0 : count), view: isActive ? 'primary-inverted' : 'primary' }));
             })))),
-        !!totalHeads && (react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
+        !hidePriceHints && !!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),
             })))),
+        hidePriceHints && (!!totalHeads || !!childDescription) && (react_1.default.createElement("div", { style: {
+                display: 'flex',
+                flexDirection: 'column',
+                gap: 6,
+                padding: '12px 14px',
+                border: '1px dashed var(--color-border-secondary)',
+                borderRadius: 'calc(var(--widget-radius, 12px) * 0.75)',
+                boxSizing: 'border-box',
+            } },
+            !!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),
+                })))),
+            !!childDescription && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
+                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, childDescription))))),
         !!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')))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/hooks",
-  "version": "1.10.174",
+  "version": "2.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -14,9 +14,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/services": "^1.10.182",
-    "@escapenavigator/types": "^1.10.167",
-    "@escapenavigator/utils": "^1.10.175",
+    "@escapenavigator/services": "^2.0.0",
+    "@escapenavigator/types": "^2.0.0",
+    "@escapenavigator/utils": "^2.0.0",
     "libphonenumber-js": "^1.12.24",
     "react": "19.2.6",
     "react-phone-input-2": "^2.15.1"
@@ -32,5 +32,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.6"
   },
-  "gitHead": "6c5bb1ea0799fb0f47e65fd9d3ea2d206784bf24"
+  "gitHead": "4bc136046ad634699417e72afff25e7b28dfbe7a"
 }