@redneckz/wildless-cms-uni-blocks 0.6.43 → 0.6.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (142) hide show
  1. package/bundle/ProjectSettings.d.ts +2 -0
  2. package/bundle/bundle.umd.js +39 -22
  3. package/bundle/bundle.umd.min.js +1 -1
  4. package/bundle/services/BlockRouter/BlockRouter.d.ts +1 -1
  5. package/bundle/services/sitemap/checkIsHrefSameOrigin.d.ts +2 -4
  6. package/bundle/utils/normalizeURLPath.d.ts +1 -0
  7. package/bundle/utils/url.d.ts +1 -0
  8. package/dist/ProjectSettings.d.ts +2 -0
  9. package/dist/ProjectSettings.js +5 -0
  10. package/dist/ProjectSettings.js.map +1 -1
  11. package/dist/api/LikeAPI.js +2 -2
  12. package/dist/api/LikeAPI.js.map +1 -1
  13. package/dist/components/Header/Header.js +1 -6
  14. package/dist/components/Header/Header.js.map +1 -1
  15. package/dist/hooks/useLink.js +3 -5
  16. package/dist/hooks/useLink.js.map +1 -1
  17. package/dist/hooks/useLocation.js +11 -5
  18. package/dist/hooks/useLocation.js.map +1 -1
  19. package/dist/services/BlockRouter/BlockRouter.d.ts +1 -1
  20. package/dist/services/BlockRouter/BlockRouter.js.map +1 -1
  21. package/dist/services/sitemap/checkIsHrefSameOrigin.d.ts +2 -4
  22. package/dist/services/sitemap/checkIsHrefSameOrigin.js +1 -1
  23. package/dist/services/sitemap/checkIsHrefSameOrigin.js.map +1 -1
  24. package/dist/services/sitemap/isHrefActive.js +2 -3
  25. package/dist/services/sitemap/isHrefActive.js.map +1 -1
  26. package/dist/setup-fixture.js +3 -3
  27. package/dist/setup-fixture.js.map +1 -1
  28. package/dist/utils/normalizeURLPath.d.ts +1 -0
  29. package/dist/utils/normalizeURLPath.js +12 -0
  30. package/dist/utils/normalizeURLPath.js.map +1 -0
  31. package/dist/utils/url.d.ts +1 -0
  32. package/dist/utils/url.js +9 -1
  33. package/dist/utils/url.js.map +1 -1
  34. package/dist/wlc.json +3 -1
  35. package/lib/ProjectSettings.d.ts +2 -0
  36. package/lib/ProjectSettings.js +5 -0
  37. package/lib/ProjectSettings.js.map +1 -1
  38. package/lib/api/LikeAPI.js +2 -2
  39. package/lib/api/LikeAPI.js.map +1 -1
  40. package/lib/components/Header/Header.js +1 -6
  41. package/lib/components/Header/Header.js.map +1 -1
  42. package/lib/hooks/useLink.js +3 -5
  43. package/lib/hooks/useLink.js.map +1 -1
  44. package/lib/hooks/useLocation.js +11 -5
  45. package/lib/hooks/useLocation.js.map +1 -1
  46. package/lib/services/BlockRouter/BlockRouter.d.ts +1 -1
  47. package/lib/services/BlockRouter/BlockRouter.js.map +1 -1
  48. package/lib/services/sitemap/checkIsHrefSameOrigin.d.ts +2 -4
  49. package/lib/services/sitemap/checkIsHrefSameOrigin.js +1 -1
  50. package/lib/services/sitemap/checkIsHrefSameOrigin.js.map +1 -1
  51. package/lib/services/sitemap/isHrefActive.js +3 -4
  52. package/lib/services/sitemap/isHrefActive.js.map +1 -1
  53. package/lib/setup-fixture.js +3 -3
  54. package/lib/setup-fixture.js.map +1 -1
  55. package/lib/utils/normalizeURLPath.d.ts +1 -0
  56. package/lib/utils/normalizeURLPath.js +9 -0
  57. package/lib/utils/normalizeURLPath.js.map +1 -0
  58. package/lib/utils/url.d.ts +1 -0
  59. package/lib/utils/url.js +7 -0
  60. package/lib/utils/url.js.map +1 -1
  61. package/lib/wlc.json +3 -1
  62. package/mobile/bundle/ProjectSettings.d.ts +2 -0
  63. package/mobile/bundle/bundle.umd.js +38 -16
  64. package/mobile/bundle/bundle.umd.min.js +1 -1
  65. package/mobile/bundle/services/BlockRouter/BlockRouter.d.ts +1 -1
  66. package/mobile/bundle/services/sitemap/checkIsHrefSameOrigin.d.ts +2 -4
  67. package/mobile/bundle/utils/normalizeURLPath.d.ts +1 -0
  68. package/mobile/bundle/utils/url.d.ts +1 -0
  69. package/mobile/dist/ProjectSettings.d.ts +2 -0
  70. package/mobile/dist/ProjectSettings.js +5 -0
  71. package/mobile/dist/ProjectSettings.js.map +1 -1
  72. package/mobile/dist/api/LikeAPI.js +2 -2
  73. package/mobile/dist/api/LikeAPI.js.map +1 -1
  74. package/mobile/dist/hooks/useLink.js +3 -5
  75. package/mobile/dist/hooks/useLink.js.map +1 -1
  76. package/mobile/dist/hooks/useLocation.js +11 -5
  77. package/mobile/dist/hooks/useLocation.js.map +1 -1
  78. package/mobile/dist/services/BlockRouter/BlockRouter.d.ts +1 -1
  79. package/mobile/dist/services/BlockRouter/BlockRouter.js.map +1 -1
  80. package/mobile/dist/services/sitemap/checkIsHrefSameOrigin.d.ts +2 -4
  81. package/mobile/dist/services/sitemap/checkIsHrefSameOrigin.js +1 -1
  82. package/mobile/dist/services/sitemap/checkIsHrefSameOrigin.js.map +1 -1
  83. package/mobile/dist/services/sitemap/isHrefActive.js +2 -3
  84. package/mobile/dist/services/sitemap/isHrefActive.js.map +1 -1
  85. package/mobile/dist/setup-fixture.js +3 -3
  86. package/mobile/dist/setup-fixture.js.map +1 -1
  87. package/mobile/dist/utils/normalizeURLPath.d.ts +1 -0
  88. package/mobile/dist/utils/normalizeURLPath.js +12 -0
  89. package/mobile/dist/utils/normalizeURLPath.js.map +1 -0
  90. package/mobile/dist/utils/url.d.ts +1 -0
  91. package/mobile/dist/utils/url.js +9 -1
  92. package/mobile/dist/utils/url.js.map +1 -1
  93. package/mobile/dist/wlc.json +3 -1
  94. package/mobile/lib/ProjectSettings.d.ts +2 -0
  95. package/mobile/lib/ProjectSettings.js +5 -0
  96. package/mobile/lib/ProjectSettings.js.map +1 -1
  97. package/mobile/lib/api/LikeAPI.js +2 -2
  98. package/mobile/lib/api/LikeAPI.js.map +1 -1
  99. package/mobile/lib/hooks/useLink.js +3 -5
  100. package/mobile/lib/hooks/useLink.js.map +1 -1
  101. package/mobile/lib/hooks/useLocation.js +11 -5
  102. package/mobile/lib/hooks/useLocation.js.map +1 -1
  103. package/mobile/lib/services/BlockRouter/BlockRouter.d.ts +1 -1
  104. package/mobile/lib/services/BlockRouter/BlockRouter.js.map +1 -1
  105. package/mobile/lib/services/sitemap/checkIsHrefSameOrigin.d.ts +2 -4
  106. package/mobile/lib/services/sitemap/checkIsHrefSameOrigin.js +1 -1
  107. package/mobile/lib/services/sitemap/checkIsHrefSameOrigin.js.map +1 -1
  108. package/mobile/lib/services/sitemap/isHrefActive.js +3 -4
  109. package/mobile/lib/services/sitemap/isHrefActive.js.map +1 -1
  110. package/mobile/lib/setup-fixture.js +3 -3
  111. package/mobile/lib/setup-fixture.js.map +1 -1
  112. package/mobile/lib/utils/normalizeURLPath.d.ts +1 -0
  113. package/mobile/lib/utils/normalizeURLPath.js +9 -0
  114. package/mobile/lib/utils/normalizeURLPath.js.map +1 -0
  115. package/mobile/lib/utils/url.d.ts +1 -0
  116. package/mobile/lib/utils/url.js +7 -0
  117. package/mobile/lib/utils/url.js.map +1 -1
  118. package/mobile/lib/wlc.json +3 -1
  119. package/mobile/src/ProjectSettings.ts +6 -0
  120. package/mobile/src/api/LikeAPI.ts +2 -2
  121. package/mobile/src/hooks/useLink.ts +6 -7
  122. package/mobile/src/hooks/useLocation.ts +12 -6
  123. package/mobile/src/services/BlockRouter/BlockRouter.ts +1 -1
  124. package/mobile/src/services/sitemap/checkIsHrefSameOrigin.ts +5 -4
  125. package/mobile/src/services/sitemap/isHrefActive.ts +7 -4
  126. package/mobile/src/setup-fixture.ts +3 -3
  127. package/mobile/src/utils/normalizeURLPath.ts +10 -0
  128. package/mobile/src/utils/url.ts +10 -0
  129. package/mobile/src/wlc.json +3 -1
  130. package/package.json +1 -1
  131. package/src/ProjectSettings.ts +6 -0
  132. package/src/api/LikeAPI.ts +2 -2
  133. package/src/components/Header/Header.tsx +2 -10
  134. package/src/hooks/useLink.ts +6 -7
  135. package/src/hooks/useLocation.ts +12 -6
  136. package/src/services/BlockRouter/BlockRouter.ts +1 -1
  137. package/src/services/sitemap/checkIsHrefSameOrigin.ts +5 -4
  138. package/src/services/sitemap/isHrefActive.ts +7 -4
  139. package/src/setup-fixture.ts +3 -3
  140. package/src/utils/normalizeURLPath.ts +10 -0
  141. package/src/utils/url.ts +10 -0
  142. package/src/wlc.json +3 -1
