@redneckz/wildless-cms-uni-blocks 0.3.64 → 0.3.65

package/mobile/lib/components/GroupBlock/BlocksTypeProps.d.ts

@@ -1,6 +1,7 @@
+import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
 import type { ProductBlockContent } from '../../components/ProductBlock/ProductBlockContent';
 import type { ProductTileContent } from '../../components/ProductTile/ProductTileContent';
-import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+import type { EmptyOption } from '../../model/EmptyOptionType';
 export interface ActiveHandler {
     context: ContentPageContext;
     blocks?: GroupBlockDef[];
@@ -26,10 +27,6 @@ export declare type ProductBlockDef = ProductBlockContent & GroupBlockCommonProp
 export declare type ProductTileDef = ProductTileContent & GroupBlockCommonProps & {
     blockType: 'ProductTile';
 };
-/**
- * @title Выберите блок
- */
-export declare type EmptyOption = null;
 /**
  * @title Содержимое блока
  */

package/mobile/lib/model/EmptyOptionType.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Выберите блок
+ */
+export declare type EmptyOption = null;

package/mobile/lib/model/EmptyOptionType.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EmptyOptionType.js.map

package/mobile/lib/model/EmptyOptionType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmptyOptionType.js","sourceRoot":"","sources":["../../src/model/EmptyOptionType.ts"],"names":[],"mappings":""}

package/mobile/lib/ui-kit/BlocksList/BlocksListProps.d.ts

@@ -1,14 +1,15 @@
+import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
 import type { GalleryContent } from '../../components/Gallery/GalleryContent';
 import type { HeadlineContent } from '../../components/Headline/HeadlineContent';
 import type { LinkDocsContent } from '../../components/LinkDocs/LinkDocsContent';
+import type { LinkListContent } from '../../components/LinkList/LinkListContent';
 import type { MiniGalleryContent } from '../../components/MiniGallery/MiniGalleryContent';
 import type { PictureTextContent } from '../../components/PictureText/PictureTextContent';
 import type { ProductBlockContent } from '../../components/ProductBlock/ProductBlockContent';
 import type { ProductTileContent } from '../../components/ProductTile/ProductTileContent';
 import type { TextBlockContent } from '../../components/TextBlock/TextBlockContent';
 import type { TileContent } from '../../components/Tile/TileContent';
-import type { LinkListContent } from '../../components/LinkList/LinkListContent';
-import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+import type { EmptyOption } from '../../model/EmptyOptionType';
 export interface ActiveHandler {
     context: ContentPageContext;
     blocks?: BlockDef[];
@@ -69,7 +70,7 @@ export declare type ProductTileBlockListDef = ProductTileContent & {
     blockListType: 'ProductTile';
 };
 /**
- * @title Галлерея
+ * @title Галерея
  * @default {"blockListType": "Gallery"}
  */
 export declare type GalleryBlockListDef = GalleryContent & {
@@ -89,10 +90,6 @@ export declare type MiniGalleryBlockListDef = MiniGalleryContent & {
 export declare type LinkListBlockListDef = LinkListContent & {
     blockListType: 'LinkList';
 };
-/**
- * @title Выберите блок
- */
-export declare type EmptyOption = null;
 /**
  * @title Содержимое блока
  */

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

@@ -0,0 +1,21 @@
+{
+  "calcTabs": [
+    {
+      "nav": {
+        "title": "Вкладка 1",
+        "description": "Описание вкладки 1",
+        "icon": { "icon": "CalendarIcon" }
+      },
+      "calculatorBlock": {
+        "calcType": "CreditCalculatorForm",
+        "buttons": [
+          {
+            "href": "#",
+            "text": "Кнопка 1",
+            "version": "primary"
+          }
+        ]
+      }
+    }
+  ]
+}

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

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import type { CalculatorContent, CalculatorBlockDef } from './CalculatorContent';
 import { ArrowButton } from '../../ui-kit/Button/ArrowButton';
 import { Img } from '../../ui-kit/Img/Img';
-import { renderCalculatorList } from './renderCalculatorList';
+import type { CalculatorBlockDef, CalculatorContent } from './CalculatorContent';
 import { CalculatorNav } from './CalculatorContent';
+import { renderCalculatorBlock } from './renderCalculatorBlock';
 
 export interface CalculatorProps extends CalculatorContent, UniBlockProps {}
 
@@ -72,11 +72,9 @@ export const Calculator = JSX<CalculatorProps>(
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}
           role="list"
         >
-          {renderCalculatorList({
-            context,
-            className,
-            blockCalcTabs,
-          })}
+          {blockCalcTabs?.length
+            ? blockCalcTabs.map(renderCalculatorBlock({ context, className }))
+            : null}
         </div>
       </section>
     );
@@ -99,7 +97,7 @@ function renderNavButton({ tab, i, activeSlideIndex, onClick }: NavButtonProps)
       key={String(i)}
       onClick={onClick}
       aria-label={tab?.title}
-      className={`box-border font-sans relative border-[1px] border-main-stroke cursor-pointer text-left border-b-0 flex
+      className={`box-border font-sans relative border border-main-stroke cursor-pointer text-left border-b-0 flex
       ${btnClassName}`}
     >
       <Img

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

@@ -1,49 +1,96 @@
-import { Picture } from '../../model/Picture';
+import type { EmptyOption } from '../../model/EmptyOptionType';
+import type { Picture } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 export interface CommonCalculatorProps {
+  /** @title Кнопки */
   buttons?: ButtonWithIconProps[];
 }
 
+/**
+ * TODO: данные из справочника
+ **/
 export interface CreditCalculatorParams {
+  /** @hidden */
   isSalary?: boolean;
+  /** @hidden */
   isInsurance?: boolean;
+  /** @hidden */
   isAnnuity?: boolean;
+  /** @hidden */
   minSum?: number;
+  /** @hidden */
   maxSum?: number;
+  /** @hidden */
   minMonths?: number;
+  /** @hidden */
   maxMonths?: number;
+  /** @hidden */
   rateWithInsurance?: number;
+  /** @hidden */
   rateWithoutInsurance?: number;
 }
 
+/**
+ * TODO: данные из справочника
+ **/
 export interface MortgageCalculatorParams {
+  /** @hidden */
   isAnnuity?: boolean;
+  /** @hidden */
   minInitialContribution?: number;
+  /** @hidden */
   minSum?: number;
+  /** @hidden */
   maxSum?: number;
+  /** @hidden */
   minMonths?: number;
+  /** @hidden */
   maxMonths?: number;
+  /** @hidden */
   rateWithInsurance?: number;
+  /** @hidden */
   rateWithoutInsurance?: number;
 }
 
+/**
+ * TODO: данные из справочника
+ **/
 export interface DepositCalculatorParams {
+  /** @hidden */
   minSum?: number;
+  /** @hidden */
   maxSum?: number;
+  /** @hidden */
   minMonths?: number;
+  /** @hidden */
   maxMonths?: number;
+  /** @hidden */
   rate?: number;
 }
 
+/**
+ * TODO: данные из справочника
+ **/
+
 export interface BonusCalculatorParams {
+  /** @hidden */
   bonus?: number;
+  /** @hidden */
   minSumTrip?: number;
+  /** @hidden */
   maxSumTrip?: number;
+  /** @hidden */
   minSumOther?: number;
+  /** @hidden */
   maxSumOther?: number;
 }
 
+/**
+ * ? Общий интерфейс для всех типов калькуляторов?
+ * ? Используется во вложенных функциях. Может быть как то разбить это и вынести отсюда?
+ * @hidden
+ */
 export interface CalculatorParams {
   isAnnuity?: boolean;
   minSum?: number;
@@ -55,7 +102,7 @@ export interface CalculatorParams {
 }
 
 /**
- * @title Заголовок
+ * @title Кредитный калькулятор
  * @default {"calcType": "CreditCalculatorForm"}
  */
 export type CreditCalculatorParamsDef = CreditCalculatorParams &
@@ -64,7 +111,7 @@ export type CreditCalculatorParamsDef = CreditCalculatorParams &
   };
 
 /**
- * @title Заголовок
+ * @title Ипотечный калькулятор
  * @default {"calcType": "MortgageCalculatorForm"}
  */
 export type MortgageCalculatorParamsDef = MortgageCalculatorParams &
@@ -73,7 +120,7 @@ export type MortgageCalculatorParamsDef = MortgageCalculatorParams &
   };
 
 /**
- * @title Заголовок
+ * @title Калькулятор вкладов
  * @default {"calcType": "DepositCalculatorForm"}
  */
 export type DepositCalculatorParamsDef = DepositCalculatorParams &
@@ -82,7 +129,7 @@ export type DepositCalculatorParamsDef = DepositCalculatorParams &
   };
 
 /**
- * @title Заголовок
+ * @title Калькулятор бонусов
  * @default {"calcType": "BonusCalculatorForm"}
  */
 export type BonusCalculatorParamsDef = BonusCalculatorParams &
@@ -91,12 +138,7 @@ export type BonusCalculatorParamsDef = BonusCalculatorParams &
   };
 
 /**
- * @title Выберите калькулятор
- */
-export type EmptyOption = null;
-
-/**
- * @title Калькулятор
+ * @title Настройки калькулятора
  */
 export type CalculatorBlockDef =
   | EmptyOption
@@ -121,7 +163,6 @@ export interface CalculatorNav {
  */
 export interface CalculatorTab {
   nav?: CalculatorNav;
-  /** @title Настройки калькулятора */
   calculatorBlock?: CalculatorBlockDef;
 }
 

package/mobile/src/components/Calculator/{renderCalculatorList.tsx → renderCalculatorBlock.tsx}

@@ -9,15 +9,7 @@ type EmbeddableCalcBlocks = {
   className?: string;
 };
 
-export const renderCalculatorList = ({
-  blockCalcTabs,
-  context,
-  className,
-}: EmbeddableCalcBlocks) => {
-  return blockCalcTabs?.length ? blockCalcTabs.map(renderBlock({ context, className })) : null;
-};
-
-const renderBlock =
+export const renderCalculatorBlock =
   ({ context, className }: any) =>
   (blockCalcTabs: CalculatorBlockDef, i: number) => {
     const type = blockCalcTabs?.calcType;
@@ -27,16 +19,12 @@ const renderBlock =
     const EmbeddedBlock: JSXBlock<EmbeddableCalcProps> = EmbeddableCalcBlocks[type];
     return (
       <section
-        key={`${String(i)}`}
-        className={`box-border relative flex grow-0 shrink-0 basis-full ${className}`}
+        key={String(i)}
+        className={`box-border relative flex shrink-0 basis-full ${className}`}
         role="listitem"
       >
-        <div className={`box-border p-9 w-full`}>
-          <EmbeddedBlock
-            context={context}
-            {...blockCalcTabs}
-            className="!p-0 flex justify-between"
-          />
+        <div className="box-border p-9 w-full">
+          <EmbeddedBlock context={context} {...blockCalcTabs} className="flex justify-between" />
         </div>
       </section>
     );

package/mobile/src/components/CreditCalculator/CreditCalculatorContent.ts

@@ -1,5 +1,8 @@
 import type { Tab } from '../../ui-kit/Tabs/TabsProps';
 
+/**
+ * @hidden
+ */
 export interface CalculatorParams {
   isAnnuity?: boolean;
   minSum?: number;

package/mobile/src/components/GroupBlock/BlocksTypeProps.ts

@@ -1,6 +1,7 @@
+import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
 import type { ProductBlockContent } from '../../components/ProductBlock/ProductBlockContent';
 import type { ProductTileContent } from '../../components/ProductTile/ProductTileContent';
-import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+import type { EmptyOption } from '../../model/EmptyOptionType';
 
 export interface ActiveHandler {
   context: ContentPageContext;
@@ -29,11 +30,6 @@ export type ProductBlockDef = ProductBlockContent &
 export type ProductTileDef = ProductTileContent &
   GroupBlockCommonProps & { blockType: 'ProductTile' };
 
-/**
- * @title Выберите блок
- */
-export type EmptyOption = null;
-
 /**
  * @title Содержимое блока
  */

package/mobile/src/model/EmptyOptionType.ts

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

package/mobile/src/ui-kit/BlocksList/BlocksListProps.ts

@@ -1,14 +1,15 @@
+import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
 import type { GalleryContent } from '../../components/Gallery/GalleryContent';
 import type { HeadlineContent } from '../../components/Headline/HeadlineContent';
 import type { LinkDocsContent } from '../../components/LinkDocs/LinkDocsContent';
+import type { LinkListContent } from '../../components/LinkList/LinkListContent';
 import type { MiniGalleryContent } from '../../components/MiniGallery/MiniGalleryContent';
 import type { PictureTextContent } from '../../components/PictureText/PictureTextContent';
 import type { ProductBlockContent } from '../../components/ProductBlock/ProductBlockContent';
 import type { ProductTileContent } from '../../components/ProductTile/ProductTileContent';
 import type { TextBlockContent } from '../../components/TextBlock/TextBlockContent';
 import type { TileContent } from '../../components/Tile/TileContent';
-import type { LinkListContent } from '../../components/LinkList/LinkListContent';
-import { ContentPageContext } from '../../components/ContentPage/ContentPageContext';
+import type { EmptyOption } from '../../model/EmptyOptionType';
 
 export interface ActiveHandler {
   context: ContentPageContext;
@@ -65,7 +66,7 @@ export type TileBlockListDef = TileContent & { blockListType: 'Tile' };
 export type ProductTileBlockListDef = ProductTileContent & { blockListType: 'ProductTile' };
 
 /**
- * @title Галлерея
+ * @title Галерея
  * @default {"blockListType": "Gallery"}
  */
 export type GalleryBlockListDef = GalleryContent & { blockListType: 'Gallery' };
@@ -82,11 +83,6 @@ export type MiniGalleryBlockListDef = MiniGalleryContent & { blockListType: 'Min
  */
 export type LinkListBlockListDef = LinkListContent & { blockListType: 'LinkList' };
 
-/**
- * @title Выберите блок
- */
-export type EmptyOption = null;
-
 /**
  * @title Содержимое блока
  */

package/package.json

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

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

@@ -0,0 +1,21 @@
+{
+  "calcTabs": [
+    {
+      "nav": {
+        "title": "Вкладка 1",
+        "description": "Описание вкладки 1",
+        "icon": { "icon": "CalendarIcon" }
+      },
+      "calculatorBlock": {
+        "calcType": "CreditCalculatorForm",
+        "buttons": [
+          {
+            "href": "#",
+            "text": "Кнопка 1",
+            "version": "primary"
+          }
+        ]
+      }
+    }
+  ]
+}

package/src/components/Calculator/Calculator.tsx

@@ -1,10 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { UniBlockProps } from '../../types';
-import type { CalculatorContent, CalculatorBlockDef } from './CalculatorContent';
 import { ArrowButton } from '../../ui-kit/Button/ArrowButton';
 import { Img } from '../../ui-kit/Img/Img';
-import { renderCalculatorList } from './renderCalculatorList';
+import type { CalculatorBlockDef, CalculatorContent } from './CalculatorContent';
 import { CalculatorNav } from './CalculatorContent';
+import { renderCalculatorBlock } from './renderCalculatorBlock';
 
 export interface CalculatorProps extends CalculatorContent, UniBlockProps {}
 
@@ -72,11 +72,9 @@ export const Calculator = JSX<CalculatorProps>(
           style={{ transform: `translateX(-${activeSlideIndex}00%)` }}
           role="list"
         >
-          {renderCalculatorList({
-            context,
-            className,
-            blockCalcTabs,
-          })}
+          {blockCalcTabs?.length
+            ? blockCalcTabs.map(renderCalculatorBlock({ context, className }))
+            : null}
         </div>
       </section>
     );
@@ -99,7 +97,7 @@ function renderNavButton({ tab, i, activeSlideIndex, onClick }: NavButtonProps)
       key={String(i)}
       onClick={onClick}
       aria-label={tab?.title}
-      className={`box-border font-sans relative border-[1px] border-main-stroke cursor-pointer text-left border-b-0 flex
+      className={`box-border font-sans relative border border-main-stroke cursor-pointer text-left border-b-0 flex
       ${btnClassName}`}
     >
       <Img

package/src/components/Calculator/CalculatorContent.ts

@@ -1,49 +1,96 @@
-import { Picture } from '../../model/Picture';
+import type { EmptyOption } from '../../model/EmptyOptionType';
+import type { Picture } from '../../model/Picture';
 import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 
 export interface CommonCalculatorProps {
+  /** @title Кнопки */
   buttons?: ButtonWithIconProps[];
 }
 
+/**
+ * TODO: данные из справочника
+ **/
 export interface CreditCalculatorParams {
+  /** @hidden */
   isSalary?: boolean;
+  /** @hidden */
   isInsurance?: boolean;
+  /** @hidden */
   isAnnuity?: boolean;
+  /** @hidden */
   minSum?: number;
+  /** @hidden */
   maxSum?: number;
+  /** @hidden */
   minMonths?: number;
+  /** @hidden */
   maxMonths?: number;
+  /** @hidden */
   rateWithInsurance?: number;
+  /** @hidden */
   rateWithoutInsurance?: number;
 }
 
+/**
+ * TODO: данные из справочника
+ **/
 export interface MortgageCalculatorParams {
+  /** @hidden */
   isAnnuity?: boolean;
+  /** @hidden */
   minInitialContribution?: number;
+  /** @hidden */
   minSum?: number;
+  /** @hidden */
   maxSum?: number;
+  /** @hidden */
   minMonths?: number;
+  /** @hidden */
   maxMonths?: number;
+  /** @hidden */
   rateWithInsurance?: number;
+  /** @hidden */
   rateWithoutInsurance?: number;
 }
 
+/**
+ * TODO: данные из справочника
+ **/
 export interface DepositCalculatorParams {
+  /** @hidden */
   minSum?: number;
+  /** @hidden */
   maxSum?: number;
+  /** @hidden */
   minMonths?: number;
+  /** @hidden */
   maxMonths?: number;
+  /** @hidden */
   rate?: number;
 }
 
+/**
+ * TODO: данные из справочника
+ **/
+
 export interface BonusCalculatorParams {
+  /** @hidden */
   bonus?: number;
+  /** @hidden */
   minSumTrip?: number;
+  /** @hidden */
   maxSumTrip?: number;
+  /** @hidden */
   minSumOther?: number;
+  /** @hidden */
   maxSumOther?: number;
 }
 
+/**
+ * ? Общий интерфейс для всех типов калькуляторов?
+ * ? Используется во вложенных функциях. Может быть как то разбить это и вынести отсюда?
+ * @hidden
+ */
 export interface CalculatorParams {
   isAnnuity?: boolean;
   minSum?: number;
@@ -55,7 +102,7 @@ export interface CalculatorParams {
 }
 
 /**
- * @title Заголовок
+ * @title Кредитный калькулятор
  * @default {"calcType": "CreditCalculatorForm"}
  */
 export type CreditCalculatorParamsDef = CreditCalculatorParams &
@@ -64,7 +111,7 @@ export type CreditCalculatorParamsDef = CreditCalculatorParams &
   };
 
 /**
- * @title Заголовок
+ * @title Ипотечный калькулятор
  * @default {"calcType": "MortgageCalculatorForm"}
  */
 export type MortgageCalculatorParamsDef = MortgageCalculatorParams &
@@ -73,7 +120,7 @@ export type MortgageCalculatorParamsDef = MortgageCalculatorParams &
   };
 
 /**
- * @title Заголовок
+ * @title Калькулятор вкладов
  * @default {"calcType": "DepositCalculatorForm"}
  */
 export type DepositCalculatorParamsDef = DepositCalculatorParams &
@@ -82,7 +129,7 @@ export type DepositCalculatorParamsDef = DepositCalculatorParams &
   };
 
 /**
- * @title Заголовок
+ * @title Калькулятор бонусов
  * @default {"calcType": "BonusCalculatorForm"}
  */
 export type BonusCalculatorParamsDef = BonusCalculatorParams &
@@ -91,12 +138,7 @@ export type BonusCalculatorParamsDef = BonusCalculatorParams &
   };
 
 /**
- * @title Выберите калькулятор
- */
-export type EmptyOption = null;
-
-/**
- * @title Калькулятор
+ * @title Настройки калькулятора
  */
 export type CalculatorBlockDef =
   | EmptyOption
@@ -121,7 +163,6 @@ export interface CalculatorNav {
  */
 export interface CalculatorTab {
   nav?: CalculatorNav;
-  /** @title Настройки калькулятора */
   calculatorBlock?: CalculatorBlockDef;
 }
 

package/src/components/Calculator/{renderCalculatorList.tsx → renderCalculatorBlock.tsx}

@@ -9,15 +9,7 @@ type EmbeddableCalcBlocks = {
   className?: string;
 };
 
-export const renderCalculatorList = ({
-  blockCalcTabs,
-  context,
-  className,
-}: EmbeddableCalcBlocks) => {
-  return blockCalcTabs?.length ? blockCalcTabs.map(renderBlock({ context, className })) : null;
-};
-
-const renderBlock =
+export const renderCalculatorBlock =
   ({ context, className }: any) =>
   (blockCalcTabs: CalculatorBlockDef, i: number) => {
     const type = blockCalcTabs?.calcType;
@@ -27,16 +19,12 @@ const renderBlock =
     const EmbeddedBlock: JSXBlock<EmbeddableCalcProps> = EmbeddableCalcBlocks[type];
     return (
       <section
-        key={`${String(i)}`}
-        className={`box-border relative flex grow-0 shrink-0 basis-full ${className}`}
+        key={String(i)}
+        className={`box-border relative flex shrink-0 basis-full ${className}`}
         role="listitem"
       >
-        <div className={`box-border p-9 w-full`}>
-          <EmbeddedBlock
-            context={context}
-            {...blockCalcTabs}
-            className="!p-0 flex justify-between"
-          />
+        <div className="box-border p-9 w-full">
+          <EmbeddedBlock context={context} {...blockCalcTabs} className="flex justify-between" />
         </div>
       </section>
     );

package/src/components/CreditCalculator/CreditCalculatorContent.ts

@@ -1,5 +1,8 @@
 import type { Tab } from '../../ui-kit/Tabs/TabsProps';
 
+/**
+ * @hidden
+ */
 export interface CalculatorParams {
   isAnnuity?: boolean;
   minSum?: number;