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

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/Fields/DulIssuedByField.tsx

@@ -0,0 +1,26 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } =
+    field('dulSubdivisionCode');
+
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    changeDulSubdivisionCode?.(item?.data?.code?.replace('-', ''));
+  }, []);
+
+  return (
+    <InputControl
+      label="Кем выдан"
+      {...input}
+      {...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required)}
+      onDaDataChange={onDaDataChange}
+      daDataQueryPrefix={dulSubdivisionCode}
+    />
+  );
+});

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

@@ -0,0 +1,27 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
+  }, []);
+
+  return (
+    <InputControl
+      label="Код подразделения"
+      type="number"
+      {...input}
+      {...getValidation(
+        field('dulSubdivisionCode'),
+        validatorObj.dulSubdivisionCode,
+        input?.required,
+      )}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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

@@ -1,13 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const InnField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="ИНН"
-    type="number"
-    {...getValidation(field('inn'), validatorObj.inn, input?.required)}
-  />
-));
+export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
+    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+  }, []);
+
+  return (
+    <InputControl
+      label="ИНН"
+      type="number"
+      {...input}
+      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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

@@ -1,13 +1,23 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Наименование организации"
-    {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
-    {...input}
-  />
-));
+export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+    field?.('inn')?.onChange?.(item.data?.inn);
+    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+  }, []);
+
+  return (
+    <InputControl
+      label="Наименование организации"
+      {...input}
+      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+      onDaDataChange={onDaDataChange}
+    />
+  );
+});

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/getField.tsx

@@ -26,10 +26,10 @@ import { ConsentToReceiveMaterialsField } from './Fields/ConsentToReceiveMateria
 import { DependentsField } from './Fields/DependentsField';
 import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
 import { DulIssueDateField } from './Fields/DulIssueDateField';
-import { DulIssuedBy } from './Fields/DulIssuedBy';
+import { DulIssuedByField } from './Fields/DulIssuedByField';
 import { DulNumberField } from './Fields/DulNumberField';
 import { DulSerieField } from './Fields/DulSerieField';
-import { DulSubdivisionCode } from './Fields/DulSubdivisionCode';
+import { DulSubdivisionCodeField } from './Fields/DulSubdivisionCodeField';
 import { EducationField } from './Fields/EducationField';
 import { EmailField } from './Fields/EmailField';
 import { EmployerActivitiesField } from './Fields/EmployerActivitiesField';
@@ -163,8 +163,8 @@ export const getField =
       dulSerie: <DulSerieField field={field} input={input} />,
       dulNumber: <DulNumberField field={field} input={input} />,
       dulIssueDateField: <DulIssueDateField field={field} input={input} />,
-      dulSubdivisionCode: <DulSubdivisionCode field={field} input={input} />,
-      dulIssuedBy: <DulIssuedBy field={field} input={input} />,
+      dulSubdivisionCode: <DulSubdivisionCodeField field={field} input={input} />,
+      dulIssuedBy: <DulIssuedByField field={field} input={input} />,
       participantAddress: <ParticipantAddressField field={field} input={input} />,
       participantDateRegistration: <ParticipantDateRegistrationField field={field} input={input} />,
     };

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/Input/InputControl.tsx

@@ -18,10 +18,12 @@ export const InputControl = JSX<InputProps>(
     error,
     errors,
     onChange = noop,
+    onDaDataChange,
     onBlur,
     isTextarea,
     type,
     name = '',
+    daDataQueryPrefix,
     dadata = false,
   }) => {
     const [isOpen, { setFalse: close, setTrue: open }] = useBool();
@@ -31,7 +33,9 @@ export const InputControl = JSX<InputProps>(
       isOpen: isOpen && dadata,
       name,
       value,
+      daDataQueryPrefix,
       onChange,
+      onDaDataChange,
     });
 
     return (

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

@@ -3,7 +3,7 @@ import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 
 export interface InputPopupProps {
   options?: Array<DaDataSuggestion>;
-  onChange: (e: string) => void;
+  onChange: (e: DaDataSuggestion) => void;
   value?: string;
 }
 
@@ -17,7 +17,7 @@ export const InputPopup = JSX<InputPopupProps>(({ options, onChange }) => (
         key={key.toString()}
         className="flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative"
         role="listitem"
-        onMouseDown={() => onChange(item.processedValue)}
+        onMouseDown={() => onChange(item)}
       >
         <span className="min-h-6">{item.processedValue}</span>
       </div>

package/mobile/src/ui-kit/Input/InputProps.ts

@@ -1,4 +1,5 @@
 import { type DefaultControlType } from '../../model/DefaultControlType';
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { type InputTypes } from '../../model/InputTypes';
 import { type ControlProps } from '../ControlProps';
 import { type PreventableEventWithTarget } from '../PreventableEvent';
@@ -10,6 +11,8 @@ export interface InputProps<V = string> extends DefaultControlType, ControlProps
   pattern?: string;
   onFocus?: (ev: PreventableEventWithTarget) => void;
   onBlur?: (ev?: PreventableEventWithTarget) => void;
+  onDaDataChange?: (ev: DaDataSuggestion) => void;
+  daDataQueryPrefix?: string;
   valid?: boolean;
   disabled?: boolean;
   autoFocus?: boolean;

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

@@ -10,10 +10,19 @@ interface InputPopupOptions {
   isOpen?: boolean;
   name: string;
   value?: string;
+  daDataQueryPrefix?: string;
   onChange: (e: string) => void;
+  onDaDataChange?: (e: DaDataSuggestion) => void;
 }
 
-export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptions) {
+export function useInputPopup({
+  isOpen,
+  value,
+  name,
+  onChange,
+  onDaDataChange,
+  daDataQueryPrefix,
+}: InputPopupOptions) {
   const prevInputValue = useRef(value);
   const currentInputValue = useRef(value);
   const [hintsList, setHintsList] = useState<Array<DaDataSuggestion>>([]);
@@ -27,10 +36,11 @@ export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptio
   }, [value]);
 
   const handleChange = useCallback(
-    (option: string) => {
+    (option: DaDataSuggestion) => {
       close();
-      currentInputValue.current = option;
-      onChange && onChange(option);
+      currentInputValue.current = option.processedValue;
+      onChange && onChange(option.processedValue);
+      onDaDataChange && onDaDataChange(option);
     },
     [close, onChange],
   );
@@ -44,16 +54,18 @@ export function useInputPopup({ isOpen, value, name, onChange }: InputPopupOptio
       }
       const result = await getDaDataHints({
         url: defaultHintsListOptions.url,
+        responseItemHandler: defaultHintsListOptions.responseItemHandler,
         requestData: {
           ...defaultHintsListOptions?.requestData,
         },
         query: searchValue,
+        queryPrefix: daDataQueryPrefix,
       });
       if (result?.length) {
         setHintsList(result);
       }
     },
-    [],
+    [daDataQueryPrefix],
   );
 
   const debouncedGetHintsList = useMemo(() => debounce(getHintsList, 300), [getHintsList]);

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.597",
   "private": false,
   "license": "MIT",
   "author": "ЦК",