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

package/src/hooks/useLink.ts

@@ -1,4 +1,4 @@
-import type { LinkProps } from '../model/LinkProps';
+import type { LinkProps, Target } from '../model/LinkProps';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
 import { adjustHref } from '../utils/adjustHref';
 import { isHash, isURL } from '../utils/url';
@@ -25,11 +25,7 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
       onClick: handlerDecorator((ev?: { preventDefault: () => void }) => {
         props.onClick && props.onClick(ev);
 
-        const isLocalHref = href && !isURL(href);
-        const isLocalTarget = !props.target || props.target === '_self';
-
-        if (!isLocalHref || !isLocalTarget) {
-          // Default handle
+        if (isRemoteHref(href, props.target)) {
           return;
         }
 
@@ -37,9 +33,12 @@ export function useLink(): <L extends Partial<LinkProps & ClickHandler>>(
         if (isHash(href)) {
           blockRouter.goto(href);
         } else {
-          router.push(href);
+          href && router.push(href);
         }
       }, props),
     };
   };
 }
+
+const isRemoteHref = (href?: string, target?: Target) =>
+  isURL(href) || (target && target !== '_self') || href?.startsWith('/');

package/src/hooks/useLocation.ts

@@ -15,14 +15,10 @@ interface LocationStorageData {
   region: RegionData;
 }
 
-const localStorageLocation = globalThis?.localStorage.getItem('location');
-const currentLocation: LocationStorageData | null = localStorageLocation
-  ? JSON.parse(localStorageLocation)
-  : null;
-
 export function useLocation(
   defaultLocation: string,
 ): [RegionData, (newLocation: RegionData) => void] {
+  const currentLocation = getLocalStorageLocation();
   const [location, setLocation] = useState<RegionData>(
     currentLocation?.region ?? { name: defaultLocation },
   );
@@ -38,7 +34,7 @@ export function useLocation(
 
   const onChangeLocation = useCallback(
     (region: RegionData) => {
-      globalThis?.localStorage.setItem('location', JSON.stringify({ manual: true, region }));
+      globalThis.localStorage?.setItem('location', JSON.stringify({ manual: true, region }));
       setLocation(region);
     },
     [setLocation],
@@ -46,3 +42,13 @@ export function useLocation(
 
   return [location, onChangeLocation];
 }
+
+const getLocalStorageLocation = (): LocationStorageData | null => {
+  const localStorageLocation = globalThis.localStorage?.getItem('location');
+
+  try {
+    return localStorageLocation ? JSON.parse(localStorageLocation) : null;
+  } catch (_) {
+    return null;
+  }
+};

package/src/services/BlockRouter/BlockRouter.ts

@@ -29,7 +29,7 @@ export class BlockRouter {
     }
   }
 
-  goto(rawAnchor: string) {
+  goto(rawAnchor?: string) {
     const anchor = normalizeAnchor(rawAnchor);
     if (anchor) {
       this.push(anchor);

package/src/services/sitemap/checkIsHrefSameOrigin.ts

@@ -1,6 +1,7 @@
+import type { Router } from '../../hooks/useRouter';
 import { getOrigin } from '../../utils/url';
 
-export const checkIsHrefSameOrigin = (
-  href: string | undefined,
-  router: { pathname?: string; href?: string },
-) => getOrigin(href) === getOrigin(router.href);
+export const checkIsHrefSameOrigin = (href: string | undefined, router: Router) =>
+  [getOrigin(href), getOrigin(router.href)].every(
+    (link, _, arr) => Boolean(link) && link === arr[0],
+  );

package/src/services/sitemap/isHrefActive.ts

@@ -1,10 +1,13 @@
-import { isURL, withoutQuery } from '../../utils/url';
+import { normalizeURLPath } from '../../utils/normalizeURLPath';
+import { getPathname, isURL, withoutQuery } from '../../utils/url';
 
 export const isHrefActive = (
   href: string | undefined,
   router: { pathname?: string; href?: string },
   cmp: (targetHref: string, baseHref: string) => boolean = (targetHref, baseHref) =>
     baseHref.startsWith(targetHref),
-) => {
-  return cmp(withoutQuery(href), withoutQuery(isURL(href) ? router.href : router.pathname));
-};
+) =>
+  cmp(
+    withoutQuery(normalizeURLPath(href)),
+    withoutQuery(isURL(href) ? router.href : getPathname(router.href)),
+  );

package/src/setup-fixture.ts

@@ -8,11 +8,11 @@ import wlc from './wlc.json';
 projectSettings.setup(wlc);
 
 useRouter.setup(() => {
-  const [href, setHref] = useState<string>(globalThis.location.href);
+  const [, setHref] = useState<string>(globalThis.location.href);
 
   return {
-    href: href,
-    pathname: '/credits',
+    href: `${globalThis.location.origin}${projectSettings.BASE_PATH}cards-credit`, //for header active links
+    pathname: '/cards-credit',
     query: {},
     push: (url: string) => {
       globalThis.history.pushState(null, '', url);

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

@@ -0,0 +1,8 @@
+import { JSX } from '@redneckz/uni-jsx';
+import type { MarkdownTextProps } from './MarkdownTextProps';
+
+export const MarkdownText = JSX<MarkdownTextProps>((props) => {
+  const { md = '' } = props;
+
+  return <div className="md-container" dangerouslySetInnerHTML={{ __html: md }} />;
+});

package/src/ui-kit/MarkdownText/MarkdownTextProps.ts

@@ -0,0 +1,6 @@
+type Markdown = string;
+
+export interface MarkdownTextProps {
+  /** @title Текст */
+  md?: Markdown;
+}

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

@@ -8,10 +8,8 @@ interface TextProps {
   font?: FontWeight;
 }
 
-export const Text = JSX<TextProps>((props) => {
-  const { size = '', color = '', align = '', font = '', children } = props;
-
-  const textClasses = `font-sans ${size} ${color} ${align} ${font}`;
-
-  return <span className={textClasses}>{children}</span>;
-});
+export const Text = JSX<TextProps>(({ size, color, align, font, children }) => (
+  <span className={['font-sans', size, color, align, font].filter(Boolean).join(' ')}>
+    {children}
+  </span>
+));

package/src/utils/normalizeURLPath.ts

@@ -0,0 +1,10 @@
+import { projectSettings } from '../ProjectSettings';
+import { isURL } from './url';
+
+export const normalizeURLPath = (href?: string) => {
+  if (isURL(href) || href?.startsWith('/')) {
+    return href;
+  }
+
+  return `${projectSettings.BASE_PATH || ''}${href}`;
+};

package/src/utils/url.ts

@@ -15,6 +15,16 @@ export const getOrigin = (href?: string) => {
   return endOfOrigin !== -1 ? url.substring(0, endOfOrigin) : url;
 };
 
+export const getPathname = (href?: string) => {
+  if (!href || !isURL(href)) {
+    return undefined;
+  }
+
+  const url = new URL(href);
+
+  return url.pathname;
+};
+
 export const getHash = (href?: string) => {
   if (!href || !isURL(href)) {
     return undefined;

package/src/wlc.json

@@ -1,5 +1,7 @@
 {
   "PROD_BRANCH": "master",
   "FORCED_DRAFT_FLOW": false,
-  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b"
+  "YANDEX_MAP_API_KEY": "f4b40c1e-1891-45f2-b307-90c481af210b",
+  "BASE_PATH": "/natural/",
+  "SITEMAP": "sayt-rshb"
 }