From 32755c026cd3118ef4bbb5ab01fd71b2a4b88457 Mon Sep 17 00:00:00 2001
From: David Cho-Lerat <david.cho-lerat@sonarsource.com>
Date: Mon, 15 Jul 2024 16:41:35 +0200
Subject: [PATCH] SONAR-22453 Use the updated "align" prop for
 DropdownMenu.Root

---
 .../js/app/components/nav/global/GlobalNavMore.tsx  |  4 ++--
 .../js/app/components/nav/settings/SettingsNav.tsx  |  4 ++--
 .../js/components/activity-graph/GraphsHeader.tsx   |  4 ++--
 .../embed-docs-modal/EmbedDocsPopupHelper.tsx       | 13 +++++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMore.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMore.tsx
index 84de3342ce8..ab4a4150bd4 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMore.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMore.tsx
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import { DropdownMenu } from '@sonarsource/echoes-react';
+import { DropdownMenu, DropdownMenuAlign } from '@sonarsource/echoes-react';
 import { MainMenuItem } from 'design-system';
 import * as React from 'react';
 import { translate } from '../../../../helpers/l10n';
@@ -43,7 +43,7 @@ function GlobalNavMore({ appState: { globalPages = [] } }: Readonly<{ appState:
 
   return (
     <DropdownMenu.Root
-      align="start"
+      align={DropdownMenuAlign.Start}
       id="moreMenuDropdown"
       items={withoutPortfolios.map(renderGlobalPageLink)}
     >
diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx
index e562c6016c7..516b1cca0c7 100644
--- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import { DropdownMenu } from '@sonarsource/echoes-react';
+import { DropdownMenu, DropdownMenuAlign } from '@sonarsource/echoes-react';
 import { LightLabel, NavBarTabLink, NavBarTabs, TopBar } from 'design-system';
 import * as React from 'react';
 import { Location } from 'react-router-dom';
@@ -95,7 +95,7 @@ export class SettingsNav extends React.PureComponent<Props> {
 
     return (
       <DropdownMenu.Root
-        align="start"
+        align={DropdownMenuAlign.Start}
         id="settings-navigation-configuration-dropdown"
         items={
           <>
diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx
index 008c47f2cd3..13265163d17 100644
--- a/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx
+++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import { DropdownMenu } from '@sonarsource/echoes-react';
+import { DropdownMenu, DropdownMenuAlign } from '@sonarsource/echoes-react';
 import { ButtonSecondary, ChevronDownIcon, TextMuted } from 'design-system';
 import * as React from 'react';
 import { translate } from '../../helpers/l10n';
@@ -77,7 +77,7 @@ export default function GraphsHeader(props: Props) {
   return (
     <div className={className}>
       <div className="sw-flex">
-        <DropdownMenu.Root id="activity-graph-type" align="start" items={options}>
+        <DropdownMenu.Root align={DropdownMenuAlign.Start} id="activity-graph-type" items={options}>
           <ButtonSecondary
             aria-label={translate('project_activity.graphs.choose_type')}
             className={
diff --git a/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx b/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx
index b929c57fd6c..96bb70c5c5b 100644
--- a/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx
+++ b/server/sonar-web/src/main/js/components/embed-docs-modal/EmbedDocsPopupHelper.tsx
@@ -18,7 +18,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-import { DropdownMenu, IconQuestionMark, Tooltip } from '@sonarsource/echoes-react';
+import {
+  DropdownMenu,
+  DropdownMenuAlign,
+  IconQuestionMark,
+  Tooltip,
+} from '@sonarsource/echoes-react';
 import { InteractiveIcon } from 'design-system';
 import * as React from 'react';
 import { translate } from '../../helpers/l10n';
@@ -27,7 +32,11 @@ import { EmbedDocsPopup } from './EmbedDocsPopup';
 export default function EmbedDocsPopupHelper() {
   return (
     <div className="dropdown">
-      <DropdownMenu.Root align="end" id="help-menu-dropdown" items={<EmbedDocsPopup />}>
+      <DropdownMenu.Root
+        align={DropdownMenuAlign.End}
+        id="help-menu-dropdown"
+        items={<EmbedDocsPopup />}
+      >
         <Tooltip content={translate('help')}>
           <InteractiveIcon
             Icon={IconQuestionMark}
-- 
2.39.5