@@ -15,7 +15,7 @@ export declare class BlockRouter {
15
15
  static readonly inst: BlockRouter;
16
16
  readonly eventBus: EventBus<EventMap>;
17
17
  constructor();
18
- goto(rawAnchor: string): void;
18
+ goto(rawAnchor?: string): void;
19
19
  push(rawAnchor: string): void;
20
20
  replace(rawAnchor: string): void;
21
21
  reset(): void;
@@ -1,4 +1,2 @@
1
- export declare const checkIsHrefSameOrigin: (href: string | undefined, router: {
2
- pathname?: string | undefined;
3
- href?: string | undefined;
4
- }) => boolean;
1
+ import type { Router } from '../../hooks/useRouter';
2
+ export declare const checkIsHrefSameOrigin: (href: string | undefined, router: Router) => boolean;
@@ -0,0 +1 @@
1
+ export declare const normalizeURLPath: (href?: string) => string | undefined;
@@ -1,5 +1,6 @@
1
1
  export declare const isURL: (href?: string) => boolean | undefined;
2
2
  export declare const withoutQuery: (href?: string) => string;
3
3
  export declare const getOrigin: (href?: string) => string | undefined;
4
+ export declare const getPathname: (href?: string) => string | undefined;
4
5
  export declare const getHash: (href?: string) => string | undefined;
5
6
  export declare const isHash: (href?: string) => boolean | undefined;
@@ -7,6 +7,7 @@ export interface ProjectSettings {
7
7
  SITEMAP?: string;
8
8
  FOOTER?: string;
9
9
  CDN?: string;
10
+ BASE_PATH?: string;
10
11
  YANDEX_MAP_API_KEY?: string;
11
12
  YANDEX_METRIKA_ID?: string;
12
13
  }
@@ -21,6 +22,7 @@ export declare const projectSettings: {
21
22
  readonly SITEMAP: string | undefined;
22
23
  readonly FOOTER: string | undefined;
23
24
  readonly CDN: string | undefined;
25
+ readonly BASE_PATH: string | undefined;
24
26
  readonly YANDEX_MAP_API_KEY: string | undefined;
25
27
  readonly YANDEX_METRIKA_ID: string | undefined;
26
28
  };
@@ -32,6 +32,11 @@ exports.projectSettings = new (class {
32
32
  get CDN() {
33
33
  return this._.CDN;
34
34
  }
35
+ get BASE_PATH() {
36
+ return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
37
+ ? `${this._.BASE_PATH}/`
38
+ : this._.BASE_PATH;
39
+ }
35
40
  get YANDEX_MAP_API_KEY() {
36
41
  return this._.YANDEX_MAP_API_KEY;
37
42
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":";;AAaa,QAAA,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB;QACnB,WAAW,EAAE,QAAQ;QACrB,iBAAiB,EAAE,KAAK;KACzB,CAAC;IAEF,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":";;AAca,QAAA,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB;QACnB,WAAW,EAAE,QAAQ;QACrB,iBAAiB,EAAE,KAAK;KACzB,CAAC;IAEF,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxD,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,GAAG;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvB,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC"}
@@ -83,7 +83,7 @@ function LikeAPI() {
83
83
  }
84
84
  async function auth() {
85
85
  try {
86
- const userData = JSON.parse(globalThis.localStorage.getItem(STORAGE_KEY) || '');
86
+ const userData = JSON.parse(globalThis.localStorage?.getItem(STORAGE_KEY) || '');
87
87
  if (userData?.token) {
88
88
  return userData;
89
89
  }
@@ -103,7 +103,7 @@ function LikeAPI() {
103
103
  }),
104
104
  });
105
105
  const { token, name } = await response.json();
106
- globalThis.localStorage.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
106
+ globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
107
107
  return { token, name };
108
108
  }
109
109
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"LikeAPI.js","sourceRoot":"","sources":["../../src/api/LikeAPI.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LikeAPI.js","sourceRoot":"","sources":["../../src/api/LikeAPI.ts"],"names":[],"mappings":"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"}
@@ -18,13 +18,8 @@ const BORDER_COLORS = {
18
18
  exports.Header = (0, uni_jsx_1.JSX)(({ bgColor = 'bg-white', className = '', showSubMenu = true, ...rest }) => {
19
19
  const router = (0, useRouter_1.useRouter)();
20
20
  const { topItems, logo, defaultLocation, foreignOffices, officesLink } = (0, useSWRResource_1.useSWRResource)(ProjectSettings_1.projectSettings.SITEMAP || 'sitemap', rest.options?.page?.fallback);
21
- const activeTopItem = showSubMenu ? getActiveItem(topItems, router) : null;
21
+ const activeTopItem = topItems?.find((0, isTopItemActive_1.isTopItemActive)(router));
22
22
  const topMenu = topItems?.map((_, i) => ((0, jsx_runtime_1.jsx)(TopItem_1.TopItem, { active: _ === activeTopItem, "aria-label": _.text, bgColor: bgColor, ..._ }, String(i))));
23
23
  return ((0, jsx_runtime_1.jsx)(BlockWrapper_1.BlockWrapper, { tag: "header", className: `pt-6 px-20 ${bgColor} ${className} ${showSubMenu && activeTopItem?.items?.length ? 'pb-4' : 'pb-5'}`, ...rest, children: (0, jsx_runtime_1.jsxs)("div", { className: "container", children: [(0, jsx_runtime_1.jsxs)("div", { className: "flex items-center", children: [(0, jsx_runtime_1.jsx)(Logo_1.Logo, { className: "mr-8", bgColor: bgColor, logo: logo }), topMenu, (0, jsx_runtime_1.jsx)(HeaderSecondaryMenu_1.HeaderSecondaryMenu, { className: "ml-auto", foreignOffices: foreignOffices, defaultLocation: defaultLocation, officesLink: officesLink, bgColor: bgColor })] }), (0, jsx_runtime_1.jsx)("div", { className: `mt-6 h-px ${BORDER_COLORS[bgColor]}` }), showSubMenu && activeTopItem?.items?.length ? ((0, jsx_runtime_1.jsx)(HeaderSubMenu_1.HeaderSubMenu, { subItems: activeTopItem.items, bgColor: bgColor })) : null] }) }));
24
24
  });
25
- const getActiveItem = (topItems, router) => {
26
- const [firstPortal] = topItems || [];
27
- // Если по слагу невозможно понять к какому подпорталу этот слаг относиться, то выбираем первый подпортал.
28
- return topItems?.find((0, isTopItemActive_1.isTopItemActive)(router)) || firstPortal;
29
- };
30
25
  //# sourceMappingURL=Header.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/Header/Header.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,qDAA0D;AAI1D,2DAAwD;AACxD,4EAAyE;AAEzE,0EAAuE;AACvE,4DAAyD;AACzD,iDAA8C;AAC9C,0DAAuD;AAEvD,+DAA4D;AAC5D,mDAAgD;AAEhD,MAAM,aAAa,GAAmC;IACpD,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,4BAA4B;CAC1C,CAAC;AAIW,QAAA,MAAM,GAAG,IAAA,aAAG,EACvB,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,SAAS,GAAG,EAAE,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAE3B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,GACpE,IAAA,+BAAc,EACZ,iCAAe,CAAC,OAAO,IAAI,SAAS,EACpC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAC7B,CAAC;IAEJ,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE3E,MAAM,OAAO,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACtC,uBAAC,iBAAO,IAEN,MAAM,EAAE,CAAC,KAAK,aAAa,gBACf,CAAC,CAAC,IAAI,EAClB,OAAO,EAAE,OAAO,KACZ,CAAC,IAJA,MAAM,CAAC,CAAC,CAAC,CAKd,CACH,CAAC,CAAC;IAEH,OAAO,CACL,uBAAC,2BAAY,IACX,GAAG,EAAC,QAAQ,EACZ,SAAS,EAAE,cAAc,OAAO,IAAI,SAAS,IAC3C,WAAW,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MACzD,EAAE,KACE,IAAI,YAER,iCAAK,SAAS,EAAC,WAAW,aACxB,iCAAK,SAAS,EAAC,mBAAmB,aAChC,uBAAC,WAAI,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAI,EACtD,OAAO,EACR,uBAAC,yCAAmB,IAClB,SAAS,EAAC,SAAS,EACnB,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,GAChB,IACE,EACN,gCAAK,SAAS,EAAE,aAAa,aAAa,CAAC,OAAO,CAAC,EAAE,GAAI,EACxD,WAAW,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAC7C,uBAAC,6BAAa,IAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAI,CACnE,CAAC,CAAC,CAAC,IAAI,IACJ,GACO,CAChB,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,QAAmC,EAAE,MAAc,EAAE,EAAE;IAC5E,MAAM,CAAC,WAAW,CAAC,GAAG,QAAQ,IAAI,EAAE,CAAC;IAErC,0GAA0G;IAC1G,OAAO,QAAQ,EAAE,IAAI,CAAC,IAAA,iCAAe,EAAC,MAAM,CAAC,CAAC,IAAI,WAAW,CAAC;AAChE,CAAC,CAAC"}
1
+ {"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/Header/Header.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,qDAAkD;AAGlD,2DAAwD;AACxD,4EAAyE;AAEzE,0EAAuE;AACvE,4DAAyD;AACzD,iDAA8C;AAC9C,0DAAuD;AAEvD,+DAA4D;AAC5D,mDAAgD;AAEhD,MAAM,aAAa,GAAmC;IACpD,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,4BAA4B;CAC1C,CAAC;AAIW,QAAA,MAAM,GAAG,IAAA,aAAG,EACvB,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,SAAS,GAAG,EAAE,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAE3B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,GACpE,IAAA,+BAAc,EACZ,iCAAe,CAAC,OAAO,IAAI,SAAS,EACpC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAC7B,CAAC;IAEJ,MAAM,aAAa,GAAG,QAAQ,EAAE,IAAI,CAAC,IAAA,iCAAe,EAAC,MAAM,CAAC,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACtC,uBAAC,iBAAO,IAEN,MAAM,EAAE,CAAC,KAAK,aAAa,gBACf,CAAC,CAAC,IAAI,EAClB,OAAO,EAAE,OAAO,KACZ,CAAC,IAJA,MAAM,CAAC,CAAC,CAAC,CAKd,CACH,CAAC,CAAC;IAEH,OAAO,CACL,uBAAC,2BAAY,IACX,GAAG,EAAC,QAAQ,EACZ,SAAS,EAAE,cAAc,OAAO,IAAI,SAAS,IAC3C,WAAW,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MACzD,EAAE,KACE,IAAI,YAER,iCAAK,SAAS,EAAC,WAAW,aACxB,iCAAK,SAAS,EAAC,mBAAmB,aAChC,uBAAC,WAAI,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAI,EACtD,OAAO,EACR,uBAAC,yCAAmB,IAClB,SAAS,EAAC,SAAS,EACnB,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,GAChB,IACE,EACN,gCAAK,SAAS,EAAE,aAAa,aAAa,CAAC,OAAO,CAAC,EAAE,GAAI,EACxD,WAAW,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAC7C,uBAAC,6BAAa,IAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAI,CACnE,CAAC,CAAC,CAAC,IAAI,IACJ,GACO,CAChB,CAAC;AACJ,CAAC,CACF,CAAC"}
@@ -16,10 +16,7 @@ function useLink() {
16
16
  'aria-label': props.text,
17
17
  onClick: (0, handlerDecorator_1.handlerDecorator)((ev) => {
18
18
  props.onClick && props.onClick(ev);
19
- const isLocalHref = href && !(0, url_1.isURL)(href);
20
- const isLocalTarget = !props.target || props.target === '_self';
21
- if (!isLocalHref || !isLocalTarget) {
22
- // Default handle
19
+ if (isRemoteHref(href, props.target)) {
23
20
  return;
24
21
  }
25
22
  ev?.preventDefault();
@@ -27,11 +24,12 @@ function useLink() {
27
24
  blockRouter.goto(href);
28
25
  }
29
26
  else {
30
- router.push(href);
27
+ href && router.push(href);
31
28
  }
32
29
  }, props),
33
30
  };
34
31
  };
35
32
  }
36
33
  exports.useLink = useLink;
34
+ const isRemoteHref = (href, target) => (0, url_1.isURL)(href) || (target && target !== '_self') || href?.startsWith('/');
37
35
  //# sourceMappingURL=useLink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AACA,2EAAwE;AACxE,oDAAiD;AACjD,sCAA6C;AAC7C,yDAAsD;AACtD,2CAAwC;AAMxC,SAAgB,OAAO;IAGrB,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,IAAA,+BAAc,GAAE,CAAC;IAErC,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,CAAC,EAAmC,EAAE,EAAE;gBAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAEnC,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC;gBAEhE,IAAI,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE;oBAClC,iBAAiB;oBACjB,OAAO;iBACR;gBAED,EAAE,EAAE,cAAc,EAAE,CAAC;gBACrB,IAAI,IAAA,YAAM,EAAC,IAAI,CAAC,EAAE;oBAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACxB;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACnB;YACH,CAAC,EAAE,KAAK,CAAC;SACV,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjCD,0BAiCC"}
1
+ {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AACA,2EAAwE;AACxE,oDAAiD;AACjD,sCAA6C;AAC7C,yDAAsD;AACtD,2CAAwC;AAMxC,SAAgB,OAAO;IAGrB,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,IAAA,+BAAc,GAAE,CAAC;IAErC,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,CAAC,EAAmC,EAAE,EAAE;gBAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAEnC,IAAI,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;oBACpC,OAAO;iBACR;gBAED,EAAE,EAAE,cAAc,EAAE,CAAC;gBACrB,IAAI,IAAA,YAAM,EAAC,IAAI,CAAC,EAAE;oBAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACxB;qBAAM;oBACL,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC3B;YACH,CAAC,EAAE,KAAK,CAAC;SACV,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA7BD,0BA6BC;AAED,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,MAAe,EAAE,EAAE,CACtD,IAAA,WAAK,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC"}
@@ -4,11 +4,8 @@ const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
4
4
  const fetchJSON_1 = require("../utils/fetchJSON");
5
5
  const useCachedAsyncData_1 = require("./useCachedAsyncData");
6
6
  const REGION_URL = '/api/v1/region';
7
- const localStorageLocation = globalThis?.localStorage.getItem('location');
8
- const currentLocation = localStorageLocation
9
- ? JSON.parse(localStorageLocation)
10
- : null;
11
7
  function useLocation(defaultLocation) {
8
+ const currentLocation = getLocalStorageLocation();
12
9
  const [location, setLocation] = (0, hooks_1.useState)(currentLocation?.region ?? { name: defaultLocation });
13
10
  const { data } = (0, useCachedAsyncData_1.useCachedAsyncData)(REGION_URL, fetchJSON_1.fetchJSONUnsafe);
14
11
  (0, hooks_1.useEffect)(() => {
@@ -17,10 +14,19 @@ function useLocation(defaultLocation) {
17
14
  : data || { name: defaultLocation });
18
15
  }, [data]);
19
16
  const onChangeLocation = (0, hooks_1.useCallback)((region) => {
20
- globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
17
+ globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
21
18
  setLocation(region);
22
19
  }, [setLocation]);
23
20
  return [location, onChangeLocation];
24
21
  }
25
22
  exports.useLocation = useLocation;
23
+ const getLocalStorageLocation = () => {
24
+ const localStorageLocation = globalThis.localStorage?.getItem('location');
25
+ try {
26
+ return localStorageLocation ? JSON.parse(localStorageLocation) : null;
27
+ }
28
+ catch (_) {
29
+ return null;
30
+ }
31
+ };
26
32
  //# sourceMappingURL=useLocation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useLocation.js","sourceRoot":"","sources":["../../src/hooks/useLocation.ts"],"names":[],"mappings":";;AAAA,uDAA+E;AAC/E,kDAAqD;AACrD,6DAA0D;AAE1D,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAapC,MAAM,oBAAoB,GAAG,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC1E,MAAM,eAAe,GAA+B,oBAAoB;IACtE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;IAClC,CAAC,CAAC,IAAI,CAAC;AAET,SAAgB,WAAW,CACzB,eAAuB;IAEvB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EACtC,eAAe,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACrD,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,uCAAkB,EAAa,UAAU,EAAE,2BAAe,CAAC,CAAC;IAE7E,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,WAAW,CACT,eAAe,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM;YAChD,CAAC,CAAC,eAAe,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACtC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,CAAC,MAAkB,EAAE,EAAE;QACrB,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvF,WAAW,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;AACtC,CAAC;AAzBD,kCAyBC"}
1
+ {"version":3,"file":"useLocation.js","sourceRoot":"","sources":["../../src/hooks/useLocation.ts"],"names":[],"mappings":";;AAAA,uDAA+E;AAC/E,kDAAqD;AACrD,6DAA0D;AAE1D,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAapC,SAAgB,WAAW,CACzB,eAAuB;IAEvB,MAAM,eAAe,GAAG,uBAAuB,EAAE,CAAC;IAClD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,gBAAQ,EACtC,eAAe,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACrD,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,uCAAkB,EAAa,UAAU,EAAE,2BAAe,CAAC,CAAC;IAE7E,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,WAAW,CACT,eAAe,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM;YAChD,CAAC,CAAC,eAAe,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACtC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAClC,CAAC,MAAkB,EAAE,EAAE;QACrB,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvF,WAAW,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;AACtC,CAAC;AA1BD,kCA0BC;AAED,MAAM,uBAAuB,GAAG,GAA+B,EAAE;IAC/D,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAE1E,IAAI;QACF,OAAO,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC"}
@@ -15,7 +15,7 @@ export declare class BlockRouter {
15
15
  static readonly inst: BlockRouter;
16
16
  readonly eventBus: EventBus<EventMap>;
17
17
  constructor();
18
- goto(rawAnchor: string): void;
18
+ goto(rawAnchor?: string): void;
19
19
  push(rawAnchor: string): void;
20
20
  replace(rawAnchor: string): void;
21
21
  reset(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":";;AAAA,sDAAmD;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAE5E,MAAa,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,mBAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;;AA9BH,kCA+BC"}
1
+ {"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":";;AAAA,sDAAmD;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAE5E,MAAa,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,mBAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAkB;QACrB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;;AA9BH,kCA+BC"}
@@ -1,4 +1,2 @@
1
- export declare const checkIsHrefSameOrigin: (href: string | undefined, router: {
2
- pathname?: string | undefined;
3
- href?: string | undefined;
4
- }) => boolean;
1
+ import type { Router } from '../../hooks/useRouter';
2
+ export declare const checkIsHrefSameOrigin: (href: string | undefined, router: Router) => boolean;
@@ -1,6 +1,6 @@
1
1
  Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.checkIsHrefSameOrigin = void 0;
3
3
  const url_1 = require("../../utils/url");
4
- const checkIsHrefSameOrigin = (href, router) => (0, url_1.getOrigin)(href) === (0, url_1.getOrigin)(router.href);
4
+ const checkIsHrefSameOrigin = (href, router) => [(0, url_1.getOrigin)(href), (0, url_1.getOrigin)(router.href)].every((link, _, arr) => Boolean(link) && link === arr[0]);
5
5
  exports.checkIsHrefSameOrigin = checkIsHrefSameOrigin;
6
6
  //# sourceMappingURL=checkIsHrefSameOrigin.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"checkIsHrefSameOrigin.js","sourceRoot":"","sources":["../../../src/services/sitemap/checkIsHrefSameOrigin.ts"],"names":[],"mappings":";;AAAA,yCAA4C;AAErC,MAAM,qBAAqB,GAAG,CACnC,IAAwB,EACxB,MAA4C,EAC5C,EAAE,CAAC,IAAA,eAAS,EAAC,IAAI,CAAC,KAAK,IAAA,eAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAHnC,QAAA,qBAAqB,yBAGc"}
1
+ {"version":3,"file":"checkIsHrefSameOrigin.js","sourceRoot":"","sources":["../../../src/services/sitemap/checkIsHrefSameOrigin.ts"],"names":[],"mappings":";;AACA,yCAA4C;AAErC,MAAM,qBAAqB,GAAG,CAAC,IAAwB,EAAE,MAAc,EAAE,EAAE,CAChF,CAAC,IAAA,eAAS,EAAC,IAAI,CAAC,EAAE,IAAA,eAAS,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAC7C,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CACnD,CAAC;AAHS,QAAA,qBAAqB,yBAG9B"}
@@ -1,8 +1,7 @@
1
1
  Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.isHrefActive = void 0;
3
+ const normalizeURLPath_1 = require("../../utils/normalizeURLPath");
3
4
  const url_1 = require("../../utils/url");
4
- const isHrefActive = (href, router, cmp = (targetHref, baseHref) => baseHref.startsWith(targetHref)) => {
5
- return cmp((0, url_1.withoutQuery)(href), (0, url_1.withoutQuery)((0, url_1.isURL)(href) ? router.href : router.pathname));
6
- };
5
+ const isHrefActive = (href, router, cmp = (targetHref, baseHref) => baseHref.startsWith(targetHref)) => cmp((0, url_1.withoutQuery)((0, normalizeURLPath_1.normalizeURLPath)(href)), (0, url_1.withoutQuery)((0, url_1.isURL)(href) ? router.href : (0, url_1.getPathname)(router.href)));
7
6
  exports.isHrefActive = isHrefActive;
8
7
  //# sourceMappingURL=isHrefActive.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"isHrefActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isHrefActive.ts"],"names":[],"mappings":";;AAAA,yCAAsD;AAE/C,MAAM,YAAY,GAAG,CAC1B,IAAwB,EACxB,MAA4C,EAC5C,MAAyD,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,CAChF,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EACjC,EAAE;IACF,OAAO,GAAG,CAAC,IAAA,kBAAY,EAAC,IAAI,CAAC,EAAE,IAAA,kBAAY,EAAC,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5F,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB"}
1
+ {"version":3,"file":"isHrefActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isHrefActive.ts"],"names":[],"mappings":";;AAAA,mEAAgE;AAChE,yCAAmE;AAE5D,MAAM,YAAY,GAAG,CAC1B,IAAwB,EACxB,MAA4C,EAC5C,MAAyD,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,CAChF,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,EACjC,EAAE,CACF,GAAG,CACD,IAAA,kBAAY,EAAC,IAAA,mCAAgB,EAAC,IAAI,CAAC,CAAC,EACpC,IAAA,kBAAY,EAAC,IAAA,WAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,iBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CACnE,CAAC;AATS,QAAA,YAAY,gBASrB"}
@@ -10,10 +10,10 @@ const ProjectSettings_1 = require("./ProjectSettings");
10
10
  const wlc_json_1 = __importDefault(require("./wlc.json"));
11
11
  ProjectSettings_1.projectSettings.setup(wlc_json_1.default);
12
12
  useRouter_1.useRouter.setup(() => {
13
- const [href, setHref] = (0, react_1.useState)(globalThis.location.href);
13
+ const [, setHref] = (0, react_1.useState)(globalThis.location.href);
14
14
  return {
15
- href: href,
16
- pathname: '/credits',
15
+ href: `${globalThis.location.origin}${ProjectSettings_1.projectSettings.BASE_PATH}cards-credit`,
16
+ pathname: '/cards-credit',
17
17
  query: {},
18
18
  push: (url) => {
19
19
  globalThis.history.pushState(null, '', url);
@@ -1 +1 @@
1
- {"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":";;;;AAAA,6CAA2C;AAC3C,iCAAiC;AACjC,+DAA4D;AAC5D,iDAA8C;AAC9C,uDAAoD;AACpD,0DAA6B;AAE7B,iCAAe,CAAC,KAAK,CAAC,kBAAG,CAAC,CAAC;AAE3B,qBAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAS,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnE,OAAO;QACL,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,mCAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,aAAa,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC7D,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":";;;;AAAA,6CAA2C;AAC3C,iCAAiC;AACjC,+DAA4D;AAC5D,iDAA8C;AAC9C,uDAAoD;AACpD,0DAA6B;AAE7B,iCAAe,CAAC,KAAK,CAAC,kBAAG,CAAC,CAAC;AAE3B,qBAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAS,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE/D,OAAO;QACL,IAAI,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,iCAAe,CAAC,SAAS,cAAc;QAC7E,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,EAAE;QACT,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,mCAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,aAAa,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC7D,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ export declare const normalizeURLPath: (href?: string) => string | undefined;
@@ -0,0 +1,12 @@
1
+ Object.defineProperty(exports, "__esModule", { value: true });
2
+ exports.normalizeURLPath = void 0;
3
+ const ProjectSettings_1 = require("../ProjectSettings");
4
+ const url_1 = require("./url");
5
+ const normalizeURLPath = (href) => {
6
+ if ((0, url_1.isURL)(href) || href?.startsWith('/')) {
7
+ return href;
8
+ }
9
+ return `${ProjectSettings_1.projectSettings.BASE_PATH || ''}${href}`;
10
+ };
11
+ exports.normalizeURLPath = normalizeURLPath;
12
+ //# sourceMappingURL=normalizeURLPath.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"normalizeURLPath.js","sourceRoot":"","sources":["../../src/utils/normalizeURLPath.ts"],"names":[],"mappings":";;AAAA,wDAAqD;AACrD,+BAA8B;AAEvB,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAAE,EAAE;IAChD,IAAI,IAAA,WAAK,EAAC,IAAI,CAAC,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,GAAG,iCAAe,CAAC,SAAS,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;AACrD,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
@@ -1,5 +1,6 @@
1
1
  export declare const isURL: (href?: string) => boolean | undefined;
2
2
  export declare const withoutQuery: (href?: string) => string;
3
3
  export declare const getOrigin: (href?: string) => string | undefined;
4
+ export declare const getPathname: (href?: string) => string | undefined;
4
5
  export declare const getHash: (href?: string) => string | undefined;
5
6
  export declare const isHash: (href?: string) => boolean | undefined;
package/dist/utils/url.js CHANGED
@@ -1,5 +1,5 @@
1
1
  Object.defineProperty(exports, "__esModule", { value: true });
2
- exports.isHash = exports.getHash = exports.getOrigin = exports.withoutQuery = exports.isURL = void 0;
2
+ exports.isHash = exports.getHash = exports.getPathname = exports.getOrigin = exports.withoutQuery = exports.isURL = void 0;
3
3
  const isURL = (href) => href?.includes('//');
4
4
  exports.isURL = isURL;
5
5
  const withoutQuery = (href) => (href || '').replace(/\/?\?.*/, '');
@@ -15,6 +15,14 @@ const getOrigin = (href) => {
15
15
  return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
16
16
  };
17
17
  exports.getOrigin = getOrigin;
18
+ const getPathname = (href) => {
19
+ if (!href || !(0, exports.isURL)(href)) {
20
+ return undefined;
21
+ }
22
+ const url = new URL(href);
23
+ return url.pathname;
24
+ };
25
+ exports.getPathname = getPathname;
18
26
  const getHash = (href) => {
19
27
  if (!href || !(0, exports.isURL)(href)) {
20
28
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAAO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAAhD,QAAA,KAAK,SAA2C;AAEtD,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAAtE,QAAA,YAAY,gBAA0D;AAE5E,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAXW,QAAA,SAAS,aAWpB;AAEK,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE;IACvC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC,CAAC;AARW,QAAA,OAAO,WAQlB;AAEK,MAAM,MAAM,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;AAAlD,QAAA,MAAM,UAA4C"}
1
+ {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAAO,MAAM,KAAK,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAAhD,QAAA,KAAK,SAA2C;AAEtD,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAAtE,QAAA,YAAY,gBAA0D;AAE5E,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,IAAI,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAEzE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAClE,CAAC,CAAC;AAXW,QAAA,SAAS,aAWpB;AAEK,MAAM,WAAW,GAAG,CAAC,IAAa,EAAE,EAAE;IAC3C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;IAE1B,OAAO,GAAG,CAAC,QAAQ,CAAC;AACtB,CAAC,CAAC;AARW,QAAA,WAAW,eAQtB;AAEK,MAAM,OAAO,GAAG,CAAC,IAAa,EAAE,EAAE;IACvC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEpC,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC/E,CAAC,CAAC;AARW,QAAA,OAAO,WAQlB;AAEK,MAAM,MAAM,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;AAAlD,QAAA,MAAM,UAA4C"}
package/dist/wlc.json CHANGED
@@ -1,5 +1,7 @@
1
1
  {
2
2
  "PROD_BRANCH": "master",
3
3
  "FORCED_DRAFT_FLOW": false,
4
- "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b"
4
+ "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
5
+ "BASE_PATH": "/natural/",
6
+ "SITEMAP": "sayt-rshb"
5
7
  }
@@ -7,6 +7,7 @@ export interface ProjectSettings {
7
7
  SITEMAP?: string;
8
8
  FOOTER?: string;
9
9
  CDN?: string;
10
+ BASE_PATH?: string;
10
11
  YANDEX_MAP_API_KEY?: string;
11
12
  YANDEX_METRIKA_ID?: string;
12
13
  }
@@ -21,6 +22,7 @@ export declare const projectSettings: {
21
22
  readonly SITEMAP: string | undefined;
22
23
  readonly FOOTER: string | undefined;
23
24
  readonly CDN: string | undefined;
25
+ readonly BASE_PATH: string | undefined;
24
26
  readonly YANDEX_MAP_API_KEY: string | undefined;
25
27
  readonly YANDEX_METRIKA_ID: string | undefined;
26
28
  };
@@ -30,6 +30,11 @@ export const projectSettings = new (class {
30
30
  get CDN() {
31
31
  return this._.CDN;
32
32
  }
33
+ get BASE_PATH() {
34
+ return this._.BASE_PATH && !this._.BASE_PATH.endsWith('/')
35
+ ? `${this._.BASE_PATH}/`
36
+ : this._.BASE_PATH;
37
+ }
33
38
  get YANDEX_MAP_API_KEY() {
34
39
  return this._.YANDEX_MAP_API_KEY;
35
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB;QACnB,WAAW,EAAE,QAAQ;QACrB,iBAAiB,EAAE,KAAK;KACzB,CAAC;IAEF,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"ProjectSettings.js","sourceRoot":"","sources":["../src/ProjectSettings.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,CAAC,GAAoB;QACnB,WAAW,EAAE,QAAQ;QACrB,iBAAiB,EAAE,KAAK;KACzB,CAAC;IAEF,KAAK,CAAC,CAAkB;QACtB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC5B,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;IACxB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACxD,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,GAAG;YACxB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACvB,CAAC;IACD,IAAI,kBAAkB;QACpB,OAAO,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnC,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACF,CAAC,EAAE,CAAC"}
@@ -81,7 +81,7 @@ export function LikeAPI() {
81
81
  }
82
82
  async function auth() {
83
83
  try {
84
- const userData = JSON.parse(globalThis.localStorage.getItem(STORAGE_KEY) || '');
84
+ const userData = JSON.parse(globalThis.localStorage?.getItem(STORAGE_KEY) || '');
85
85
  if (userData?.token) {
86
86
  return userData;
87
87
  }
@@ -101,7 +101,7 @@ export function LikeAPI() {
101
101
  }),
102
102
  });
103
103
  const { token, name } = await response.json();
104
- globalThis.localStorage.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
104
+ globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify({ token, name }));
105
105
  return { token, name };
106
106
  }
107
107
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"LikeAPI.js","sourceRoot":"","sources":["../../src/api/LikeAPI.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LikeAPI.js","sourceRoot":"","sources":["../../src/api/LikeAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAWrD,MAAM,WAAW,GAAG,OAAO,CAAC;AAC5B,MAAM,WAAW,GAAG,YAAY,CAAC;AAEjC,kDAAkD;AAClD,MAAM,UAAU,OAAO;IACrB,KAAK,UAAU,YAAY,CAAC,GAAG,OAAiB;QAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,EAAE,CAAC;SACX;QAED,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QAE9C,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,8BAA8B,eAAe,CAAC,iBAAiB,cAAc,EAC7E;gBACE,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE;gBAC9D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,QAAQ,EAAE,OAAO;iBAClB,CAAC;aACH,CACF,CAAC;YAEF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAExC,OAAO,KAAK,IAAI,EAAE,CAAC;SACpB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEjB,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAED,KAAK,UAAU,IAAI,CAAC,MAAc;QAChC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,CAAC;SACV;QAED,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,8BAA8B,eAAe,CAAC,iBAAiB,aAAa,EAC5E;gBACE,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa;oBACb,MAAM,EAAE,IAAI;iBACb;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,MAAM;oBACf,SAAS,EAAE,IAAI;iBAChB,CAAC;aACH,CACF,CAAC;YACF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAExC,OAAO,KAAK,IAAI,CAAC,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEjB,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,UAAU,OAAO,CAAC,MAAc;QACnC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,CAAC;SACV;QAED,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAC1B,8BAA8B,eAAe,CAAC,iBAAiB,eAAe,EAC9E;gBACE,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,aAAa;oBACb,MAAM,EAAE,IAAI;iBACb;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,OAAO,EAAE,MAAM;oBACf,SAAS,EAAE,IAAI;iBAChB,CAAC;aACH,CACF,CAAC;YACF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAExC,OAAO,KAAK,IAAI,CAAC,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEjB,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,UAAU,IAAI;QACjB,IAAI;YACF,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YAC3F,IAAI,QAAQ,EAAE,KAAK,EAAE;gBACnB,OAAO,QAAQ,CAAC;aACjB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,aAAa;SACd;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,wBAAwB,EAAE;gBACrD,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,MAAM,EAAE,WAAW;iBACpB,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAE9C,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAE/E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAc,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEjB,OAAO,EAAc,CAAC;SACvB;IACH,CAAC;IAED,OAAO;QACL,YAAY;QACZ,IAAI;QACJ,OAAO;KACR,CAAC;AACJ,CAAC"}
@@ -16,13 +16,8 @@ const BORDER_COLORS = {
16
16
  export const Header = JSX(({ bgColor = 'bg-white', className = '', showSubMenu = true, ...rest }) => {
17
17
  const router = useRouter();
18
18
  const { topItems, logo, defaultLocation, foreignOffices, officesLink } = useSWRResource(projectSettings.SITEMAP || 'sitemap', rest.options?.page?.fallback);
19
- const activeTopItem = showSubMenu ? getActiveItem(topItems, router) : null;
19
+ const activeTopItem = topItems?.find(isTopItemActive(router));
20
20
  const topMenu = topItems?.map((_, i) => (_jsx(TopItem, { active: _ === activeTopItem, "aria-label": _.text, bgColor: bgColor, ..._ }, String(i))));
21
21
  return (_jsx(BlockWrapper, { tag: "header", className: `pt-6 px-20 ${bgColor} ${className} ${showSubMenu && activeTopItem?.items?.length ? 'pb-4' : 'pb-5'}`, ...rest, children: _jsxs("div", { className: "container", children: [_jsxs("div", { className: "flex items-center", children: [_jsx(Logo, { className: "mr-8", bgColor: bgColor, logo: logo }), topMenu, _jsx(HeaderSecondaryMenu, { className: "ml-auto", foreignOffices: foreignOffices, defaultLocation: defaultLocation, officesLink: officesLink, bgColor: bgColor })] }), _jsx("div", { className: `mt-6 h-px ${BORDER_COLORS[bgColor]}` }), showSubMenu && activeTopItem?.items?.length ? (_jsx(HeaderSubMenu, { subItems: activeTopItem.items, bgColor: bgColor })) : null] }) }));
22
22
  });
23
- const getActiveItem = (topItems, router) => {
24
- const [firstPortal] = topItems || [];
25
- // Если по слагу невозможно понять к какому подпорталу этот слаг относиться, то выбираем первый подпортал.
26
- return topItems?.find(isTopItemActive(router)) || firstPortal;
27
- };
28
23
  //# sourceMappingURL=Header.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/Header/Header.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Header.js","sourceRoot":"","sources":["../../../src/components/Header/Header.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,aAAa,GAAmC;IACpD,UAAU,EAAE,iBAAiB;IAC7B,WAAW,EAAE,4BAA4B;CAC1C,CAAC;AAIF,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CACvB,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,SAAS,GAAG,EAAE,EAAE,WAAW,GAAG,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,GACpE,cAAc,CACZ,eAAe,CAAC,OAAO,IAAI,SAAS,EACpC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAC7B,CAAC;IAEJ,MAAM,aAAa,GAAG,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACtC,KAAC,OAAO,IAEN,MAAM,EAAE,CAAC,KAAK,aAAa,gBACf,CAAC,CAAC,IAAI,EAClB,OAAO,EAAE,OAAO,KACZ,CAAC,IAJA,MAAM,CAAC,CAAC,CAAC,CAKd,CACH,CAAC,CAAC;IAEH,OAAO,CACL,KAAC,YAAY,IACX,GAAG,EAAC,QAAQ,EACZ,SAAS,EAAE,cAAc,OAAO,IAAI,SAAS,IAC3C,WAAW,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MACzD,EAAE,KACE,IAAI,YAER,eAAK,SAAS,EAAC,WAAW,aACxB,eAAK,SAAS,EAAC,mBAAmB,aAChC,KAAC,IAAI,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAI,EACtD,OAAO,EACR,KAAC,mBAAmB,IAClB,SAAS,EAAC,SAAS,EACnB,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,GAChB,IACE,EACN,cAAK,SAAS,EAAE,aAAa,aAAa,CAAC,OAAO,CAAC,EAAE,GAAI,EACxD,WAAW,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAC7C,KAAC,aAAa,IAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAI,CACnE,CAAC,CAAC,CAAC,IAAI,IACJ,GACO,CAChB,CAAC;AACJ,CAAC,CACF,CAAC"}
@@ -14,10 +14,7 @@ export function useLink() {
14
14
  'aria-label': props.text,
15
15
  onClick: handlerDecorator((ev) => {
16
16
  props.onClick && props.onClick(ev);
17
- const isLocalHref = href && !isURL(href);
18
- const isLocalTarget = !props.target || props.target === '_self';
19
- if (!isLocalHref || !isLocalTarget) {
20
- // Default handle
17
+ if (isRemoteHref(href, props.target)) {
21
18
  return;
22
19
  }
23
20
  ev?.preventDefault();
@@ -25,10 +22,11 @@ export function useLink() {
25
22
  blockRouter.goto(href);
26
23
  }
27
24
  else {
28
- router.push(href);
25
+ href && router.push(href);
29
26
  }
30
27
  }, props),
31
28
  };
32
29
  };
33
30
  }
31
+ const isRemoteHref = (href, target) => isURL(href) || (target && target !== '_self') || href?.startsWith('/');
34
32
  //# sourceMappingURL=useLink.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IAGrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAmC,EAAE,EAAE;gBAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAEnC,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC;gBAEhE,IAAI,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE;oBAClC,iBAAiB;oBACjB,OAAO;iBACR;gBAED,EAAE,EAAE,cAAc,EAAE,CAAC;gBACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;oBAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACxB;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACnB;YACH,CAAC,EAAE,KAAK,CAAC;SACV,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO;IAGrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAmC,EAAE,EAAE;gBAChE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBAEnC,IAAI,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;oBACpC,OAAO;iBACR;gBAED,EAAE,EAAE,cAAc,EAAE,CAAC;gBACrB,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;oBAChB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACxB;qBAAM;oBACL,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC3B;YACH,CAAC,EAAE,KAAK,CAAC;SACV,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,MAAe,EAAE,EAAE,CACtD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,IAAI,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC"}
@@ -2,11 +2,8 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
2
2
  import { fetchJSONUnsafe } from '../utils/fetchJSON.js';
3
3
  import { useCachedAsyncData } from './useCachedAsyncData.js';
4
4
  const REGION_URL = '/api/v1/region';
5
- const localStorageLocation = globalThis?.localStorage.getItem('location');
6
- const currentLocation = localStorageLocation
7
- ? JSON.parse(localStorageLocation)
8
- : null;
9
5
  export function useLocation(defaultLocation) {
6
+ const currentLocation = getLocalStorageLocation();
10
7
  const [location, setLocation] = useState(currentLocation?.region ?? { name: defaultLocation });
11
8
  const { data } = useCachedAsyncData(REGION_URL, fetchJSONUnsafe);
12
9
  useEffect(() => {
@@ -15,9 +12,18 @@ export function useLocation(defaultLocation) {
15
12
  : data || { name: defaultLocation });
16
13
  }, [data]);
17
14
  const onChangeLocation = useCallback((region) => {
18
- globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
15
+ globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
19
16
  setLocation(region);
20
17
  }, [setLocation]);
21
18
  return [location, onChangeLocation];
22
19
  }
20
+ const getLocalStorageLocation = () => {
21
+ const localStorageLocation = globalThis.localStorage?.getItem('location');
22
+ try {
23
+ return localStorageLocation ? JSON.parse(localStorageLocation) : null;
24
+ }
25
+ catch (_) {
26
+ return null;
27
+ }
28
+ };
23
29
  //# sourceMappingURL=useLocation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"useLocation.js","sourceRoot":"","sources":["../../src/hooks/useLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAapC,MAAM,oBAAoB,GAAG,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC1E,MAAM,eAAe,GAA+B,oBAAoB;IACtE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;IAClC,CAAC,CAAC,IAAI,CAAC;AAET,MAAM,UAAU,WAAW,CACzB,eAAuB;IAEvB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CACtC,eAAe,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACrD,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAa,UAAU,EAAE,eAAe,CAAC,CAAC;IAE7E,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CACT,eAAe,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM;YAChD,CAAC,CAAC,eAAe,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACtC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,gBAAgB,GAAG,WAAW,CAClC,CAAC,MAAkB,EAAE,EAAE;QACrB,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvF,WAAW,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;AACtC,CAAC"}
1
+ {"version":3,"file":"useLocation.js","sourceRoot":"","sources":["../../src/hooks/useLocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,UAAU,GAAG,gBAAgB,CAAC;AAapC,MAAM,UAAU,WAAW,CACzB,eAAuB;IAEvB,MAAM,eAAe,GAAG,uBAAuB,EAAE,CAAC;IAClD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CACtC,eAAe,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACrD,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAa,UAAU,EAAE,eAAe,CAAC,CAAC;IAE7E,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CACT,eAAe,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM;YAChD,CAAC,CAAC,eAAe,CAAC,MAAM;YACxB,CAAC,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CACtC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,gBAAgB,GAAG,WAAW,CAClC,CAAC,MAAkB,EAAE,EAAE;QACrB,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACvF,WAAW,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,WAAW,CAAC,CACd,CAAC;IAEF,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,uBAAuB,GAAG,GAA+B,EAAE;IAC/D,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAE1E,IAAI;QACF,OAAO,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC"}
@@ -15,7 +15,7 @@ export declare class BlockRouter {
15
15
  static readonly inst: BlockRouter;
16
16
  readonly eventBus: EventBus<EventMap>;
17
17
  constructor();
18
- goto(rawAnchor: string): void;
18
+ goto(rawAnchor?: string): void;
19
19
  push(rawAnchor: string): void;
20
20
  replace(rawAnchor: string): void;
21
21
  reset(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAE5E,MAAM,OAAO,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC"}
1
+ {"version":3,"file":"BlockRouter.js","sourceRoot":"","sources":["../../../src/services/BlockRouter/BlockRouter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAiBnD,MAAM,eAAe,GAAG,CAAC,SAAkB,EAAE,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAE5E,MAAM,OAAO,WAAW;IACf,MAAM,CAAU,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;IAEvC,QAAQ,GAAG,IAAI,QAAQ,EAAY,CAAC;IAE7C;QACE,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,IAAI,CAAC,SAAkB;QACrB,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxC;IACH,CAAC;IAED,IAAI,CAAC,SAAiB;QACpB,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,CAAC,SAAiB;QACvB,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK;QACH,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC"}
@@ -1,4 +1,2 @@
1
- export declare const checkIsHrefSameOrigin: (href: string | undefined, router: {
2
- pathname?: string | undefined;
3
- href?: string | undefined;
4
- }) => boolean;
1
+ import type { Router } from '../../hooks/useRouter';
2
+ export declare const checkIsHrefSameOrigin: (href: string | undefined, router: Router) => boolean;
@@ -1,3 +1,3 @@
1
1
  import { getOrigin } from '../../utils/url.js';
2
- export const checkIsHrefSameOrigin = (href, router) => getOrigin(href) === getOrigin(router.href);
2
+ export const checkIsHrefSameOrigin = (href, router) => [getOrigin(href), getOrigin(router.href)].every((link, _, arr) => Boolean(link) && link === arr[0]);
3
3
  //# sourceMappingURL=checkIsHrefSameOrigin.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"checkIsHrefSameOrigin.js","sourceRoot":"","sources":["../../../src/services/sitemap/checkIsHrefSameOrigin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,IAAwB,EACxB,MAA4C,EAC5C,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"checkIsHrefSameOrigin.js","sourceRoot":"","sources":["../../../src/services/sitemap/checkIsHrefSameOrigin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAwB,EAAE,MAAc,EAAE,EAAE,CAChF,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAC7C,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CACnD,CAAC"}