@skyux/ag-grid 7.19.0 → 7.21.0

package/fesm2020/skyux-ag-grid.mjs

@@ -77,6 +77,10 @@ class SkyAgGridAdapterService {
             focusableChildren[0].focus();
         }
     }
+    focusOnColumnHeader(parentEl, colId) {
+        const columnHeader = parentEl.querySelector(`.ag-header-cell[col-id="${colId}"]`);
+        columnHeader?.focus();
+    }
 }
 _SkyAgGridAdapterService_skyAdapterService = new WeakMap();
 SkyAgGridAdapterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.11", ngImport: i0, type: SkyAgGridAdapterService, deps: [{ token: i1.SkyCoreAdapterService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1613,12 +1617,14 @@ _SkyAgGridService_keyMap = new WeakMap(), _SkyAgGridService_ngUnsubscribe = new
             minWidth: 100,
             resizable: true,
             sortable: true,
+            suppressHeaderKeyboardEvent: (keypress) => keypress.event.code === 'Tab',
             suppressKeyboardEvent: (keypress) => __classPrivateFieldGet(this, _SkyAgGridService_instances, "m", _SkyAgGridService_suppressTab).call(this, keypress),
         },
         defaultColGroupDef: {
             headerGroupComponent: SkyAgGridHeaderGroupComponent,
         },
         domLayout: 'autoHeight',
+        ensureDomOrder: true,
         enterMovesDownAfterEdit: true,
         components: {
             'sky-ag-grid-cell-renderer-currency': SkyAgGridCellRendererCurrencyComponent,
@@ -1900,17 +1906,13 @@ class SkyAgGridWrapperComponent {
         }
     }
     onAnchorFocus(event) {
-        const gridId = this.gridId;
         const relatedTarget = event.relatedTarget;
-        const previousFocusedId = relatedTarget && relatedTarget.id;
-        const previousWasCell = relatedTarget &&
-            !!__classPrivateFieldGet(this, _SkyAgGridWrapperComponent_adapterService, "f").getElementOrParentWithClass(relatedTarget, 'ag-cell');
-        if (previousFocusedId !== gridId && !previousWasCell) {
-            const columns = this.agGrid?.columnApi.getAllDisplayedColumns();
-            const firstColumn = columns?.[0];
-            const rowIndex = this.agGrid?.api.getFirstDisplayedRow();
-            if (firstColumn && rowIndex !== undefined && rowIndex >= 0) {
-                this.agGrid?.api.setFocusedCell(rowIndex, firstColumn);
+        const previousWasGrid = relatedTarget && !!__classPrivateFieldGet(this, _SkyAgGridWrapperComponent_elementRef, "f").nativeElement.contains(relatedTarget);
+        if (this.agGrid && !previousWasGrid) {
+            const firstColumn = this.agGrid.columnApi.getAllDisplayedColumns()[0];
+            if (firstColumn) {
+                this.agGrid.api.ensureColumnVisible(firstColumn);
+                __classPrivateFieldGet(this, _SkyAgGridWrapperComponent_adapterService, "f").focusOnColumnHeader(__classPrivateFieldGet(this, _SkyAgGridWrapperComponent_elementRef, "f").nativeElement, firstColumn.getColId());
             }
         }
     }