@redneckz/wildless-cms-uni-blocks 0.14.564 → 0.14.566

package/bundle/bundle.umd.js

@@ -1100,7 +1100,7 @@
             },
         ];
     };
-    const shellowCompare = (a, b) => Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
+    const shellowCompare = (a, b) => a && b && Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
 
     const ApplicationFormLayout = JSX((props) => {
         const { className, title, children, ...rest } = props;
@@ -1382,8 +1382,11 @@
     }, isDisabled ? 'text-gray hover:bg-transparent' : 'cursor-pointer');
 
     const WEEK_DAYS = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
-    const Calendar = JSX(({ today, currentMonth, currentYear, min, max, onDateSelect = noop }) => {
-        const handleDateClick = useCallback((date) => onDateSelect(date), []);
+    const Calendar = JSX(({ today, currentMonth, currentYear, min, max, onDateSelect = noop, setValue = noop }) => {
+        const handleDateClick = useCallback((date) => {
+            onDateSelect(date);
+            setValue(false);
+        }, []);
         const { firstDayOfWeek, totalDays } = useMemo(() => ({
             firstDayOfWeek: new Date(currentYear, currentMonth, 1).getDay() - 1,
             totalDays: new Date(currentYear, currentMonth + 1, 0).getDate(),
@@ -1484,7 +1487,7 @@
             selectedMonth,
             showCalendar,
         });
-        return (jsxs("div", { className: style('space-y-xs', className), ref: ref, children: [renderLabel(label), jsxs("div", { className: "relative", children: [renderDatePickerForm(handleChangeVisibleCalendar, value, valid), showCalendar ? (jsxs("div", { className: "absolute bg-white z-20 select-none", children: [jsxs("div", { className: "flex gap-s", children: [jsx("div", { className: "my-auto", onClick: handlePrevMonth, children: jsx(Icon, { ...ICON_PROPS, className: "-rotate-90 cursor-pointer" }) }), jsx(Select, { onChange: handleSelectMonth, value: { key: months[selectedMonth] }, options: monthsOptions, ...SELECT_PROPS }), jsx(Select, { onChange: handleSelectYear, value: { key: String(selectedYear) }, options: yearsOptions, ...SELECT_PROPS }), jsx("div", { className: "my-auto", onClick: handleNextMonth, children: jsx(Icon, { ...ICON_PROPS, className: "rotate-90 cursor-pointer" }) })] }), jsx(Calendar, { today: value, currentMonth: selectedMonth, currentYear: selectedYear, onDateSelect: onChange, min: minDate, max: maxDate })] })) : null] })] }));
+        return (jsxs("div", { className: style('space-y-xs', className), ref: ref, children: [renderLabel(label), jsxs("div", { className: "relative", children: [renderDatePickerForm(handleChangeVisibleCalendar, value, valid), showCalendar ? (jsxs("div", { className: "absolute bg-white z-20 select-none bottom-full", children: [jsxs("div", { className: "flex gap-s", children: [jsx("div", { className: "my-auto", onClick: handlePrevMonth, children: jsx(Icon, { ...ICON_PROPS, className: "-rotate-90 cursor-pointer" }) }), jsx(Select, { onChange: handleSelectMonth, value: { key: months[selectedMonth] }, options: monthsOptions, ...SELECT_PROPS }), jsx(Select, { onChange: handleSelectYear, value: { key: String(selectedYear) }, options: yearsOptions, ...SELECT_PROPS }), jsx("div", { className: "my-auto", onClick: handleNextMonth, children: jsx(Icon, { ...ICON_PROPS, className: "rotate-90 cursor-pointer" }) })] }), jsx(Calendar, { today: value, currentMonth: selectedMonth, currentYear: selectedYear, onDateSelect: onChange, min: minDate, max: maxDate })] })) : null] })] }));
     });
     const renderDatePickerForm = (handleChangeVisibleCalendar, value, valid) => (jsxs("div", { onClick: handleChangeVisibleCalendar, className: style(formStyle, valid ? 'border-gray' : 'border-error'), children: [jsx(Paragraph, { children: value && formatDate(value) }), jsx(Icon, { ...ICON_PROPS, name: "CalendarIcon" })] }));
 
@@ -3197,6 +3200,37 @@
 
     const isRubles = (currency = 'rub') => currency === 'rub';
 
+    const normalizeDepositParams = (rows) => (_) => !rows
+        ? _
+        : {
+            ..._,
+            ...normalizeReplenishWithdrawn(_),
+            ...normalizeMoneyValue(_, rows),
+            ...normalizeMonthValue(_, rows),
+            ...normalizeCurrency(_, rows),
+        };
+    const normalizeMonthValue = (_, rows) => {
+        const { minMonths, maxMonths } = getRangeByKeys(['minMonths', 'maxMonths'], getRows(rows, _?.currency));
+        const monthsValue = _.monthsValue || Math.round((minMonths + maxMonths) / 2);
+        return { monthsValue: clamp(monthsValue, minMonths, maxMonths) };
+    };
+    const normalizeMoneyValue = (_, rows) => {
+        const { minSum, maxSum } = getRangeByKeys(['minSum', 'maxSum'], getRows(rows, _?.currency));
+        const moneyValue = _.moneyValue || minSum;
+        return { moneyValue: clamp(moneyValue, minSum, maxSum) };
+    };
+    const normalizeCurrency = (_, rows) => ({
+        currency: _?.currency ?? rows?.map((row) => row.currency)?.[0],
+    });
+    const normalizeReplenishWithdrawn = (_) => {
+        const _isRubles = isRubles(_?.currency?.key);
+        return { isReplenish: _isRubles && _?.isReplenish, isWithdrawn: _isRubles && _?.isWithdrawn };
+    };
+    const getRows = (rows, currencyValue) => {
+        const { rates } = rows?.find((_) => _?.currency.key === currencyValue?.key) ?? {};
+        return rates ?? rows?.[0]?.rates;
+    };
+
     const renderRegistrationType = (props) => renderBinaryRadioButtonGroup({
         ...props,
         items: [
@@ -3249,28 +3283,6 @@
     };
     const renderSeparator = (isShow = false) => isShow ? jsx("div", { className: "border-b border-main-divider w-full" }) : null;
 
-    const normalizeMonthValue = (_, rows) => {
-        const { minMonths, maxMonths } = getRangeByKeys(['minMonths', 'maxMonths'], getRows(rows, _?.currency));
-        const monthsValue = _.monthsValue || Math.round((minMonths + maxMonths) / 2);
-        return { monthsValue: clamp(monthsValue, minMonths, maxMonths) };
-    };
-    const normalizeMoneyValue = (_, rows) => {
-        const { minSum, maxSum } = getRangeByKeys(['minSum', 'maxSum'], getRows(rows, _?.currency));
-        const moneyValue = _.moneyValue || minSum;
-        return { moneyValue: clamp(moneyValue, minSum, maxSum) };
-    };
-    const normalizeCurrency = (_, rows) => ({
-        currency: _?.currency ?? rows?.map((row) => row.currency)?.[0],
-    });
-    const normalizeReplenishWithdrawn = (_) => {
-        const _isRubles = isRubles(_?.currency?.key);
-        return { isReplenish: _isRubles && _?.isReplenish, isWithdrawn: _isRubles && _?.isWithdrawn };
-    };
-    const getRows = (rows, currencyValue) => {
-        const { rates } = rows?.find((_) => _?.currency.key === currencyValue?.key) ?? {};
-        return rates ?? rows?.[0]?.rates;
-    };
-
     const MAP = {
         isMonthlyInterestPayment: 'isMonthlyInterestPayment',
         isRemoteRegistration: 'isRemoteRegistration',
@@ -3287,15 +3299,7 @@
     const CalculatorDeposit = UniBlock(({ className, title, calcSource, buttons = [], footnote = '', paramsViewSettings, defaultParams, ...rest }) => {
         const { rows } = calcSource ?? {};
         const currencyOptions = rows?.map((_) => _.currency) ?? [DEFAULT_CURRENCY];
-        const normalize = useCallback((_) => !rows
-            ? _
-            : {
-                ..._,
-                ...normalizeReplenishWithdrawn(_),
-                ...normalizeMoneyValue(_, rows),
-                ...normalizeMonthValue(_, rows),
-                ...normalizeCurrency(_, rows),
-            }, [rows]);
+        const normalize = useCallback(normalizeDepositParams(rows), [rows]);
         const [userInputParams, { field }] = useForm({
             moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
             monthsValue: getMonthsDefaultValue(defaultParams, DEPOSIT_DEFAULT_MONTHS),
@@ -3311,7 +3315,7 @@
         const row = getRows(rows, currencyValue);
         const calcParams = getDepositCalculatorParams(userInputParams, row, paramsViewSettings);
         const { rate, income, finalSum, type = '' } = calcParams;
-        const handleDefaultParamsCals = () => {
+        const handleDefaultParamsCals = useCallback(() => {
             setDefaultParamsCalc({
                 field,
                 defParams: getDefaultParamsMax(row, isNewClient),
@@ -3319,7 +3323,7 @@
                 monthsValue: 'minMonths',
                 map: MAP,
             });
-        };
+        }, [field, rows]);
         useEffect(() => {
             if (!isDefaultParams(defaultParams) && row) {
                 handleDefaultParamsCals();
@@ -6565,7 +6569,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.563";
+    const packageVersion = "0.14.565";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;