@angular/aria 22.0.0-next.7 → 22.0.0-rc.0

package/fesm2022/_widget-chunk.mjs

@@ -1,4 +1,4 @@
-import { computed, signal, linkedSignal, KeyboardEventManager, Modifier } from './_signal-like-chunk.mjs';
+import { computed, signal, linkedSignal, KeyboardEventManager, Modifier } from './_violations-chunk.mjs';
 import { ClickEventManager } from './_click-event-manager-chunk.mjs';
 import { untracked } from '@angular/core/primitives/signals';
 import { ElementRef } from '@angular/core';
@@ -707,6 +707,16 @@ class GridPattern {
       cells: computed(() => this.inputs.rows().map(row => row.inputs.cells()))
     });
   }
+  validate() {
+    const violations = [];
+    const rows = this.inputs.rows();
+    for (const row of rows) {
+      if (row.inputs.cells().length === 0) {
+        violations.push('ngGridRow must contain at least one ngGridCell.');
+      }
+    }
+    return violations;
+  }
   onKeydown(event) {
     if (this.disabled()) return;
     this.hasBeenInteracted.set(true);
@@ -831,11 +841,6 @@ class GridCellPattern {
   onKeydown(event) {
     if (this.disabled()) return;
     this.widget()?.onKeydown(event);
-    if (this.widget()?.inputs.widgetType() === 'simple') {
-      if (event.key === 'Enter' || event.key === ' ') {
-        this.inputs.onActivate?.(event);
-      }
-    }
   }
   onFocusIn(event) {
     this.isFocused.set(true);
@@ -877,23 +882,31 @@ class GridCellWidgetPattern {
   element = () => this.inputs.element();
   widgetHost = () => resolveElement(this.inputs.focusTarget(), this.element()) ?? this.element();
   disabled = computed(() => this.inputs.disabled() || this.inputs.cell().disabled());
-  tabIndex = computed(() => this.inputs.cell().widgetTabIndex());
+  tabIndex = computed(() => {
+    if (this.inputs.focusTarget()) {
+      return -1;
+    }
+    return this.inputs.cell().widgetTabIndex();
+  });
   active = computed(() => this.inputs.cell().active() && this.inputs.cell().widget() === this);
   isActivated = signal(false);
   lastActivateEvent = signal(undefined);
   lastDeactivateEvent = signal(undefined);
   keydown = computed(() => {
     const manager = new KeyboardEventManager();
-    if (this.isActivated()) {
-      manager.on('Escape', e => {
-        this.deactivate(e);
-        this.focus();
+    if (this.inputs.widgetType() === 'simple') {
+      return manager.on('Enter', e => this.inputs.onActivate?.(e), {
+        preventDefault: false,
+        stopPropagation: false
+      }).on(' ', e => this.inputs.onActivate?.(e), {
+        preventDefault: false,
+        stopPropagation: false
       });
+    }
+    if (this.isActivated()) {
+      manager.on('Escape', e => this.deactivate(e));
       if (this.inputs.widgetType() === 'editable') {
-        manager.on('Enter', e => {
-          this.deactivate(e);
-          this.focus();
-        });
+        manager.on('Enter', e => this.deactivate(e));
       }
       return manager;
     }
@@ -927,6 +940,24 @@ class GridCellWidgetPattern {
   focus() {
     this.widgetHost().focus();
   }
+  activationEffect() {
+    if (this.isActivated()) {
+      const event = this.lastActivateEvent();
+      this.inputs.onActivate?.(event);
+      if (this.inputs.focusTarget()) {
+        this.focus();
+      }
+    }
+  }
+  deactivationEffect() {
+    const event = this.lastDeactivateEvent();
+    if (event) {
+      this.inputs.onDeactivate?.(event);
+      if (event instanceof KeyboardEvent) {
+        this.focus();
+      }
+    }
+  }
   activate(event) {
     if (this.isActivated()) return;
     if (this.inputs.widgetType() === 'simple') return;