diff --git a/packages/main/src/NavigationMenu.ts b/packages/fiori/src/NavigationMenu.ts similarity index 88% rename from packages/main/src/NavigationMenu.ts rename to packages/fiori/src/NavigationMenu.ts index 279e6f23012a..e9c9cd276b43 100644 --- a/packages/main/src/NavigationMenu.ts +++ b/packages/fiori/src/NavigationMenu.ts @@ -4,14 +4,14 @@ import jsxRenderer from "@ui5/webcomponents-base/dist/renderer/JsxRenderer.js"; import { isDesktop, } from "@ui5/webcomponents-base/dist/Device.js"; -import Menu from "./Menu.js"; -import type MenuItem from "./MenuItem.js"; +import Menu from "@ui5/webcomponents/dist/Menu.js"; +import type MenuItem from "@ui5/webcomponents/dist/MenuItem.js"; import type NavigationMenuItem from "./NavigationMenuItem.js"; import NavigationMenuTemplate from "./NavigationMenuTemplate.js"; // Styles import navigationMenuCss from "./generated/themes/NavigationMenu.css.js"; -import menuCss from "./generated/themes/Menu.css.js"; +import menuCss from "@ui5/webcomponents/dist/generated/themes/Menu.css.js"; import { NAVIGATION_MENU_POPOVER_HIDDEN_TEXT, @@ -31,7 +31,7 @@ import { * * ### ES6 Module Import * - * `import "@ui5/webcomponents/dist/NavigationMenu.js";` + * `import "@ui5/webcomponents-fiori/dist/NavigationMenu.js";` * @constructor * @extends Menu * @since 1.22.0 diff --git a/packages/main/src/NavigationMenuItem.ts b/packages/fiori/src/NavigationMenuItem.ts similarity index 95% rename from packages/main/src/NavigationMenuItem.ts rename to packages/fiori/src/NavigationMenuItem.ts index 927bf88416a8..b3897390bc52 100644 --- a/packages/main/src/NavigationMenuItem.ts +++ b/packages/fiori/src/NavigationMenuItem.ts @@ -2,7 +2,7 @@ import customElement from "@ui5/webcomponents-base/dist/decorators/customElement import jsxRenderer from "@ui5/webcomponents-base/dist/renderer/JsxRenderer.js"; import type { ClassMap } from "@ui5/webcomponents-base/dist/types.js"; import property from "@ui5/webcomponents-base/dist/decorators/property.js"; -import MenuItem from "./MenuItem.js"; +import MenuItem from "@ui5/webcomponents/dist/MenuItem.js"; import NavigationMenu from "./NavigationMenu.js"; import NavigationMenuItemTemplate from "./NavigationMenuItemTemplate.js"; @@ -29,7 +29,7 @@ import { * * ### ES6 Module Import * - * `import "@ui5/webcomponents/dist/NavigationMenuItem.js";` + * `import "@ui5/webcomponents-fiori/dist/NavigationMenuItem.js";` * @constructor * @extends MenuItem * @since 1.22.0 diff --git a/packages/main/src/NavigationMenuItemTemplate.tsx b/packages/fiori/src/NavigationMenuItemTemplate.tsx similarity index 87% rename from packages/main/src/NavigationMenuItemTemplate.tsx rename to packages/fiori/src/NavigationMenuItemTemplate.tsx index fb8cda67f111..f6170c3d5061 100644 --- a/packages/main/src/NavigationMenuItemTemplate.tsx +++ b/packages/fiori/src/NavigationMenuItemTemplate.tsx @@ -1,15 +1,15 @@ import type NavigationMenuItem from "./NavigationMenuItem.js"; -import MenuItemTemplate from "./MenuItemTemplate.js"; -import type { MenuItemHooks } from "./MenuItemTemplate.js"; -import Icon from "./Icon.js"; +import MenuItemTemplate from "@ui5/webcomponents/dist/MenuItemTemplate.js"; +import type { MenuItemHooks } from "@ui5/webcomponents/dist/MenuItemTemplate.js"; +import Icon from "@ui5/webcomponents/dist/Icon.js"; import slimArrowRightIcon from "@ui5/webcomponents-icons/dist/slim-arrow-right.js"; import arrowRightIcon from "@ui5/webcomponents-icons/dist/arrow-right.js"; import declineIcon from "@ui5/webcomponents-icons/dist/decline.js"; import navBackIcon from "@ui5/webcomponents-icons/dist/nav-back.js"; -import ResponsivePopover from "./ResponsivePopover.js"; -import Button from "./Button.js"; -import List from "./List.js"; -import BusyIndicator from "./BusyIndicator.js"; +import ResponsivePopover from "@ui5/webcomponents/dist/ResponsivePopover.js"; +import Button from "@ui5/webcomponents/dist/Button.js"; +import List from "@ui5/webcomponents/dist/List.js"; +import BusyIndicator from "@ui5/webcomponents/dist/BusyIndicator.js"; const predefinedHooks: Partial = { listItemContent, diff --git a/packages/main/src/NavigationMenuTemplate.tsx b/packages/fiori/src/NavigationMenuTemplate.tsx similarity index 88% rename from packages/main/src/NavigationMenuTemplate.tsx rename to packages/fiori/src/NavigationMenuTemplate.tsx index db2bf736eafd..bc9f78374625 100644 --- a/packages/main/src/NavigationMenuTemplate.tsx +++ b/packages/fiori/src/NavigationMenuTemplate.tsx @@ -1,7 +1,7 @@ -import List from "./List.js"; -import Button from "./Button.js"; -import BusyIndicator from "./BusyIndicator.js"; -import ResponsivePopover from "./ResponsivePopover.js"; +import List from "@ui5/webcomponents/dist/List.js"; +import Button from "@ui5/webcomponents/dist/Button.js"; +import BusyIndicator from "@ui5/webcomponents/dist/BusyIndicator.js"; +import ResponsivePopover from "@ui5/webcomponents/dist/ResponsivePopover.js"; import type NavigationMenu from "./NavigationMenu.js"; import declineIcon from "@ui5/webcomponents-icons/dist/decline.js"; diff --git a/packages/fiori/src/SideNavigation.ts b/packages/fiori/src/SideNavigation.ts index 80351ddab727..fb4c6cd40d06 100644 --- a/packages/fiori/src/SideNavigation.ts +++ b/packages/fiori/src/SideNavigation.ts @@ -4,7 +4,7 @@ import i18n from "@ui5/webcomponents-base/dist/decorators/i18n.js"; import getEffectiveScrollbarStyle from "@ui5/webcomponents-base/dist/util/getEffectiveScrollbarStyle.js"; import jsxRender from "@ui5/webcomponents-base/dist/renderer/JsxRenderer.js"; import type ResponsivePopover from "@ui5/webcomponents/dist/ResponsivePopover.js"; -import type NavigationMenu from "@ui5/webcomponents/dist/NavigationMenu.js"; +import type NavigationMenu from "./NavigationMenu.js"; import type { MenuItemClickEventDetail } from "@ui5/webcomponents/dist/Menu.js"; import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js"; import event from "@ui5/webcomponents-base/dist/decorators/event-strict.js"; diff --git a/packages/fiori/src/SideNavigationPopoverTemplate.tsx b/packages/fiori/src/SideNavigationPopoverTemplate.tsx index ae3772c75034..50e253199166 100644 --- a/packages/fiori/src/SideNavigationPopoverTemplate.tsx +++ b/packages/fiori/src/SideNavigationPopoverTemplate.tsx @@ -1,5 +1,5 @@ -import NavigationMenu from "@ui5/webcomponents/dist/NavigationMenu.js"; -import NavigationMenuItem from "@ui5/webcomponents/dist/NavigationMenuItem.js"; +import NavigationMenu from "./NavigationMenu.js"; +import NavigationMenuItem from "./NavigationMenuItem.js"; import ResponsivePopover from "@ui5/webcomponents/dist/ResponsivePopover.js"; import SideNavigation from "./SideNavigation.js"; import SideNavigationItem from "./SideNavigationItem.js"; diff --git a/packages/fiori/src/bundle.esm.ts b/packages/fiori/src/bundle.esm.ts index af7cf4fdb52f..cd4da1159be4 100644 --- a/packages/fiori/src/bundle.esm.ts +++ b/packages/fiori/src/bundle.esm.ts @@ -21,6 +21,8 @@ import FlexibleColumnLayout from "./FlexibleColumnLayout.js"; import IllustratedMessage from "./IllustratedMessage.js"; import MediaGallery from "./MediaGallery.js"; import MediaGalleryItem from "./MediaGalleryItem.js"; +import NavigationMenu from "./NavigationMenu.js"; +import NavigationMenuItem from "./NavigationMenuItem.js"; import NotificationListGroupItem from "./NotificationListGroupItem.js"; import NotificationListItem from "./NotificationListItem.js"; import NotificationList from "./NotificationList.js"; diff --git a/packages/fiori/src/i18n/messagebundle.properties b/packages/fiori/src/i18n/messagebundle.properties index 972fdc4d693a..8f43fc1eed97 100644 --- a/packages/fiori/src/i18n/messagebundle.properties +++ b/packages/fiori/src/i18n/messagebundle.properties @@ -41,6 +41,9 @@ FCL_START_SEPARATOR_TOOLTIP=Resize between start and mid columns #XACT: ARIA announcement for the separator between mid and end columns FCL_END_SEPARATOR_TOOLTIP=Resize between mid and end columns +#XTXT: Text for the Navigation Menu Popover hidden text +NAVIGATION_MENU_POPOVER_HIDDEN_TEXT=Navigation + #XTXT: Accessible name for the NotificationList NOTIFICATION_LIST_ACCESSIBLE_NAME=Notifications diff --git a/packages/main/src/themes/NavigationMenu.css b/packages/fiori/src/themes/NavigationMenu.css similarity index 100% rename from packages/main/src/themes/NavigationMenu.css rename to packages/fiori/src/themes/NavigationMenu.css diff --git a/packages/main/src/themes/NavigationMenuItem.css b/packages/fiori/src/themes/NavigationMenuItem.css similarity index 100% rename from packages/main/src/themes/NavigationMenuItem.css rename to packages/fiori/src/themes/NavigationMenuItem.css diff --git a/packages/fiori/test/ssr/component-imports.js b/packages/fiori/test/ssr/component-imports.js index 50ed6715f87c..c55ffdd82d3e 100644 --- a/packages/fiori/test/ssr/component-imports.js +++ b/packages/fiori/test/ssr/component-imports.js @@ -6,6 +6,8 @@ import FlexibleColumnLayout from "../../dist/FlexibleColumnLayout.js"; import IllustratedMessage from "../../dist/IllustratedMessage.js"; import MediaGallery from "../../dist/MediaGallery.js"; import MediaGalleryItem from "../../dist/MediaGalleryItem.js"; +import NavigationMenu from "../../dist/NavigationMenu.js"; +import NavigationMenuItem from "../../dist/NavigationMenuItem.js"; import NotificationListGroupItem from "../../dist/NotificationListGroupItem.js"; import NotificationListItem from "../../dist/NotificationListItem.js"; import Page from "../../dist/Page.js"; diff --git a/packages/main/src/bundle.esm.ts b/packages/main/src/bundle.esm.ts index 965de388f080..d2027233f9c1 100644 --- a/packages/main/src/bundle.esm.ts +++ b/packages/main/src/bundle.esm.ts @@ -68,8 +68,6 @@ import MultiInput from "./MultiInput.js"; import Label from "./Label.js"; import Link from "./Link.js"; import Menu from "./Menu.js"; -import NavigationMenu from "./NavigationMenu.js"; -import NavigationMenuItem from "./NavigationMenuItem.js"; import MenuItem from "./MenuItem.js"; import MenuSeparator from "./MenuSeparator.js"; import Popover from "./Popover.js"; diff --git a/packages/main/src/i18n/messagebundle.properties b/packages/main/src/i18n/messagebundle.properties index 1d819e526f98..4481cc6f61a9 100644 --- a/packages/main/src/i18n/messagebundle.properties +++ b/packages/main/src/i18n/messagebundle.properties @@ -576,9 +576,6 @@ MENU_CLOSE_BUTTON_ARIA_LABEL=Decline #XACT: ARIA information for the Menu popover MENU_POPOVER_ACCESSIBLE_NAME=Select an option from the menu -#XTXT: Text for the Navigation Menu Popover hidden text -NAVIGATION_MENU_POPOVER_HIDDEN_TEXT=Navigation - #XACT: ARIA announcement for roldesecription attribute of Dialog header DIALOG_HEADER_ARIA_ROLE_DESCRIPTION=Interactive Header diff --git a/packages/main/test/ssr/component-imports.js b/packages/main/test/ssr/component-imports.js index 8e40a9f761b5..ae13081e16cc 100644 --- a/packages/main/test/ssr/component-imports.js +++ b/packages/main/test/ssr/component-imports.js @@ -24,8 +24,6 @@ import MultiInput from "../../dist/MultiInput.js"; import Label from "../../dist/Label.js"; import Link from "../../dist/Link.js"; import Menu from "../../dist/Menu.js"; -import NavigationMenu from "../../dist/NavigationMenu.js"; -import NavigationMenuItem from "../../dist/NavigationMenuItem.js"; import MenuItem from "../../dist/MenuItem.js"; import Popover from "../../dist/Popover.js"; import Panel from "../../dist/Panel.js";