@wix/editor-react-components 1.2847.0 → 1.2849.0

package/dist/site/components/Menu/component.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { c as clsx } from "../chunks/clsx.js";
 import { useService, useGetService } from "@wix/services-manager-react";
-import { t as toUrlWithoutQuery } from "../chunks/urlUtils.js";
+import { t as toUrlWithoutQuery, s as safeDecode } from "../chunks/urlUtils.js";
 import { U as UrlDefinition } from "../chunks/index16.js";
 import { d as defineService } from "../chunks/index11.js";
 import { T as TranslationsDefinition } from "../chunks/index4.js";
@@ -39,6 +39,7 @@ const MenuContextProvider = ({
   items,
   partToPreviewStateMap,
   currentUrl,
+  siteUrl,
   activeAnchor,
   translations,
   menuStyleId,
@@ -63,6 +64,7 @@ const MenuContextProvider = ({
       items,
       partToPreviewStateMap,
       currentUrl,
+      siteUrl,
       activeAnchor,
       translations,
       menuStyleId,
@@ -79,6 +81,7 @@ const MenuContextProvider = ({
       items,
       partToPreviewStateMap,
       currentUrl,
+      siteUrl,
       activeAnchor,
       translations,
       menuStyleId,
@@ -611,6 +614,24 @@ const INITIAL_HAMBURGER_MENU_ANIMATION_STATE = {
   name: HamburgerMenuAnimationName.None
 };
 const removeQueryFromUrl = (url) => url.split("?")[0];
+const isPathInSite = (pathname, sitePathname) => {
+  const sitePath = sitePathname.replace(/\/$/, "");
+  return pathname === sitePath || pathname.startsWith(`${sitePath}/`);
+};
+const isSitePageHref = (href, siteUrl) => {
+  if (!href || href.startsWith("#") || href.startsWith("?")) {
+    return false;
+  }
+  try {
+    const { protocol, origin, pathname } = new URL(href, `${siteUrl}/`);
+    const site = new URL(siteUrl);
+    const isWebPage = protocol === "http:" || protocol === "https:";
+    return isWebPage && origin === site.origin && isPathInSite(pathname, site.pathname);
+  } catch {
+    return false;
+  }
+};
+const toComparablePageUrl = (href, siteUrl) => siteUrl && isSitePageHref(href, siteUrl) ? toUrlWithoutQuery(href, siteUrl) : safeDecode(removeQueryFromUrl(href));
 const isDefaultAnchor = (activeAnchor) => {
   return activeAnchor.dataId === "SCROLL_TO_TOP" || activeAnchor.dataId === "SCROLL_TO_BOTTOM";
 };
@@ -636,7 +657,7 @@ const flattenMenuItems = (items) => {
   });
   return result;
 };
-const getCurrentMenuItem = (items, activeAnchor, currentPageHref) => {
+const getCurrentMenuItem = (items, activeAnchor, currentPageHref, siteUrl) => {
   const flatItems = flattenMenuItems(items);
   const selectedFromVelo = flatItems.find((item2) => item2.selected);
   if (selectedFromVelo) {
@@ -654,7 +675,7 @@ const getCurrentMenuItem = (items, activeAnchor, currentPageHref) => {
     if (!link) {
       return false;
     }
-    return !isAnchorLink(link) && decodeURIComponent(removeQueryFromUrl(link.href || "")) === currentPageHref;
+    return !isAnchorLink(link) && toComparablePageUrl(link.href || "", siteUrl) === currentPageHref;
   });
 };
 const isSameAnchorLinks = (first, second) => {
@@ -1976,6 +1997,7 @@ const MenuContent = (props) => {
     items,
     partToPreviewStateMap,
     currentUrl,
+    siteUrl,
     activeAnchor,
     translations,
     getAnimationPackage,
@@ -1992,7 +2014,12 @@ const MenuContent = (props) => {
     void 0
   );
   const currentItem = useMemo(() => {
-    const menuItem = getCurrentMenuItem(items, activeAnchor, currentUrl);
+    const menuItem = getCurrentMenuItem(
+      items,
+      activeAnchor,
+      currentUrl,
+      siteUrl
+    );
     if (activeAnchor) {
       if (isDefaultAnchor(activeAnchor)) {
         lastValidAnchorMenuItemRef.current = void 0;
@@ -2003,7 +2030,7 @@ const MenuContent = (props) => {
       }
     }
     return menuItem;
-  }, [items, activeAnchor, currentUrl]);
+  }, [items, activeAnchor, currentUrl, siteUrl]);
   const {
     isScrollable,
     updateScrollState,
@@ -2519,6 +2546,7 @@ const Menu = (props) => {
           translations,
           getAnimationPackage: () => animationName,
           currentUrl,
+          siteUrl: url.siteUrl,
           activeAnchor,
           navAriaLabel: ((_a = navbarProps == null ? void 0 : navbarProps.a11y) == null ? void 0 : _a.ariaLabel) ?? "",
           a11yProps: convertA11yKeysToHtmlFormat((navbarProps == null ? void 0 : navbarProps.a11y) ?? {}),

package/dist/site/components/Menu/contexts/MenuContext.d.ts

@@ -5,6 +5,7 @@ export type MenuContextValue = {
     items: Array<MenuItemWithChildren>;
     partToPreviewStateMap?: MenuPreviewStateMap;
     currentUrl: string;
+    siteUrl?: string;
     activeAnchor?: ActiveAnchor;
     translations: {
         dropdownButtonAriaLabel?: string;

package/dist/site/components/Menu/menuItems.d.ts

@@ -1,4 +1,4 @@
 import { MenuItemProps, ActiveAnchor } from '../../../types/vendored/editor-elements-definitions';
 export declare const isDefaultAnchor: (activeAnchor: ActiveAnchor) => boolean;
-export declare const getCurrentMenuItem: (items: Array<MenuItemProps>, activeAnchor?: ActiveAnchor, currentPageHref?: string) => MenuItemProps | undefined;
+export declare const getCurrentMenuItem: (items: Array<MenuItemProps>, activeAnchor?: ActiveAnchor, currentPageHref?: string, siteUrl?: string) => MenuItemProps | undefined;
 export declare const isCurrentItem: (item: MenuItemProps, currentItem?: MenuItemProps) => boolean;

package/dist/site/components/chunks/urlUtils.js

@@ -17,5 +17,6 @@ const toUrlWithoutQuery = (currentUrl, siteUrl) => {
   return relative === "./" ? siteUrl : relative.replace("./", `${siteUrl}/`);
 };
 export {
+  safeDecode as s,
   toUrlWithoutQuery as t
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/editor-react-components",
-  "version": "1.2847.0",
+  "version": "1.2849.0",
   "description": "React components for the Wix Editor",
   "license": "MIT",
   "type": "module",
@@ -228,5 +228,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "falconPackageHash": "77670a572b4021ed23a8d36dc104c1dfd8a32bec13d723102513c195"
+  "falconPackageHash": "87fda7bac018df8b6c2d46f9cec101626a51a8642229dfc8b3dc6f1d"
 }