@redneckz/wildless-cms-uni-blocks 0.3.95 → 0.4.0

package/src/components/StepsBlock/StepsBlock.tsx

@@ -91,7 +91,7 @@ const renderStepIcon =
     return (
       <div key={String(i)} className="flex flex-col items-center text-center">
         <div
-          className={`h-[100px] w-[100px] min-w-[100px] min-h-[100px] rounded-full p-[26px] box-border z-10 
+          className={`h-[100px] w-[100px] min-w-[100px] min-h-[100px] rounded-full p-[26px] box-border z-10 flex justify-center items-center
             ${styleMap.iconBackground} ${styleMap.title}`}
         >
           {checkIsIconRenderable(icon) ? (
@@ -124,14 +124,12 @@ const renderStepTitle =
     return (
       <div
         key={String(i)}
-        className="flex flex-col items-center justify-between text-center relative w-[276px] 
+        className="flex flex-col items-center justify-between text-center relative w-[276px]
         whitespace-pre-line overflow-hidden"
       >
-        {step?.label ? (
-          <div className="font-normal text-xl-light m-0 mt-4">{step.label}</div>
-        ) : null}
+        {step?.label ? <div className="text-xl m-0 mt-4">{step.label}</div> : null}
         {step?.description ? (
-          <div className={`font-light text-base ${styleMap.description} ${additionalMarginClass}`}>
+          <div className={`text-l-light ${styleMap.description} ${additionalMarginClass}`}>
             {step.description}
           </div>
         ) : null}

package/src/components/Tabs/Tabs.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { EventBus } from '../../EventBus/EventBus';
 import type { UniBlockProps } from '../../types';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
@@ -14,9 +15,9 @@ export interface TabsProps extends TabsContent, UniBlockProps {}
 export const Tabs = JSX<TabsProps>((props) => {
   const { context, className, tabs, page, showCounter } = props;
 
-  const [currentTab, setCurrentTab] = context.useState(tabs ? tabs[0] : undefined);
+  const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
 
-  context.useEffect(() => EventBus.inst.subject('tab', { label: currentTab?.id }), [currentTab]);
+  useEffect(() => EventBus.inst.subject('tab', { label: currentTab?.id }), [currentTab]);
 
   const handleClick = (selectedTab: Tab) => {
     EventBus.inst.fire('tab', { label: selectedTab.id });

package/src/components/Tabs/renderTab.tsx

@@ -10,7 +10,7 @@ interface RenderTabProps {
 
 type OnTabClick = (tab: Tab) => void;
 
-const badgeStyle = 'min-w-[22px] w-[22px] h-[22px] rounded-full text-xs ml-2';
+const badgeStyle = 'min-w-[22px] w-[22px] h-[22px] rounded-full text-xs-light ml-2';
 
 export const renderTab =
   ({ onClick, currentTab, showCounter, page }: RenderTabProps) =>
@@ -18,7 +18,7 @@ export const renderTab =
     const isActive = currentTab === tab;
 
     const tabBg = isActive ? 'bg-primary-main' : 'group bg-white';
-    const tabText = `text-m ${
+    const tabText = `text-m-light ${
       isActive ? 'text-white' : 'text-secondary-text group-hover:text-primary-main'
     }`;
     const counterBlockStyle = `${badgeStyle}

package/src/components/TariffsTable/TariffsTable.mobile.tsx

@@ -25,7 +25,7 @@ export const TariffsTable = JSX<TariffsTableProps>(
         {title ? (
           <Heading headingType="h2" className={`text-center ${headingMargin}`} title={title} />
         ) : null}
-        {description ? <div className="mb-5 text-center text-m-md">{description}</div> : null}
+        {description ? <div className="mb-5 text-center text-m">{description}</div> : null}
         {tiles?.length ? renderOrientationTable(orientation, tiles, context) : null}
       </section>
     );

package/src/components/TariffsTable/TariffsTable.tsx

@@ -1,8 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useTableArrowScrollControl } from '../../hooks/useTableArrowScrollControl';
 import type { VNode } from '../../model/VNode';
-import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import type { UniBlockProps } from '../../types';
+import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { TableArrowScrollControl } from '../../ui-kit/TableArrowScrollControl/TableArrowScrollControl';
@@ -20,7 +21,7 @@ export interface TariffsTableProps extends TariffsTableContent, UniBlockProps {}
 
 export const TariffsTable = JSX<TariffsTableProps>(
   ({ className, context, title, description, rowHeaders, columns, hiddenRowsNum = 0, ...rest }) => {
-    const [activeCardIndex, setActiveCardIndex] = context.useState(0);
+    const [activeCardIndex, setActiveCardIndex] = useState(0);
 
     const colData = getColData(columns);
     const rowData = getRowData(rowHeaders, colData);

package/src/components/TariffsTable/TariffsTableCell.tsx

@@ -31,8 +31,8 @@ const renderCellInner = (
     {i > 0 && (
       <div className="border-main-divider border border-solid border-t-0 border-x-0 my-4" />
     )}
-    {label ? <div className="text-xl font-medium m-0">{label}</div> : null}
-    {description ? <div className="text-sm text-secondary-text">{description}</div> : null}
+    {label ? <div className="text-xl m-0">{label}</div> : null}
+    {description ? <div className="text-s text-secondary-text">{description}</div> : null}
     {list?.items?.length ? renderList(list) : null}
     {image ? <Img image={image} /> : null}
     {buttons?.length ? renderButtons(buttons) : null}
@@ -41,7 +41,7 @@ const renderCellInner = (
 
 const renderList = (list: TariffsTableList) => (
   <List
-    className="flex flex-col justify-between items-start text-sm"
+    className="flex flex-col justify-between items-start text-s"
     version="gray"
     items={list.items}
     isDotted={list.isDotted ?? true}

package/src/components/TariffsTable/TariffsTableRow.tsx

@@ -18,7 +18,7 @@ export const TariffsTableRow = JSX<TariffsTableRowProps>(
     return (
       <TableRowContainer>
         <div
-          className={`text-sm py-5 ${FIRST_CELL_CLASSES} ${DIVIDER_CLASSES} ${
+          className={`text-s py-5 ${FIRST_CELL_CLASSES} ${DIVIDER_CLASSES} ${
             !isLastRow ? 'border-solid' : ''
           }`}
         >

package/src/components/TariffsTable/TariffsTableTileCell.tsx

@@ -28,10 +28,8 @@ const renderCellInner = (
     {i > 0 && (
       <div className="border-main-divider border border-solid border-t-0 border-x-0 my-2" />
     )}
-    {label ? <div className="text-m-sm m-0">{label}</div> : null}
-    {description ? (
-      <div className="text-m-sm text-secondary-text mt-[3px]">{description}</div>
-    ) : null}
+    {label ? <div className="text-s m-0">{label}</div> : null}
+    {description ? <div className="text-s text-secondary-text mt-[3px]">{description}</div> : null}
     {list?.items?.length ? renderList(list) : null}
     {image ? <Img image={{ ...image, className: 'm-0' }} /> : null}
     {buttons?.length ? renderButtons(buttons) : null}
@@ -40,7 +38,7 @@ const renderCellInner = (
 
 const renderList = (list: TariffsTableList) => (
   <List
-    className="flex flex-col justify-between items-start text-m-sm"
+    className="flex flex-col justify-between items-start text-s"
     version="gray"
     items={list.items}
     isDotted={list.isDotted ?? true}

package/src/components/TextBlock/TextBlock.mobile.tsx

@@ -50,14 +50,14 @@ export const TextBlock = JSX<TextBlockProps>(
         {iconVersion === 'big' ? renderImage(image) : null}
         <div className="py-0.5">
           {title ? (
-            <div className={`font-medium text-base mb-1 ${textBlockStyleMap.title}`}>{title}</div>
+            <div className={`text-l font-medium mb-1 ${textBlockStyleMap.title}`}>{title}</div>
           ) : null}
           {description ? (
-            <div className={`text-sm ${textBlockStyleMap.description}`}>{description}</div>
+            <div className={`text-s ${textBlockStyleMap.description}`}>{description}</div>
           ) : null}
           {items?.length ? (
             <List
-              className="mt-1 text-m-md"
+              className="mt-1 text-m"
               items={items}
               isDotted={isDotted}
               version={listBlockVersion}
@@ -72,7 +72,7 @@ export const TextBlock = JSX<TextBlockProps>(
 function renderIcon(className: string) {
   return (
     <div className="mb-3">
-      <div className={`rounded-full h-4 w-4 text-center text-xs ${className}`}>i</div>
+      <div className={`rounded-full h-4 w-4 text-center text-xs-light ${className}`}>i</div>
     </div>
   );
 }

package/src/components/TextBlock/TextBlock.tsx

@@ -44,10 +44,10 @@ export const TextBlock = JSX<TextBlockProps>(
         {iconVersion === 'big' ? renderImage(image) : null}
         <div className="py-0.5">
           {title ? (
-            <div className={`font-medium text-base mb-1 ${textBlockStyleMap.title}`}>{title}</div>
+            <div className={`text-l font-medium mb-1 ${textBlockStyleMap.title}`}>{title}</div>
           ) : null}
           {description ? (
-            <div className={`text-sm ${textBlockStyleMap.description}`}>{description}</div>
+            <div className={`text-s ${textBlockStyleMap.description}`}>{description}</div>
           ) : null}
         </div>
       </BlockWrapper>
@@ -58,7 +58,7 @@ export const TextBlock = JSX<TextBlockProps>(
 function renderIcon(className: string) {
   return (
     <div className="pt-1.5 pl-1 pr-4">
-      <div className={`rounded-full h-4 w-4 text-center text-xs ${className}`}>i</div>
+      <div className={`rounded-full h-4 w-4 text-center text-xs-light ${className}`}>i</div>
     </div>
   );
 }

package/src/components/Tile/Tile.tsx

@@ -83,11 +83,6 @@ function renderList(items, version, isDotted: boolean) {
   const listVersion = version === 'primary' ? 'tile' : 'tile-white';
 
   return items?.length ? (
-    <List
-      items={items}
-      isDotted={isDotted}
-      itemClassName="text-h6 font-light mt-2"
-      version={listVersion}
-    />
+    <List items={items} isDotted={isDotted} itemClassName="text-h6 mt-2" version={listVersion} />
   ) : null;
 }

package/src/components/__snapshots__/Blocks.spec.tsx.snap

@@ -2,7 +2,7 @@
 
 exports[`Blocks Accordion should render block "Accordion" without content 1`] = `
 <section
-  class="p-[50px] font-sans bg-white text-primary-text "
+  class="p-[50px] mb-1 last:mb-0 font-sans bg-white text-primary-text "
 />
 `;
 
@@ -19,6 +19,9 @@ exports[`Blocks Bonus should render block "Bonus" without content 1`] = `
   <div
     class="container"
   >
+    <section
+      class="font-sans flex flex-col p-[50px] gap-3 bg-transparent !p-0"
+    />
     <div
       class="flex flex-wrap w-full mt-9"
     />
@@ -29,14 +32,20 @@ exports[`Blocks Bonus should render block "Bonus" without content 1`] = `
 exports[`Blocks BonusBenefitsBlock should render block "BonusBenefitsBlock" without content 1`] = `
 <section
   class="font-sans text-primary-text bg-white p-50 flex flex-col text-center "
-/>
+>
+  <section
+    class="font-sans flex flex-col p-[50px] gap-3 bg-transparent !p-0"
+  />
+</section>
 `;
 
 exports[`Blocks Calculator should render block "Calculator" without content 1`] = `
 <section
-  class="box-border overflow-hidden relative font-sans w-100 bg-white text-primary-text "
+  class="box-border overflow-hidden relative font-sans w-100 text-primary-text "
 >
-  <div>
+  <div
+    class="bg-white"
+  >
     <div />
   </div>
   <div
@@ -51,8 +60,11 @@ exports[`Blocks Catalog should render block "Catalog" without content 1`] = `
 <section
   class="bg-white relative font-sans p-12 overflow-hidden text-center "
 >
+  <section
+    class="font-sans flex flex-col p-[50px] gap-3 bg-transparent !p-0"
+  />
   <div
-    class="flex duration-1000 gap-3.5"
+    class="flex duration-1000 gap-3.5 mt-8"
     role="list"
     style="transform: translateX(-0px);"
   />
@@ -112,17 +124,17 @@ exports[`Blocks ExchangeRateTile should render block "ExchangeRateTile" without
                 <thead>
                   <tr>
                     <th
-                      class="text-left text-m text-secondary-text"
+                      class="text-left text-m-light text-secondary-text"
                     >
                       Валюта
                     </th>
                     <th
-                      class="text-left text-m text-secondary-text pl-11"
+                      class="text-left text-m-light text-secondary-text pl-11"
                     >
                       Купить
                     </th>
                     <th
-                      class="text-left text-m text-secondary-text pl-11"
+                      class="text-left text-m-light text-secondary-text pl-11"
                     >
                       Продать
                     </th>
@@ -241,7 +253,7 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
       </div>
       <input
         class="h-12 pl-12 w-full peer text-l text-black border border-solid rounded-md box-border
-              outline-none pr-[6%] border-main-divider focus:border-primary-text font-light h-full"
+              outline-none pr-[6%] border-main-divider focus:border-primary-text h-full"
         id="search-bar-input"
         name="search-bar-input"
         type="text"
@@ -252,7 +264,7 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
         role="button"
       >
         <div
-          class="font-normal text-sm px-9 py-[9px]"
+          class="text-s px-9 py-2.5"
         >
           Найти
         </div>
@@ -280,7 +292,7 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
           >
             <div>
               <div
-                class="text-xs text-left"
+                class="text-xs-light text-left"
               />
               <div
                 class="text-left text-l"
@@ -317,7 +329,7 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
       </div>
     </div>
     <div
-      class="flex items-start justify-between gap-[54px] xl:gap-5 pt-[3px]"
+      class="flex flex-grow items-start justify-between gap-[54px] xl:gap-5 pt-[3px]"
     />
   </div>
   <div
@@ -330,7 +342,7 @@ exports[`Blocks Footer should render block "Footer" without content 1`] = `
       class="pt-5"
     >
       <span
-        class="font-light text-xs text-secondary-text"
+        class="text-xs-light text-secondary-text"
       >
         © 2000-2022 АО «Россельхозбанк» Генеральная лицензия Банка России № 3349 от 12.08.2015 г.
       </span>
@@ -347,11 +359,11 @@ exports[`Blocks Gallery should render block "Gallery" without content 1`] = `
     <div
       class="absolute top-0 left-0 bottom-0 w-[84px] bg-gradient-to-r from-white to-transparent"
     />
-    <div
-      class="flex flex-col items-center mb-8"
+    <section
+      class="font-sans flex flex-col p-[50px] gap-4 bg-transparent !p-0"
     />
     <div
-      class="flex justify-center duration-1000"
+      class="flex mt-8 justify-center duration-1000"
       role="list"
       style="transform: translateX(-0px);"
     />
@@ -370,11 +382,8 @@ exports[`Blocks GracePeriod should render block "GracePeriod" without content 1`
 <section
   class="font-sans bg-white p-[50px] "
 >
-  <h3
-    class="font-sans m-0 text-h3 text-center"
-  />
-  <div
-    class="text-l-light-md text-center mt-3"
+  <section
+    class="font-sans flex flex-col p-[50px] gap-3 bg-transparent !p-0"
   />
 </section>
 `;
@@ -435,7 +444,7 @@ exports[`Blocks Header should render block "Header" without content 1`] = `
           rel="noopener noreferrer"
         >
           <span
-            class="text-primary-text hover:text-primary-main font-sans font-light text-sm"
+            class="text-primary-text hover:text-primary-main font-sans text-s-light"
           >
             Москва
           </span>
@@ -447,7 +456,7 @@ exports[`Blocks Header should render block "Header" without content 1`] = `
           rel="noopener noreferrer"
         >
           <span
-            class="text-primary-text hover:text-primary-main font-sans font-light text-sm"
+            class="text-primary-text hover:text-primary-main font-sans text-s-light"
           >
             Офисы и банкоматы
           </span>
@@ -562,11 +571,11 @@ exports[`Blocks MiniGallery should render block "MiniGallery" without content 1`
     <div
       class="absolute top-0 left-0 bottom-0 w-[84px] bg-gradient-to-r from-white to-transparent"
     />
-    <div
-      class="flex flex-col items-center mb-8"
+    <section
+      class="font-sans flex flex-col p-[50px] gap-4 bg-transparent !p-0"
     />
     <div
-      class="flex justify-center duration-1000"
+      class="flex mt-8 justify-center duration-1000"
       role="list"
       style="transform: translateX(-0px);"
     />
@@ -583,13 +592,13 @@ exports[`Blocks MiniGallery should render block "MiniGallery" without content 1`
 
 exports[`Blocks MobileAppTile should render block "MobileAppTile" without content 1`] = `
 <section
-  class="flex justify-between font-sans p-9 box-border relative
-        pr-[9.4rem] min-h-[360px]
+  class="flex justify-between font-sans p-9 box-border relative min-h-[320px]
+        min-h-[360px]
         bg-white text-primary-text
         "
 >
   <div
-    class="font-sans flex flex-col grow h-full items-start "
+    class="font-sans flex flex-col grow h-full items-start z-[1]"
   >
     <h3
       class="font-sans m-0 text-h4 whitespace-pre-wrap max-w-[509px] mb-6
@@ -608,7 +617,7 @@ exports[`Blocks MobileAppTile should render block "MobileAppTile" without conten
             class="flex flex-1 items-center"
           >
             <span
-              class="text-m text-secondary-text"
+              class="text-m-light text-secondary-text"
             >
               Наведите камеру телефона на QR-код и скачайте приложение
             </span>
@@ -625,7 +634,7 @@ exports[`Blocks Navigation should render block "Navigation" without content 1`]
   class="font-sans text-primary-text rounded-[40px] flex items-center justify-between "
 >
   <h2
-    class="font-medium text-xl-light m-0"
+    class="text-xl font-medium m-0"
   />
 </section>
 `;
@@ -669,7 +678,7 @@ exports[`Blocks Placeholder should render block "Placeholder" without content 1`
     </div>
   </section>
   <figure
-    class="m-0 min-w-[600px]"
+    class="m-0 min-w-[80%]"
   >
     <div
       class="h-4 mt-2 bg-secondary-light"
@@ -836,12 +845,12 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         >
           <div>
             <span
-              class="block font-light text-m mb-2"
+              class="block text-m-light mb-2"
             >
               Город
             </span>
             <select
-              class="appearance-none h-14 border border-gray p-4 rounded-md text-m-sm w-full cursor-pointer"
+              class="appearance-none h-14 border border-gray p-4 rounded-md text-s w-full cursor-pointer"
               style="background: url(/icons/ArrowDownIcon.svg) no-repeat 50%;"
             >
               <option
@@ -864,12 +873,12 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         >
           <div>
             <span
-              class="block font-light text-m mb-2"
+              class="block text-m-light mb-2"
             >
               Отделение
             </span>
             <select
-              class="appearance-none h-14 border border-gray p-4 rounded-md text-m-sm w-full cursor-pointer"
+              class="appearance-none h-14 border border-gray p-4 rounded-md text-s w-full cursor-pointer"
               style="background: url(/icons/ArrowDownIcon.svg) no-repeat 50%;"
             >
               <option
@@ -898,7 +907,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         class="mb-6"
       >
         <span
-          class="block font-light text-m mb-[3px]"
+          class="block text-m-light mb-[3px]"
         >
           Срок аренды
         </span>
@@ -907,12 +916,12 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
             class="block relative"
           >
             <input
-              class="m-0 mt-[5px] font-sans text-h3 w-full h-14 border border-solid border-main-stroke rounded-md
-                        outline-none p-0 pl-4 box-border text-primary-text"
+              class="m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-main-stroke rounded-md
+                        outline-none p-0 pl-4 box-border text-primary-text hover:border-primary-hover focus:border-primary-focus disabled:border-main-stroke disabled:bg-main-divider"
               value="26"
             />
             <div
-              class="absolute inset-x-0 bottom-[-4px] px-4 leading-[18px]"
+              class="absolute inset-x-0 -bottom-1 px-4 leading-[18px]"
             >
               <input
                 class="box-border w-full m-0 cursor-pointer slider"
@@ -926,15 +935,15 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
             </div>
           </label>
           <div
-            class="flex justify-between my-3"
+            class="flex justify-between my-2"
           >
             <span
-              class="text-sm leading-[14px] text-secondary-text pl-4"
+              class="text-s-light text-secondary-text"
             >
               От 1 дня
             </span>
             <span
-              class="text-sm leading-[14px] text-secondary-text pl-4"
+              class="text-s-light text-secondary-text"
             >
               До 365 дней
             </span>
@@ -949,12 +958,12 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         >
           <div>
             <span
-              class="block font-light text-m mb-2"
+              class="block text-m-light mb-2"
             >
               Размер ячейки
             </span>
             <select
-              class="appearance-none h-14 border border-gray p-4 rounded-md text-m-sm w-full cursor-pointer"
+              class="appearance-none h-14 border border-gray p-4 rounded-md text-s w-full cursor-pointer"
               style="background: url(/icons/ArrowDownIcon.svg) no-repeat 50%;"
             >
               <option
@@ -983,12 +992,12 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         >
           <div>
             <span
-              class="block font-light text-m mb-2"
+              class="block text-m-light mb-2"
             >
               Параметры ячейки, мм (ВхШхД)
             </span>
             <select
-              class="appearance-none h-14 border border-gray p-4 rounded-md text-m-sm w-full cursor-pointer"
+              class="appearance-none h-14 border border-gray p-4 rounded-md text-s w-full cursor-pointer"
               style="background: url(/icons/ArrowDownIcon.svg) no-repeat 50%;"
             >
               <option
@@ -1014,7 +1023,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
         </div>
       </div>
       <span
-        class="text-secondary-text font-light"
+        class="text-secondary-text text-l-light"
       >
         Тип договора
       </span>
@@ -1036,7 +1045,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
                 value="option1"
               />
               <span
-                class="font-sans ml-3 text-m-base cursor-pointer"
+                class="font-sans ml-3 cursor-pointer"
               >
                 Простое хранение
               </span>
@@ -1053,7 +1062,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
                 value="option2"
               />
               <span
-                class="font-sans ml-3 text-m-base cursor-pointer"
+                class="font-sans ml-3 cursor-pointer"
               >
                 Сделка с недвижимостью
               </span>
@@ -1069,7 +1078,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
           >
             <div>
               <div
-                class="text-xs text-left"
+                class="text-xs-light text-left"
               />
               <div
                 class="text-left text-l"
@@ -1091,7 +1100,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
           class="mr-11"
         >
           <span
-            class="block font-light text-m mb-1"
+            class="block text-m-light mb-1"
           >
             Аренда за
           </span>
@@ -1105,7 +1114,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
           class=""
         >
           <span
-            class="block font-light text-m mb-1"
+            class="block text-m-light mb-1"
           >
             Цена
           </span>
@@ -1138,7 +1147,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
           />
         </svg>
         <span
-          class="font-light text-white opacity-80 mt-2 inline-block"
+          class="text-s-light text-white opacity-80 mt-2 inline-block"
         >
           На рисунки изображена пачка
           <br />
@@ -1148,7 +1157,7 @@ exports[`Blocks SafeDepositRental should render block "SafeDepositRental" withou
     </div>
   </div>
   <p
-    class="text-button font-light text-secondary-text"
+    class="text-s-light text-secondary-text"
   >
     Аренда СЯ, в случае проведения процедуры купли-продажи, с использованием наличных денег или процедуры ипотечной сделки
   </p>

package/src/hooks/useExchangeRates.ts

@@ -1,4 +1,4 @@
-import type { AsyncDataHook } from '../components/ContentPage/ContentPageContext';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import type { ExchangeCurrencyItem } from '../components/ExchangeRateTile/ExchangeCurrencyCalculator';
 
 interface RatesData {
@@ -7,7 +7,7 @@ interface RatesData {
   rate_sell: number;
 }
 
-export function useExchangeRates(useAsyncData: AsyncDataHook): ExchangeCurrencyItem[] {
+export function useExchangeRates(): ExchangeCurrencyItem[] {
   const { data } = useAsyncData(EXCHANGE_RATES_URL, fetchExchangeRates);
 
   const result = data?.hits?.hits?.map((_) => _._source) || [];

package/src/hooks/useGeolocation.ts

@@ -0,0 +1,22 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { DaDataAPI } from '../api/DaDataAPI';
+
+const DaData = DaDataAPI('https://10.80.4.9');
+
+export function useGeolocation(defaultLocation: string): [string, () => void] {
+  const [city, setCity] = useState(defaultLocation);
+
+  useEffect(() => {
+    setCity(globalThis?.localStorage.getItem('location') || defaultLocation);
+  }, [defaultLocation]);
+
+  const getCity = useCallback(() => {
+    DaData.getFetcherAddress().then((_) => {
+      const location = _ || defaultLocation;
+      globalThis?.localStorage.setItem('location', location);
+      setCity(location);
+    });
+  }, [defaultLocation]);
+
+  return [city, getCity];
+}