@redneckz/wildless-cms-uni-blocks 0.4.3 → 0.4.4

package/mobile/lib/utils/assertUnreachable.d.ts

@@ -0,0 +1 @@
+export declare function assertUnreachable(x: never): never;

package/mobile/lib/utils/assertUnreachable.js

@@ -0,0 +1,4 @@
+export function assertUnreachable(x) {
+    throw new Error(x);
+}
+//# sourceMappingURL=assertUnreachable.js.map

package/mobile/lib/utils/assertUnreachable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assertUnreachable.js","sourceRoot":"","sources":["../../src/utils/assertUnreachable.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,CAAQ;IACxC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AACrB,CAAC"}

package/mobile/lib/utils/fetchJSON.d.ts

@@ -0,0 +1,2 @@
+export declare function fetchJSON<R = unknown>(url: string, options?: RequestInit): Promise<R | null>;
+export declare function fetchJSONUnsafe<R = unknown>(url: string, options?: RequestInit): Promise<R>;

package/mobile/lib/utils/fetchJSON.js

@@ -0,0 +1,20 @@
+export async function fetchJSON(url, options) {
+    try {
+        return await fetchJSONUnsafe(url, options);
+    }
+    catch (err) {
+        console.error(err);
+    }
+    return null;
+}
+export async function fetchJSONUnsafe(url, options) {
+    const response = await fetch(url, {
+        ...options,
+        headers: {
+            ...options?.headers,
+            'Content-Type': 'application/json',
+        },
+    });
+    return await response.json();
+}
+//# sourceMappingURL=fetchJSON.js.map

package/mobile/lib/utils/fetchJSON.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchJSON.js","sourceRoot":"","sources":["../../src/utils/fetchJSON.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAW,EACX,OAAqB;IAErB,IAAI;QACF,OAAO,MAAM,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;KAC5C;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAc,GAAW,EAAE,OAAqB;IACnF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAChC,GAAG,OAAO;QACV,OAAO,EAAE;YACP,GAAG,OAAO,EAAE,OAAO;YACnB,cAAc,EAAE,kBAAkB;SACnC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;AAC/B,CAAC"}

package/mobile/lib/utils/roundTo.d.ts

@@ -1 +1 @@
-export declare const roundTo: (value: number, precision?: number) => number;
+export declare const roundTo: (value: number | string, precision?: number) => number;

package/mobile/lib/utils/roundTo.js

@@ -1,5 +1,5 @@
 export const roundTo = (value, precision = 2) => {
-    const factor = Math.pow(10, precision);
+    const factor = 10 ** precision;
     return Math.round(parseFloat(String(value)) * factor) / factor;
 };
 //# sourceMappingURL=roundTo.js.map

package/mobile/lib/utils/roundTo.js.map

