@redneckz/wildless-cms-uni-blocks 0.11.0 → 0.11.1

package/src/components/Calculator/useCreditCalculatorParams.ts

@@ -1,8 +1,11 @@
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { clamp } from '../../utils/clamp';
 import type { CreditCalculatorParamsViewSettings } from './CalculatorContent';
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
+import { getCreditCalculatorLimitParams } from './getCreditCalculatorLimitParams';
+import { getCreditCalculatorRateParams } from './getCreditCalculatorRateParams';
 import { getMonthlyPayment } from './getMonthlyPayment';
-import { checkRangeByKeys, getLimitRangeByKeys } from './rangeHelpers';
+import { getLimitRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonCreditParams {
@@ -48,90 +51,52 @@ export const useCreditCalculatorParams = (
   sourceBookDir?: string,
   paramsViewSettings?: CreditCalculatorParamsViewSettings,
 ): CreditCalculatorParams => {
-  const { moneyValue, monthsValue } = userInputParams;
+  let { moneyValue, monthsValue } = userInputParams;
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
+  const rateRows = data?.rateRows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
+  const limitRows = data?.limitRows || [];
+  const creditCalculatorSourceBookLimitParams = getCreditCalculatorLimitParams({
+    limitRows,
+    userInputParams,
+    paramsViewSettings,
+  });
 
-  const creditCalculatorSourceBookLimitParams = data?.limitRows?.find((row) =>
-    checkRowCommonParams({
-      row,
-      userInputParams,
-      paramsViewSettings,
-    }),
+  const { minSum, maxSum } = getLimitRangeByKeys(
+    ['minSum', 'maxSum'],
+    creditCalculatorSourceBookLimitParams,
+    rateRows,
+  );
+  const { minMonths, maxMonths } = getLimitRangeByKeys(
+    ['minMonths', 'maxMonths'],
+    creditCalculatorSourceBookLimitParams,
+    rateRows,
   );
 
-  const creditCalculatorSourceBookRateParams =
-    data?.rateRows?.find(
-      (row) =>
-        checkRowCommonParams({
-          row,
-          userInputParams,
-          paramsViewSettings,
-        }) &&
-        checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
-        checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row),
-    ) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
+  moneyValue = clamp(moneyValue, minSum, maxSum);
+  monthsValue = clamp(monthsValue, minMonths, maxMonths);
 
-  const { rate } = creditCalculatorSourceBookRateParams;
+  const creditCalculatorRateParams = getCreditCalculatorRateParams({
+    rateRows,
+    userInputParams,
+    paramsViewSettings,
+    moneyValue,
+    monthsValue,
+  });
+  const { rate } = creditCalculatorRateParams;
   const monthlyPayment = getMonthlyPayment(rate, userInputParams);
-  const rateRows = data?.rateRows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
 
   return useMemo(
     () => ({
-      ...creditCalculatorSourceBookRateParams,
-      ...getLimitRangeByKeys(['minSum', 'maxSum'], creditCalculatorSourceBookLimitParams, rateRows),
-      ...getLimitRangeByKeys(
-        ['minMonths', 'maxMonths'],
-        creditCalculatorSourceBookLimitParams,
-        rateRows,
-      ),
+      ...creditCalculatorRateParams,
       ...userInputParams,
+      minSum,
+      maxSum,
+      minMonths,
+      maxMonths,
+      moneyValue,
+      monthsValue,
       monthlyPayment,
     }),
     [userInputParams, data],
   );
 };
-
-interface CheckSourceBookRowProps {
-  row: CommonCreditParams;
-  userInputParams: CreditCalculatorUserInputParams;
-  paramsViewSettings?: CreditCalculatorParamsViewSettings;
-}
-
-interface CheckSourceBookRowFieldProps extends CheckSourceBookRowProps {
-  fieldKey: string;
-  viewSettingFieldKey: string;
-}
-
-const checkRowCommonParams = (props: CheckSourceBookRowProps) =>
-  checkRowParam({
-    ...props,
-    fieldKey: 'isSalaryClient',
-    viewSettingFieldKey: 'isShowSalaryClient',
-  }) &&
-  checkRowParam({
-    ...props,
-    fieldKey: 'isStateEmployee',
-    viewSettingFieldKey: 'isShowStateEmployee',
-  }) &&
-  checkRowParam({
-    ...props,
-    fieldKey: 'isPensionClient',
-    viewSettingFieldKey: 'isShowPensionClient',
-  }) &&
-  checkRowParam({
-    ...props,
-    fieldKey: 'isInsurance',
-    viewSettingFieldKey: 'isShowInsurance',
-  });
-
-const checkRowParam = ({
-  row,
-  userInputParams,
-  paramsViewSettings,
-  fieldKey,
-  viewSettingFieldKey,
-}: CheckSourceBookRowFieldProps) => {
-  const isExclude = paramsViewSettings ? !paramsViewSettings[viewSettingFieldKey] : false;
-
-  return isExclude || userInputParams[fieldKey] === row[fieldKey];
-};

package/src/components/Footer/TextInformation.tsx

@@ -6,13 +6,13 @@ import { textInformationTextSize } from './textInformationTextSize';
 
 export const TextInformation = JSX<FooterLink>(({ className = '', links }) => (
   <div className={className}>
-    <div className="pt-5 sm:py-4">
+    <div className="pt-4 xl:pt-5">
       <Text size={textInformationTextSize} color="text-secondary-text">
         {`\u00a9\u00A02000-${new Date().getFullYear()}\u00A0АО \u00ABРоссельхозбанк\u00BB Генеральная лицензия Банка России \u2116\u00A03349 от\u00A012.08.2015\u00A0г.`}
       </Text>
     </div>
     {links?.length ? (
-      <div className="flex justify-start items-start gap-5 pt-2.5">
+      <div className="flex justify-start items-start gap-5 pt-4">
         {links.map((_, i) => (
           <TextInformationLink key={String(i)} index={i} {..._} />
         ))}

package/src/components/ProductBlock/ProductBlockInner.tsx

@@ -35,7 +35,7 @@ export const ProductBlockInner = JSX<ProductBlockInnerProps>(
         className={className}
         insetTitle={
           <Headline
-            className="max-w-[600px] xl:max-w-[800px]"
+            className="max-w-[600px] xl:max-w-[728px]"
             title={title}
             description={description}
             headlineVersion={headlineVersion}

package/src/ui-kit/Img/ImgAsPicture.tsx

@@ -45,7 +45,7 @@ export const ImgAsPicture = JSX<ImageProps>(
 const renderImg = (image: Picture, imageClassName = '', isMobile = false) => {
   const style = {
     width: image.size?.width ? `${image.size?.width}px` : '100%',
-    height: image.size?.height ? `${image.size?.height}px` : '100%',
+    height: image.size?.height ? `${image.size?.height}px` : 'auto',
   };
 
   const title = image.title || '';

package/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -18,7 +18,7 @@ export const TableInnerButton = JSX<TableInnerButtonProps>(({ isOpen, onClick })
       onClick={onClick}
       className="w-full flex items-center justify-center rounded-none py-5"
     >
-      <div className="text-h4">{isOpen ? 'Скрыть' : 'Показать ставки по вкладу'}</div>
+      <div className="text-h4">{isOpen ? 'Скрыть' : 'Показать'}</div>
       <Icon
         name={isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon'}
         className="ml-3"

package/tailwind.config.cjs

@@ -9,21 +9,6 @@ module.exports = {
     filter: true,
   },
   theme: {
-    screens: {
-      sm: { max: '767px' },
-      // => @media (max-width: 767px) { ... }
-
-      md: { min: '768px', max: '1023px' },
-      // => @media (min-width: 768px and max-width: 1023px) { ... }
-
-      lg: { min: '1024px', max: '1279px' },
-      // => @media (min-width: 1024px and max-width: 1279px) { ... }
-
-      xl: { min: '1280px' },
-      // => @media (min-width: 1280px) { ... }
-      xl: { min: '1280px' },
-      // => @media (min-width: 1280px) { ... }
-    },
     container: {
       center: true,
     },