Skip to content

Commit ebfd976

Browse files
fix2
1 parent 6a5d129 commit ebfd976

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

packages/devextreme/js/__internal/grids/grid_core/editing/const.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export const EDITING_EDITCOLUMNNAME_OPTION_NAME = 'editing.editColumnName';
1414

1515
export const TARGET_COMPONENT_NAME = 'targetComponent';
1616

17+
export const EDITORS_TEXTAREA_SELECTOR = 'textarea:not([hidden])';
1718
export const EDITORS_INPUT_SELECTOR = 'input:not([type=\'hidden\'])';
1819
export const FOCUSABLE_ELEMENT_SELECTOR = `[tabindex]:not([disabled]), ${EDITORS_INPUT_SELECTOR}:not([disabled])`;
1920

packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_
3131
import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory';
3232
import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
3333

34-
import { EDITORS_INPUT_SELECTOR } from '../editing/const';
34+
import { EDITORS_INPUT_SELECTOR, EDITORS_TEXTAREA_SELECTOR } from '../editing/const';
3535
import type { EditingController } from '../editing/m_editing';
3636
import type { NormalizedEditCellOptions } from '../editing/types';
3737
import modules from '../m_modules';
@@ -1442,7 +1442,8 @@ export const validatingEditorFactoryExtender = (Base: ModuleType<EditorFactory>)
14421442

14431443
private _getCurrentFocusElement($focus) {
14441444
if (this._editingController.isEditing()) {
1445-
return $focus.find(EDITORS_INPUT_SELECTOR).first();
1445+
const selector = [EDITORS_INPUT_SELECTOR, EDITORS_TEXTAREA_SELECTOR].join(', ');
1446+
return $focus.find(selector).first();
14461447
}
14471448
return $focus;
14481449
}

0 commit comments

Comments
 (0)