Merge branch 'main' into renovate/npm-vite-vulnerability

SAP · Jan 22, 2025 · 6ef50f2 · 6ef50f2
2 parents e83726e + afa28de
commit 6ef50f2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 27 deletions.
diff --git a/.storybook/components/VersionSwitch.tsx b/.storybook/components/VersionSwitch.tsx
@@ -1,26 +1,57 @@
+/* eslint-disable react-hooks/rules-of-hooks */
+
 import { IconButton } from '@storybook/components';
 import { addons, types } from '@storybook/manager-api';
-import { ActionSheet, Button } from '@ui5/webcomponents-react';
+import '@ui5/webcomponents/dist/Menu.js';
+import '@ui5/webcomponents/dist/MenuItem.js';
 import * as React from 'react';
 
 const ADDON_ID = 'version-switch';
 const TOOL_ID = `${ADDON_ID}/toolbar`;
 
-addons.register(ADDON_ID, (api) => {
+const handleVersionSelect = (e) => {
+  const { slug } = e.detail.item.dataset;
+  window.location.href = `https://sap.github.io/ui5-webcomponents-react/${slug}/`;
+};
+
+addons.register(ADDON_ID, () => {
   addons.add(TOOL_ID, {
     type: types.TOOLEXTRA,
     title: 'Version Switch',
     render: () => {
       const [open, setOpen] = React.useState(false);
-
-      const handleVersionSelect = (e) => {
-        const { slug } = e.target.dataset;
-        window.location.href = `https://sap.github.io/ui5-webcomponents-react/${slug}/`;
-      };
+      const menuRef = React.useRef(null);
 
       const activeVersionSlug =
         window.location.pathname.replace('/ui5-webcomponents-react/', '').replaceAll('/', '') || 'nightly';
       const activeVersion = activeVersionSlug.at(0).toUpperCase() + activeVersionSlug.slice(1);
+
+      React.useEffect(() => {
+        const menu = menuRef.current;
+        if (menu) {
+          menuRef.current.open = open;
+        }
+      }, [open]);
+
+      React.useEffect(() => {
+        const menu = menuRef.current;
+        const handleClose = () => {
+          setOpen(false);
+        };
+
+        if (menu) {
+          menu.addEventListener('item-click', handleVersionSelect);
+          menu.addEventListener('close', handleClose);
+        }
+
+        return () => {
+          if (menu) {
+            menu.removeEventListener('item-click', handleVersionSelect);
+            menu.removeEventListener('close', handleClose);
+          }
+        };
+      }, []);
+
       return (
         <>
           <IconButton
@@ -35,24 +66,12 @@ addons.register(ADDON_ID, (api) => {
           >
             Version: {activeVersion}
           </IconButton>
-          <ActionSheet
-            placement="Bottom"
-            open={open}
-            opener={TOOL_ID}
-            onClose={() => {
-              setOpen(false);
-            }}
-          >
-            <Button onClick={handleVersionSelect} data-slug={'v2'}>
-              Version 2
-            </Button>
-            <Button onClick={handleVersionSelect} data-slug={'v1'}>
-              Version 1
-            </Button>
-            <Button onClick={handleVersionSelect} data-slug={'nightly'}>
-              🚧 Nightly
-            </Button>
-          </ActionSheet>
+          {/*todo: use wcr components once supported*/}
+          <ui5-menu opener={TOOL_ID} ref={menuRef}>
+            <ui5-menu-item text="Version 2" data-slug={'v2'}></ui5-menu-item>
+            <ui5-menu-item text="Version 1" data-slug={'v1'}></ui5-menu-item>
+            <ui5-menu-item text="🚧 Nightly" data-slug={'nightly'}></ui5-menu-item>
+          </ui5-menu>
         </>
       );
     }

diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -7,8 +7,7 @@ import { isChromatic } from './utils';
 const isDevMode = process.env.NODE_ENV === 'development';
 
 const addons = [
-  // todo: enable again once https://github.com/storybookjs/storybook/pull/30003 is published
-  // './addons/version-switch',
+  './addons/version-switch',
   {
     name: '@storybook/addon-essentials',
     options: {