Skip to content

Commit

Permalink
chore: move navigation menu to fiori package (#10637)
Browse files Browse the repository at this point in the history
The `<ui5-navigation-menu>` is an internal component designed for use within the `<ui5-side-navigation>`.

In that case It is more correct to be placed inside `@ui5/webcomponents-fiori` package.
  • Loading branch information
nnaydenow authored Jan 23, 2025
1 parent cda7d8b commit 67b5145
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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<MenuItemHooks> = {
listItemContent,
Expand Down
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion packages/fiori/src/SideNavigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/fiori/src/SideNavigationPopoverTemplate.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 2 additions & 0 deletions packages/fiori/src/bundle.esm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 3 additions & 0 deletions packages/fiori/src/i18n/messagebundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions packages/fiori/test/ssr/component-imports.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 0 additions & 2 deletions packages/main/src/bundle.esm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 0 additions & 3 deletions packages/main/src/i18n/messagebundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions packages/main/test/ssr/component-imports.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit 67b5145

Please sign in to comment.