@redneckz/wildless-cms-uni-blocks 0.13.13 → 0.13.15

package/mobile/lib/ui-kit/SwipeListControl/useSwipeListScroll.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSwipeListScroll.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/useSwipeListScroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiBhD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAwB,EACxD,SAAS,EACT,sBAAsB,GACD,EAAkE,EAAE;IACzF,MAAM,YAAY,GAAG,MAAM,CAAW,IAAI,CAAC,CAAC;IAE5C,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAC;IACnE,MAAM,0BAA0B,GAAG,WAAW,CAC5C,CAAC,OAAiB,EAAE,EAAE;QACpB,iBAAiB,CAAC,CAAC,WAAW,EAAE,EAAE,CAChC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAC7D,CAAC;QACF,sBAAsB,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC,EACD,CAAC,SAAS,CAAC,CACZ,CAAC;IAEF,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,cAAc,CAAC,MAAM;QAChD,CAAC,CAAC,CAAC,KAAK,EAAU,CAAC,cAAc,CAAC,EAAE,KAAK,EAAU,CAAC,cAAc,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEb,MAAM,aAAa,GAAG,QAAQ,GAAG,CAAC,CAAC;IACnC,MAAM,cAAc,GAAG,QAAQ,GAAG,SAAS,GAAG,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAClC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;YACzB,OAAO;SACR;QAED,IAAI,aAAa,EAAE;YACjB,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;aAAM;YACL,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACnC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;IAE/B,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;YACzB,OAAO;SACR;QAED,IAAI,cAAc,EAAE;YAClB,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;SAC9C;aAAM;YACL,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;IAEhC,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,YAAY,EAAE,OAAO,EAAE;YACzB,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,CAAC;SACtD;IACH,CAAC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,OAAO;QACL,YAAY;QACZ;YACE,UAAU;YACV,WAAW;YACX,QAAQ;YACR,aAAa;YACb,cAAc;YACd,mBAAmB,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;YACzC,0BAA0B;SAC3B;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useSwipeListScroll.js","sourceRoot":"","sources":["../../../src/ui-kit/SwipeListControl/useSwipeListScroll.ts"],"names":[],"mappings":"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"}

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

@@ -1,9 +1,12 @@
 {
   "content": {
-    "button": {
-      "text": "Отправить заявку"
+    "formBlock": {
+      "button": {
+        "text": "Отправить заявку",
+        "version": "primary"
+      },
+      "formType": "ApplicationFormBusinessCard"
     },
-    "typeForm": "credit",
     "version": "primary"
   }
 }

package/mobile/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -2,12 +2,11 @@ import type { ButtonVersion } from '../../model/ButtonVersion';
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkProps } from '../../model/LinkProps';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Кнопка
  */
-export interface SubmitButtonProps extends ButtonContent {
+export interface SubmitButtonProps {
   /** @title Текст */
   text?: string;
   version?: ButtonVersion;
@@ -19,64 +18,73 @@ export type CommonApplicationFormProps = TitleProps & {
   link?: LinkProps;
 };
 
-export type ApplicationFormBlockDef =
-  | BusinessCardFormParamsDef
-  | WedFormParamsDef
-  | DepositFormParamsDef
-  | CreditFormParamsDef
-  | AcquiringFormParamsDef
-  | GrantSupportFormParamsDef;
-
 /**
  * @title Бизнес-карта
- * @default {"formType": "ApplicationFormBusinessCard"}
  */
-export type BusinessCardFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormBusinessCard';
-};
+export type BusinessCardFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormBusinessCard */
+    formType: 'ApplicationFormBusinessCard';
+  };
 
 /**
  * @title ВЭД
- * @default {"formType": "ApplicationFormWed"}
  */
-export type WedFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormWed';
-};
+export type WedFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormWed */
+    formType: 'ApplicationFormWed';
+  };
 
 /**
  * @title Депозит
- * @default {"formType": "ApplicationFormDeposit"}
  */
-export type DepositFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormDeposit';
-};
+export type DepositFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormDeposit */
+    formType: 'ApplicationFormDeposit';
+  };
 
 /**
  * @title Кредит
- * @default {"formType": "ApplicationFormCredit"}
  */
-export type CreditFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormCredit';
-};
+export type CreditFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormCredit */
+    formType: 'ApplicationFormCredit';
+  };
 
 /**
  * @title Эквайринг
- * @default {"formType": "ApplicationFormAcquiring"}
  */