@@ -1 +1 @@
-{"version":3,"file":"roundTo.js","sourceRoot":"","sources":["../../src/utils/roundTo.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,SAAS,GAAG,CAAC,EAAE,EAAE;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAEvC,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;AACjE,CAAC,CAAC"}
+{"version":3,"file":"roundTo.js","sourceRoot":"","sources":["../../src/utils/roundTo.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAsB,EAAE,SAAS,GAAG,CAAC,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,EAAE,IAAI,SAAS,CAAC;IAE/B,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;AACjE,CAAC,CAAC"}

package/mobile/src/EventBus/EventMap.ts

@@ -1,5 +1,6 @@
 import type { TabActivationEvent } from '../components/Tabs/Tabs';
-
+import type { TariffsTableInnerEvent } from '../ui-kit/InnerTable/InnerTableProps';
 export interface EventMap {
   tab: TabActivationEvent;
+  tariffInnerTable: TariffsTableInnerEvent;
 }

package/mobile/src/components/Accordion/AccordionItem.tsx

@@ -25,11 +25,13 @@ export const AccordionItem = JSX<AccordionItemProps>(
             }`}
           >
             {labelIcon ? (
-              <Img image={labelIcon} width="24" height="24" asSVG className="mr-3" />
+              <Img image={labelIcon} className="mr-3 flex-shrink-0" width="24" height="24" asSVG />
             ) : null}
             {label}
           </span>
-          {hasContent ? <Img className="w-6" image={icon} width="24" height="24" asSVG /> : null}
+          {hasContent ? (
+            <Img className="flex-shrink-0" image={icon} width="24" height="24" asSVG />
+          ) : null}
         </button>
         {hasContent ? <AccordionItemInner blocks={blocks} context={context} /> : null}
       </li>

package/mobile/src/components/BaseTile/BaseTile.tsx

@@ -10,9 +10,9 @@ export const BaseTile = JSX<BaseTileProps>(
       <div className={`font-sans flex flex-col grow h-full items-start ${className}`}>
         {title}
         <div className="flex grow w-full justify-between">
-          <div className="flex flex-col w-full">
+          <div className="flex flex-col justify-between w-full">
             <div>{children}</div>
-            {buttons ? <div className="mt-9">{buttons}</div> : null}
+            {buttons ? <div className="mt-auto">{buttons}</div> : null}
           </div>
           {image}
         </div>

package/mobile/src/components/BenefitsBlock/BenefitsBlockContent.ts

@@ -1,5 +1,5 @@
 import type { Picture } from '../../model/Picture';
-import type { TitleProp } from '../../model/HeadlineType';
+import type { TitleProps } from '../../model/HeadlineType';
 import type { EmptyOption } from '../../model/EmptyOptionType';
 
 /**
@@ -48,7 +48,7 @@ export interface BenefitItemProps {
 /**
  * @title Блок преимущества
  */
-export type BenefitsBlockContent = TitleProp & {
+export type BenefitsBlockContent = TitleProps & {
   /**
    * @title Список преимуществ
    * @maxItems 6

package/mobile/src/components/BlockContent.ts

@@ -6,14 +6,12 @@ import type { ExchangeRateTileContent } from './ExchangeRateTile/ExchangeRateTil
 import type { FooterContent } from './Footer/FooterContent';
 import type { GalleryContent } from './Gallery/GalleryContent';
 import type { GracePeriodContent } from './GracePeriod/GracePeriodContent';
-import type { GroupBlockContent } from './GroupBlock/GroupBlockContent';
 import type { HeaderContent } from './Header/HeaderContent';
 import type { InsuranceAmountBlockContent } from './InsuranceAmountBlock/InsuranceAmountBlockContent';
 import type { LinkDocsContent } from './LinkDocs/LinkDocsContent';
 import type { LinkListContent } from './LinkList/LinkListContent';
 import type { MobileAppTileContent } from './MobileAppTile/MobileAppTileContent';
 import type { NavigationContent } from './Navigation/NavigationContent';
-import type { NavigatorTabsContent } from './NavigatorTabs/NavigatorTabsContent';
 import type { PictureTextContent } from './PictureText/PictureTextContent';
 import type { PlaceholderContent } from './Placeholder/PlaceholderContent';
 import type { ProductBlockContent } from './ProductBlock/ProductBlockContent';
@@ -22,6 +20,7 @@ import type { ProductTileContent } from './ProductTile/ProductTileContent';
 import type { PromoTileContent } from './PromoTile/PromoTileContent';
 import type { SafeDepositRentalContent } from './SafeDepositRental/SafeDepositRentalContent';
 import type { StepsBlockContent } from './StepsBlock/StepsBlockContent';
+import { TabsContent } from './Tabs/TabsContent';
 import type { TariffsTableContent } from './TariffsTable/TariffsTableContent';
 import type { TextBlockContent } from './TextBlock/TextBlockContent';
 import type { TileContent } from './Tile/TileContent';
@@ -41,7 +40,6 @@ export type BlockContent =
   | InsuranceAmountBlockContent
   | LinkDocsContent
   | MobileAppTileContent
-  | NavigatorTabsContent
   | PictureTextContent
   | PlaceholderContent
   | ProductBlockContent
@@ -54,6 +52,6 @@ export type BlockContent =
   | TileContent
   | NavigationContent
   | LinkListContent
-  | GroupBlockContent
   | BonusBenefitsBlockContent
-  | SafeDepositRentalContent;
+  | SafeDepositRentalContent
+  | TabsContent;

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

@@ -109,7 +109,7 @@ function renderTabs({ tabsShift, tabsNav, activeSlideIndex, setActiveSlideIndex
     <div>
       <div
         style={{ transform: `translateX(-${tabsShift * 388}px)` }}
-        className="flex flex-col justify-end items-center h-[126px] pt-[38px] box-border duration-1000"
+        className="flex flex-col justify-end items-center h-[126px] pt-9 box-border duration-1000"
       >
         <div className="w-full flex flex-nowrap items-end gap-2">
           {tabsNav.map((tab, i) =>

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

@@ -1,16 +1,8 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { fetchJSONUnsafe } from '../../utils/fetchJSON';
 
 export function useCalculatorParams<Data>(dir: string) {
-  const { data } = useAsyncData<Data>(
-    `/wcms-resources/${dir}.json`,
-    fetchCalculatorSourceBookParams,
-  );
+  const { data } = useAsyncData<Data>(`/wcms-resources/${dir}.json`, fetchJSONUnsafe);
 
   return data;
 }
-
-async function fetchCalculatorSourceBookParams<Data>(url: string): Promise<Data> {
-  const response = await fetch(url);
-
-  return await response.json();
-}

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

@@ -54,12 +54,10 @@ export const useCreditCalculatorParams = (
   const finalRate = moneyValue <= sumBorder ? rateBottomRange : rateTopRange;
   const monthlyPayment = getMonthlyPayment(finalRate, userInputParams);
 
-  const extendedCalculatorParams = {
+  return {
     ...creditCalculatorSourceBookParams,
     ...userInputParams,
     finalRate,
     monthlyPayment,
   };
-
-  return extendedCalculatorParams;
 };

package/mobile/src/components/Catalog/CatalogCard.tsx

@@ -12,6 +12,12 @@ export interface CatalogCardProps extends CatalogCardType, UniBlockProps {
   version?: BlockVersion;
 }
 
+const iconVersionMap = {
+  default: 'normal',
+  primary: 'white',
+  secondary: 'black',
+};
+
 const cardStyleMap: Record<CatalogProductColor, string> = {
   black: 'bg-black',
   white: 'bg-white',
@@ -50,22 +56,23 @@ const renderColorOption = (color: CatalogProductColor, i: number) => (
 );
 
 const renderButton = (button: ButtonWithIconProps) => {
-  const { icon, iconRight, text } = button;
+  const { icon, iconRight, ...other } = button;
 
-  if (!text) {
+  if (!button?.text) {
     return null;
   }
 
-  const leftIcon = renderButtonIcon(icon);
-  const rightIcon = renderButtonIcon(iconRight);
+  const iconVersion = iconVersionMap[button?.version || 'default'];
+  const leftIcon = renderButtonIcon({ ...icon, iconVersion });
+  const rightIcon = renderButtonIcon({ ...iconRight, iconVersion });
 
   return (
-    <Button className="mt-5 w-full" appendLeft={leftIcon} appendRight={rightIcon} {...button} />
+    <Button className="mt-5 w-full" appendLeft={leftIcon} appendRight={rightIcon} {...other} />
   );
 };
 
 const renderButtonIcon = (buttonIcon?: Picture) => {
-  if (!buttonIcon || !buttonIcon.icon) {
+  if (!buttonIcon || (!buttonIcon?.icon && !buttonIcon?.src)) {
     return null;
   }
 

package/mobile/src/components/ComparisonTable/ComparisonTableContent.ts

@@ -1,6 +1,6 @@
 import type { LinkProps } from '../../model/LinkProps';
-import type { Picture } from '../../model/Picture';
 import type { ListOrientation } from '../../model/ListOrientation';
+import type { Picture } from '../../model/Picture';
 
 /**
  * @hidden
@@ -28,7 +28,13 @@ export interface ColumnHeader {
   title?: string;
   /** @title Подзаголовок */
   subtitle?: string;
+  /**
+   * @default { "format": "webp", "size": { "width": 24 } }
+   */
   icon?: Picture;
+  /**
+   * @default { "format": "webp", "size": { "width": 100 } }
+   */
   image?: Picture;
   link?: LinkProps;
 }
@@ -64,6 +70,7 @@ export interface TableColumnData {
 export interface TableColumnHeader {
   /** @title Заголовок */
   title?: string;
+
   icon?: Picture;
 }
 

package/mobile/src/components/ComparisonTable/ComparisonTableRows.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { TableRow } from './TableRow';
+import type { TitleProps } from '../../model/HeadlineType';
 import { TableArrowScrollControl } from '../../ui-kit/TableArrowScrollControl/TableArrowScrollControl';
 import type { TableArrowScrollControlProps } from '../../ui-kit/TableArrowScrollControl/TableArrowScrollControlProps';
 import type { CellData } from './ComparisonTableContent';
-import type { TitleProp } from '../../model/HeadlineType';
+import { TableRow } from './TableRow';
 
 type ComparisonTableRowsProps = TableArrowScrollControlProps & {
-  rowData: { header: TitleProp; data: CellData[][] }[];
+  rowData: { header: TitleProps; data: CellData[][] }[];
   activeCardIndex: number;
   isColoredFirstColumn: boolean;
 };

package/mobile/src/components/ContentPage/ContentPage.page.json

@@ -16,7 +16,7 @@
   },
   "jsonLd": "json",
   "date": "2022-04-08",
-  "style": ["bg-secondary-light"],
+  "style": ["bg-main-divider"],
   "likeControl": true,
   "slots": {
     "header": {
@@ -554,39 +554,6 @@
         }
       }
     },
-    {
-      "type": "NavigatorTabs",
-      "style": ["col-span-12"],
-      "content": {
-        "navigatorTabs": [
-          {
-            "text": "Калькулятор",
-            "href": "#calculator"
-          },
-          {
-            "text": "Преимущества",
-            "href": "#advantages"
-          },
-          {
-            "text": "Как оформить",
-            "href": "#howToApply"
-          },
-          {
-            "text": "Тарифы",
-            "href": "#tariffs"
-          },
-          {
-            "text": "Документы",
-            "href": "#documents"
-          },
-          {
-            "text": "Урожай",
-            "href": "https://rshb.ru/",
-            "target": "_blank"
-          }
-        ]
-      }
-    },
     {
       "type": "ProductTile",
       "style": ["col-span-6"],

package/mobile/src/components/ContentPage/normalizePage.ts

@@ -7,7 +7,7 @@ export function normalizePage(
   contentPage: ContentPageDef | undefined | null,
 ): ContentPageDef | undefined {
   if (!contentPage) {
-    return;
+    return undefined;
   }
 
   const { blocks, slots } = contentPage;

package/mobile/src/components/Gallery/Gallery.tsx

@@ -1,19 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { ListOrientation } from '../../model/ListOrientation';
+import type { GalleryCardProps, GalleryItemProps } from './GalleryContent';
+import type { GalleryProps } from './GalleryProps';
 import { Button } from '../../ui-kit/Button/Button';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { getListStyle } from '../../ui-kit/List/ListItem';
 import { SwipeListControl } from '../../ui-kit/SwipeListControl/SwipeListControl';
-import type { GalleryCard } from './GalleryContent';
-import { GalleryItem } from './GalleryContent';
-import type { GalleryProps } from './GalleryProps';
-
-const blockStyle: Record<BlockVersion, string> = {
-  primary: 'bg-white',
-  secondary: 'bg-primary-main text-white',
-};
+import { VersionStyleMap } from '../../model/BlockVersion';
 
 export const Gallery = JSX<GalleryProps>(
   ({ context, title, description, cards = [], className, orientation = 'horizontal' }) => {
@@ -37,7 +32,7 @@ export const Gallery = JSX<GalleryProps>(
   },
 );
 
-function renderCardsLayout(orientation: ListOrientation, cards: GalleryCard[], context) {
+function renderCardsLayout(orientation: ListOrientation, cards: GalleryCardProps[], context) {
   return orientation === 'horizontal' ? (
     <SwipeListControl context={context}>{cards?.map(renderCard)}</SwipeListControl>
   ) : (
@@ -45,11 +40,11 @@ function renderCardsLayout(orientation: ListOrientation, cards: GalleryCard[], c
   );
 }
 
-function renderCard(card: GalleryCard, key: number) {
+function renderCard(card: GalleryCardProps, key: number) {
   return (
     <div
       className={`h-full justify-between box-border horizontal-list-item border-solid border rounded-md border-main-stroke p-4 flex flex-col
-      ${blockStyle[card.version ?? 'primary']}`}
+      ${VersionStyleMap[card.version ?? 'primary']}`}
       key={key}
     >
       <div>
@@ -77,7 +72,7 @@ function renderButton(button) {
   );
 }
 
