@angular/aria 21.0.3 → 21.1.0-next.1

package/fesm2022/grid.mjs

@@ -1,18 +1,13 @@
+import { _IdGenerator } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, ElementRef, contentChildren, computed, input, booleanAttribute, afterRenderEffect, Directive, output, model } from '@angular/core';
+import { inject, ElementRef, contentChildren, computed, input, booleanAttribute, afterRenderEffect, Directive, model, output } from '@angular/core';
 import { Directionality } from '@angular/cdk/bidi';
-import { GridPattern, GridCellWidgetPattern, GridCellPattern, GridRowPattern } from './_widget-chunk.mjs';
-import { _IdGenerator } from '@angular/cdk/a11y';
-import './_pointer-event-manager-chunk.mjs';
-import './_list-navigation-chunk.mjs';
-
-const GRID_CELL = new InjectionToken('GRID_CELL');
-const GRID_ROW = new InjectionToken('GRID_ROW');
+import { GridPattern, GridRowPattern, GridCellPattern, GridCellWidgetPattern } from './_widget-chunk.mjs';
 
 class Grid {
   _elementRef = inject(ElementRef);
   element = this._elementRef.nativeElement;
-  _rows = contentChildren(GRID_ROW, ...(ngDevMode ? [{
+  _rows = contentChildren(GridRow, ...(ngDevMode ? [{
     debugName: "_rows",
     descendants: true
   }] : [{
@@ -190,7 +185,7 @@ class Grid {
     },
     queries: [{
       propertyName: "_rows",
-      predicate: GRID_ROW,
+      predicate: GridRow,
       descendants: true,
       isSignal: true
     }],
@@ -226,7 +221,7 @@ i0.ɵɵngDeclareClassMetadata({
   propDecorators: {
     _rows: [{
       type: i0.ContentChildren,
-      args: [i0.forwardRef(() => GRID_ROW), {
+      args: [i0.forwardRef(() => GridRow), {
         ...{
           descendants: true
         },
@@ -307,134 +302,68 @@ i0.ɵɵngDeclareClassMetadata({
     }]
   }
 });
-
-class GridCellWidget {
+class GridRow {
   _elementRef = inject(ElementRef);
   element = this._elementRef.nativeElement;
-  active = computed(() => this._pattern.active(), ...(ngDevMode ? [{
-    debugName: "active"
-  }] : []));
-  _cell = inject(GRID_CELL);
-  id = input(inject(_IdGenerator).getId('ng-grid-cell-widget-', true), ...(ngDevMode ? [{
-    debugName: "id"
-  }] : []));
-  widgetType = input('simple', ...(ngDevMode ? [{
-    debugName: "widgetType"
-  }] : []));
-  disabled = input(false, ...(ngDevMode ? [{
-    debugName: "disabled",
-    transform: booleanAttribute
+  _cells = contentChildren(GridCell, ...(ngDevMode ? [{
+    debugName: "_cells",
+    descendants: true
   }] : [{
-    transform: booleanAttribute
+    descendants: true
   }]));
-  focusTarget = input(...(ngDevMode ? [undefined, {
-    debugName: "focusTarget"
+  _cellPatterns = computed(() => this._cells().map(c => c._pattern), ...(ngDevMode ? [{
+    debugName: "_cellPatterns"
   }] : []));
-  onActivate = output();
-  onDeactivate = output();
-  tabindex = input(...(ngDevMode ? [undefined, {
-    debugName: "tabindex"
+  _grid = inject(Grid);
+  _gridPattern = computed(() => this._grid._pattern, ...(ngDevMode ? [{
+    debugName: "_gridPattern"
   }] : []));
-  _tabIndex = computed(() => this.tabindex() ?? (this.focusTarget() ? -1 : this._pattern.tabIndex()), ...(ngDevMode ? [{
-    debugName: "_tabIndex"
+  rowIndex = input(...(ngDevMode ? [undefined, {
+    debugName: "rowIndex"
   }] : []));
-  _pattern = new GridCellWidgetPattern({
+  _pattern = new GridRowPattern({
     ...this,
-    element: () => this.element,
-    cell: () => this._cell._pattern,
-    focusTarget: computed(() => {
-      if (this.focusTarget() instanceof ElementRef) {
-        return this.focusTarget().nativeElement;
-      }
-      return this.focusTarget();
-    })
+    cells: this._cellPatterns,
+    grid: this._gridPattern
   });
-  get isActivated() {
-    return this._pattern.isActivated.asReadonly();
-  }
-  constructor() {
-    afterRenderEffect(() => {
-      const activateEvent = this._pattern.lastActivateEvent();
-      if (activateEvent) {
-        this.onActivate.emit(activateEvent);
-      }
-    });
-    afterRenderEffect(() => {
-      const deactivateEvent = this._pattern.lastDeactivateEvent();
-      if (deactivateEvent) {
-        this.onDeactivate.emit(deactivateEvent);
-      }
-    });
-  }
-  activate() {
-    this._pattern.activate();
-  }
-  deactivate() {
-    this._pattern.deactivate();
-  }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
     version: "21.0.0",
     ngImport: i0,
-    type: GridCellWidget,
+    type: GridRow,
     deps: [],
     target: i0.ɵɵFactoryTarget.Directive
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
-    minVersion: "17.1.0",
+    minVersion: "17.2.0",
     version: "21.0.0",
-    type: GridCellWidget,
+    type: GridRow,
     isStandalone: true,
-    selector: "[ngGridCellWidget]",
+    selector: "[ngGridRow]",
     inputs: {
-      id: {
-        classPropertyName: "id",
-        publicName: "id",
-        isSignal: true,
-        isRequired: false,
-        transformFunction: null
-      },
-      widgetType: {
-        classPropertyName: "widgetType",
-        publicName: "widgetType",
-        isSignal: true,
-        isRequired: false,
-        transformFunction: null
-      },
-      disabled: {
-        classPropertyName: "disabled",
-        publicName: "disabled",
-        isSignal: true,
-        isRequired: false,
-        transformFunction: null
-      },
-      focusTarget: {
-        classPropertyName: "focusTarget",
-        publicName: "focusTarget",
-        isSignal: true,
-        isRequired: false,
-        transformFunction: null
-      },
-      tabindex: {
-        classPropertyName: "tabindex",
-        publicName: "tabindex",
+      rowIndex: {
+        classPropertyName: "rowIndex",
+        publicName: "rowIndex",
         isSignal: true,
         isRequired: false,
         transformFunction: null
       }
     },
-    outputs: {
-      onActivate: "onActivate",
-      onDeactivate: "onDeactivate"
-    },
     host: {
+      attributes: {
+        "role": "row"
+      },
       properties: {
-        "attr.data-active": "active()",
-        "attr.data-active-control": "isActivated() ? \"widget\" : \"cell\"",
-        "tabindex": "_tabIndex()"
+        "attr.aria-rowindex": "_pattern.rowIndex()"
       }
     },
-    exportAs: ["ngGridCellWidget"],
+    queries: [{
+      propertyName: "_cells",
+      predicate: GridCell,
+      descendants: true,
+      isSignal: true
+    }],
+    exportAs: ["ngGridRow"],
     ngImport: i0
   });
 }
@@ -442,72 +371,38 @@ i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
   version: "21.0.0",
   ngImport: i0,
-  type: GridCellWidget,
+  type: GridRow,
   decorators: [{
     type: Directive,
     args: [{
-      selector: '[ngGridCellWidget]',
-      exportAs: 'ngGridCellWidget',
+      selector: '[ngGridRow]',
+      exportAs: 'ngGridRow',
       host: {
-        '[attr.data-active]': 'active()',
-        '[attr.data-active-control]': 'isActivated() ? "widget" : "cell"',
-        '[tabindex]': '_tabIndex()'
+        'role': 'row',
+        '[attr.aria-rowindex]': '_pattern.rowIndex()'
       }
     }]
   }],
-  ctorParameters: () => [],
   propDecorators: {
-    id: [{
-      type: i0.Input,
-      args: [{
-        isSignal: true,
-        alias: "id",
-        required: false
-      }]
-    }],
-    widgetType: [{
-      type: i0.Input,
-      args: [{
-        isSignal: true,
-        alias: "widgetType",
-        required: false
-      }]
-    }],
-    disabled: [{
-      type: i0.Input,
-      args: [{
-        isSignal: true,
-        alias: "disabled",
-        required: false
-      }]
-    }],
-    focusTarget: [{
-      type: i0.Input,
-      args: [{
-        isSignal: true,
-        alias: "focusTarget",
-        required: false
+    _cells: [{
+      type: i0.ContentChildren,
+      args: [i0.forwardRef(() => GridCell), {
+        ...{
+          descendants: true
+        },
+        isSignal: true
       }]
     }],
-    onActivate: [{
-      type: i0.Output,
-      args: ["onActivate"]
-    }],
-    onDeactivate: [{
-      type: i0.Output,
-      args: ["onDeactivate"]
-    }],
-    tabindex: [{
+    rowIndex: [{
       type: i0.Input,
       args: [{
         isSignal: true,
-        alias: "tabindex",
+        alias: "rowIndex",
         required: false
       }]
     }]
   }
 });
-
 class GridCell {
   _elementRef = inject(ElementRef);
   element = this._elementRef.nativeElement;
@@ -523,7 +418,7 @@ class GridCell {
   _widgetPatterns = computed(() => this._widgets().map(w => w._pattern), ...(ngDevMode ? [{
     debugName: "_widgetPatterns"
   }] : []));
-  _row = inject(GRID_ROW);
+  _row = inject(GridRow);
   textDirection = inject(Directionality).valueSignal;
   id = input(inject(_IdGenerator).getId('ng-grid-cell-', true), ...(ngDevMode ? [{
     debugName: "id"
@@ -710,10 +605,6 @@ class GridCell {
         "tabindex": "_tabIndex()"
       }
     },
-    providers: [{
-      provide: GRID_CELL,
-      useExisting: GridCell
-    }],
     queries: [{
       propertyName: "_widgets",
       predicate: GridCellWidget,
@@ -748,11 +639,7 @@ i0.ɵɵngDeclareClassMetadata({
         '[attr.aria-colindex]': '_pattern.ariaColIndex()',
         '[attr.aria-selected]': '_pattern.ariaSelected()',
         '[tabindex]': '_tabIndex()'
-      },
-      providers: [{
-        provide: GRID_CELL,
-        useExisting: GridCell
-      }]
+      }
     }]
   }],
   ctorParameters: () => [],
@@ -867,73 +754,133 @@ i0.ɵɵngDeclareClassMetadata({
     }]
   }
 });
-
-class GridRow {
+class GridCellWidget {
   _elementRef = inject(ElementRef);
   element = this._elementRef.nativeElement;
-  _cells = contentChildren(GRID_CELL, ...(ngDevMode ? [{
-    debugName: "_cells",
-    descendants: true
+  active = computed(() => this._pattern.active(), ...(ngDevMode ? [{
+    debugName: "active"
+  }] : []));
+  _cell = inject(GridCell);
+  id = input(inject(_IdGenerator).getId('ng-grid-cell-widget-', true), ...(ngDevMode ? [{
+    debugName: "id"
+  }] : []));
+  widgetType = input('simple', ...(ngDevMode ? [{
+    debugName: "widgetType"
+  }] : []));
+  disabled = input(false, ...(ngDevMode ? [{
+    debugName: "disabled",
+    transform: booleanAttribute
   }] : [{
-    descendants: true
+    transform: booleanAttribute
   }]));
-  _cellPatterns = computed(() => this._cells().map(c => c._pattern), ...(ngDevMode ? [{
-    debugName: "_cellPatterns"
+  focusTarget = input(...(ngDevMode ? [undefined, {
+    debugName: "focusTarget"
   }] : []));
-  _grid = inject(Grid);
-  _gridPattern = computed(() => this._grid._pattern, ...(ngDevMode ? [{
-    debugName: "_gridPattern"
+  onActivate = output();
+  onDeactivate = output();
+  tabindex = input(...(ngDevMode ? [undefined, {
+    debugName: "tabindex"
   }] : []));
-  rowIndex = input(...(ngDevMode ? [undefined, {
-    debugName: "rowIndex"
+  _tabIndex = computed(() => this.tabindex() ?? (this.focusTarget() ? -1 : this._pattern.tabIndex()), ...(ngDevMode ? [{
+    debugName: "_tabIndex"
   }] : []));
-  _pattern = new GridRowPattern({
+  _pattern = new GridCellWidgetPattern({
     ...this,
-    cells: this._cellPatterns,
-    grid: this._gridPattern
+    element: () => this.element,
+    cell: () => this._cell._pattern,
+    focusTarget: computed(() => {
+      if (this.focusTarget() instanceof ElementRef) {
+        return this.focusTarget().nativeElement;
+      }
+      return this.focusTarget();
+    })
   });
+  get isActivated() {
+    return this._pattern.isActivated.asReadonly();
+  }
+  constructor() {
+    afterRenderEffect(() => {
+      const activateEvent = this._pattern.lastActivateEvent();
+      if (activateEvent) {
+        this.onActivate.emit(activateEvent);
+      }
+    });
+    afterRenderEffect(() => {
+      const deactivateEvent = this._pattern.lastDeactivateEvent();
+      if (deactivateEvent) {
+        this.onDeactivate.emit(deactivateEvent);
+      }
+    });
+  }
+  activate() {
+    this._pattern.activate();
+  }
+  deactivate() {
+    this._pattern.deactivate();
+  }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
     version: "21.0.0",
     ngImport: i0,
-    type: GridRow,
+    type: GridCellWidget,
     deps: [],
     target: i0.ɵɵFactoryTarget.Directive
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
-    minVersion: "17.2.0",
+    minVersion: "17.1.0",
     version: "21.0.0",
-    type: GridRow,
+    type: GridCellWidget,
     isStandalone: true,
-    selector: "[ngGridRow]",
+    selector: "[ngGridCellWidget]",
     inputs: {
-      rowIndex: {
-        classPropertyName: "rowIndex",
-        publicName: "rowIndex",
+      id: {
+        classPropertyName: "id",
+        publicName: "id",
+        isSignal: true,
+        isRequired: false,
+        transformFunction: null
+      },
+      widgetType: {
+        classPropertyName: "widgetType",
+        publicName: "widgetType",
+        isSignal: true,
+        isRequired: false,
+        transformFunction: null
+      },
+      disabled: {
+        classPropertyName: "disabled",
+        publicName: "disabled",
+        isSignal: true,
+        isRequired: false,
+        transformFunction: null
+      },
+      focusTarget: {
+        classPropertyName: "focusTarget",
+        publicName: "focusTarget",
+        isSignal: true,
+        isRequired: false,
+        transformFunction: null
+      },
+      tabindex: {
+        classPropertyName: "tabindex",
+        publicName: "tabindex",
         isSignal: true,
         isRequired: false,
         transformFunction: null
       }
     },
+    outputs: {
+      onActivate: "onActivate",
+      onDeactivate: "onDeactivate"
+    },
     host: {
-      attributes: {
-        "role": "row"
-      },
       properties: {
-        "attr.aria-rowindex": "_pattern.rowIndex()"
+        "attr.data-active": "active()",
+        "attr.data-active-control": "isActivated() ? \"widget\" : \"cell\"",
+        "tabindex": "_tabIndex()"
       }
     },
-    providers: [{
-      provide: GRID_ROW,
-      useExisting: GridRow
-    }],
-    queries: [{
-      propertyName: "_cells",
-      predicate: GRID_CELL,
-      descendants: true,
-      isSignal: true
-    }],
-    exportAs: ["ngGridRow"],
+    exportAs: ["ngGridCellWidget"],
     ngImport: i0
   });
 }
@@ -941,37 +888,66 @@ i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
   version: "21.0.0",
   ngImport: i0,
-  type: GridRow,
+  type: GridCellWidget,
   decorators: [{
     type: Directive,
     args: [{
-      selector: '[ngGridRow]',
-      exportAs: 'ngGridRow',
+      selector: '[ngGridCellWidget]',
+      exportAs: 'ngGridCellWidget',
       host: {
-        'role': 'row',
-        '[attr.aria-rowindex]': '_pattern.rowIndex()'
-      },
-      providers: [{
-        provide: GRID_ROW,
-        useExisting: GridRow
-      }]
+        '[attr.data-active]': 'active()',
+        '[attr.data-active-control]': 'isActivated() ? "widget" : "cell"',
+        '[tabindex]': '_tabIndex()'
+      }
     }]
   }],
+  ctorParameters: () => [],
   propDecorators: {
-    _cells: [{
-      type: i0.ContentChildren,
-      args: [i0.forwardRef(() => GRID_CELL), {
-        ...{
-          descendants: true
-        },
-        isSignal: true
+    id: [{
+      type: i0.Input,
+      args: [{
+        isSignal: true,
+        alias: "id",
+        required: false
       }]
     }],
-    rowIndex: [{
+    widgetType: [{
       type: i0.Input,
       args: [{
         isSignal: true,
-        alias: "rowIndex",
+        alias: "widgetType",
+        required: false
+      }]
+    }],
+    disabled: [{
+      type: i0.Input,
+      args: [{
+        isSignal: true,
+        alias: "disabled",
+        required: false
+      }]
+    }],
+    focusTarget: [{
+      type: i0.Input,
+      args: [{
+        isSignal: true,
+        alias: "focusTarget",
+        required: false
+      }]
+    }],
+    onActivate: [{
+      type: i0.Output,
+      args: ["onActivate"]
+    }],
+    onDeactivate: [{
+      type: i0.Output,
+      args: ["onDeactivate"]
+    }],
+    tabindex: [{
+      type: i0.Input,
+      args: [{
+        isSignal: true,
+        alias: "tabindex",
         required: false
       }]
     }]