@redneckz/wildless-cms-uni-blocks 0.14.675 → 0.14.677

package/mobile/lib/hooks/useLocation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLocation.js","sourceRoot":"","sources":["../../src/hooks/useLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;AAG/E,MAAM,UAAU,GAAG,GAAG,YAAY,SAAS,CAAC;AAC5C,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAExC,MAAM,UAAU,WAAW,CAAC,eAAe,GAAG,QAAQ;IACpD,MAAM,CAAC,eAAe,EAAE,mBAAmB,CAAC,GAAG,cAAc,CAC3D,eAAe,EACf,UAAU,EACV,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CAC/C,CAAC;IAEF,MAAM,qBAAqB,GAAG,WAAW,CAAC,CAAC,CAAS,EAAE,EAAE;QACtD,aAAa,CAAC,CAAC,CAAC,CAAC;QACjB,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAC3B,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,EACvC,eAA8C,CAC/C,CAAC;IACF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,IAAI,CAAC,iBAAiB,EAAE,EAAE;YAChC,mBAAmB,CAAC,IAAI,CAAC,CAAC;SAC3B;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,CAAC,eAAe,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,qBAAqB,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAEhG,MAAM,eAAe,GAAG,GAAkB,EAAE;IAC1C,IAAI;QACF,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAEpE,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;KACjC;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,EAAE;IAClC,IAAI;QACF,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;KAC3E;IAAC,OAAO,EAAE,EAAE;QACX,aAAa;KACd;AACH,CAAC,CAAC"}
+{"version":3,"file":"useLocation.js","sourceRoot":"","sources":["../../src/hooks/useLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,MAAM,UAAU,GAAG,GAAG,YAAY,SAAS,CAAC;AAM5C,MAAM,UAAU,WAAW,CAAC,eAAe,GAAG,QAAQ;IACpD,MAAM,aAAa,GAAG,aAAa,EAAiB,CAAC;IAErD,OAAO,aAAa,CAAC,QAAQ,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,eAAe,GAAG,QAAQ;IAC3D,MAAM,aAAa,GAAG,aAAa,EAAiB,CAAC;IAErD,MAAM,iBAAiB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC/C,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YAC3B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAS,UAAU,CAAC,CAAC;YACnD,aAAa,CAAC,QAAQ,GAAG,MAAM,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;SAC9D;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC;IAErC,YAAY,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAE5C,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/mobile/lib/hooks/useNavigator.d.ts

@@ -0,0 +1,8 @@
+export interface Navigator {
+    assign: (url: string) => void;
+}
+export declare function useNavigator(): Navigator;
+export declare namespace useNavigator {
+    var _impl: () => Navigator;
+    var setup: (impl: () => Navigator) => void;
+}

package/mobile/lib/hooks/useNavigator.js

@@ -0,0 +1,10 @@
+export function useNavigator() {
+    return useNavigator._impl();
+}
+useNavigator._impl = () => ({
+    assign: (url) => globalThis.location.assign(url),
+});
+useNavigator.setup = (impl) => {
+    useNavigator._impl = impl;
+};
+//# sourceMappingURL=useNavigator.js.map

package/mobile/lib/hooks/useNavigator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useNavigator.js","sourceRoot":"","sources":["../../src/hooks/useNavigator.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,YAAY;IAC1B,OAAO,YAAY,CAAC,KAAK,EAAE,CAAC;AAC9B,CAAC;AAED,YAAY,CAAC,KAAK,GAAG,GAAc,EAAE,CAAC,CAAC;IACrC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;CACjD,CAAC,CAAC;AAEH,YAAY,CAAC,KAAK,GAAG,CAAC,IAAqB,EAAE,EAAE;IAC7C,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;AAC5B,CAAC,CAAC"}

package/mobile/lib/hooks/useRegions.js

@@ -2,8 +2,10 @@ import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { API_BASE_URI } from '../api/apiBaseUrl.js';
 import { fetchJSONUnsafe } from '../utils/fetchJSON.js';
 const REGIONS_URL = `${API_BASE_URI}/regions`;
+const EMPTY_REGIONS = [];
+// TODO Почему url можно менять? Разве смысл не в инкапсуляции api url. Тоже под рефакторинг попадает
 export function useRegions(url = REGIONS_URL) {
     const { data } = useAsyncData(url, fetchJSONUnsafe);
-    return Array.isArray(data) ? data : [];
+    return Array.isArray(data) ? data : EMPTY_REGIONS;
 }
 //# sourceMappingURL=useRegions.js.map

package/mobile/lib/hooks/useRegions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRegions.js","sourceRoot":"","sources":["../../src/hooks/useRegions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;AAE/E,MAAM,WAAW,GAAG,GAAG,YAAY,UAAU,CAAC;AAY9C,MAAM,UAAU,UAAU,CAAC,MAAc,WAAW;IAClD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,eAAgD,CAAC,CAAC;IAErF,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AACzC,CAAC"}
+{"version":3,"file":"useRegions.js","sourceRoot":"","sources":["../../src/hooks/useRegions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,eAAe,EAA4B,MAAM,oBAAoB,CAAC;AAE/E,MAAM,WAAW,GAAG,GAAG,YAAY,UAAU,CAAC;AAY9C,MAAM,aAAa,GAAa,EAAE,CAAC;AAEnC,qGAAqG;AACrG,MAAM,UAAU,UAAU,CAAC,MAAc,WAAW;IAClD,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC,GAAG,EAAE,eAAgD,CAAC,CAAC;IAErF,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;AACpD,CAAC"}

package/mobile/lib/index.d.ts

@@ -3,6 +3,7 @@ export { setup } from '@redneckz/uni-jsx/lib/setup';
 export { Blocks } from './components/Blocks';
 export { ContentPage } from './components/ContentPage/ContentPage';
 export { handlerDecorator } from './hooks/handlerDecorator';
+export { useNavigator } from './hooks/useNavigator';
 export { useRouter } from './hooks/useRouter';
 export { projectSettings } from './ProjectSettings';
 export { joinList } from './utils/joinList';

package/mobile/lib/index.js

@@ -3,6 +3,7 @@ export { setup } from '@redneckz/uni-jsx/lib/setup';
 export { Blocks } from './components/Blocks.js';
 export { ContentPage } from './components/ContentPage/ContentPage.js';
 export { handlerDecorator } from './hooks/handlerDecorator.js';
+export { useNavigator } from './hooks/useNavigator.js';
 export { useRouter } from './hooks/useRouter.js';
 export { projectSettings } from './ProjectSettings.js';
 export { joinList } from './utils/joinList.js';

package/mobile/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,kBAAkB,CAAC"}

package/mobile/lib/ui-kit/DialogManager/useDialogsList.js

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

package/mobile/lib/ui-kit/DialogManager/useDialogsList.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDialogsList.js","sourceRoot":"","sources":["../../../src/ui-kit/DialogManager/useDialogsList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQlE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,UAAU,EACV,OAAO,MACe,EAAE,EAAsB,EAAE;IAChD,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,EAAoB,CAAC;IAEpE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;QAClC,KAAK,EAAE,CAAC;IACV,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAE1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAChD,GAAG,EAAE,CAAC;IACR,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAEvB,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;QAC7C,QAAQ,MAAM,CAAC,IAAI,EAAE;YACnB,KAAK,MAAM;gBACT,IAAI,CAAC,MAAM,CAAC,CAAC;gBACb,MAAM;YACR,KAAK,OAAO;gBACV,IAAI,MAAM,CAAC,GAAG,EAAE;oBACd,QAAQ,EAAE,CAAC;iBACZ;qBAAM;oBACL,KAAK,EAAE,CAAC;iBACT;gBACD,MAAM;YACR;gBACE,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,EACJ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAClB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
+{"version":3,"file":"useDialogsList.js","sourceRoot":"","sources":["../../../src/ui-kit/DialogManager/useDialogsList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAQlE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,UAAU,EACV,OAAO,MACe,EAAE,EAAsB,EAAE;IAChD,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,EAAoB,CAAC;IAEpE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,UAAU,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;QAClC,KAAK,EAAE,CAAC;IACV,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAE1B,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAChD,GAAG,EAAE,CAAC;IACR,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAEvB,SAAS,CACP,GAAG,EAAE,CACH,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE;QAC7C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QACD,QAAQ,MAAM,CAAC,IAAI,EAAE;YACnB,KAAK,MAAM;gBACT,IAAI,CAAC,MAAM,CAAC,CAAC;gBACb,MAAM;YACR,KAAK,OAAO;gBACV,IAAI,MAAM,CAAC,GAAG,EAAE;oBACd,QAAQ,EAAE,CAAC;iBACZ;qBAAM;oBACL,KAAK,EAAE,CAAC;iBACT;gBACD,MAAM;YACR;gBACE,iBAAiB,CAAC,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,EACJ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAClB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}

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

@@ -1,40 +1,37 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useLink } from '../../hooks/useLink.js';
-import { useLocation } from '../../hooks/useLocation.js';
+import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useDefaultLocation } from '../../hooks/useLocation.js';
 import { useRegions } from '../../hooks/useRegions.js';
 import { groupBy } from '../../utils/groupBy.js';
 import { jaroWinklerDistance } from '../../utils/jaroWinklerDistance.js';
 import { Dialog } from '../DialogManager/Dialog.js';
 import { useDialogManager } from '../DialogManager/useDialogManager.js';
-import { LinkWrapper } from '../LinkWrapper/LinkWrapper.js';
-import { Paragraph } from '../Paragraph/Paragraph.js';
 import { Text } from '../Text/Text.js';
 import { renderForeignOffices } from './renderForeignOffices.js';
 import { renderRegion } from './renderRegion.js';
 import { renderRegionGroup } from './renderRegionGroup.js';
 import { SearchBar } from './SearchBar.js';
+import { SelectedLocation } from './SelectedLocation.js';
 const SEARCH_TERM_MIN_LENGTH = 3;
 export const LocationDialog = JSX(({ 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 = cleanUpRegions(useRegions()).sort((a, b) => a.name.localeCompare(b.name));
-    const regionsGroupByLetter = groupBy(regions, regionFirstLetter);
+    const rawRegions = useRegions();
+    const regions = useMemo(() => cleanUpRegions(rawRegions).sort((a, b) => a.name.localeCompare(b.name)), [rawRegions]);
+    const regionsGroupByLetter = useMemo(() => groupBy(regions, regionFirstLetter), [regions]);
     const { close } = useDialogManager();
-    const handleChangeLocation = useCallback((region) => {
-        selectCurrentLocation(region);
+    const handleChangeLocation = useCallback((_) => {
+        locationStore.location = _;
         close();
-    }, []);
-    return (_jsxs(Dialog, { className: "pb-20", head: _jsxs("div", { children: [_jsx(Text, { size: "text-h4", color: "text-primary-text", children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B" }), currentLocation ? (_jsx("div", { className: "mb-s", children: _jsxs(Paragraph, { size: "text-l", color: "text-primary-text", children: ["\u0421\u0435\u0439\u0447\u0430\u0441 \u0432\u044B\u0431\u0440\u0430\u043D:", _jsx(LinkWrapper, { href: href, className: "inline mx-2xs text-primary-main", children: currentLocation.name })] }) })) : null, _jsx(SearchBar, { onSearch: setQuery, searchTerm: query })] }), children: [query && query.length >= SEARCH_TERM_MIN_LENGTH ? (_jsx("div", { children: regions
+    }, [locationStore]);
+    return (_jsxs(Dialog, { className: "pb-20", head: _jsxs("div", { children: [_jsx(Text, { size: "text-h4", color: "text-primary-text", children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B" }), _jsx(SelectedLocation, { defaultLocation: branches?.default }), _jsx(SearchBar, { onSearch: setQuery, searchTerm: query })] }), children: [query && query.length >= SEARCH_TERM_MIN_LENGTH ? (_jsx("div", { children: regions
                     .filter(({ name }) => name && jaroWinklerDistance(name.toLowerCase())(query.toLowerCase()) >= 0.8)
                     .map(renderRegion(branches?.dataSelect, handleChangeLocation)) })) : (_jsx("div", { className: "columns-1 sm:columns-3 md:columns-4 lg:columns-5", children: Array.from(regionsGroupByLetter.entries()).map(renderRegionGroup(handleChangeLocation, branches?.dataSelect)) })), renderForeignOffices(foreignOffices)] }));
 });
-const regionFirstLetter = (region) => region.name?.charAt(0) || '';
+const regionFirstLetter = (region) => region.name?.charAt(0) ?? '';
 const cleanUpRegions = (regions) => regions.map((region) => ({
     ...region,
-    name: region.name?.replace(/республика|область|край'/gi, '').trim() || '',
+    name: region.name?.replace(/республика|область|край'/gi, '').trim() ?? '',
 }));
 //# sourceMappingURL=LocationDialog.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"LocationDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/LocationDialog/LocationDialog.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LocationDialog.js","sourceRoot":"","sources":["../../../src/ui-kit/LocationDialog/LocationDialog.tsx"],"names":[],"mappings":"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"}

package/mobile/lib/ui-kit/LocationDialog/SelectedLocation.d.ts

@@ -0,0 +1,5 @@
+interface SelectedLocationProps {
+    defaultLocation?: string;
+}
+export declare const SelectedLocation: import("@redneckz/uni-jsx").UNIComponent<SelectedLocationProps, any, any>;
+export {};

package/mobile/lib/ui-kit/LocationDialog/SelectedLocation.js

@@ -0,0 +1,13 @@
+import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
+import { JSX } from '@redneckz/uni-jsx';
+import { useLink } from '../../hooks/useLink.js';
+import { useLocation } from '../../hooks/useLocation.js';
+import { LinkWrapper } from '../LinkWrapper/LinkWrapper.js';
+import { Paragraph } from '../Paragraph/Paragraph.js';
+export const SelectedLocation = JSX(({ defaultLocation }) => {
+    const currentLocation = useLocation(defaultLocation);
+    const link = useLink();
+    const { href } = link({ href: `/branches/${currentLocation.slug}` });
+    return currentLocation ? (_jsx("div", { className: "mb-s", children: _jsxs(Paragraph, { size: "text-l", color: "text-primary-text", children: ["\u0421\u0435\u0439\u0447\u0430\u0441 \u0432\u044B\u0431\u0440\u0430\u043D:", _jsx(LinkWrapper, { href: href, className: "inline mx-2xs text-primary-main", children: currentLocation.name })] }) })) : null;
+});
+//# sourceMappingURL=SelectedLocation.js.map

package/mobile/lib/ui-kit/LocationDialog/SelectedLocation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SelectedLocation.js","sourceRoot":"","sources":["../../../src/ui-kit/LocationDialog/SelectedLocation.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAwB,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE;IACjF,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAErD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAErE,OAAO,eAAe,CAAC,CAAC,CAAC,CACvB,cAAK,SAAS,EAAC,MAAM,YACnB,MAAC,SAAS,IAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAC,mBAAmB,2FAEhD,KAAC,WAAW,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,iCAAiC,YACjE,eAAe,CAAC,IAAI,GACT,IACJ,GACR,CACP,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC,CAAC"}

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/api/RetailAPI/updateRefreshToken.ts

@@ -5,17 +5,15 @@ interface UpdateRefreshTokenBody {
   access_token: string;
 }
 
-const PORTAL_NATURAL_URL = '/';
-
 const UPDATING_INTERVAL = 60000 * 4;
 
-export const updateRefreshToken = () => {
+export const updateRefreshToken = (failCallback: () => void) => {
   const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
   const accessToken = globalThis.sessionStorage?.getItem('accessToken');
   const taskId = globalThis.localStorage.getItem('taskId');
 
   if (!accessToken || !refreshToken || !taskId) {
-    globalThis.location.href = PORTAL_NATURAL_URL;
+    failCallback();
 
     return () => null;
   }
@@ -28,9 +26,11 @@ export const updateRefreshToken = () => {
       access_token: accessToken,
     });
 
-    if (res) {
-      handleStatus(res.status);
+    if (res?.status == 401) {
+      failCallback();
+    }
 
+    if (res?.ok) {
       const data: UpdateRefreshTokenBody = await res.json();
 
       globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
@@ -44,9 +44,3 @@ export const updateRefreshToken = () => {
 
   return () => clearInterval(timer);
 };
-
-const handleStatus = (status: number) => {
-  if (status == 401) {
-    globalThis.location.href = PORTAL_NATURAL_URL;
-  }
-};

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
+import { useNavigator } from '../../hooks/useNavigator';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
@@ -11,6 +12,8 @@ import { stepsSectionsMap } from './creditCardFormStepsData';
 
 interface CreditCardFormWizardProps extends CreditCardFormContent, UniBlockProps {}
 
+const PORTAL_NATURAL_URL = '/';
+
 const WIZARD_STEPS = 6;
 
 const WIZARD_TITLES = [
@@ -31,7 +34,9 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
     [formContainerRef],
   );
 
-  useEffect(updateRefreshToken, []);
+  const navigator = useNavigator();
+
+  useEffect(() => updateRefreshToken(() => navigator.assign(PORTAL_NATURAL_URL)), []);
 
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));

package/mobile/src/components/CreditForm/CreditForm.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
+import { useNavigator } from '../../hooks/useNavigator';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
@@ -12,6 +13,8 @@ import { stepsSectionsMap } from './creditFormStepsData';
 
 interface CreditFormWizardProps extends CreditFormContent, UniBlockProps {}
 
+const PORTAL_NATURAL_URL = '/';
+
 const WIZARD_STEPS = 5;
 
 const WIZARD_TITLES = [
@@ -32,7 +35,9 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
     [formContainerRef],
   );
 
-  useEffect(updateRefreshToken, []);
+  const navigator = useNavigator();
+
+  useEffect(() => updateRefreshToken(() => navigator.assign(PORTAL_NATURAL_URL)), []);
 
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));

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/useNavigator.ts

@@ -0,0 +1,15 @@
+export interface Navigator {
+  assign: (url: string) => void;
+}
+
+export function useNavigator(): Navigator {
+  return useNavigator._impl();
+}
+
+useNavigator._impl = (): Navigator => ({
+  assign: (url) => globalThis.location.assign(url),
+});
+
+useNavigator.setup = (impl: () => Navigator) => {
+  useNavigator._impl = impl;
+};

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/index.ts

@@ -3,6 +3,7 @@ export { setup } from '@redneckz/uni-jsx/lib/setup';
 export { Blocks } from './components/Blocks';
 export { ContentPage } from './components/ContentPage/ContentPage';
 export { handlerDecorator } from './hooks/handlerDecorator';
+export { useNavigator } from './hooks/useNavigator';
 export { useRouter } from './hooks/useRouter';
 export { projectSettings } from './ProjectSettings';
 export { joinList } from './utils/joinList';

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);