-function renderDescription(card: GalleryCard) {
+function renderDescription(card: GalleryCardProps) {
   return (
     <div
       className={`text-secondary-text mt-1 text-s ${
@@ -89,7 +84,7 @@ function renderDescription(card: GalleryCard) {
   );
 }
 
-function renderItems(items: GalleryItem[], isDotted, version: BlockVersion = 'primary') {
+function renderItems(items: GalleryItemProps[], isDotted, version: BlockVersion = 'primary') {
   return (
     <section className="mt-3">
       {items.map((item, i) => (

package/mobile/src/components/Gallery/GalleryCardInner.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { BlockVersion } from '../../model/BlockVersion';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
 import { List } from '../../ui-kit/List/List';
-import type { GalleryCard, GalleryItem } from './GalleryContent';
+import type { BlockVersion } from '../../model/BlockVersion';
+import type { GalleryCardProps, GalleryItemProps } from './GalleryContent';
 
-export const GalleryCardInner = JSX<GalleryCard>(
+export const GalleryCardInner = JSX<GalleryCardProps>(
   ({ title, description, image, items, button, version, isDotted = true }) => {
     const titleStyleClasses = getTitleStyle(version);
 
@@ -41,7 +41,11 @@ function renderCardTitle(title: string, className: string) {
   return <div className={`text-xl-light m-0 ${className}`}>{title}</div>;
 }
 
-function renderItems(items: GalleryItem[], isDotted: boolean, version: BlockVersion = 'primary') {
+function renderItems(
+  items: GalleryItemProps[],
+  isDotted: boolean,
+  version: BlockVersion = 'primary',
+) {
   return (
     <List
       className={`max-w-[308px] mt-2 text-s ${version === 'primary' ? '!text-secondary-text' : ''}`}

package/mobile/src/components/Gallery/GalleryContainer.tsx

@@ -1,18 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { VersionStyleMap } from '../../model/BlockVersion';
 import type { GalleryVersion } from '../../model/GalleryVersion';
 import type { ContentPageContext } from '../ContentPage/ContentPageContext';
-import { cardStyleMap, cardVersionMap, cardWidthMap, galleryLengthForScrollMap } from './constants';
+import { Headline } from '../Headline/Headline';
+import { cardStyleMap, cardWidthMap, galleryLengthForScrollMap } from './constants';
 import { GalleryCardInner } from './GalleryCardInner';
-import type { GalleryCard } from './GalleryContent';
+import type { GalleryCardProps } from './GalleryContent';
 import type { GalleryInnerProps } from './GalleryInner';
-import { Headline } from '../Headline/Headline';
 
 export interface GalleryContainerProps extends Omit<GalleryInnerProps, 'className'> {
   activeCardIndex: number;
 }
 
 export interface GalleryCardData {
-  card: GalleryCard;
+  card: GalleryCardProps;
   version: GalleryVersion;
   context: ContentPageContext;
 }
@@ -49,7 +50,7 @@ function renderCard({ card, version }: GalleryCardData, i: number) {
     <section
       className={`box-border border-solid border border-main-stroke p-6 mx-2 flex flex-col justify-between
         items-stretch ${cardStyleMap[version]} ${
-        cardVersionMap[card.version ?? 'primary']
+        VersionStyleMap[card.version ?? 'primary']
       } w-full col-span-4`}
       key={String(i)}
       role="listitem"

package/mobile/src/components/Gallery/GalleryContent.ts

@@ -6,7 +6,7 @@ import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 /**
  * @title Элемент списка
  */
-export interface GalleryItem {
+export interface GalleryItemProps {
   /** @title Заголовок (моб.) */
   title?: string; //TODO: for mobile
   /** @title Текст */
@@ -16,7 +16,7 @@ export interface GalleryItem {
 /**
  * @title Карточка
  */
-export interface GalleryCard {
+export interface GalleryCardProps {
   /** @title Заголовок */
   title?: string;
   /** @title Описание */
@@ -40,7 +40,7 @@ export interface GalleryCard {
    */
   isDotted?: boolean;
   /** @title Список */
-  items?: GalleryItem[];
+  items?: GalleryItemProps[];
   version?: BlockVersion;
 }
 
@@ -56,7 +56,7 @@ export interface GalleryContent {
    * @title Карточки
    * @minItems 3
    */
-  cards?: GalleryCard[];
+  cards?: GalleryCardProps[];
   /** @title Отображать элементы в моб. версии (прокрутка shift+mouseScroll) */
   orientation?: ListOrientation; //TODO: for mobile
 }

package/mobile/src/components/Gallery/GalleryProps.ts

@@ -1,4 +1,4 @@
 import type { UniBlockProps } from '../../types';
-import { GalleryContent } from './GalleryContent';
+import type { GalleryContent } from './GalleryContent';
 
 export interface GalleryProps extends GalleryContent, UniBlockProps {}

package/mobile/src/components/Gallery/constants.ts

@@ -1,11 +1,5 @@
-import type { BlockVersion } from '../../model/BlockVersion';
 import type { GalleryVersion } from '../../model/GalleryVersion';
 
-export const cardVersionMap: Record<BlockVersion, string> = {
-  primary: 'bg-white text-secondary-text',
-  secondary: 'bg-primary-main text-white',
-};
-
 export const galleryLengthForScrollMap: Record<GalleryVersion, number> = {
   normal: 3,
   mini: 4,