GridCore: fix tests

Author: anna-shakhova

packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts

@@ -8,7 +8,7 @@ import Toolbar from '@js/ui/toolbar';
 import type { EditingController } from '@ts/grids/grid_core/editing/m_editing';
 import type { HeaderFilterController } from '@ts/grids/grid_core/header_filter/m_header_filter';
 import type { DefaultToolbarItem, ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types';
-import { isDefaultToolbarItem, normalizeToolbarItems } from '@ts/grids/new/grid_core/toolbar/utils';
+import { normalizeToolbarItems } from '@ts/grids/new/grid_core/toolbar/utils';
 
 import type { ModuleType } from '../m_types';
 import { ColumnsView } from '../views/m_columns_view';
@@ -44,7 +44,7 @@ export class HeaderPanel extends ColumnsView {
   public addToolbarItem(name: string, item: ToolbarItem): void {
     this._registeredToolbarItems[name] = item;
 
-    if (this._toolbar) {
+    if (this._$element) {
       this._invalidate();
     }
   }
@@ -54,7 +54,7 @@ export class HeaderPanel extends ColumnsView {
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
       delete this._registeredToolbarItems[name];
 
-      if (this._toolbar) {
+      if (this._$element) {
         this._invalidate();
       }
     }
@@ -92,14 +92,10 @@ export class HeaderPanel extends ColumnsView {
         visible: userToolbarOptions?.visible,
         disabled: userToolbarOptions?.disabled,
         onItemRendered(e) {
-          const { itemData } = e;
+          const itemRenderedCallback = e.itemData?.onItemRendered;
 
-          if (itemData && isDefaultToolbarItem(itemData)) {
-            const itemRenderedCallback = itemData.onItemRendered;
-
-            if (itemRenderedCallback) {
-              itemRenderedCallback(e);
-            }
+          if (itemRenderedCallback) {
+            itemRenderedCallback(e);
           }
         },
       },

packages/devextreme/js/__internal/grids/new/grid_core/toolbar/types.ts

@@ -7,6 +7,7 @@ export type DefaultToolbarItemName = typeof DEFAULT_TOOLBAR_ITEMS[number];
 export interface ToolbarItem extends BaseToolbarItem {
   name?: DefaultToolbarItemName | string;
   sortIndex?: number;
+  onItemRendered?: (e: ItemRenderedEvent) => void,
 }
 
 export type DefaultToolbarItem = ToolbarItem & {

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js

@@ -211,13 +211,13 @@ QUnit.module('Grid view', {
     QUnit.test('Check search panel aria attribute', function(assert) {
         // arrange
         const testElement = $('#container');
-        const gridView = this.createGridView(this.defaultOptions);
-
-        gridView.render(testElement, $.extend(this.options, {
+        const gridView = this.createGridView(this.defaultOptions, {
             searchPanel: {
                 visible: true
             }
-        }));
+        });
+
+        gridView.render(testElement);
 
         // assert
         assert.equal(testElement.find('.dx-datagrid-search-panel :not(.dx-texteditor-input)').attr('aria-label'), undefined, 'aria-label attribute not presents for non \'input\' elements');
@@ -819,6 +819,8 @@ QUnit.module('Grid view', {
         const headersTable = gridView.getView('columnHeadersView')._tableElement;
         const scrollerWidth = gridView.getView('rowsView').getScrollbarWidth();
 
+        debugger;
+
         if(device.ios || device.mac || device.android || (device.deviceType !== 'desktop')) {
             assert.strictEqual(scrollerWidth, 0);
         } else {

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js

@@ -3498,21 +3498,22 @@ QUnit.module('Keyboard keys', {
 
         QUnit.testInActiveWindow(`${keyName} + F`, function(assert) {
             // arrange
-            setupModules(this);
-
-            // act
-            this.options.searchPanel = {
-                visible: true
+            this.options = {
+                searchPanel: {
+                    visible: true
+                }
             };
 
+            setupModules(this);
             this.gridView.render($('#container'));
 
+            // act
             $(this.rowsView.element()).click();
-
             const isPreventDefaultCalled = this.triggerKeyDown('F', keyConfig).preventDefault;
-            const $searchPanelElement = $('.dx-datagrid-search-panel');
 
             // assert
+            const $searchPanelElement = $('.dx-datagrid-search-panel');
+
             assert.ok($searchPanelElement.hasClass('dx-state-focused'), 'search panel has focus class');
             assert.ok($searchPanelElement.find(':focus').hasClass('dx-texteditor-input'), 'search panel\'s editor is focused');
             assert.ok(isPreventDefaultCalled, 'preventDefault is called');