@redneckz/wildless-cms-uni-blocks 0.8.2 → 0.8.4

package/src/services/sitemap/findActiveSubItem.ts

@@ -1,12 +1,12 @@
 import type { Router } from '../../hooks/useRouter';
 import type { LinkProps } from '../../model/LinkProps';
 import { maxBy } from '../../utils/maxBy';
-import { isSubItemActive } from './isSubItemActive';
+import { isHrefActive } from './isHrefActive';
 
 export const findActiveSubItem =
   (router: Router) =>
   <T extends LinkProps>(items: T[] = []): T | undefined => {
-    const possibleActiveSubItems = items?.filter(isSubItemActive(router));
+    const possibleActiveSubItems = items?.filter(isHrefActive(router));
 
     return possibleActiveSubItems?.length
       ? maxBy((_: T) => _.href?.length || 0)(possibleActiveSubItems) // More specific item with max length

package/src/services/sitemap/isHrefActive.ts

@@ -1,7 +1,15 @@
-import { adjustHref } from '../../utils/adjustHref';
-import { getPathname, isURL, withoutQuery } from '../../utils/url';
+import type { Router } from '../../hooks/useRouter';
+import { projectSettings } from '../../ProjectSettings';
+import { isURL, withoutQuery } from '../../utils/url';
 
-export const isHrefActive = (href: string | undefined, router: { href?: string }) =>
-  withoutQuery(isURL(href) ? router.href : getPathname(router.href)).startsWith(
-    withoutQuery(adjustHref(href)),
-  );
+export const isHrefActive =
+  (router: Router) =>
+  ({ href }: { href?: string }): boolean => {
+    const { BASE_PATH } = projectSettings;
+    const relativeHref =
+      BASE_PATH && href?.startsWith(BASE_PATH) ? href.substring(BASE_PATH.length) : href;
+
+    return withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(
+      withoutQuery(relativeHref),
+    );
+  };

package/src/services/sitemap/isTopItemActive.ts

@@ -1,8 +1,8 @@
+import type { Router } from '../../hooks/useRouter';
 import { isHrefActive } from './isHrefActive';
-import { isSubItemActive } from './isSubItemActive';
 import { TopMenuItem } from './SitemapProps';
 
 export const isTopItemActive =
-  (router: { href?: string }) =>
+  (router: Router) =>
   (topItem: TopMenuItem): boolean =>
-    topItem.items?.some(isSubItemActive(router)) || isHrefActive(topItem.href, router);
+    topItem.items?.some(isHrefActive(router)) || isHrefActive(router)(topItem);

package/src/ui-kit/TopItem/TopItem.tsx

@@ -15,7 +15,7 @@ export interface TopItemProps extends TopItemContent {
 }
 
 export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {
-  const link = useLink();
+  const link = useLink(true);
   const { href, target, text, onClick } = link(rest);
 
   return (

package/src/utils/url.ts

@@ -1,18 +1,10 @@
 import type { Target } from '../model/LinkProps';
-import { projectSettings } from '../ProjectSettings';
 
 export const isURL = (href?: string): href is `${string}//${string}` =>
   Boolean(href?.includes('//'));
 
 export const isLocalURL = (href: string | undefined, target?: Target) =>
-  Boolean(
-    href &&
-      !isURL(href) &&
-      (projectSettings.BASE_PATH
-        ? href.startsWith(projectSettings.BASE_PATH)
-        : !href.startsWith('/')) &&
-      (!target || target === '_self'),
-  );
+  Boolean(href && !isURL(href) && (!target || target === '_self'));
 
 export const isHash = (href?: string): href is `#${string}` => Boolean(href?.startsWith('#'));
 

package/tailwind.config.cjs

@@ -59,6 +59,7 @@ module.exports = {
         'm-title': ['1.375rem', '1.8125rem'], // 22px 29px // Временно оставлен до готовности нового мобильного дизайна
         'm-title-xs': ['1.0625rem', '1.375rem'], // 17px 22px // Временно оставлен до готовности нового мобильного дизайна
 
+        'title-large': ['7.5rem', '10rem'], // 120px 160px
         'title-extra': ['15.625rem', '14.687rem'], // 250px 235px
         'title-huge': ['12.5rem', '15.625rem'], // 200px 250px
         h0: [
@@ -237,6 +238,7 @@ module.exports = {
         'green-dark': 'rgba(var(--color-green-dark), <alpha-value>)',
         'green-more-dark': 'rgba(var(--color-green-more-dark), <alpha-value>)',
         yellow: 'rgba(var(--color-yellow), <alpha-value>)',
+        'yellow-light': 'rgba(206, 200, 51, <alpha-value>)',
         gray: 'rgba(var(--color-gray), <alpha-value>)',
         error: 'rgba(242, 48, 48, <alpha-value>)',
       },

package/bundle/services/sitemap/isSubItemActive.d.ts

@@ -1,4 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const isSubItemActive: (router: {
-    href?: string;
-}) => (subItem: LinkProps) => boolean;

package/bundle/utils/adjustHref.d.ts

@@ -1 +0,0 @@
-export declare const adjustHref: (href: string | undefined) => string | undefined;

package/dist/services/sitemap/isSubItemActive.d.ts

@@ -1,4 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const isSubItemActive: (router: {
-    href?: string;
-}) => (subItem: LinkProps) => boolean;

package/dist/services/sitemap/isSubItemActive.js

@@ -1,6 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSubItemActive = void 0;
-const isHrefActive_1 = require("./isHrefActive");
-const isSubItemActive = (router) => (subItem) => (0, isHrefActive_1.isHrefActive)(subItem.href, router);
-exports.isSubItemActive = isSubItemActive;
-//# sourceMappingURL=isSubItemActive.js.map

package/dist/services/sitemap/isSubItemActive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isSubItemActive.ts"],"names":[],"mappings":";;AACA,iDAA8C;AAEvC,MAAM,eAAe,GAC1B,CAAC,MAAyB,EAAE,EAAE,CAC9B,CAAC,OAAkB,EAAW,EAAE,CAC9B,IAAA,2BAAY,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAH1B,QAAA,eAAe,mBAGW"}

package/dist/utils/adjustHref.d.ts

@@ -1 +0,0 @@
-export declare const adjustHref: (href: string | undefined) => string | undefined;

package/dist/utils/adjustHref.js

@@ -1,9 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.adjustHref = void 0;
-const ProjectSettings_1 = require("../ProjectSettings");
-const url_1 = require("./url");
-const adjustHref = (href) => href && ProjectSettings_1.projectSettings.BASE_PATH && !((0, url_1.isURL)(href) || href.startsWith('/'))
-    ? `${ProjectSettings_1.projectSettings.BASE_PATH}${href}`
-    : href;
-exports.adjustHref = adjustHref;
-//# sourceMappingURL=adjustHref.js.map

package/dist/utils/adjustHref.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":";;AAAA,wDAAqD;AACrD,+BAA8B;AAEvB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,EAAE,CACrD,IAAI,IAAI,iCAAe,CAAC,SAAS,IAAI,CAAC,CAAC,IAAA,WAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC,CAAC,GAAG,iCAAe,CAAC,SAAS,GAAG,IAAI,EAAE;IACvC,CAAC,CAAC,IAAI,CAAC;AAHE,QAAA,UAAU,cAGZ"}

package/lib/services/sitemap/isSubItemActive.d.ts

@@ -1,4 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const isSubItemActive: (router: {
-    href?: string;
-}) => (subItem: LinkProps) => boolean;

package/lib/services/sitemap/isSubItemActive.js

@@ -1,3 +0,0 @@
-import { isHrefActive } from './isHrefActive.js';
-export const isSubItemActive = (router) => (subItem) => isHrefActive(subItem.href, router);
-//# sourceMappingURL=isSubItemActive.js.map

package/lib/services/sitemap/isSubItemActive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isSubItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAyB,EAAE,EAAE,CAC9B,CAAC,OAAkB,EAAW,EAAE,CAC9B,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC"}

package/lib/utils/adjustHref.d.ts

@@ -1 +0,0 @@
-export declare const adjustHref: (href: string | undefined) => string | undefined;

package/lib/utils/adjustHref.js

@@ -1,6 +0,0 @@
-import { projectSettings } from '../ProjectSettings.js';
-import { isURL } from './url.js';
-export const adjustHref = (href) => href && projectSettings.BASE_PATH && !(isURL(href) || href.startsWith('/'))
-    ? `${projectSettings.BASE_PATH}${href}`
-    : href;
-//# sourceMappingURL=adjustHref.js.map

package/lib/utils/adjustHref.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,EAAE,CACrD,IAAI,IAAI,eAAe,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC,CAAC,GAAG,eAAe,CAAC,SAAS,GAAG,IAAI,EAAE;IACvC,CAAC,CAAC,IAAI,CAAC"}

package/mobile/bundle/services/sitemap/isSubItemActive.d.ts

@@ -1,4 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const isSubItemActive: (router: {
-    href?: string;
-}) => (subItem: LinkProps) => boolean;

package/mobile/bundle/utils/adjustHref.d.ts

@@ -1 +0,0 @@
-export declare const adjustHref: (href: string | undefined) => string | undefined;

package/mobile/dist/services/sitemap/isSubItemActive.d.ts

@@ -1,4 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const isSubItemActive: (router: {
-    href?: string;
-}) => (subItem: LinkProps) => boolean;

package/mobile/dist/services/sitemap/isSubItemActive.js

@@ -1,6 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSubItemActive = void 0;
-const isHrefActive_1 = require("./isHrefActive");
-const isSubItemActive = (router) => (subItem) => (0, isHrefActive_1.isHrefActive)(subItem.href, router);
-exports.isSubItemActive = isSubItemActive;
-//# sourceMappingURL=isSubItemActive.js.map

package/mobile/dist/services/sitemap/isSubItemActive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isSubItemActive.ts"],"names":[],"mappings":";;AACA,iDAA8C;AAEvC,MAAM,eAAe,GAC1B,CAAC,MAAyB,EAAE,EAAE,CAC9B,CAAC,OAAkB,EAAW,EAAE,CAC9B,IAAA,2BAAY,EAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAH1B,QAAA,eAAe,mBAGW"}

package/mobile/dist/utils/adjustHref.d.ts

@@ -1 +0,0 @@
-export declare const adjustHref: (href: string | undefined) => string | undefined;

package/mobile/dist/utils/adjustHref.js

@@ -1,9 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.adjustHref = void 0;
-const ProjectSettings_1 = require("../ProjectSettings");
-const url_1 = require("./url");
-const adjustHref = (href) => href && ProjectSettings_1.projectSettings.BASE_PATH && !((0, url_1.isURL)(href) || href.startsWith('/'))
-    ? `${ProjectSettings_1.projectSettings.BASE_PATH}${href}`
-    : href;
-exports.adjustHref = adjustHref;
-//# sourceMappingURL=adjustHref.js.map

package/mobile/dist/utils/adjustHref.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":";;AAAA,wDAAqD;AACrD,+BAA8B;AAEvB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,EAAE,CACrD,IAAI,IAAI,iCAAe,CAAC,SAAS,IAAI,CAAC,CAAC,IAAA,WAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC,CAAC,GAAG,iCAAe,CAAC,SAAS,GAAG,IAAI,EAAE;IACvC,CAAC,CAAC,IAAI,CAAC;AAHE,QAAA,UAAU,cAGZ"}

package/mobile/lib/services/sitemap/isSubItemActive.d.ts

@@ -1,4 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-export declare const isSubItemActive: (router: {
-    href?: string;
-}) => (subItem: LinkProps) => boolean;

package/mobile/lib/services/sitemap/isSubItemActive.js

@@ -1,3 +0,0 @@
-import { isHrefActive } from './isHrefActive.js';
-export const isSubItemActive = (router) => (subItem) => isHrefActive(subItem.href, router);
-//# sourceMappingURL=isSubItemActive.js.map

package/mobile/lib/services/sitemap/isSubItemActive.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isSubItemActive.js","sourceRoot":"","sources":["../../../src/services/sitemap/isSubItemActive.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAyB,EAAE,EAAE,CAC9B,CAAC,OAAkB,EAAW,EAAE,CAC9B,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC"}

package/mobile/lib/utils/adjustHref.d.ts

@@ -1 +0,0 @@
-export declare const adjustHref: (href: string | undefined) => string | undefined;

package/mobile/lib/utils/adjustHref.js

@@ -1,6 +0,0 @@
-import { projectSettings } from '../ProjectSettings.js';
-import { isURL } from './url.js';
-export const adjustHref = (href) => href && projectSettings.BASE_PATH && !(isURL(href) || href.startsWith('/'))
-    ? `${projectSettings.BASE_PATH}${href}`
-    : href;
-//# sourceMappingURL=adjustHref.js.map

package/mobile/lib/utils/adjustHref.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adjustHref.js","sourceRoot":"","sources":["../../src/utils/adjustHref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,EAAE,CACrD,IAAI,IAAI,eAAe,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC,CAAC,GAAG,eAAe,CAAC,SAAS,GAAG,IAAI,EAAE;IACvC,CAAC,CAAC,IAAI,CAAC"}

package/mobile/src/services/sitemap/isSubItemActive.ts

@@ -1,7 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-import { isHrefActive } from './isHrefActive';
-
-export const isSubItemActive =
-  (router: { href?: string }) =>
-  (subItem: LinkProps): boolean =>
-    isHrefActive(subItem.href, router);

package/mobile/src/utils/adjustHref.ts

@@ -1,7 +0,0 @@
-import { projectSettings } from '../ProjectSettings';
-import { isURL } from './url';
-
-export const adjustHref = (href: string | undefined) =>
-  href && projectSettings.BASE_PATH && !(isURL(href) || href.startsWith('/'))
-    ? `${projectSettings.BASE_PATH}${href}`
-    : href;

package/src/services/sitemap/isSubItemActive.ts

@@ -1,7 +0,0 @@
-import type { LinkProps } from '../../model/LinkProps';
-import { isHrefActive } from './isHrefActive';
-
-export const isSubItemActive =
-  (router: { href?: string }) =>
-  (subItem: LinkProps): boolean =>
-    isHrefActive(subItem.href, router);

package/src/utils/adjustHref.ts

@@ -1,7 +0,0 @@
-import { projectSettings } from '../ProjectSettings';
-import { isURL } from './url';
-
-export const adjustHref = (href: string | undefined) =>
-  href && projectSettings.BASE_PATH && !(isURL(href) || href.startsWith('/'))
-    ? `${projectSettings.BASE_PATH}${href}`
-    : href;