approach 1 of handling dialog close from menu item trigger

libs/components/src/button/button.component.ts

@@ -148,7 +148,7 @@ export class ButtonComponent implements ButtonLikeAbstraction {
   );
 
   readonly disabled = model<boolean>(false);
-  private el = inject(ElementRef<HTMLButtonElement>);
+  readonly el = inject(ElementRef<HTMLButtonElement>);
 
   constructor() {
     ariaDisableElement(this.el.nativeElement, this.disabledAttr);

libs/components/src/dialog/dialog.service.ts

@@ -62,7 +62,7 @@ export abstract class DialogRef<R = unknown, C = unknown> implements Pick<
 
 export type DialogConfig<D = unknown, R = unknown> = Pick<
   CdkDialogConfig<D, R>,
-  "data" | "disableClose" | "ariaModal" | "positionStrategy" | "height" | "width"
+  "data" | "disableClose" | "ariaModal" | "positionStrategy" | "height" | "width" | "restoreFocus"
 >;
 
 /**

libs/components/src/menu/menu.mdx

@@ -38,3 +38,8 @@ prior to being clicked and `aria-expanded="true"` after the user clicks the elem
 
 User should be able to navigate the opened menu via the up and down arrow keys and close the menu
 using the escape key or clicking out of the menu.
+
+Are you using a menu item to open a dialog? Be sure to pass the `restoreFocus` config option to the
+`dialog.open` method, specifying where the user's focus should return to upon dialog close. (The
+menu closes when the dialog launches, so the built-in strategy of returning focus to the trigger
+element is not possible, since the trigger element menu item is gone.)

libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.ts

@@ -32,6 +32,7 @@ import {
   FormFieldModule,
   IconButtonModule,
   ToastService,
+  DialogConfig,
 } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
@@ -175,10 +176,17 @@ export class AddEditFolderDialogComponent implements AfterViewInit, OnInit {
     this.dialogRef.close(result);
   }
 
-  static open(dialogService: DialogService, data?: AddEditFolderDialogData) {
+  static open(
+    dialogService: DialogService,
+    data?: AddEditFolderDialogData,
+    dialogConfig?: DialogConfig,
+  ) {
     return dialogService.open<AddEditFolderDialogResult, AddEditFolderDialogData>(
       AddEditFolderDialogComponent,
-      { data },
+      {
+        ...dialogConfig,
+        data,
+      },
     );
   }
 }

libs/vault/src/components/new-cipher-menu/new-cipher-menu.component.html

@@ -7,6 +7,7 @@
       [bitMenuTriggerFor]="addOptions"
       id="newItemDropdown"
       [appA11yTitle]="'new' | i18n"
+      #newItemDropdown
     >
       <i class="bwi bwi-plus" aria-hidden="true"></i>
       {{ "new" | i18n }}

libs/vault/src/components/new-cipher-menu/new-cipher-menu.component.ts

@@ -1,12 +1,12 @@
 import { CommonModule } from "@angular/common";
-import { Component, input, output } from "@angular/core";
+import { Component, input, output, viewChild } from "@angular/core";
 import { map, shareReplay } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
 import { CIPHER_MENU_ITEMS } from "@bitwarden/common/vault/types/cipher-menu-items";
-import { ButtonModule, MenuModule } from "@bitwarden/components";
+import { ButtonComponent, ButtonModule, MenuModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
 // FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
@@ -33,6 +33,8 @@ export class NewCipherMenuComponent {
   collectionAdded = output();
   cipherAdded = output<CipherType>();
 
+  readonly newCipherButton = viewChild<ButtonComponent>("newItemDropdown");
+
   constructor(private restrictedItemTypesService: RestrictedItemTypesService) {}
 
   /**