fix: revert name to DropDownMenu

Signed-off-by: axel7083 <42176370+axel7083@users.noreply.github.com>
containers · May 27, 2024 · cac7317 · cac7317
1 parent 194d8ca
commit cac7317
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 35 deletions.
diff --git a/packages/renderer/src/lib/compose/ComposeActions.svelte b/packages/renderer/src/lib/compose/ComposeActions.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { faArrowsRotate, faFileCode, faPlay, faRocket, faStop, faTrash } from '@fortawesome/free-solid-svg-icons';
-import { Dropdown } from '@podman-desktop/ui-svelte';
+import { DropdownMenu } from '@podman-desktop/ui-svelte';
 import { createEventDispatcher, onMount } from 'svelte';
 import { router } from 'tinro';
 
@@ -108,9 +108,9 @@ function openGenerateKube(): void {
 
 // If dropdownMenu = true, we'll change style to the imported dropdownMenu style
 // otherwise, leave blank.
-let actionsStyle: typeof Dropdown | typeof FlatMenu;
+let actionsStyle: typeof DropdownMenu | typeof FlatMenu;
 if (dropdownMenu) {
-  actionsStyle = Dropdown;
+  actionsStyle = DropdownMenu;
 } else {
   actionsStyle = FlatMenu;
 }

diff --git a/packages/renderer/src/lib/container/ContainerActions.svelte b/packages/renderer/src/lib/container/ContainerActions.svelte
@@ -11,7 +11,7 @@ import {
   faTerminal,
   faTrash,
 } from '@fortawesome/free-solid-svg-icons';
-import { Dropdown } from '@podman-desktop/ui-svelte';
+import { DropdownMenu } from '@podman-desktop/ui-svelte';
 import { createEventDispatcher, onMount } from 'svelte';
 import { router } from 'tinro';
 
@@ -127,9 +127,9 @@ function deployToKubernetes(): void {
 
 // If dropdownMenu = true, we'll change style to the imported dropdownMenu style
 // otherwise, leave blank.
-let actionsStyle: typeof Dropdown | typeof FlatMenu;
+let actionsStyle: typeof DropdownMenu | typeof FlatMenu;
 if (dropdownMenu) {
-  actionsStyle = Dropdown;
+  actionsStyle = DropdownMenu;
 } else {
   actionsStyle = FlatMenu;
 }

diff --git a/packages/renderer/src/lib/image/ActionsMenu.svelte b/packages/renderer/src/lib/image/ActionsMenu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { Dropdown } from '@podman-desktop/ui-svelte';
+import { DropdownMenu } from '@podman-desktop/ui-svelte';
 
 import FlatMenu from '../ui/FlatMenu.svelte';
 
@@ -9,7 +9,8 @@ export let onBeforeToggle = () => {};
 </script>
 
 {#if dropdownMenu}
-  <Dropdown shownAsMenuActionItem="{dropdownMenuAsMenuActionItem}" onBeforeToggle="{onBeforeToggle}"><slot /></Dropdown>
+  <DropdownMenu shownAsMenuActionItem="{dropdownMenuAsMenuActionItem}" onBeforeToggle="{onBeforeToggle}"
+    ><slot /></DropdownMenu>
 {:else}
   <FlatMenu><slot /></FlatMenu>
 {/if}
diff --git a/packages/renderer/src/lib/pod/PodActions.svelte b/packages/renderer/src/lib/pod/PodActions.svelte
@@ -8,7 +8,7 @@ import {
   faStop,
   faTrash,
 } from '@fortawesome/free-solid-svg-icons';
-import { Dropdown } from '@podman-desktop/ui-svelte';
+import { DropdownMenu } from '@podman-desktop/ui-svelte';
 import { createEventDispatcher, onMount } from 'svelte';
 import { router } from 'tinro';
 
@@ -149,9 +149,9 @@ function deployToKubernetes(): void {
 }
 // If dropdownMenu = true, we'll change style to the imported dropdownMenu style
 // otherwise, leave blank.
-let actionsStyle: typeof Dropdown | typeof FlatMenu;
+let actionsStyle: typeof DropdownMenu | typeof FlatMenu;
 if (dropdownMenu) {
-  actionsStyle = Dropdown;
+  actionsStyle = DropdownMenu;
 } else {
   actionsStyle = FlatMenu;
 }
@@ -217,7 +217,7 @@ if (dropdownMenu) {
         detailed="{detailed}"
         icon="{faExternalLinkSquareAlt}" />
     {:else if openingUrls.length > 1}
-      <Dropdown icon="{faExternalLinkSquareAlt}" hidden="{dropdownMenu}" shownAsMenuActionItem="{true}">
+      <DropdownMenu icon="{faExternalLinkSquareAlt}" hidden="{dropdownMenu}" shownAsMenuActionItem="{true}">
         {#each openingUrls as url}
           <ListItemButtonIcon
             title="Open {extractPort(url)}"
@@ -228,7 +228,7 @@ if (dropdownMenu) {
             detailed="{detailed}"
             icon="{faExternalLinkSquareAlt}" />
         {/each}
-      </Dropdown>
+      </DropdownMenu>
     {/if}
     <ListItemButtonIcon
       title="Restart Pod"
@@ -256,7 +256,7 @@ if (dropdownMenu) {
         detailed="{detailed}"
         icon="{faExternalLinkSquareAlt}" />
     {:else if openingKubernetesUrls.size > 1}
-      <Dropdown
+      <DropdownMenu
         title="Open Kubernetes Routes"
         icon="{faExternalLinkSquareAlt}"
         hidden="{dropdownMenu}"
@@ -271,7 +271,7 @@ if (dropdownMenu) {
             detailed="{detailed}"
             icon="{faExternalLinkSquareAlt}" />
         {/each}
-      </Dropdown>
+      </DropdownMenu>
     {/if}
   {/if}
   <ContributionActions

diff --git a/packages/renderer/src/lib/preferences/PreferencesAuthenticationProvidersRendering.svelte b/packages/renderer/src/lib/preferences/PreferencesAuthenticationProvidersRendering.svelte
@@ -5,7 +5,7 @@ import {
   faRightFromBracket,
   faRightToBracket,
 } from '@fortawesome/free-solid-svg-icons';
-import { Button, Dropdown, EmptyScreen, Tooltip } from '@podman-desktop/ui-svelte';
+import { Button, DropdownMenu, EmptyScreen, Tooltip } from '@podman-desktop/ui-svelte';
 import Fa from 'svelte-fa';
 
 import EmbeddableCatalogExtensionList from '/@/lib/extensions/EmbeddableCatalogExtensionList.svelte';
@@ -147,14 +147,14 @@ import SettingsPage from './SettingsPage.svelte';
               <!-- Authentication Provider Auth Request Sign In button end -->
             {:else if sessionRequests.length > 1}
               <!-- Authentication Provider Auth Requests DropDown start -->
-              <Dropdown>
+              <DropdownMenu>
                 {#each sessionRequests as request}
-                  <Dropdown.MenuItem
+                  <DropdownMenu.Item
                     title="Sign in to use {request.extensionLabel}"
                     onClick="{() => window.requestAuthenticationProviderSignIn(request.id)}"
                     icon="{faArrowRightToBracket}" />
                 {/each}
-              </Dropdown>
+              </DropdownMenu>
               <!-- Authentication Provider Auth Requests DropDown end -->
             {/if}
           </div>

diff --git a/packages/renderer/src/lib/preferences/PreferencesRegistriesEditing.svelte b/packages/renderer/src/lib/preferences/PreferencesRegistriesEditing.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { faPlusCircle, faTrash, faUser, faUserPen } from '@fortawesome/free-solid-svg-icons';
 import type * as containerDesktopAPI from '@podman-desktop/api';
-import { Button, Dropdown, Input } from '@podman-desktop/ui-svelte';
+import { Button, DropdownMenu, Input } from '@podman-desktop/ui-svelte';
 import { onMount } from 'svelte';
 
 import PasswordInput from '/@/lib/ui/PasswordInput.svelte';
@@ -347,22 +347,22 @@ function removeExistingRegistry(registry: containerDesktopAPI.Registry) {
 
                 <!-- Show/hide password end -->
                 <!-- containerDesktopAPI.Registry menu start -->
-                <Dropdown>
-                  <Dropdown.MenuItem
+                <DropdownMenu>
+                  <DropdownMenu.Item
                     title="Login"
                     onClick="{() => markRegistryAsModified(registry)}"
                     hidden="{!!registry.username && !!registry.secret}"
                     icon="{faUser}" />
-                  <Dropdown.MenuItem
+                  <DropdownMenu.Item
                     title="Edit password"
                     onClick="{() => markRegistryAsModified(registry)}"
                     hidden="{!registry.username && !registry.secret}"
                     icon="{faUserPen}" />
-                  <Dropdown.MenuItem
+                  <DropdownMenu.Item
                     title="Remove"
                     onClick="{() => removeExistingRegistry(registry)}"
                     icon="{faTrash}" />
-                </Dropdown>
+                </DropdownMenu>
               </div>
             {/if}
           </div>

diff --git a/packages/renderer/src/lib/ui/ListItemButtonIcon.svelte b/packages/renderer/src/lib/ui/ListItemButtonIcon.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import type { IconDefinition } from '@fortawesome/fontawesome-common-types';
-import { Dropdown, isFontAwesomeIcon } from '@podman-desktop/ui-svelte';
+import { DropdownMenu, isFontAwesomeIcon } from '@podman-desktop/ui-svelte';
 import { onDestroy, onMount } from 'svelte';
 import type { Unsubscriber } from 'svelte/motion';
 import Fa from 'svelte-fa';
@@ -115,7 +115,7 @@ $: styleClass = detailed
 <!-- If menu = true, use the menu, otherwise implement the button -->
 {#if menu}
   <!-- enabled menu -->
-  <Dropdown.MenuItem
+  <DropdownMenu.Item
     title="{title}"
     tooltip="{tooltip}"
     icon="{icon}"

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -56,9 +56,9 @@
       "types": "./dist/alert/ErrorMessage.svelte.d.ts",
       "svelte": "./dist/alert/ErrorMessage.svelte"
     },
-    "./Dropdown": {
-      "types": "./dist/dropdown/index.d.ts",
-      "svelte": "./dist/dropdown/index.js"
+    "./DropdownMenu": {
+      "types": "./dist/dropdownMenu/index.d.ts",
+      "svelte": "./dist/dropdownMenu/index.js"
     },
     "./icons": {
       "types": "./dist/icons/index.d.ts",

diff --git a/...src/lib/dropdown/DropDownMenuItem.spec.ts → ...lib/dropdownMenu/DropDownMenuItem.spec.ts b/...src/lib/dropdown/DropDownMenuItem.spec.ts → ...lib/dropdownMenu/DropDownMenuItem.spec.ts
diff --git a/.../src/lib/dropdown/DropDownMenuItem.svelte → .../lib/dropdownMenu/DropDownMenuItem.svelte b/.../src/lib/dropdown/DropDownMenuItem.svelte → .../lib/dropdownMenu/DropDownMenuItem.svelte
diff --git a/...src/lib/dropdown/DropDownMenuItems.svelte → ...lib/dropdownMenu/DropDownMenuItems.svelte b/...src/lib/dropdown/DropDownMenuItems.svelte → ...lib/dropdownMenu/DropDownMenuItems.svelte
diff --git a/...ages/ui/src/lib/dropdown/Dropdown.spec.ts → ...src/lib/dropdownMenu/DropdownMenu.spec.ts b/...ages/ui/src/lib/dropdown/Dropdown.spec.ts → ...src/lib/dropdownMenu/DropdownMenu.spec.ts
@@ -21,7 +21,7 @@ import '@testing-library/jest-dom/vitest';
 import { fireEvent, render, screen } from '@testing-library/svelte';
 import { expect, test, vi } from 'vitest';
 
-import DropdownMenu from './Dropdown.svelte';
+import DropdownMenu from './DropdownMenu.svelte';
 
 test('Expect the onBeforeToggle function to be called when the menu is clicked', async () => {
   const onBeforeToggleMock = vi.fn();

diff --git a/packages/ui/src/lib/dropdown/Dropdown.svelte → .../src/lib/dropdownMenu/DropdownMenu.svelte b/packages/ui/src/lib/dropdown/Dropdown.svelte → .../src/lib/dropdownMenu/DropdownMenu.svelte
diff --git a/packages/ui/src/lib/dropdown/index.ts → packages/ui/src/lib/dropdownMenu/index.ts b/packages/ui/src/lib/dropdown/index.ts → packages/ui/src/lib/dropdownMenu/index.ts
@@ -15,9 +15,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ***********************************************************************/
-import DropdownMenu from './Dropdown.svelte';
+import DropdownMenu from './DropdownMenu.svelte';
 import DropDownMenuItem from './DropDownMenuItem.svelte';
 
 export default Object.assign(DropdownMenu, {
-  MenuItem: DropDownMenuItem,
+  Item: DropDownMenuItem,
 });
diff --git a/packages/ui/src/lib/index.ts b/packages/ui/src/lib/index.ts
@@ -19,7 +19,7 @@ import ErrorMessage from './alert/ErrorMessage.svelte';
 import type { ButtonType } from './button/Button';
 import Button from './button/Button.svelte';
 import Checkbox from './checkbox/Checkbox.svelte';
-import Dropdown from './dropdown';
+import DropdownMenu from './dropdownMenu';
 import Input from './inputs/Input.svelte';
 import SearchInput from './inputs/SearchInput.svelte';
 import NavPage from './layouts/NavPage.svelte';
@@ -41,8 +41,8 @@ export type { ButtonType };
 export {
   Button,
   Checkbox,
+  DropdownMenu,
   EmptyScreen,
-  Dropdown,
   ErrorMessage,
   FilteredEmptyScreen,
   Input,