@redneckz/wildless-cms-uni-blocks 0.14.595 → 0.14.596

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

@@ -1,28 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { defaultEventBus } from '../../EventBus/defaultEventBus';
-import { type AspectsDef } from '../../model/AspectsProps';
-import { type Slot } from '../../model/ContentPageDef';
-import { type VNode } from '../../model/VNode';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useSubjectState } from '../../EventBus/useSubjectState';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
-import { Foldable } from '../../ui-kit/Foldable/Foldable';
-import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import { Heading } from '../../ui-kit/Heading/Heading';
-import { Icon } from '../../ui-kit/Icon/Icon';
 import { Img } from '../../ui-kit/Img/Img';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
-import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { isIcon } from '../../utils/isIcon';
 import { style } from '../../utils/style';
+import { CardCellsSection } from './CardCellsSection';
 import { type CarouselTariffsCardContent } from './CarouselTariffsCardContent';
-import { renderCardInfo } from './renderCardInfo';
+import { carouselTariffsCardEventBus } from './carouselTariffsCardEventBus';
 
 export interface CarouselTariffsCardProps extends CarouselTariffsCardContent, UniBlockProps {}
 
 export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
   ({
-    className = '',
+    className,
     title,
     align = 'text-center',
     icon,
@@ -33,22 +27,20 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
     data,
     ...rest
   }) => {
-    const cellsNode = cardCells.map(renderCardInfo);
-
-    const [visibleCells, hiddenCells] =
-      visibleCellsCount > 0
-        ? [cellsNode.slice(0, visibleCellsCount), cellsNode.slice(visibleCellsCount)]
-        : [cellsNode, []];
-    const [isVisible, setIsVisible] = useState(false);
+    const { isUnfolded, parent: firedParent } = useSubjectState(
+      carouselTariffsCardEventBus.observable,
+      'fold',
+      {},
+    );
+    const isVisible = isUnfolded && firedParent === options?.parent;
 
-    useEffect(
+    const toggle = useCallback(
       () =>
-        defaultEventBus.subscribe('fold', (event) => {
-          if (options?.parent !== undefined && event.parent === options?.parent) {
-            setIsVisible(event.isUnfolded);
-          }
+        carouselTariffsCardEventBus.emitter.fire('fold', {
+          isUnfolded: !isVisible,
+          parent: options?.parent,
         }),
-      [options?.parent],
+      [isVisible, options?.parent],
     );
 
     return (
@@ -62,49 +54,14 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
           <Heading className={style('pt-xs', align)} headingType="h5" title={title} />
         ) : null}
         {button?.text ? <LinkButton className="w-full mt-m mb-lg" {...button} /> : null}
-        {hiddenCells.length ? (
-          <Foldable
-            renderFoldableSection={() => (
-              <div>
-                {visibleCells}
-                <FoldableSection isUnfolded={isVisible}>{hiddenCells}</FoldableSection>
-              </div>
-            )}
-            renderFoldButton={
-              cardCells.length >= visibleCellsCount
-                ? renderFoldButton(options?.parent, data, isVisible)
-                : null
-            }
-          />
-        ) : (
-          <div>{visibleCells}</div>
-        )}
+        <CardCellsSection
+          cardCells={cardCells}
+          visibleCellsCount={visibleCellsCount}
+          isUnfolded={isVisible}
+          data={data}
+          onToggle={toggle}
+        />
       </BlockWrapper>
     );
   },
 );
-
-const renderFoldButton =
-  (parent?: Slot, data?: AspectsDef[], isUnfolded = false) =>
-  (): VNode =>
-    (
-      <button
-        className="w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center"
-        onClick={() => {
-          if (parent !== undefined) {
-            defaultEventBus.fire('fold', { type: 'fold', isUnfolded: !isUnfolded, parent });
-          }
-        }}
-        type="button"
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...(isUnfolded ? getAspectsAttributes(data) : {})}
-      >
-        <div>{isUnfolded ? 'Скрыть' : 'Подробнее о тарифе'}</div>
-        <Icon
-          className="text-primary-text"
-          name={isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon'}
-          width="16"
-          height="16"
-        />
-      </button>
-    );

package/mobile/src/components/CarouselTariffsCard/carouselTariffsCardEventBus.ts

@@ -0,0 +1,11 @@
+import { EventBus } from '../../EventBus/EventBus';
+import { type Slot } from '../../model/ContentPageDef';
+
+export type CarouselTariffsCardFoldAction = {
+  isUnfolded?: boolean;
+  parent?: Slot;
+};
+
+export const carouselTariffsCardEventBus = new EventBus<{
+  fold: CarouselTariffsCardFoldAction;
+}>();

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocation } from '../../hooks/useLocation';
+import { useLocationState } from '../../hooks/useLocation';
 import { BaseTile } from '../../ui-kit/BaseTile/BaseTile';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -19,7 +19,7 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
   ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-    const [currentLocation] = useLocation();
+    const currentLocation = useLocationState();
     const exchangeRates = useFetchExchangeRateData(currentLocation);
 
     const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);

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