-export type AcquiringFormParamsDef = CommonApplicationFormProps & {
-  formType: 'ApplicationFormAcquiring';
-};
+export type AcquiringFormParamsDef = TitleProps &
+  CommonApplicationFormProps & {
+    /** @default ApplicationFormAcquiring */
+    formType: 'ApplicationFormAcquiring';
+  };
 
 /**
  * @title Грантовая поддержка
- * @default {"formType": "ApplicationFormGrantSupport"}
  */
-export type GrantSupportFormParamsDef = CommonApplicationFormProps & {
+export type GrantSupportFormParamsDef = TitleProps & {
+  /** @default ApplicationFormGrantSupport */
   formType: 'ApplicationFormGrantSupport';
+  button?: SubmitButtonProps;
   /** @title Адрес справочника */
   sourceBookDir?: string;
 };
 
+/**
+ * @title Настройки формы
+ */
+export type ApplicationFormBlockDef =
+  | BusinessCardFormParamsDef
+  | WedFormParamsDef
+  | DepositFormParamsDef
+  | CreditFormParamsDef
+  | AcquiringFormParamsDef
+  | GrantSupportFormParamsDef;
+
 /**
  * @title Форма заявки
  */

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

@@ -7,6 +7,9 @@
       "items": {
         "icon": {
           "ui:field": "icon"
+        },
+        "iconRight": {
+          "ui:field": "icon"
         }
       }
     }

package/mobile/src/components/CarouselRecommendationCard/CarouselRecommendationCardContent.ts

