@redneckz/wildless-cms-uni-blocks 0.12.13 → 0.12.14

package/src/components/InsuranceAmountBlock/InsuranceAmountBlockContent.ts

@@ -1,7 +1,7 @@
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Кнопка выбора программы
@@ -31,5 +31,5 @@ export type InsuranceAmountBlockContent = UniBlockContent &
     /** @title Список вкладок */
     insuranceTabs?: InsuranceAmountBlockTab[];
     /** @title Кнопка */
-    button?: ButtonProps;
+    button?: ButtonContent;
   };

package/src/components/InsuranceAmountBlock/InsuranceAmountBlockInner.tsx

@@ -2,15 +2,15 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useCarouselControls } from '../../hooks/useCarouselControls';
 import { Button } from '../../ui-kit/Button/Button';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { renderArrows } from '../../ui-kit/Button/renderArrows';
 import { Img } from '../../ui-kit/Img/Img';
 import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import type { CardItem, InsuranceAmountBlockTab } from './InsuranceAmountBlockContent';
+import type { ButtonCommonContent } from '../../ui-kit/Button/ButtonContent';
 
 export interface InsuranceAmountBlockInnerProps extends InsuranceAmountBlockTab {
   className?: string;
-  button?: ButtonProps;
+  button?: ButtonCommonContent;
 }
 
 type InsuranceGalleryProps = {

package/src/components/MobileAppTile/MobileAppTile.fixture.mobile.tsx

@@ -20,24 +20,13 @@ const listItems = [
   'Копите бонусные баллы',
 ];
 
-const button1: ButtonProps = {
+const buttonStore: ButtonProps = {
   text: 'App Store',
   href: 'apps.apple.com',
   version: 'primary',
 };
 
-const button2: ButtonProps = {
-  text: 'Google Play',
-  href: 'play.google.com',
-  version: 'secondary',
-};
-const button3: ButtonProps = {
-  text: 'Google Play',
-  href: 'play.google.com',
-  version: 'secondary',
-};
-
-const button4: ButtonProps = {
+const buttonPlay: ButtonProps = {
   text: 'Google Play',
   href: 'play.google.com',
   version: 'secondary',
@@ -54,10 +43,10 @@ export default {
         title="Мобильное приложение!"
         buttons={[
           {
-            ...button1,
+            ...buttonStore,
             version: 'secondary',
           },
-          button2,
+          buttonPlay,
         ]}
       />
     </div>
@@ -72,12 +61,12 @@ export default {
         title="Мобильное приложение!"
         buttons={[
           {
-            ...button1,
+            ...buttonStore,
             version: 'secondary',
           },
-          button2,
-          button3,
-          button4,
+          buttonPlay,
+          buttonPlay,
+          buttonPlay,
         ]}
       />
     </div>

package/src/components/MobileAppTile/MobileAppTile.fixture.tsx

@@ -1,8 +1,8 @@
 import '../../setup-fixture';
 
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { MobileAppTile } from './MobileAppTile';
 import type { Picture } from '../../model/Picture';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const image: Picture = {
   src: 'icon-phone.png',
@@ -30,7 +30,7 @@ const listItems = [
   'Копите бонусные баллы',
 ];
 
-const button1: ButtonWithIconProps = {
+const buttonStore: ButtonContent = {
   aboveText: 'Загрузите в',
   text: 'App Store',
   icon: { icon: 'AppleIcon', iconVersion: 'white' },
@@ -38,7 +38,7 @@ const button1: ButtonWithIconProps = {
   version: 'primary',
 };
 
-const button2: ButtonWithIconProps = {
+const buttonPlay: ButtonContent = {
   aboveText: 'Доступно в',
   text: 'Google Play',
   icon: { icon: 'PlayMarketIcon' },
@@ -60,14 +60,14 @@ export default {
         items={listItems}
         buttons={[
           {
-            ...button1,
+            ...buttonStore,
             icon: { icon: 'AppleIcon' },
             version: 'secondary',
           },
-          button2,
-          button2,
-          button1,
-          button2,
+          buttonPlay,
+          buttonPlay,
+          buttonStore,
+          buttonPlay,
         ]}
       />
     </div>
@@ -80,7 +80,7 @@ export default {
         qr={qr}
         headingType="h3"
         items={listItems}
-        buttons={[button1, button2]}
+        buttons={[buttonStore, buttonPlay]}
       />
     </div>
   ),
@@ -92,13 +92,13 @@ export default {
         qr={qr}
         headingType="h3"
         items={listItems}
-        buttons={[button1, button2]}
+        buttons={[buttonStore, buttonPlay]}
       />
     </div>
   ),
   'without-image-and-list': (
     <div className="container grid grid-cols-12">
-      <MobileAppTile className="col-span-8" qr={qr} buttons={[button1, button2]} />
+      <MobileAppTile className="col-span-8" qr={qr} buttons={[buttonStore, buttonPlay]} />
     </div>
   ),
 };

package/src/components/MobileAppTile/MobileAppTileContent.ts

@@ -2,10 +2,10 @@ import type { AlignType } from '../../model/AlignType';
 import type { HeadlineCommonProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { HeadingCommonProps } from '../../ui-kit/Heading/HeadingProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { ListContent } from '../../ui-kit/List/ListContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @title Мобильное приложение
@@ -13,7 +13,7 @@ import type { ListContent } from '../../ui-kit/List/ListContent';
 export type MobileAppTileContent = UniBlockContent &
   HeadlineCommonProps &
   HeadingCommonProps &
-  ButtonContent &
+  ButtonsSectionContent &
   ListContent &
   ImageContent & {
     /** @title Выравнивание заголовка */

package/src/components/ProductBlock/ProductBlock.fixture.mobile.tsx

@@ -2,8 +2,8 @@ import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
 import type { ComplexBenefitContent } from '../../ui-kit/BenefitItem/BenefitItemContent';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ProductBlock } from './ProductBlock';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const title = 'Кредит до 5 000 000 Р\nбез залога и поручителей';
 const description =
@@ -41,7 +41,7 @@ const benefits: ComplexBenefitContent[] = [
   },
 ];
 
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Оформить карту',

package/src/components/ProductBlock/ProductBlock.fixture.tsx

@@ -2,7 +2,7 @@ import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
 import type { ComplexBenefitContent } from '../../ui-kit/BenefitItem/BenefitItemContent';
-import type { BackwardButtonProps, ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { ProductBlock } from './ProductBlock';
 import type { ProductBlockContent } from './ProductBlockContent';
 
@@ -37,7 +37,7 @@ const benefits: ComplexBenefitContent[] = [
   },
 ];
 
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Оформить карту',
@@ -52,7 +52,7 @@ const buttons: ButtonWithIconProps[] = [
   },
 ];
 
-const buttonsSecond: ButtonWithIconProps[] = [
+const buttonsSecond: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Подробнее',
@@ -67,7 +67,7 @@ const items = [
   'Расходы для бизнеса на УСН 15% позволят снизить налоговую базу',
 ];
 
-const backwardButton: BackwardButtonProps = {
+const backwardButton: ButtonContent = {
   href: 'https://rshb.ru',
   text: 'Все кредитные карты',
   icon: { icon: 'ArrowLeftIcon' },

package/src/components/ProductBlock/ProductBlockContent.ts

@@ -1,6 +1,6 @@
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { BaseProductTileContent } from '../../ui-kit/BaseProductTile/BaseProductTileContent';
-import type { BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Продуктовый блок
@@ -8,5 +8,5 @@ import type { BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
 export type ProductBlockContent = UniBlockContent &
   BaseProductTileContent & {
     /** @title Кнопка возврата */
-    backwardButton?: BackwardButtonProps;
+    backwardButton?: ButtonContent;
   };

package/src/components/ProductBlock/renderBackwardButton.tsx

@@ -1,10 +1,10 @@
 import type { ButtonVersion } from '../../model/ButtonVersion';
 import { Button } from '../../ui-kit/Button/Button';
-import type { BackwardButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { Img } from '../../ui-kit/Img/Img';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 export function renderBackwardButton(
-  { text, href, target, icon }: BackwardButtonProps,
+  { text, href, target, icon }: ButtonContent,
   version: ButtonVersion,
 ) {
   const iconVersion = version === 'primary' ? 'white' : 'black';

package/src/components/ProductGallery/ProductGallery.fixture.mobile.tsx

@@ -1,7 +1,7 @@
 import type { Picture } from '../../model/Picture';
 import '../../setup-fixture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ProductGallery } from './ProductGallery';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const percentImage: Picture = {
   src: '3-6-percent.png',
@@ -27,7 +27,7 @@ const items = [
   'Получите деньги без залога и поручительства',
   'Кредитный лимит до 5 млн рублей',
 ];
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Подробнее',
@@ -36,7 +36,7 @@ const buttons: ButtonWithIconProps[] = [
   },
 ];
 
-const buttonsSecondary: ButtonWithIconProps[] = [
+const buttonsSecondary: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Подробнее',

package/src/components/ProductGallery/ProductGallery.fixture.tsx

@@ -1,8 +1,8 @@
 import '../../setup-fixture';
 
 import type { Picture } from '../../model/Picture';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import { ProductGallery } from './ProductGallery';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 const percentImage: Picture = {
   src: '3-6-percent.png',
@@ -37,7 +37,7 @@ const items = [
   'Получите деньги без залога и поручительства',
   'Кредитный лимит до 5 млн рублей',
 ];
-const buttons: ButtonWithIconProps[] = [
+const buttons: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Подробнее',
@@ -46,7 +46,7 @@ const buttons: ButtonWithIconProps[] = [
   },
 ];
 
-const buttonsSecondary: ButtonWithIconProps[] = [
+const buttonsSecondary: ButtonContent[] = [
   {
     href: 'https://rshb.ru',
     text: 'Подробнее',

package/src/components/PromoTile/PromoTileContent.ts

@@ -1,6 +1,6 @@
 import type { DescriptionProps, HeadlineProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @title Акции
@@ -8,7 +8,7 @@ import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 export type PromoTileContent = UniBlockContent &
   HeadlineProps &
   DescriptionProps &
-  ButtonContent & {
+  ButtonsSectionContent & {
     /** @title Дата публикации */
     date?: string;
   };

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.fixture.mobile.tsx

@@ -1,10 +1,10 @@
 import '../../setup-fixture';
 
 import { RepresentativeOfficeInfo } from './RepresentativeOfficeInfo';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { Picture } from '../../model/Picture';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
-const BUTTON: ButtonWithIconProps = {
+const BUTTON: ButtonContent = {
   text: 'Информация о регионе',
   target: '_blank',
   version: 'secondary',

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfo.fixture.tsx

@@ -1,10 +1,10 @@
 import '../../setup-fixture';
 
 import { RepresentativeOfficeInfo } from './RepresentativeOfficeInfo';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { Picture } from '../../model/Picture';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
-const BUTTON: ButtonWithIconProps = {
+const BUTTON: ButtonContent = {
   text: 'Информация о регионе',
   target: '_blank',
   version: 'secondary',

package/src/components/RepresentativeOfficeInfo/RepresentativeOfficeInfoContent.ts

@@ -1,8 +1,8 @@
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
 import type { IconProps } from '../../model/Picture';
 import type { RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 import type { TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 
 /**
  * @title Блок с информацией о представительстве
@@ -18,5 +18,5 @@ export type RepresentativeOfficeInfoContent = UniBlockContent &
     /** @title E-mail */
     email?: string;
     /** @title Кнопка */
-    button?: ButtonWithIconProps;
+    button?: ButtonContent;
   };

package/src/components/StepsBlock/StepsBlockContent.ts

@@ -1,7 +1,7 @@
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { BulletsProps } from '../../model/Bullets';
-import type { ButtonCommonIconProps } from '../../model/Button';
-import type { ButtonWithIconProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 import type { DefaultListItemType } from '../../model/DefaultListItemType';
 import type { DescriptionProps, HeadlineCommonProps, LabelProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
@@ -10,7 +10,11 @@ import type { RichTextItem } from '../../model/RichTextItem';
 import type { SizeVersion } from '../../model/SizeVersion';
 import type { ListContent } from '../../ui-kit/List/ListContent';
 
-type StepCommonProps = IconProps & ButtonCommonIconProps & BulletsProps & ListContent;
+type StepCommonProps = IconProps &
+  BulletsProps &
+  ListContent & {
+    button?: ButtonContent;
+  };
 
 /**
  * @title Стандартный
@@ -34,7 +38,8 @@ export type Step = DefaultStep | RichTextStep;
  * @title Блок шаги
  */
 export type StepsBlockContent = UniBlockContent &
-  HeadlineCommonProps & {
+  HeadlineCommonProps &
+  ButtonsSectionContent & {
     /** @title Линии */
     showLines?: boolean;
     /**
@@ -49,9 +54,4 @@ export type StepsBlockContent = UniBlockContent &
     stepVersion?: BlockVersion;
     /** @title Размер шагов */
     size?: SizeVersion; // TODO: mobile content
-    /**
-     * @title Кнопки
-     * @maxItems 2
-     */
-    buttons?: ButtonWithIconProps[];
   };

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

@@ -1,10 +1,11 @@
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Img } from '../../ui-kit/Img/Img';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import { List } from '../../ui-kit/List/List';
 import type { ListProps } from '../../ui-kit/List/ListProps';
 import type { LabelDescriptionCell } from './TariffsTableContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 export type EmbeddableCellDataType =
   | ButtonContent
@@ -12,7 +13,7 @@ export type EmbeddableCellDataType =
   | ImageContent
   | ListProps;
 
-const renderButtonsCellData = ({ buttons }: ButtonContent) =>
+const renderButtonsCellData = ({ buttons }: ButtonsSectionContent) =>
   renderButtonsSection(buttons, {
     className: 'mt-3',
     buttonClassName: 'w-12 h-12',

package/src/components/TariffsTable/EmbeddableCellData.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonContent } from '../../ui-kit/Button/ButtonContent';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Img } from '../../ui-kit/Img/Img';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
@@ -11,6 +11,7 @@ import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTabl
 import { List } from '../../ui-kit/List/List';
 import type { ListProps } from '../../ui-kit/List/ListProps';
 import type { LabelDescriptionCell } from './TariffsTableContent';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 export type EmbeddableCellDataType =
   | LabelDescriptionCell
@@ -24,7 +25,7 @@ interface TableCellDataProps extends TableInnerButtonProps {
   displayTable: (props: TariffsTableInnerContent) => void;
 }
 
-const renderButtonsCellData = ({ buttons }: ButtonContent) => renderButtonsSection(buttons);
+const renderButtonsCellData = ({ buttons }: ButtonsSectionContent) => renderButtonsSection(buttons);
 
 const renderLabelDescriptionCellData = ({ label, description }: LabelDescriptionCell) => {
   const labelClassName = `text-h6 m-0 ${description ? 'mb-1' : ''}`;

package/src/components/TariffsTable/TariffsTableContent.ts

@@ -3,10 +3,10 @@ import type { DescriptionProps, LabelProps, TitleProps } from '../../model/Headl
 import type { UniBlockContent, UniBlockProps } from '../../model/JSXBlock';
 import type { ListOrientation } from '../../model/ListOrientation';
 import type { IconProps } from '../../model/Picture';
-import type { ButtonContent } from '../../ui-kit/Button/ButtonProps';
 import type { ImageContent } from '../../ui-kit/Img/ImgProps';
 import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 import type { ListProps } from '../../ui-kit/List/ListProps';
+import type { ButtonsSectionContent } from '../../ui-kit/Button/ButtonsSectionContent';
 
 /**
  * @hidden
@@ -56,7 +56,7 @@ export type ImageCellDef = ImageContent & {
 /**
  * @title Кнопки
  */
-export type ButtonsCellDef = ButtonContent & {
+export type ButtonsCellDef = ButtonsSectionContent & {
   /** @default Buttons */
   tableCellType: 'Buttons';
 };

package/src/hooks/useLink.ts

@@ -1,5 +1,5 @@
 import type { LinkProps } from '../model/LinkProps';
-import { useDialog } from '../ui-kit/Dialog/useDialog';
+import { useDialogManager } from '../ui-kit/DialogManager/useDialogManager';
 import type { PreventableEvent } from '../ui-kit/PreventableEvent';
 import { adjustHref } from '../utils/adjustHref';
 import { isLocalURL } from '../utils/url';
@@ -19,7 +19,7 @@ export function useLink(params: UseLinkParams = {}) {
   const { isRemote, basePath } = params;
 
   const router = useRouter();
-  const { close } = useDialog();
+  const { closeAll } = useDialogManager();
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
@@ -37,7 +37,7 @@ export function useLink(params: UseLinkParams = {}) {
         return;
       }
 
-      close();
+      closeAll();
 
       // Client routing
       ev?.preventDefault();

package/src/hooks/useList.ts

@@ -0,0 +1,24 @@
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+
+export function useList<T>(initialList: T[] = []): [
+  T[],
+  {
+    setList: (_: T[]) => void;
+    push: (item: T) => void;
+    pop: () => void;
+    remove: (item: T) => void;
+    clear: () => void;
+  },
+] {
+  const [list, setList] = useState<T[]>(initialList);
+
+  const push = useCallback((item: T) => setList((_) => [..._, item]), []);
+  const pop = useCallback(() => setList((_) => _.slice(0, -1)), []);
+  const remove = useCallback(
+    (item: T) => setList((_) => _.filter((currentItem) => currentItem !== item)),
+    [],
+  );
+  const clear = useCallback(() => setList([]), []);
+
+  return [list, { setList, push, pop, remove, clear }];
+}

package/src/hooks/useLocation.ts

@@ -1,6 +1,8 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { defaultEventBus } from '../EventBus/defaultEventBus';
+import { useLatestEvent } from '../EventBus/useLatestEvent';
 import { fetchJSONUnsafe } from '../utils/fetchJSON';
-import { useCachedAsyncData } from './useCachedAsyncData';
 
 const REGION_URL = '/api/v1/region';
 
@@ -10,42 +12,46 @@ export interface RegionData {
   name?: string;
 }
 
-interface LocationStorageData {
-  manual?: boolean;
-  region: RegionData;
-}
+const LOCATION_STORAGE_KEY = 'location';
 
-export function useLocation(
-  defaultLocation = 'Москва',
-): [RegionData, (newLocation: RegionData) => void] {
-  const currentLocation = getLocalStorageLocation();
-  const [location, setLocation] = useState<RegionData>(
-    currentLocation?.region ?? { name: defaultLocation },
+export function useLocation(defaultLocation = 'Москва'): [RegionData, (_: RegionData) => void] {
+  const [currentLocation, fireCurrentLocation] = useLatestEvent(
+    defaultEventBus,
+    'location',
+    restoreLocation() ?? { name: defaultLocation },
   );
-  const { data } = useCachedAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
 
+  const selectCurrentLocation = useCallback((_: RegionData) => {
+    storeLocation(_);
+    fireCurrentLocation(_);
+  }, []);
+
+  const { data } = useAsyncData<RegionData>(REGION_URL, fetchJSONUnsafe);
   useEffect(() => {
-    setLocation(
-      currentLocation?.region && currentLocation?.manual
-        ? currentLocation.region
-        : data || { name: defaultLocation },
-    );
+    if (data && !hasStoredLocation()) {
+      fireCurrentLocation(data);
+    }
   }, [data]);
 
-  const onChangeLocation = useCallback((region: RegionData) => {
-    globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
-    setLocation(region);
-  }, []);
-
-  return [location, onChangeLocation];
+  return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
 }
 
-const getLocalStorageLocation = (): LocationStorageData | null => {
-  const localStorageLocation = globalThis.localStorage?.getItem('location');
+const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
 
+const restoreLocation = (): RegionData | null => {
   try {
-    return localStorageLocation ? JSON.parse(localStorageLocation) : null;
-  } catch (_) {
+    const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
+
+    return data && JSON.parse(data);
+  } catch (ex) {
     return null;
   }
 };
+
+const storeLocation = (_: RegionData) => {
+  try {
+    globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+  } catch (ex) {
+    // Do nothing
+  }
+};

package/src/hooks/useSWRResource.ts

@@ -4,10 +4,15 @@ import { fetchJSONUnsafe } from '../utils/fetchJSON';
 
 const EMPTY_VALUE = {};
 
-export function useSWRResource<Data>(filename: string, fallback: Fallback = {}): Data {
-  const { data } = useAsyncData<Data>(`/wcms-resources/${filename}.json`, fetchJSONUnsafe, {
-    fallback,
-  });
+export function useSWRResource<Data>(
+  filename: string | null | undefined,
+  fallback: Fallback = EMPTY_VALUE,
+): Data {
+  const { data } = useAsyncData<Data, any, string | null>(
+    filename ? `/wcms-resources/${filename}.json` : null,
+    fetchJSONUnsafe,
+    { fallback },
+  );
 
   return data || (EMPTY_VALUE as Data);
 }