@redneckz/wildless-cms-uni-blocks 0.8.3 → 0.8.5

package/src/components/Carousel/Carousel.tsx

@@ -40,7 +40,7 @@ export const Carousel: JSXBlock<CarouselProps> = JSX<CarouselProps>(
       isCyclic,
     });
 
-    const isBankHistoryCarousel = childBlocks && childBlocks[0].type === 'CarouselBankHistoryCard';
+    const isBankHistoryCarousel = childBlocks && childBlocks[0]?.type === 'CarouselBankHistoryCard';
 
     return (
       <BlockWrapper className={style(getPaddingStyle(isPadding), className)} {...rest}>
@@ -86,7 +86,7 @@ Carousel.childrenTypes = [
 ];
 
 const buildBlocks = (blocks?: BlockDef[], activeIndex?: number) => {
-  return blocks && blocks[0].type === 'CarouselBankHistoryCard'
+  return blocks && blocks[0]?.type === 'CarouselBankHistoryCard'
     ? blocks.map((_, i) => {
         return {
           ..._,

package/src/services/sitemap/isHrefActive.ts

@@ -1,7 +1,15 @@
 import type { Router } from '../../hooks/useRouter';
+import { projectSettings } from '../../ProjectSettings';
 import { isURL, withoutQuery } from '../../utils/url';
 
 export const isHrefActive =
   (router: Router) =>
-  ({ href }: { href?: string }): boolean =>
-    withoutQuery(isURL(href) ? router.href : router.pathname).startsWith(withoutQuery(href));
+  ({ 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),
+    );
+  };