@@ -4,7 +4,7 @@ import { type SearchHeaderProps } from '../../data/CommonData';
 import { type HeaderData } from '../../data/HeaderData';
 import { type NavigationData } from '../../data/NavigationData';
 import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspectsWithInclude';
-import { useLocation } from '../../hooks/useLocation';
+import { useLocationState } from '../../hooks/useLocation';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type IconVersion } from '../../model/IconVersion';
 import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
@@ -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 = useLocationState(rest?.branches?.default);
 
     const searchDialog = useSearchDialog(rest);
     const locationDialog = useLocationDialog(rest);

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocation } from '../../hooks/useLocation';
+import { useLocationState } from '../../hooks/useLocation';
 import { type AtmsDef } from './OfficesAtmsMapContent';
 import { OfficesAtmsMapLayout } from './OfficesAtmsMapLayout';
 import { type Atm } from './OfficesAtmsMapProps';
@@ -30,8 +30,7 @@ export interface AtmsMapProps {
 }
 
 export const AtmsMap = JSX<AtmsMapProps>(({ descriptionData, className }) => {
-  const [currentLocation] = useLocation();
-
+  const currentLocation = useLocationState();
   const regionCode = currentLocation?.code ?? '000';
 
   const { data: officesData, isLoad } = useAtms(regionCode);

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocation } from '../../hooks/useLocation';
+import { useLocationState } from '../../hooks/useLocation';
 import { OfficesAtmsMapLayout } from './OfficesAtmsMapLayout';
 import { getOfficePoint, renderOfficeCard } from './renderOfficeCard';
 import { getRemoteWorkplacePoint, renderRemoteWorkplaceCard } from './renderRemoteWorkplaceCard';
@@ -10,7 +10,7 @@ export interface OfficesMapProps {
 }
 
 export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
-  const [currentLocation] = useLocation();
+  const currentLocation = useLocationState();
   const regionCode = currentLocation?.code ?? '000';
   const { data, isLoad } = useOffices(regionCode);
 

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

@@ -4,7 +4,7 @@ import { type HeaderData } from '../../data/HeaderData';
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type StickyMenuItem } from '../../data/StickyMobileData';
 import { env } from '../../Env';
-import { useLocation } from '../../hooks/useLocation';
+import { useLocationState } from '../../hooks/useLocation';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
 import { getBasePath } from '../../utils/getBasePath';
@@ -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 } = useLocationState();
     const menuDimensions = menuRef?.current?.getBoundingClientRect();
     const basePath = getBasePath(env.SITE_URL);
 

package/mobile/src/hooks/useLocation.ts

@@ -1,54 +1,40 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
-import { useLatestEvent } from '../EventBus/useLatestEvent';
-import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
+import { useSubject } from '../EventBus/useSubject';
+import { useSubjectState } from '../EventBus/useSubjectState';
+import { fetchJSON } from '../utils/fetchJSON';
 import { type Region } from './useRegions';
 
 const REGION_URL = '/api/v1/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);
+export function useLocation(defaultLocation = 'Москва'): (_: Region) => void {
+  useEffect(() => defaultEventBus.subscribe('location', storeLocation), []);
+
+  return useSubject(defaultEventBus.emitter, 'location', restoreLocation(defaultLocation));
+}
+
+export function useLocationState(defaultLocation = 'Москва'): Region {
+  return useSubjectState(defaultEventBus.observable, 'location', { name: defaultLocation });
+}
+
+function restoreLocation(defaultLocation: string) {
+  return async (): Promise<Region> => {
+    if (!globalThis.localStorage?.hasItem(LOCATION_STORAGE_KEY)) {
+      storeLocation(await fetchJSON<Region>(REGION_URL));
+    }
+
+    const storedLocation = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
+    try {
+      return storedLocation && JSON.parse(storedLocation);
+    } catch (ex) {
+      // Do nothing
     }
-  }, [data]);
 
-  return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
+    return { name: defaultLocation };
+  };
 }
 
-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
-  }
-};
+function storeLocation(_: Region | null | undefined) {
+  _ && globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+}

package/mobile/src/hooks/useReducer.ts

@@ -0,0 +1,21 @@
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+
+export type NotUndefined = object | null;
+export type Reducer<S, A extends NotUndefined> = (state: S, action: A) => S;
+export type Dispatch<A extends NotUndefined> = (action: A) => void;
+
+export function useReducer<S, A extends NotUndefined>(
+  reducer: Reducer<S, A>,
+  initialArg: S,
+): [state: S, dispatch: Dispatch<A>] {
+  const [state, setState] = useState(initialArg);
+
+  const dispatch = useCallback(
+    (action: A) => {
+      setState((_) => reducer(_, action));
+    },
+    [reducer],
+  );
+
+  return [state, dispatch];
+}

package/mobile/src/hooks/useRegions.ts

