@redneckz/wildless-cms-uni-blocks 0.14.3 → 0.14.4

package/mobile/src/components/Calculator/BonusCalculatorForm.tsx

@@ -15,7 +15,7 @@ export interface BonusCalculatorProps extends CommonCalculatorProps {
 }
 
 export const BonusCalculatorForm = JSX<BonusCalculatorProps>(
-  ({ className = '', sourceBookDir = '', buttons, footnote }) => {
+  ({ className = '', sourceBookDir, buttons, footnote }) => {
     const [userInputParams, { field }] = useForm({
       travelExpenseValue: DEFAULT_TRAVEL_MIN_SUM,
       restExpenseValue: DEFAULT_REST_MIN_SUM,

package/mobile/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -22,7 +22,7 @@ export interface BusinessDepositCalculatorProp extends BusinessDepositCalculator
 }
 
 export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
-  ({ className = '', sourceBookDir, buttons, footnote, bottomFootnote, isShowDepositeName }) => {
+  ({ className = '', rateParams, buttons, footnote, bottomFootnote, isShowDepositeName }) => {
     const [userInputParams, { field }] = useForm({
       moneyValue: BUSINESS_DEFAULT_SUM,
       daysValue: BUSINESS_DEFAULT_DAYS,
@@ -32,7 +32,10 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
       isMonthlyInterestPayment: false,
     });
 
-    const calculatorParams = useBusinessDepositCalculatorParams(userInputParams, sourceBookDir);
+    const calculatorParams = useBusinessDepositCalculatorParams(
+      userInputParams,
+      rateParams?.sourceBookDir,
+    );
     const { income, finalSum, rate, isUnavailableByTerm, depositeName } = calculatorParams;
 
     return (

package/mobile/src/components/Calculator/Calculator.example.json

@@ -1,5 +1,6 @@
 {
   "content": {
+    "tabAlign": "left",
     "calculatorTabs": [
       {
         "nav": {

package/mobile/src/components/Calculator/Calculator.ui.json

@@ -11,6 +11,14 @@
           "sourceBookDir": {
             "ui:widget": "sourceBook"
           },
+          "rateParams": {
+            "rateType": {
+              "ui:widget": "hidden"
+            },
+            "sourceBookDir": {
+              "ui:widget": "sourceBook"
+            }
+          },
           "calcType": {
             "ui:widget": "hidden"
           },

package/mobile/src/components/Calculator/CalculatorContent.ts

@@ -1,9 +1,36 @@
+import { Align } from '../../model/Align';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { Footnote } from '../../model/Footnote';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
 import type { IconProps } from '../../model/Picture';
 import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
+export interface RateParams {
+  /** @title Адрес справочника */
+  sourceBookDir?: string;
+}
+
+/**
+ * @title ЮЛ
+ * @default {"rateType": "UL"}
+ */
+export type ULRateDef = RateParams & {
+  rateType: 'UL';
+};
+
+/**
+ * @title ИП
+ * @default {"rateType": "IP"}
+ */
+export type IPRateDef = RateParams & {
+  rateType: 'IP';
+};
+
+/**
+ * @title Назначение ставки
+ */
+export type RateParamsDef = EmptyOption | ULRateDef | IPRateDef;
+
 export type CommonCalculatorProps = Footnote &
   ButtonsSectionContent & {
     /** @title Адрес справочника */
@@ -51,7 +78,9 @@ export interface DepositCalculatorProps extends CommonCalculatorProps {
   paramsViewSettings?: DepositCalculatorParamsViewSettings;
 }
 
-export interface BusinessDepositCalculatorProps extends CommonCalculatorProps {
+export interface BusinessDepositCalculatorProps extends Footnote, ButtonsSectionContent {
+  /** @title Ставка для */
+  rateParams?: RateParamsDef;
   /** @title Сноска снизу блока */
   bottomFootnote?: string;
   /** @title Показывать название депозита */
@@ -151,6 +180,7 @@ export type CalculatorTab = {
  * @title Калькулятор
  */
 export interface CalculatorContent {
+  tabAlign?: Align;
   /** @title Вкладки */
   calculatorTabs?: CalculatorTab[];
 }

package/mobile/src/components/Calculator/CreditCalculatorForm.tsx

@@ -1,21 +1,21 @@
 /* eslint-disable max-lines, max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { style } from '../../utils/style';
 import type {
   CreditCalculatorParamsViewSettings,
   CreditCalculatorProps,
 } from './CalculatorContent';
+import { CalculatorValueBlock } from './CalculatorValueBlock';
+import { CREDIT_DEFAULT_SUM, DEFAULT_MONTHS } from './constants';
 import { renderFootnote } from './renderFootnote';
-import { renderWantedSumInput } from './renderWantedSumInput';
 import { renderMonthsInput } from './renderMonthsInput';
-import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
-import { CREDIT_DEFAULT_SUM, DEFAULT_MONTHS } from './constants';
-import { CreditCalculatorParams, useCreditCalculatorParams } from './useCreditCalculatorParams';
 import { renderPaymentType } from './renderPaymentType';
-import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { renderRate } from './renderRate';
-import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
+import { renderWantedSumInput } from './renderWantedSumInput';
+import { CreditCalculatorParams, useCreditCalculatorParams } from './useCreditCalculatorParams';
 
 export interface CreditCalculatorProp extends CreditCalculatorProps {
   className?: string;

package/mobile/src/components/Calculator/DepositCalculatorForm.tsx

@@ -1,21 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
 import type {
   DepositCalculatorParamsViewSettings,
   DepositCalculatorProps,
 } from './CalculatorContent';
-import { renderFootnote } from './renderFootnote';
-import { renderWantedSumInput } from './renderWantedSumInput';
-import { renderMonthsInput } from './renderMonthsInput';
-import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
-import { DEPOSIT_DEFAULT_SUM } from './constants';
-import { DepositCalculatorParams, useDepositCalculatorParams } from './useDepositCalculatorParams';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
+import { DEPOSIT_DEFAULT_SUM } from './constants';
+import { renderFootnote } from './renderFootnote';
 import { renderInterestPayment } from './renderInterestPayment';
-import { renderRegistrationType } from './renderRegistrationType';
+import { renderMonthsInput } from './renderMonthsInput';
 import { renderRate } from './renderRate';
+import { renderRegistrationType } from './renderRegistrationType';
+import { renderWantedSumInput } from './renderWantedSumInput';
+import { DepositCalculatorParams, useDepositCalculatorParams } from './useDepositCalculatorParams';
 
 export interface DepositCalculatorProp extends DepositCalculatorProps {
   className?: string;

package/mobile/src/components/Calculator/useBonusCalculatorParams.ts

@@ -29,7 +29,7 @@ export interface BonusCalculatorParams
 
 export const useBonusCalculatorParams = (
   userInputParams: BonusCalculatorUserInputParams,
-  sourceBookDir: string,
+  sourceBookDir?: string,
 ) => {
   const { travelExpenseValue, restExpenseValue } = userInputParams;
   const bonusCalculatorSourceBookParams =

package/mobile/src/content-page-repository/transformHTML.ts

@@ -1,5 +1,5 @@
 import rehypeParse from 'rehype-parse';
-import rehypeSanitize from 'rehype-sanitize';
+import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
 import rehypeStringify from 'rehype-stringify';
 import { unified } from 'unified';
 import { replaceHeadingTags } from './replaceHeadingTags';
@@ -9,9 +9,17 @@ export async function transformHTML(html: string | null | undefined): Promise<st
     return '';
   }
 
+  const extendedSchema = {
+    ...defaultSchema,
+    protocols: {
+      ...defaultSchema.protocols,
+      href: [...(defaultSchema?.protocols?.href || []), 'tel'],
+    },
+  };
+
   const result = await unified()
     .use(rehypeParse)
-    .use(rehypeSanitize)
+    .use(rehypeSanitize, extendedSchema)
     .use(rehypeStringify)
     .process(html);
 

package/mobile/src/model/EmptyOptionType.ts

@@ -1,4 +1,4 @@
 /**
- * @title Выберите блок
+ * @title Не выбрано
  */
 export type EmptyOption = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/Calculator/BonusCalculatorForm.tsx

@@ -15,7 +15,7 @@ export interface BonusCalculatorProps extends CommonCalculatorProps {
 }
 
 export const BonusCalculatorForm = JSX<BonusCalculatorProps>(
-  ({ className = '', sourceBookDir = '', buttons, footnote }) => {
+  ({ className = '', sourceBookDir, buttons, footnote }) => {
     const [userInputParams, { field }] = useForm({
       travelExpenseValue: DEFAULT_TRAVEL_MIN_SUM,
       restExpenseValue: DEFAULT_REST_MIN_SUM,

package/src/components/Calculator/BusinessDepositCalculatorForm.tsx

@@ -22,7 +22,7 @@ export interface BusinessDepositCalculatorProp extends BusinessDepositCalculator
 }
 
 export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
-  ({ className = '', sourceBookDir, buttons, footnote, bottomFootnote, isShowDepositeName }) => {
+  ({ className = '', rateParams, buttons, footnote, bottomFootnote, isShowDepositeName }) => {
     const [userInputParams, { field }] = useForm({
       moneyValue: BUSINESS_DEFAULT_SUM,
       daysValue: BUSINESS_DEFAULT_DAYS,
@@ -32,7 +32,10 @@ export const BusinessDepositCalculatorForm = JSX<BusinessDepositCalculatorProp>(
       isMonthlyInterestPayment: false,
     });
 
-    const calculatorParams = useBusinessDepositCalculatorParams(userInputParams, sourceBookDir);
+    const calculatorParams = useBusinessDepositCalculatorParams(
+      userInputParams,
+      rateParams?.sourceBookDir,
+    );
     const { income, finalSum, rate, isUnavailableByTerm, depositeName } = calculatorParams;
 
     return (

package/src/components/Calculator/Calculator.example.json

@@ -1,5 +1,6 @@
 {
   "content": {
+    "tabAlign": "left",
     "calculatorTabs": [
       {
         "nav": {

package/src/components/Calculator/Calculator.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useCarouselControls } from '../../hooks/useCarouselControls';
+import { Align } from '../../model/Align';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
@@ -14,6 +15,7 @@ export interface CalculatorProps extends CalculatorContent, UniBlockProps {}
 interface TabsProps {
   activeIndex: number;
   tabsNav: CalculatorNav[];
+  tabAlign?: Align;
   slideIndexShift: number;
   onClick: (index: number) => void;
 }
@@ -25,8 +27,14 @@ interface NavButtonProps {
   onClick: () => void;
 }
 
+const alignStyleMap: Record<Align, string> = {
+  start: 'justify-start',
+  center: 'justify-center',
+  end: 'justify-end',
+};
+
 export const Calculator = JSX<CalculatorProps>(
-  ({ className = '', calculatorTabs = [], ...rest }) => {
+  ({ className = '', tabAlign, calculatorTabs = [], ...rest }) => {
     const tabsNav = calculatorTabs.map((_) => _.nav || ({} as CalculatorNav));
     const calculatorBlocks = calculatorTabs.map(
       ({ calculatorBlock }) => calculatorBlock || ({} as CalculatorBlockDef),
@@ -48,7 +56,13 @@ export const Calculator = JSX<CalculatorProps>(
       >
         <div className="bg-white">
           {tabsNav.length > 1
-            ? renderTabs({ activeIndex, tabsNav, slideIndexShift, onClick: handleSlideIndexShift })
+            ? renderTabs({
+                activeIndex,
+                tabsNav,
+                tabAlign,
+                slideIndexShift,
+                onClick: handleSlideIndexShift,
+              })
             : null}
           {renderArrows({
             ...controls,
@@ -108,8 +122,9 @@ function renderNavButton({ tab, i, isActive, onClick }: NavButtonProps) {
   );
 }
 
-function renderTabs({ activeIndex, tabsNav, slideIndexShift, onClick }: TabsProps) {
+function renderTabs({ activeIndex, tabsNav, tabAlign, slideIndexShift, onClick }: TabsProps) {
   const CARD_SHIFT = 388;
+  const alignStyle = tabAlign ? alignStyleMap[tabAlign] : '';
 
   return (
     <div>
@@ -117,7 +132,7 @@ function renderTabs({ activeIndex, tabsNav, slideIndexShift, onClick }: TabsProp
         style={{ transform: `translateX(-${activeIndex * CARD_SHIFT}px)` }}
         className="flex flex-col justify-end items-center h-32 pt-4xl box-border duration-1000"
       >
-        <div className="w-full flex flex-nowrap items-end gap-xs">
+        <div className={style('w-full flex flex-nowrap items-end gap-xs', alignStyle)}>
           {tabsNav.map((tab, i) =>
             renderNavButton({
               tab,

package/src/components/Calculator/Calculator.ui.json

@@ -11,6 +11,14 @@
           "sourceBookDir": {
             "ui:widget": "sourceBook"
           },
+          "rateParams": {
+            "rateType": {
+              "ui:widget": "hidden"
+            },
+            "sourceBookDir": {
+              "ui:widget": "sourceBook"
+            }
+          },
           "calcType": {
             "ui:widget": "hidden"
           },

package/src/components/Calculator/CalculatorContent.ts

@@ -1,9 +1,36 @@
+import { Align } from '../../model/Align';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 import type { Footnote } from '../../model/Footnote';
 import type { HeadlineCommonProps, TitleProps } from '../../model/HeadlineType';
 import type { IconProps } from '../../model/Picture';
 import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
+export interface RateParams {
+  /** @title Адрес справочника */
+  sourceBookDir?: string;
+}
+
+/**
+ * @title ЮЛ
+ * @default {"rateType": "UL"}
+ */
+export type ULRateDef = RateParams & {
+  rateType: 'UL';
+};
+
+/**
+ * @title ИП
+ * @default {"rateType": "IP"}
+ */
+export type IPRateDef = RateParams & {
+  rateType: 'IP';
+};
+
+/**
+ * @title Назначение ставки
+ */
+export type RateParamsDef = EmptyOption | ULRateDef | IPRateDef;
+
 export type CommonCalculatorProps = Footnote &
   ButtonsSectionContent & {
     /** @title Адрес справочника */
@@ -51,7 +78,9 @@ export interface DepositCalculatorProps extends CommonCalculatorProps {
   paramsViewSettings?: DepositCalculatorParamsViewSettings;
 }
 
-export interface BusinessDepositCalculatorProps extends CommonCalculatorProps {
+export interface BusinessDepositCalculatorProps extends Footnote, ButtonsSectionContent {
+  /** @title Ставка для */
+  rateParams?: RateParamsDef;
   /** @title Сноска снизу блока */
   bottomFootnote?: string;
   /** @title Показывать название депозита */
@@ -151,6 +180,7 @@ export type CalculatorTab = {
  * @title Калькулятор
  */
 export interface CalculatorContent {
+  tabAlign?: Align;
   /** @title Вкладки */
   calculatorTabs?: CalculatorTab[];
 }

package/src/components/Calculator/CreditCalculatorForm.tsx

@@ -1,21 +1,21 @@
 /* eslint-disable max-lines, max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
+import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { style } from '../../utils/style';
 import type {
   CreditCalculatorParamsViewSettings,
   CreditCalculatorProps,
 } from './CalculatorContent';
+import { CalculatorValueBlock } from './CalculatorValueBlock';
+import { CREDIT_DEFAULT_SUM, DEFAULT_MONTHS } from './constants';
 import { renderFootnote } from './renderFootnote';
-import { renderWantedSumInput } from './renderWantedSumInput';
 import { renderMonthsInput } from './renderMonthsInput';
-import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
-import { CREDIT_DEFAULT_SUM, DEFAULT_MONTHS } from './constants';
-import { CreditCalculatorParams, useCreditCalculatorParams } from './useCreditCalculatorParams';
 import { renderPaymentType } from './renderPaymentType';
-import { CalculatorValueBlock } from './CalculatorValueBlock';
 import { renderRate } from './renderRate';
-import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
+import { renderWantedSumInput } from './renderWantedSumInput';
+import { CreditCalculatorParams, useCreditCalculatorParams } from './useCreditCalculatorParams';
 
 export interface CreditCalculatorProp extends CreditCalculatorProps {
   className?: string;

package/src/components/Calculator/DepositCalculatorForm.tsx

@@ -1,21 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { style } from '../../utils/style';
 import type {
   DepositCalculatorParamsViewSettings,
   DepositCalculatorProps,
 } from './CalculatorContent';
-import { renderFootnote } from './renderFootnote';
-import { renderWantedSumInput } from './renderWantedSumInput';
-import { renderMonthsInput } from './renderMonthsInput';
-import { FormFieldRegisterer, useForm } from '../../hooks/useForm';
-import { DEPOSIT_DEFAULT_SUM } from './constants';
-import { DepositCalculatorParams, useDepositCalculatorParams } from './useDepositCalculatorParams';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { CalculatorValueBlock } from './CalculatorValueBlock';
+import { DEPOSIT_DEFAULT_SUM } from './constants';
+import { renderFootnote } from './renderFootnote';
 import { renderInterestPayment } from './renderInterestPayment';
-import { renderRegistrationType } from './renderRegistrationType';
+import { renderMonthsInput } from './renderMonthsInput';
 import { renderRate } from './renderRate';
+import { renderRegistrationType } from './renderRegistrationType';
+import { renderWantedSumInput } from './renderWantedSumInput';
+import { DepositCalculatorParams, useDepositCalculatorParams } from './useDepositCalculatorParams';
 
 export interface DepositCalculatorProp extends DepositCalculatorProps {
   className?: string;

package/src/components/Calculator/useBonusCalculatorParams.ts

@@ -29,7 +29,7 @@ export interface BonusCalculatorParams
 
 export const useBonusCalculatorParams = (
   userInputParams: BonusCalculatorUserInputParams,
-  sourceBookDir: string,
+  sourceBookDir?: string,
 ) => {
   const { travelExpenseValue, restExpenseValue } = userInputParams;
   const bonusCalculatorSourceBookParams =

package/src/content-page-repository/transformHTML.ts

@@ -1,5 +1,5 @@
 import rehypeParse from 'rehype-parse';
-import rehypeSanitize from 'rehype-sanitize';
+import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
 import rehypeStringify from 'rehype-stringify';
 import { unified } from 'unified';
 import { replaceHeadingTags } from './replaceHeadingTags';
@@ -9,9 +9,17 @@ export async function transformHTML(html: string | null | undefined): Promise<st
     return '';
   }
 
+  const extendedSchema = {
+    ...defaultSchema,
+    protocols: {
+      ...defaultSchema.protocols,
+      href: [...(defaultSchema?.protocols?.href || []), 'tel'],
+    },
+  };
+
   const result = await unified()
     .use(rehypeParse)
-    .use(rehypeSanitize)
+    .use(rehypeSanitize, extendedSchema)
     .use(rehypeStringify)
     .process(html);
 

package/src/model/EmptyOptionType.ts

@@ -1,4 +1,4 @@
 /**
- * @title Выберите блок
+ * @title Не выбрано
  */
 export type EmptyOption = null;