Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DropDownEditor: Detach focus events before attaching new ones (T1238121) #28547

Open
wants to merge 3 commits into
base: 24_2
Choose a base branch
from
Open

DropDownEditor: Detach focus events before attaching new ones (T1238121) #28547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c36bcf
DropDownEditor: Detach focus events before attaching new ones
Dec 12, 2024
8bc608c
feat(ddeditor): Add tests
Dec 12, 2024
7894ae7
refactor(ddeditor): Minimize the tests
Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ const DropDownEditor = TextBox.inherit({
},

_render() {
this._detachFocusEvents();

this.callBase();

this._renderOpenHandler();
Expand Down Expand Up @@ -291,7 +293,9 @@ const DropDownEditor = TextBox.inherit({
_renderField() {
const fieldTemplate = this._getFieldTemplate();

fieldTemplate && this._renderTemplatedField(fieldTemplate, this._fieldRenderData());
if (fieldTemplate) {
this._renderTemplatedField(fieldTemplate, this._fieldRenderData());
}
},

_renderPlaceholder() {
Expand Down
2 changes: 0 additions & 2 deletions packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,11 @@ const TextEditorBase = Editor.inherit({
this._renderStylingMode();
this._renderInputType();
this._renderPlaceholder();

this._renderProps();

this.callBase();

this._renderValue();

this._renderLabel();
},

Expand Down
23 changes: 23 additions & 0 deletions packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,29 @@ QUnit.module('focus policy', () => {
assert.ok($dropDownEditor.hasClass('dx-state-focused'), 'Widget is focused after click on clearButton');
});

[
{ eventName: 'onFocusIn', scenario: 'focus' },
{ eventName: 'onFocusOut', scenario: 'blur ' },
].forEach(({ eventName, scenario }) => {
QUnit.test(`${eventName} should be called only once on component ${scenario} when fieldTemplate is specified (T1238121)`, function(assert) {
const eventStub = sinon.stub();

const dropDownEditor = $('#dropDownEditorLazy').dxDropDownEditor({
[eventName]: eventStub,
fieldTemplate(_, container) {
$('<div>').dxTextBox({
readOnly: true,
}).appendTo(container);
},
}).dxDropDownEditor('instance');

dropDownEditor.focus();
dropDownEditor.blur();

assert.strictEqual(eventStub.callCount, 1, `${eventName} called once`);
});
});

QUnit.testInActiveWindow('input is focused by click on dropDownButton', function(assert) {
const $dropDownEditor = $('#dropDownEditorLazy').dxDropDownEditor({
focusStateEnabled: true
Expand Down
Loading