@@ -11,8 +11,11 @@ export interface Region {
   localities?: 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/useDialogManager.ts

@@ -8,7 +8,7 @@ export interface DialogOptions {
 
 export const useDialogManager = () => ({
   open: (dialog: VNode, options: DialogOptions = {}) =>
-    defaultEventBus.fire('dialog', { type: 'open', dialog, ...options }),
-  close: () => defaultEventBus.fire('dialog', { type: 'close' }),
-  closeAll: () => defaultEventBus.fire('dialog', { type: 'close', all: true }),
+    defaultEventBus.emitter.fire('dialog', { type: 'open', dialog, ...options }),
+  close: () => defaultEventBus.emitter.fire('dialog', { type: 'close' }),
+  closeAll: () => defaultEventBus.emitter.fire('dialog', { type: 'close', all: true }),
 });

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

@@ -27,7 +27,7 @@ export const useDialogsList = ({
 
   useEffect(
     () =>
-      defaultEventBus.subscribe('dialog', (action) => {
+      defaultEventBus.observable.subscribe('dialog', (action) => {
         switch (action.type) {
           case 'open':
             push(action);

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

@@ -3,14 +3,30 @@ import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type VNode } from '../../model/VNode';
 import { type FoldablePartProps } from './FoldablePartProps';
 
-export interface FoldableProps {
+export interface FoldableWrapperProps {
   className?: string;
+}
+
+export interface FoldableProps extends FoldableWrapperProps {
   unfoldedByDefault?: boolean;
   isFoldButtonOnTop?: boolean;
   renderFoldableSection: (props: FoldablePartProps) => VNode;
   renderFoldButton?: ((props: FoldablePartProps) => VNode) | null;
 }
 
+export const FoldableWrapper = JSX<FoldableWrapperProps>(({ className, children }) => (
+  <div className={className} role="group">
+    {children}
+  </div>
+));
+
+/**
+ * Какой то бесполезный компонент. Его можно заменить на useBool
+ * Лучше оставить только обёрточный div с необходимой атрибутикой
+ * и сделать пассивный компонент
+ *
+ * @deprecated
+ */
 export const Foldable = JSX<FoldableProps>(
   ({
     className = '',
@@ -29,15 +45,15 @@ export const Foldable = JSX<FoldableProps>(
     const buttonNode = renderFoldButton ? renderFoldButton({ isUnfolded, onToggle }) : null;
 
     return isFoldButtonOnTop ? (
-      <div className={className} role="group">
+      <FoldableWrapper className={className}>
         {buttonNode}
         {sectionNode}
-      </div>
+      </FoldableWrapper>
     ) : (
-      <div className={className} role="group">
+      <FoldableWrapper className={className}>
         {sectionNode}
         {buttonNode}
-      </div>
+      </FoldableWrapper>
     );
   },
 );

package/mobile/src/ui-kit/FormField/constants.tsx

@@ -26,4 +26,5 @@ export const FEEDBACK_METHOD: Option[] = [
   { key: 'email', text: 'Электронное сообщение' },
 ];
 
+// TODO Тоже надо рефакторить - файлик constants
 export const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';

package/mobile/src/ui-kit/FormField/getValidation.tsx

@@ -2,5 +2,6 @@ import { type FieldProps } from '../../hooks/useForm';
 import { type Validator } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
 
+// TODO Зачем это?
 export const getValidation = (field: FieldProps<any>, validator: Validator, required = false) =>
   required ? withValidator(field, validator) : field;

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 { 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,22 +22,21 @@ 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 selectLocation = useLocation(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(
+    () => cleanUpRegions(rawRegions).sort((a, b) => (a.name ?? '').localeCompare(b.name ?? '')),
+    [rawRegions],
   );
-  const regionsGroupByLetter: Map<string, Region[]> = groupBy(regions, regionFirstLetter);
+  const regionsGroupByLetter = useMemo(() => groupBy(regions, regionFirstLetter), [regions]);
 
   const { close } = useDialogManager();
 
   const handleChangeLocation = useCallback((region: Region) => {
-    selectCurrentLocation(region);
+    selectLocation(region);
     close();
   }, []);
 
@@ -51,16 +48,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 +74,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[]) =>
+const cleanUpRegions = (regions: Region[]): 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 { useLocationState } 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 = useLocationState(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

@@ -15,7 +15,7 @@ export const PopupManager = JSX(() => {
 
   useEffect(
     () =>
-      defaultEventBus.subscribe('popup', (action) => {
+      defaultEventBus.observable.subscribe('popup', (action) => {
         switch (action.type) {
           case 'open':
           case 'update':

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

@@ -4,8 +4,8 @@ import { type PopupOptions } from './PopupAction';
 
 export const usePopupManager = () => ({
   open: (popup: VNode, options: PopupOptions) =>
-    defaultEventBus.fire('popup', { type: 'open', popup, ...options }),
+    defaultEventBus.emitter.fire('popup', { type: 'open', popup, ...options }),
   update: (popup: VNode, options: PopupOptions) =>
-    defaultEventBus.fire('popup', { type: 'update', popup, ...options }),
-  close: () => defaultEventBus.fire('popup', { type: 'close' }),
+    defaultEventBus.emitter.fire('popup', { type: 'update', popup, ...options }),
+  close: () => defaultEventBus.emitter.fire('popup', { type: 'close' }),
 });

package/package.json

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