@@ -2,8 +2,8 @@ import type { AlignProps, HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { LinkCommonProps } from '../../model/LinkProps';
 import type { IconProps } from '../../model/Picture';
-import type { ListContent } from '../../ui-kit/List/ListContent';
 import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
+import type { ListContent } from '../../ui-kit/List/ListContent';
 
 export type RecommendationSocialMedia = LinkCommonProps & IconProps & ButtonContent;
 

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

@@ -3,9 +3,14 @@ import type { BlockDef, Slot } from '../../model/ContentPageDef';
 import { mapSlot } from './mapSlot';
 
 export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
-  const { mobile, ...rest } = (block || {}) as BlockDef;
+  const { mobile, ...desktop } = (block || {}) as BlockDef;
   const result = mobile
-    ? { ...rest, ...mobile, content: { ...rest.content, ...mobile.content } }
+    ? Object.assign(
+        {},
+        desktop,
+        mobile.style ? { style: mobile.style } : {},
+        mobile.content ? { content: mobile.content } : {},
+      )
     : block;
 
   return mapSlot(filterBlocks(blocksRegistry))(result || {}) as S;

package/mobile/src/components/Footer/Footer.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { projectSettings } from '../../ProjectSettings';
 import { useSWRResource } from '../../hooks/useSWRResource';
 import type { LinkCommonProps } from '../../model/LinkProps';
-import { projectSettings } from '../../ProjectSettings';
 import { useSitemap } from '../../services/sitemap/useSitemap';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
@@ -9,12 +9,12 @@ import { LinkList } from '../../ui-kit/LinkList/LinkList';
 import { Text } from '../../ui-kit/Text/Text';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { Contacts } from './Contacts';
-import { findIconByHref } from './findIconByHref';
 import type { FooterDataProps } from './FooterDataProps';
 import type { FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
+import { findIconByHref } from './findIconByHref';
 
 export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
   const fallback = rest.options?.page?.fallback;
@@ -26,7 +26,7 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
     mobileApps,
     horizontalNavigationTitle,
     documents,
-  } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
+  } = useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', { fallback });
 
   return (
     <BlockWrapper tag="footer" className={className} {...rest}>

package/mobile/src/components/StickyBottomMenu/ActiveSubMenu.tsx

@@ -4,12 +4,13 @@ import { ActiveSubMenuItem } from './ActiveSubMenuItem';
 
 interface ActiveSubMenuProps {
   activeMenuSubItems?: LinkProps[];
+  basePath?: string;
 }
-export const ActiveSubMenu = JSX<ActiveSubMenuProps>(({ activeMenuSubItems }) => {
+export const ActiveSubMenu = JSX<ActiveSubMenuProps>(({ activeMenuSubItems, basePath }) => {
   return activeMenuSubItems ? (
     <div className="mb-5">
       {activeMenuSubItems.map((_, i) => (
-        <ActiveSubMenuItem item={_} i={i} />
+        <ActiveSubMenuItem item={_} key={String(i)} basePath={basePath} />
       ))}
     </div>
   ) : null;

package/mobile/src/components/StickyBottomMenu/ActiveSubMenuItem.tsx

@@ -1,20 +1,23 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkProps } from '../../model/LinkProps';
+import { projectSettings } from '../../ProjectSettings';
 import { useLink } from '../../hooks/useLink';
+import type { LinkProps } from '../../model/LinkProps';
 import { Img } from '../../ui-kit/Img/Img';
 
 interface ActiveSubMenuItemProps {
   item: LinkProps;
-  i: number;
+  basePath?: string;
 }
 
-export const ActiveSubMenuItem = JSX<ActiveSubMenuItemProps>(({ item, i }) => {
-  const link = useLink();
+export const ActiveSubMenuItem = JSX<ActiveSubMenuItemProps>(({ item, basePath }) => {
+  const isAnotherPortal =
+    projectSettings.BASE_PATH && basePath ? !projectSettings.BASE_PATH.startsWith(basePath) : false;
+
+  const link = useLink({ isRemote: isAnotherPortal, basePath });
   const { href, target, onClick } = link(item);
 
   return (
     <a
-      key={`subItems-${String(i)}`}
       className="py-3 text-h5 font-light flex justify-between cursor-pointer"
       href={href}
       target={target}

package/mobile/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -1,20 +1,20 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { RefObject } from 'react';
+import { useActiveRoute } from '../../hooks/useActiveRoute';
 import { useLocation } from '../../hooks/useLocation';
-import { Img } from '../../ui-kit/Img/Img';
-import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
-import { Text } from '../../ui-kit/Text/Text';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import type { UniBlockProps } from '../../model/JSXBlock';
+import { useSitemap } from '../../services/sitemap/useSitemap';
+import { Dialog } from '../../ui-kit/DialogManager/Dialog';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { Img } from '../../ui-kit/Img/Img';
 import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
+import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
 import { SwipeListContainer } from '../../ui-kit/SwipeListControl/SwipeListContainer';
 import { useSwipeListScroll } from '../../ui-kit/SwipeListControl/useSwipeListScroll';
-import { useSitemap } from '../../services/sitemap/useSitemap';
-import { TopItemMobile } from './TopItemMobile';
+import { Text } from '../../ui-kit/Text/Text';
 import { ActiveSubMenu } from './ActiveSubMenu';
-import { Dialog } from '../../ui-kit/DialogManager/Dialog';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { RefObject } from 'react';
-import { useActiveRoute } from '../../hooks/useActiveRoute';
+import { TopItemMobile } from './TopItemMobile';
 
 interface BurgerMenuDialogProps extends UniBlockProps {
   containerRef?: RefObject<HTMLDivElement>;
@@ -25,19 +25,26 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>((props) => {
   const [location] = useLocation(defaultLocation);
   const locationDialog = useLocationDialog();
   const openLocationDialog = useCallback(() => locationDialog.open(), []);
-  const itemCount = Array.isArray(topItems) ? topItems.length : 0;
   const [containerRef, scroll] = useSwipeListScroll<HTMLDivElement>({
-    itemCount,
+    itemCount: topItems?.length ?? 0,
   });
-  const [activeTopItemIndex, activeRoute] = useActiveRoute(topItems);
+  const [activeIndex] = useActiveRoute(topItems);
+  const [activeTopItemIndex, setActiveTopItemIndex] = useState(activeIndex);
+  const activeRoute = useMemo(() => topItems?.[activeTopItemIndex], [topItems, activeTopItemIndex]);
   const activeMenuSubItems = activeRoute?.items || [];
 
+  useEffect(() => {
+    setActiveTopItemIndex(activeIndex);
+  }, [activeIndex]);
+
   useEffect(() => {
     if (activeTopItemIndex > 0) {
       scroll.scrollTo(activeTopItemIndex);
     }
   }, [activeTopItemIndex, scroll]);
 
+  const handleTopItemClick = useCallback((idx: number) => setActiveTopItemIndex(idx), []);
+
   return (
     <Dialog
       head={
@@ -55,12 +62,17 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>((props) => {
             className="pb-3"
           >
             {topItems?.map((item, i) => (
-              <TopItemMobile item={item} i={i} isActive={activeTopItemIndex === i} />
+              <TopItemMobile
+                item={item}
+                key={String(i)}
+                isActive={activeTopItemIndex === i}
+                onClick={() => handleTopItemClick(i)}
+              />
             ))}
           </SwipeListContainer>
         </div>
         <div className="relative grow overflow-auto">
-          <ActiveSubMenu activeMenuSubItems={activeMenuSubItems} />
+          <ActiveSubMenu activeMenuSubItems={activeMenuSubItems} basePath={activeRoute?.href} />
           <SearchBar className="grow mb-5" />
           {renderOfficeLink(officesLink)}
           <div className="flex items-center text-s cursor-pointer" onClick={openLocationDialog}>

package/mobile/src/components/StickyBottomMenu/RenderItem.tsx

@@ -1,17 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { MenuItemProps } from './StickyBottomMenuProps';
-import { style } from '../../utils/style';
-import { Img } from '../../ui-kit/Img/Img';
+import { projectSettings } from '../../ProjectSettings';
 import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/JSXBlock';
+import { Img } from '../../ui-kit/Img/Img';
+import { style } from '../../utils/style';
+import type { MenuItemProps } from './StickyBottomMenuProps';
 
-interface RenderItemProps extends UniBlockProps {
+interface RenderItemProps {
   item: MenuItemProps;
-  idx: number;
   onClick?: () => void;
 }
-export const RenderItem = JSX<RenderItemProps>(({ item, idx, onClick }) => {
-  const link = useLink();
+
+export const RenderItem = JSX<RenderItemProps>(({ item, onClick }) => {
+  const isAnotherPortal = projectSettings?.BASE_PATH
+    ? !item.url?.startsWith(projectSettings?.BASE_PATH)
+    : true;
+
+  const link = useLink({ isRemote: isAnotherPortal });
   const {
     href,
     target,
@@ -23,7 +27,6 @@ export const RenderItem = JSX<RenderItemProps>(({ item, idx, onClick }) => {
 
   return (
     <a
-      key={`menuItems-${String(idx)}`}
       className={style(
         item.isActive ? 'text-primary-main' : 'text-primary-text',
         `w-10 m-4 flex justify-center items-center flex-col text-[10px] cursor-pointer`,
@@ -35,8 +38,8 @@ export const RenderItem = JSX<RenderItemProps>(({ item, idx, onClick }) => {
       <Img
         className="w-6 h-6"
         image={{
-          icon: item.icon?.icon,
-          iconVersion: item.icon?.iconVersion || 'black',
+          icon: item?.icon?.icon,
+          iconVersion: item?.icon?.iconVersion || 'black',
         }}
       />
       {item.title}

package/mobile/src/components/StickyBottomMenu/StickyBottomMenu.tsx

@@ -10,8 +10,7 @@ import { useBurgerMenuDialog } from './useBurgerMenuDialog';
 export const StickyBottomMenu = JSX<StickyBottomMenuProps>(({ ...rest }) => {
   const { menuItems = [] } = useSWRResource<StickyBottomMenuProps>(
     projectSettings.STICKY_MOBILE_MENU || 'sticky-mobile-menu',
-    rest.options?.page?.fallback,
-    'portal-resources',
+    { fallback: rest.options?.page?.fallback, folderName: 'portal-resources', setBasePath: true },
   );
 
   const [isBurgerMenuDialogOpen, { toggle }] = useBurgerMenuDialog();

package/mobile/src/components/StickyBottomMenu/TopItemMobile.tsx

@@ -1,32 +1,20 @@
 import type { TopMenuItemProps } from '../../services/sitemap/SitemapData';
+import { PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { style } from '../../utils/style';
-import { useLink } from '../../hooks/useLink';
 
 interface TopItemProps {
   item: TopMenuItemProps;
-  i: number;
   isActive: boolean;
+  onClick: (ev?: PreventableEvent) => void;
 }
 
-export const TopItemMobile = ({ item, i, isActive }: TopItemProps) => {
-  const link = useLink();
-  const { href, target, onClick } = link(item);
-
-  return (
-    <a
-      key={String(i)}
-      href={href}
-      target={target}
-      onClick={onClick}
-      className="relative"
-      aria-label={item.text}
-    >
-      <span className={style('whitespace-nowrap', isActive ? 'text-primary-main' : '')}>
-        {item.text}
-      </span>
-      {isActive ? (
-        <div className="absolute left-0 right-0 -bottom-3 h-0.5 bg-primary-main group-data-transparent:bg-transparent" />
-      ) : null}
-    </a>
-  );
-};
+export const TopItemMobile = ({ item, isActive, onClick }: TopItemProps) => (
+  <button type="button" onClick={onClick}>
+    <span className={style('whitespace-nowrap', isActive ? 'text-primary-main' : '')}>
+      {item.text}
+    </span>
+    {isActive ? (
+      <div className="absolute left-0 right-0 -bottom-3 h-0.5 bg-primary-main group-data-transparent:bg-transparent" />
+    ) : null}
+  </button>
+);

package/mobile/src/components/StickyBottomMenu/renderMenuItems.tsx

@@ -6,7 +6,7 @@ export const renderMenuItems = (menuItems: MenuItemProps[], onClick?: () => void
   <BlockWrapper className="sticky bottom-0 left-0 right-0 bg-transparent z-[100]" padding="p-0">
     <div className="ml-auto container bg-white flex justify-center shadow-blue-gray">
       {menuItems.map((_, i) => (
-        <RenderItem item={_} idx={i} onClick={onClick} />
+        <RenderItem item={_} key={String(i)} onClick={onClick} />
       ))}
     </div>
   </BlockWrapper>

package/mobile/src/hooks/useSWRResource.ts

@@ -1,20 +1,33 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { projectSettings } from '../ProjectSettings';
 import type { Fallback } from '../model/Fallback';
 import { fetchJSONUnsafe } from '../utils/fetchJSON';
+import { joinPath } from '../utils/url';
 
 const EMPTY_VALUE = {};
 const DEFAULT_FOLDER_NAME = 'wcms-resources';
 
+interface SWRResourceOptions {
+  fallback?: Fallback;
+  folderName?: string;
+  setBasePath?: boolean;
+}
+
 export function useSWRResource<Data>(
   filename: string | null | undefined,
-  fallback: Fallback = EMPTY_VALUE,
-  folderName: string = DEFAULT_FOLDER_NAME,
+  options: SWRResourceOptions = {},
 ): Data {
-  const { data } = useAsyncData<Data, any, string | null>(
-    filename ? `/${folderName}/${filename}.json` : null,
-    fetchJSONUnsafe,
-    { fallback },
+  const { fallback = EMPTY_VALUE, folderName = DEFAULT_FOLDER_NAME, setBasePath = false } = options;
+
+  const path = joinPath(
+    setBasePath ? projectSettings.BASE_PATH : '',
+    folderName,
+    `${filename}.json`,
   );
 
+  const { data } = useAsyncData<Data, any, string | null>(filename ? path : null, fetchJSONUnsafe, {
+    fallback,
+  });
+
   return data || (EMPTY_VALUE as Data);
 }

package/mobile/src/services/sitemap/useSitemap.ts

@@ -4,4 +4,4 @@ import { projectSettings } from '../../ProjectSettings';
 import type { SitemapData } from './SitemapData';
 
 export const useSitemap = (fallback?: Fallback) =>
-  useSWRResource<SitemapData>(projectSettings.SITEMAP || 'sitemap', fallback);
+  useSWRResource<SitemapData>(projectSettings.SITEMAP || 'sitemap', { fallback });

package/mobile/src/ui-kit/SwipeListControl/useSwipeListScroll.ts

@@ -70,9 +70,13 @@ export const useSwipeListScroll = <E extends HTMLElement>({
   }, [itemCount, canScrollRight]);
 
   const scrollTo = useCallback(
-    (idx) => {
+    (idx: number) => {
       if (containerRef?.current) {
-        containerRef.current.children[idx]?.scrollIntoView();
+        containerRef.current.children[idx]?.scrollIntoView({
+          behavior: 'smooth',
+          block: 'nearest',
+          inline: 'center',
+        });
       }
     },
     [containerRef],

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -1,9 +1,12 @@
 {
   "content": {
-    "button": {
-      "text": "Отправить заявку"
+    "formBlock": {
+      "button": {
+        "text": "Отправить заявку",
+        "version": "primary"
+      },
+      "formType": "ApplicationFormBusinessCard"
     },
-    "typeForm": "credit",
     "version": "primary"
   }
 }