refactor(aria/menu): move hasBeenFocused to pattern

Author: adolgachev

src/aria/menu/menu.ts

@@ -51,7 +51,7 @@ import {Directionality} from '@angular/cdk/bidi';
     '(click)': '_pattern.onClick()',
     '(keydown)': '_pattern.onKeydown($event)',
     '(focusout)': '_pattern.onFocusOut($event)',
-    '(focusin)': 'onFocusIn()',
+    '(focusin)': '_pattern.onFocusIn()',
   },
 })
 export class MenuTrigger<V> {
@@ -67,9 +67,6 @@ export class MenuTrigger<V> {
   /** The menu associated with the trigger. */
   menu = input<Menu<V> | undefined>(undefined);
 
-  /** Whether the menu item has been focused. */
-  readonly hasBeenFocused = signal(false);
-
   /** Whether the menu is expanded. */
   readonly expanded = computed(() => this._pattern.expanded());
 
@@ -86,11 +83,6 @@ export class MenuTrigger<V> {
   constructor() {
     effect(() => this.menu()?.parent.set(this));
   }
-
-  /** Marks the menu trigger as having been focused. */
-  onFocusIn() {
-    this.hasBeenFocused.set(true);
-  }
 }
 
 /**
@@ -205,7 +197,7 @@ export class Menu<V> {
         this._deferredContentAware?.contentVisible.set(true);
       } else {
         this._deferredContentAware?.contentVisible.set(
-          this._pattern.isVisible() || !!this.parent()?.hasBeenFocused(),
+          this._pattern.isVisible() || !!this.parent()?._pattern.hasBeenFocused(),
         );
       }
     });
@@ -339,7 +331,7 @@ export class MenuBar<V> {
   host: {
     'role': 'menuitem',
     'class': 'ng-menu-item',
-    '(focusin)': 'onFocusIn()',
+    '(focusin)': '_pattern.onFocusIn()',
     '[attr.tabindex]': '_pattern.tabIndex()',
     '[attr.data-active]': 'isActive()',
     '[attr.aria-haspopup]': 'hasPopup()',
@@ -404,11 +396,6 @@ export class MenuItem<V> {
   constructor() {
     effect(() => this.submenu()?.parent.set(this));
   }
-
-  /** Marks the menu item as having been focused. */
-  onFocusIn() {
-    this.hasBeenFocused.set(true);
-  }
 }
 
 /** Defers the rendering of the menu content. */

src/aria/private/menu/menu.ts

@@ -578,6 +578,9 @@ export class MenuTriggerPattern<V> {
   /** Whether the menu is expanded. */
   expanded = signal(false);
 
+  /** Whether the menu trigger has received focus. */
+  hasBeenFocused = signal(false);
+
   /** The role of the menu trigger. */
   role = () => 'button';
 
@@ -614,6 +617,11 @@ export class MenuTriggerPattern<V> {
     this.expanded() ? this.close() : this.open({first: true});
   }
 
+  /** Handles focusin events for the menu trigger. */
+  onFocusIn() {
+    this.hasBeenFocused.set(true);
+  }
+
   /** Handles focusout events for the menu trigger. */
   onFocusOut(event: FocusEvent) {
     const element = this.inputs.element();
@@ -679,6 +687,9 @@ export class MenuItemPattern<V> implements ListItem<V> {
   /** Whether the menu item is active. */
   isActive = computed(() => this.inputs.parent()?.inputs.activeItem() === this);
 
+  /** Whether the menu item has received focus. */
+  hasBeenFocused = signal(false);
+
   /** The tab index of the menu item. */
   tabIndex = computed(() => {
     if (this.submenu() && this.submenu()?.inputs.activeItem()) {
@@ -756,4 +767,9 @@ export class MenuItemPattern<V> implements ListItem<V> {
       }
     }
   }
+
+  /** Handles focusin events for the menu item. */
+  onFocusIn() {
+    this.hasBeenFocused.set(true);
+  }
 }