@redneckz/wildless-cms-uni-blocks 0.8.23 → 0.8.24

package/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,5 +1,5 @@
 import type { AlignType } from '../../model/AlignType';
-import type { DescriptionProps, LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 
@@ -15,8 +15,12 @@ export type ColumnsCount = '3' | '4' | '5';
 
 /**
  * @title Бонус и преимущество
+ * @default {
+ *   "title": "Верхний заголовок",
+ *   "description": "Нижний заголовок",
+ * }
  */
-export type BonusBenefit = LabelProps & IconProps & DescriptionProps;
+export type BonusBenefit = TitleProps & IconProps & DescriptionProps;
 
 /**
  * @title Блок бонусов и преимуществ

package/src/components/Calculator/getMonthlyPayment.ts

@@ -9,7 +9,9 @@ import type { CreditCalculatorUserInputParams } from './useCreditCalculatorParam
 export const getMonthlyPayment = (rate: number, params: CreditCalculatorUserInputParams) => {
   const { isAnnuity, moneyValue, monthsValue } = params;
 
-  if (isAnnuity) {
+  if (rate === 0) {
+    return 0;
+  } else if (isAnnuity) {
     const i = rate / MONTHLY_INTEREST_RATE; // Используется значение ставки в процентах
 
     return moneyValue * (i + i / (Math.pow(1 + i, monthsValue) - 1));

package/src/components/Header/HeaderSecondaryMenu.tsx

@@ -1,14 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '../../hooks/useBool';
 import { useLocation } from '../../hooks/useLocation';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
+import type { PreventableEvent } from '../../model/PreventableEvent';
+import { projectSettings } from '../../ProjectSettings';
 import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
 import { Location } from '../../ui-kit/Location/Location';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { style } from '../../utils/style';
 import { HeaderChatBotButton } from './HeaderChatBotButton';
-import { projectSettings } from '../../ProjectSettings';
 
 interface HeaderSecondaryMenuContent {
   version?: BlockVersion;
@@ -30,6 +32,11 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
 
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
+    const handleShowLocationModal = useCallback((ev?: PreventableEvent) => {
+      ev?.preventDefault();
+      showLocationModal();
+    }, []);
+
     return (
       <div className={style('flex items-center', className)}>
         <TopItem
@@ -37,7 +44,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
           flat={true}
           href="#"
           text={location.name}
-          onClick={showLocationModal}
+          onClick={handleShowLocationModal}
         />
         {officesLink ? (
           <TopItem className="mr-7" flat={true} href={officesLink} text="Офисы и банкоматы" />

package/src/components/Tabs/LinkTab.tsx

@@ -7,22 +7,28 @@ interface LinkTabProps {
   tab: LinkTabData;
   currentTab?: TabData;
   isScrollable?: boolean;
+  onClick: (tab: TabData) => void;
 }
 
 export const LinkTab = JSX<LinkTabProps>((props) => {
-  const { tab, currentTab, isScrollable = false } = props;
+  const { tab, currentTab, onClick, isScrollable = false } = props;
   const active = currentTab?.type === 'link' && currentTab.href === tab.href;
 
   const link = useLink();
   const adjustedProps = link(tab);
 
+  const handleClick = (ev?: { preventDefault: () => void }) => {
+    adjustedProps.onClick(ev);
+    onClick(tab);
+  };
+
   return (
     <a
       role="tab"
       className={getLinkTabClassName('link', active, isScrollable)}
       target={tab.target}
       href={adjustedProps.href}
-      onClick={adjustedProps.onClick}
+      onClick={handleClick}
     >
       <span className={getLinkTabClassName('text', active, isScrollable)}>{tab.text}</span>
     </a>

package/src/components/Tabs/Tabs.tsx

@@ -19,6 +19,14 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
 
+  useEffect(() => {
+    if (!tabs || !tabs[0]) {
+      return;
+    }
+
+    fireTabEvent(tabs[0]);
+  }, []);
+
   useEffect(() => {
     if (currentTab?.type === 'group') {
       defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref });
@@ -26,9 +34,7 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
   }, [currentTab]);
 
   const handleClick = useCallback((selectedTab: TabData) => {
-    if (selectedTab?.type === 'group') {
-      defaultEventBus.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
-    }
+    fireTabEvent(selectedTab);
     setCurrentTab(selectedTab);
   }, []);
 
@@ -61,3 +67,12 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
     </BlockWrapper>
   );
 });
+
+const fireTabEvent = (tab: TabData) => {
+  if (tab.type === 'group') {
+    defaultEventBus.fire('tab', { type: tab.type, label: tab.ref });
+  }
+  if (tab.type === 'link') {
+    defaultEventBus.fire('tab', { type: tab.type, label: tab.href });
+  }
+};

package/src/components/Tabs/renderTab.tsx

@@ -26,7 +26,13 @@ export const renderTab =
         return renderGroupTab({ page, currentTab, showCounter, onClick, isScrollable })(tab, i);
       case 'link': {
         return (
-          <LinkTab key={String(i)} tab={tab} currentTab={currentTab} isScrollable={isScrollable} />
+          <LinkTab
+            key={String(i)}
+            tab={tab}
+            currentTab={currentTab}
+            isScrollable={isScrollable}
+            onClick={onClick}
+          />
         );
       }
       default:

package/src/hooks/useBranches.ts

@@ -0,0 +1,43 @@
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { fetchJSON } from '../utils/fetchJSON';
+
+export interface Tariff {
+  tariffType?: string;
+  tariffValue?: number;
+}
+
+export interface SafeBoxCase {
+  safeBoxCasesSize?: string;
+  tariffs?: Tariff[];
+}
+
+export interface SafeBoxCaseVolume {
+  volume?: string;
+  safeBoxCases?: SafeBoxCase[];
+}
+
+export interface Branch {
+  branchCode?: string;
+  address?: string;
+  gpsLatitude?: number;
+  gpsLongitude?: number;
+  safeBoxCaseVolumes?: SafeBoxCaseVolume[];
+}
+
+const BRANCHES_URL = '/api/v1/branches';
+const EMPTY_VALUE = [];
+
+export function useBranches(regionCode?: string): Branch[] {
+  const { data } = useAsyncData<Branch[], any, string | null>(
+    regionCode ? `${BRANCHES_URL}?regionCode=${regionCode}` : null,
+    fetchSafeBoxes,
+  );
+
+  return data || EMPTY_VALUE;
+}
+
+const fetchSafeBoxes = async (url: string): Promise<Branch[]> => {
+  const result = await fetchJSON<Branch[]>(url, { method: 'GET' });
+
+  return result || EMPTY_VALUE;
+};

package/src/ui-kit/BlockWrapper.tsx

@@ -38,12 +38,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
       () =>
         defaultEventBus.subscribe('tab', (event) => {
           setHidden(
-            Boolean(
-              event.type === 'group' &&
-                event.label &&
-                block?.labels?.length &&
-                !block.labels.includes(event.label),
-            ),
+            Boolean(event.label && block?.labels?.length && !block.labels.includes(event.label)),
           );
         }),
       [block],

package/src/ui-kit/TopItem/TopItem.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { style } from '../../utils/style';
 
 export interface TopItemContent extends LinkProps {
@@ -11,7 +12,7 @@ export interface TopItemProps extends TopItemContent {
   className?: string;
   flat?: boolean;
   dataItemName?: string;
-  onClick?: () => void;
+  onClick?: (ev?: PreventableEvent) => void;
 }
 
 export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {