@redneckz/wildless-cms-uni-blocks 0.14.674 → 0.14.676

package/mobile/lib/ui-kit/PopupManager/PopupManager.js

@@ -11,6 +11,9 @@ export const PopupManager = JSX(() => {
         setPopup(null);
     }, []);
     useEffect(() => defaultEventBus.subscribe('popup', (action) => {
+        if (!action) {
+            return;
+        }
         switch (action.type) {
             case 'open':
             case 'update':

package/mobile/lib/ui-kit/PopupManager/PopupManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"PopupManager.js","sourceRoot":"","sources":["../../../src/ui-kit/PopupManager/PopupManager.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,EAAE;IACnC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAyB,IAAI,CAAC,CAAC;IAEjE,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAC5C,QAAQ,MAAM,CAAC,IAAI,EAAE;YACnB,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACX,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACjB,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,EAAE,CAAC;gBACR,MAAM;YACR;gBACE,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,EACJ,EAAE,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,EAAE,GAAG,EAAmB,EAAE,EAAE;QAC3B,IAAI,GAAG,KAAK,QAAQ,EAAE;YACpB,KAAK,EAAE,CAAC;SACT;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,gBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAEhE,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,cACE,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,EAC5D,KAAK,EAAE;YACL,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI;YACvB,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI;YACrB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtD,EACD,IAAI,EAAC,QAAQ,YAEZ,KAAK,CAAC,KAAK,GACR,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC"}
+{"version":3,"file":"PopupManager.js","sourceRoot":"","sources":["../../../src/ui-kit/PopupManager/PopupManager.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,EAAE;IACnC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAyB,IAAI,CAAC,CAAC;IAEjE,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAC5C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QACD,QAAQ,MAAM,CAAC,IAAI,EAAE;YACnB,KAAK,MAAM,CAAC;YACZ,KAAK,QAAQ;gBACX,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACjB,MAAM;YACR,KAAK,OAAO;gBACV,KAAK,EAAE,CAAC;gBACR,MAAM;YACR;gBACE,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,EACJ,EAAE,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,EAAE,GAAG,EAAmB,EAAE,EAAE;QAC3B,IAAI,GAAG,KAAK,QAAQ,EAAE;YACpB,KAAK,EAAE,CAAC;SACT;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,gBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;IAEhE,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,cACE,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,EAC5D,KAAK,EAAE;YACL,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI;YACvB,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI;YACrB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtD,EACD,IAAI,EAAC,QAAQ,YAEZ,KAAK,CAAC,KAAK,GACR,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC"}

package/mobile/src/EventBus/EventBus.ts

@@ -1,36 +1 @@
-export class EventBus<EM extends Record<string, any>> {
-  private subscribers: Partial<Record<keyof EM, Array<(ev: EM[keyof EM]) => void>>> = {};
-  private subjectsStateMap: Partial<EM> = {};
-
-  subscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void) {
-    this.subscribers[type] = (this.subscribers[type] || []).concat(
-      listener as (ev: EM[keyof EM]) => void,
-    );
-
-    const latestEvent = this.subjectsStateMap[type];
-    if (latestEvent) {
-      listener(latestEvent as EM[K]);
-    }
-
-    return () => {
-      this.unsubscribe(type, listener);
-    };
-  }
-
-  private unsubscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void) {
-    this.subscribers[type] = this.subscribers[type]?.filter((s) => s !== listener);
-  }
-
-  fire<K extends keyof EM>(type: K, event: EM[K]) {
-    const isSubjectDeclared = type in this.subjectsStateMap;
-    if (isSubjectDeclared) {
-      this.subjectsStateMap[type] = event;
-    }
-
-    this.subscribers[type]?.forEach((s) => s(event));
-  }
-
-  subject<K extends keyof EM>(type: K, event: EM[K]) {
-    this.subjectsStateMap[type] = event;
-  }
-}
+export { EventBus } from '@redneckz/uni-jsx/lib/EventBus/EventBus';

package/mobile/src/EventBus/defaultEventBus.ts

@@ -1,21 +1,11 @@
 import { type CarouselTariffsCardAction } from '../components/CarouselTariffsCard/CarouselTariffsCardAction';
-import { type Tab } from '../components/TabsLayout/TabsLayoutContent';
-import { type Region } from '../hooks/useRegions';
 import { type DialogAction } from '../ui-kit/DialogManager/DialogAction';
 import { type PopupAction } from '../ui-kit/PopupManager/PopupAction';
 import { EventBus } from './EventBus';
 
-interface TabActivationEvent {
-  type?: Tab['type'];
-  groupName?: string;
-  label?: string;
-}
-
 interface GlobalEventMap {
-  location: Region;
   dialog: DialogAction;
   popup: PopupAction;
-  tab: TabActivationEvent;
   fold: CarouselTariffsCardAction;
 }
 

package/mobile/src/components/CarouselTariffsCard/CarouselTariffsCard.tsx

@@ -44,7 +44,7 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
     useEffect(
       () =>
         defaultEventBus.subscribe('fold', (event) => {
-          if (options?.parent !== undefined && event.parent === options?.parent) {
+          if (event && options?.parent !== undefined && event.parent === options?.parent) {
             setIsVisible(event.isUnfolded);
           }
         }),

package/mobile/src/components/ContentPage/ContentPage.tsx

@@ -4,6 +4,7 @@ import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { useClickHandler } from '../../hooks/useClickHandler';
 import { useJSONRef } from '../../hooks/useJSONRef/useJSONRef';
+import { useDefaultLocation } from '../../hooks/useLocation';
 import { type BlockDecorator } from '../../model/BlockDecorator';
 import { type BlocksRegistry } from '../../model/BlocksRegistry';
 import { type ContentPageDef } from '../../model/ContentPageDef';
@@ -31,6 +32,7 @@ export const ContentPage = JSX<ContentPageProps>(
     const resolvedPageContent = useJSONRef(pageContent, fallback);
 
     useClickHandler();
+    useDefaultLocation();
 
     const options: BlockRendererOptions = {
       key: '',

package/mobile/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -19,7 +19,7 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
   ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-    const [currentLocation] = useLocation();
+    const currentLocation = useLocation();
     const exchangeRates = useFetchExchangeRateData(currentLocation);
 
     const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);

package/mobile/src/components/Header/HeaderSecondaryMenu.tsx

@@ -22,7 +22,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
   ({ className, version, ...rest }) => {
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
-    const [currentLocation] = useLocation(rest?.branches?.default);
+    const currentLocation = useLocation(rest?.branches?.default);
 
     const searchDialog = useSearchDialog(rest);
     const locationDialog = useLocationDialog(rest);

package/mobile/src/components/OfficesAtmsMap/AtmsMap.tsx

@@ -30,7 +30,7 @@ export interface AtmsMapProps {
 }
 
 export const AtmsMap = JSX<AtmsMapProps>(({ descriptionData, className }) => {
-  const [currentLocation] = useLocation();
+  const currentLocation = useLocation();
 
   const regionCode = currentLocation?.code ?? '000';
 

package/mobile/src/components/OfficesAtmsMap/OfficesMap.tsx

@@ -10,7 +10,7 @@ export interface OfficesMapProps {
 }
 
 export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
-  const [currentLocation] = useLocation();
+  const currentLocation = useLocation();
   const regionCode = currentLocation?.code ?? '000';
   const { data, isLoad } = useOffices(regionCode);
 

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

@@ -22,7 +22,7 @@ export interface BurgerMenuDialogProps {
 export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
   ({ menuRef, menuItem, locationDialogProps, closeAll }) => {
     const locationDialog = useLocationDialog(locationDialogProps || {});
-    const [{ name: location }] = useLocation();
+    const { name: location } = useLocation();
     const menuDimensions = menuRef?.current?.getBoundingClientRect();
     const basePath = getBasePath(env.SITE_URL);
 

package/mobile/src/hooks/useLocation.ts

@@ -1,55 +1,33 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
 import { API_BASE_URI } from '../api/apiBaseUrl';
-import { defaultEventBus } from '../EventBus/defaultEventBus';
-import { useLatestEvent } from '../EventBus/useLatestEvent';
-import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
+import { fetchJSON } from '../utils/fetchJSON';
 import { type Region } from './useRegions';
 
 const REGION_URL = `${API_BASE_URI}/region`;
-const LOCATION_STORAGE_KEY = 'location';
-
-export function useLocation(defaultLocation = 'Москва'): [Region, (_: Region) => void] {
-  const [currentLocation, fireCurrentLocation] = useLatestEvent(
-    defaultEventBus,
-    'location',
-    restoreLocation() ?? { name: defaultLocation },
-  );
-
-  const selectCurrentLocation = useCallback((_: Region) => {
-    storeLocation(_);
-    fireCurrentLocation(_);
-  }, []);
-
-  const { data } = useAsyncData(
-    hasStoredLocation() ? null : REGION_URL,
-    fetchJSONUnsafe as FetchJSONUnsafeType<Region>,
-  );
-  useEffect(() => {
-    if (data && !hasStoredLocation()) {
-      fireCurrentLocation(data);
-    }
-  }, [data]);
 
-  return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
+interface LocationStore {
+  location: Region;
 }
 
-const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
-
-const restoreLocation = (): Region | null => {
-  try {
-    const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
-
-    return data && JSON.parse(data);
-  } catch (ex) {
-    return null;
-  }
-};
-
-const storeLocation = (_: Region) => {
-  try {
-    globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
-  } catch (ex) {
-    // Do nothing
-  }
-};
+export function useLocation(defaultLocation = 'Москва'): Region {
+  const locationStore = useLocalStore<LocationStore>();
+
+  return locationStore.location ?? { name: defaultLocation };
+}
+
+export function useDefaultLocation(defaultLocation = 'Москва') {
+  const locationStore = useLocalStore<LocationStore>();
+
+  const preselectLocation = useCallback(async () => {
+    if (!locationStore.location) {
+      const region = await fetchJSON<Region>(REGION_URL);
+      locationStore.location = region ?? { name: defaultLocation };
+    }
+  }, [locationStore, defaultLocation]);
+
+  useAsyncData(REGION_URL, preselectLocation);
+
+  return locationStore;
+}

package/mobile/src/hooks/useRegions.ts

@@ -14,8 +14,11 @@ export interface Region {
   branches?: string[];
 }
 
+const EMPTY_REGIONS: Region[] = [];
+
+// TODO Почему url можно менять? Разве смысл не в инкапсуляции api url. Тоже под рефакторинг попадает
 export function useRegions(url: string = REGIONS_URL): Region[] {
   const { data } = useAsyncData(url, fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>);
 
-  return Array.isArray(data) ? data : [];
+  return Array.isArray(data) ? data : EMPTY_REGIONS;
 }

package/mobile/src/ui-kit/DialogManager/useDialogsList.ts

@@ -28,6 +28,9 @@ export const useDialogsList = ({
   useEffect(
     () =>
       defaultEventBus.subscribe('dialog', (action) => {
+        if (!action) {
+          return;
+        }
         switch (action.type) {
           case 'open':
             push(action);

package/mobile/src/ui-kit/FormField/Fields/AddressFactField.tsx

@@ -15,7 +15,7 @@ export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
     if (value) {
       field('addressFact')?.onChange?.(field('addressRegistration').value);
     }
-  }, [value]);
+  }, [value, field('addressRegistration').value]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.(fieldName)?.onChange?.({

package/mobile/src/ui-kit/FormField/validators.ts

@@ -5,6 +5,8 @@ import { validator } from '../../validation/validator';
 
 const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
+const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
+
 export const defaultValidator = (errorMsg?: string) => required(errorMsg ?? ERROR_MESSAGE);
 
 export const defaultSelectValidator = (errorMsg?: string) =>
@@ -71,12 +73,11 @@ export const emailValidator = (errorMsg: string) =>
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && address.city && address.house);
 
-export const addressDaDataValidator = () =>
-  validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
+export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
 
 export const addressOrganizationValidator = () =>
   validator((address: Address) => Boolean(address.fiasCode && address.city && address.house))(
-    'Укажите регион, город/населенный пункт, улицу, дом',
+    ADDRESS_ERROR_MESSAGE,
   );
 
 export const codeWordValidator = (errorMsg?: string) =>

package/mobile/src/ui-kit/Input/InputControl.tsx

@@ -33,8 +33,11 @@ export const InputControl = JSX<InputProps>(
     const popupRef = useOutsideClick<HTMLDivElement>(close);
 
     const handleChange = useCallback(
-      (v: string) => (maxLength ? v.length <= maxLength && onChange(v) : onChange(v)),
-      [onChange],
+      (v: string) => {
+        dadata && !isOpen && open();
+        maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
+      },
+      [dadata, isOpen, onChange],
     );
 
     const inputRef = useInputPopup({

package/mobile/src/ui-kit/LocationDialog/LocationDialog.tsx

@@ -1,20 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type BranchesHeader, type ForeignOfficeProps } from '../../data/HeaderData';
-import { useLink } from '../../hooks/useLink';
-import { useLocation } from '../../hooks/useLocation';
+import { useDefaultLocation } from '../../hooks/useLocation';
 import { useRegions, type Region } from '../../hooks/useRegions';
 import { groupBy } from '../../utils/groupBy';
 import { jaroWinklerDistance } from '../../utils/jaroWinklerDistance';
 import { Dialog } from '../DialogManager/Dialog';
 import { useDialogManager } from '../DialogManager/useDialogManager';
-import { LinkWrapper } from '../LinkWrapper/LinkWrapper';
-import { Paragraph } from '../Paragraph/Paragraph';
 import { Text } from '../Text/Text';
 import { renderForeignOffices } from './renderForeignOffices';
 import { renderRegion } from './renderRegion';
 import { renderRegionGroup } from './renderRegionGroup';
 import { SearchBar } from './SearchBar';
+import { SelectedLocation } from './SelectedLocation';
 
 const SEARCH_TERM_MIN_LENGTH = 3;
 
@@ -24,24 +22,29 @@ export interface LocationDialogProps {
 }
 
 export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branches }) => {
-  const [currentLocation, selectCurrentLocation] = useLocation(branches?.default);
-
-  const link = useLink();
-  const { href } = link({ href: `/branches/${currentLocation.slug}` });
+  const locationStore = useDefaultLocation(branches?.default);
 
   const [query, setQuery] = useState('');
 
-  const regions: Region[] = cleanUpRegions(useRegions()).sort((a, b) =>
-    a.name.localeCompare(b.name),
+  const rawRegions = useRegions();
+  const regions = useMemo(
+    (): Region[] => cleanUpRegions(rawRegions).sort((a, b) => a.name.localeCompare(b.name)),
+    [rawRegions],
+  );
+  const regionsGroupByLetter = useMemo(
+    (): Map<string, Region[]> => groupBy(regions, regionFirstLetter),
+    [regions],
   );
-  const regionsGroupByLetter: Map<string, Region[]> = groupBy(regions, regionFirstLetter);
 
   const { close } = useDialogManager();
 
-  const handleChangeLocation = useCallback((region: Region) => {
-    selectCurrentLocation(region);
-    close();
-  }, []);
+  const handleChangeLocation = useCallback(
+    (_: Region) => {
+      locationStore.location = _;
+      close();
+    },
+    [locationStore],
+  );
 
   return (
     <Dialog
@@ -51,16 +54,7 @@ export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branch
           <Text size="text-h4" color="text-primary-text">
             Выберите филиал
           </Text>
-          {currentLocation ? (
-            <div className="mb-s">
-              <Paragraph size="text-l" color="text-primary-text">
-                Сейчас выбран:
-                <LinkWrapper href={href} className="inline mx-2xs text-primary-main">
-                  {currentLocation.name}
-                </LinkWrapper>
-              </Paragraph>
-            </div>
-          ) : null}
+          <SelectedLocation defaultLocation={branches?.default} />
           <SearchBar onSearch={setQuery} searchTerm={query} />
         </div>
       }
@@ -86,10 +80,10 @@ export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branch
   );
 });
 
-const regionFirstLetter = (region: Region) => region.name?.charAt(0) || '';
+const regionFirstLetter = (region: Region) => region.name?.charAt(0) ?? '';
 
 const cleanUpRegions = (regions: Region[]) =>
   regions.map((region) => ({
     ...region,
-    name: region.name?.replace(/республика|область|край'/gi, '').trim() || '',
+    name: region.name?.replace(/республика|область|край'/gi, '').trim() ?? '',
   }));

package/mobile/src/ui-kit/LocationDialog/SelectedLocation.tsx

@@ -0,0 +1,27 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLink } from '../../hooks/useLink';
+import { useLocation } from '../../hooks/useLocation';
+import { LinkWrapper } from '../LinkWrapper/LinkWrapper';
+import { Paragraph } from '../Paragraph/Paragraph';
+
+interface SelectedLocationProps {
+  defaultLocation?: string;
+}
+
+export const SelectedLocation = JSX<SelectedLocationProps>(({ defaultLocation }) => {
+  const currentLocation = useLocation(defaultLocation);
+
+  const link = useLink();
+  const { href } = link({ href: `/branches/${currentLocation.slug}` });
+
+  return currentLocation ? (
+    <div className="mb-s">
+      <Paragraph size="text-l" color="text-primary-text">
+        Сейчас выбран:
+        <LinkWrapper href={href} className="inline mx-2xs text-primary-main">
+          {currentLocation.name}
+        </LinkWrapper>
+      </Paragraph>
+    </div>
+  ) : null;
+});

package/mobile/src/ui-kit/PopupManager/PopupManager.tsx

@@ -16,6 +16,9 @@ export const PopupManager = JSX(() => {
   useEffect(
     () =>
       defaultEventBus.subscribe('popup', (action) => {
+        if (!action) {
+          return;
+        }
         switch (action.type) {
           case 'open':
           case 'update':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.674",
+  "version": "0.14.676",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -136,9 +136,9 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@redneckz/json-op": "^0.0.7",
-    "@redneckz/json-ref": "^0.0.7",
-    "@redneckz/uni-jsx": "^2.6.2",
+    "@redneckz/json-op": "^0.0.12",
+    "@redneckz/json-ref": "^0.0.14",
+    "@redneckz/uni-jsx": "^2.6.3",
     "@tailwindcss/container-queries": "^0.1.0",
     "@types/json-schema": "^7.0.11",
     "glob": "^8.0.3",
@@ -210,7 +210,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "90 kB",
+      "limit": "92 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/EventBus/EventBus.ts

@@ -1,36 +1 @@
-export class EventBus<EM extends Record<string, any>> {
-  private subscribers: Partial<Record<keyof EM, Array<(ev: EM[keyof EM]) => void>>> = {};
-  private subjectsStateMap: Partial<EM> = {};
-
-  subscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void) {
-    this.subscribers[type] = (this.subscribers[type] || []).concat(
-      listener as (ev: EM[keyof EM]) => void,
-    );
-
-    const latestEvent = this.subjectsStateMap[type];
-    if (latestEvent) {
-      listener(latestEvent as EM[K]);
-    }
-
-    return () => {
-      this.unsubscribe(type, listener);
-    };
-  }
-
-  private unsubscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void) {
-    this.subscribers[type] = this.subscribers[type]?.filter((s) => s !== listener);
-  }
-
-  fire<K extends keyof EM>(type: K, event: EM[K]) {
-    const isSubjectDeclared = type in this.subjectsStateMap;
-    if (isSubjectDeclared) {
-      this.subjectsStateMap[type] = event;
-    }
-
-    this.subscribers[type]?.forEach((s) => s(event));
-  }
-
-  subject<K extends keyof EM>(type: K, event: EM[K]) {
-    this.subjectsStateMap[type] = event;
-  }
-}
+export { EventBus } from '@redneckz/uni-jsx/lib/EventBus/EventBus';

package/src/EventBus/defaultEventBus.ts

@@ -1,21 +1,11 @@
 import { type CarouselTariffsCardAction } from '../components/CarouselTariffsCard/CarouselTariffsCardAction';
-import { type Tab } from '../components/TabsLayout/TabsLayoutContent';
-import { type Region } from '../hooks/useRegions';
 import { type DialogAction } from '../ui-kit/DialogManager/DialogAction';
 import { type PopupAction } from '../ui-kit/PopupManager/PopupAction';
 import { EventBus } from './EventBus';
 
-interface TabActivationEvent {
-  type?: Tab['type'];
-  groupName?: string;
-  label?: string;
-}
-
 interface GlobalEventMap {
-  location: Region;
   dialog: DialogAction;
   popup: PopupAction;
-  tab: TabActivationEvent;
   fold: CarouselTariffsCardAction;
 }
 

package/src/components/CarouselTariffsCard/CarouselTariffsCard.tsx

@@ -44,7 +44,7 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
     useEffect(
       () =>
         defaultEventBus.subscribe('fold', (event) => {
-          if (options?.parent !== undefined && event.parent === options?.parent) {
+          if (event && options?.parent !== undefined && event.parent === options?.parent) {
             setIsVisible(event.isUnfolded);
           }
         }),

package/src/components/ContentPage/ContentPage.tsx

@@ -4,6 +4,7 @@ import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { useClickHandler } from '../../hooks/useClickHandler';
 import { useJSONRef } from '../../hooks/useJSONRef/useJSONRef';
+import { useDefaultLocation } from '../../hooks/useLocation';
 import { type BlockDecorator } from '../../model/BlockDecorator';
 import { type BlocksRegistry } from '../../model/BlocksRegistry';
 import { type ContentPageDef } from '../../model/ContentPageDef';
@@ -31,6 +32,7 @@ export const ContentPage = JSX<ContentPageProps>(
     const resolvedPageContent = useJSONRef(pageContent, fallback);
 
     useClickHandler();
+    useDefaultLocation();
 
     const options: BlockRendererOptions = {
       key: '',

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -19,7 +19,7 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
   ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-    const [currentLocation] = useLocation();
+    const currentLocation = useLocation();
     const exchangeRates = useFetchExchangeRateData(currentLocation);
 
     const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);

package/src/components/Header/HeaderSecondaryMenu.tsx

@@ -22,7 +22,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
   ({ className, version, ...rest }) => {
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
-    const [currentLocation] = useLocation(rest?.branches?.default);
+    const currentLocation = useLocation(rest?.branches?.default);
 
     const searchDialog = useSearchDialog(rest);
     const locationDialog = useLocationDialog(rest);

package/src/components/OfficesAtmsMap/AtmsMap.tsx

@@ -30,7 +30,7 @@ export interface AtmsMapProps {
 }
 
 export const AtmsMap = JSX<AtmsMapProps>(({ descriptionData, className }) => {
-  const [currentLocation] = useLocation();
+  const currentLocation = useLocation();
 
   const regionCode = currentLocation?.code ?? '000';
 

package/src/components/OfficesAtmsMap/OfficesMap.tsx

@@ -10,7 +10,7 @@ export interface OfficesMapProps {
 }
 
 export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
-  const [currentLocation] = useLocation();
+  const currentLocation = useLocation();
   const regionCode = currentLocation?.code ?? '000';
   const { data, isLoad } = useOffices(regionCode);
 

package/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -22,7 +22,7 @@ export interface BurgerMenuDialogProps {
 export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
   ({ menuRef, menuItem, locationDialogProps, closeAll }) => {
     const locationDialog = useLocationDialog(locationDialogProps || {});
-    const [{ name: location }] = useLocation();
+    const { name: location } = useLocation();
     const menuDimensions = menuRef?.current?.getBoundingClientRect();
     const basePath = getBasePath(env.SITE_URL);