Skip to content

Commit d50ae15

Browse files
authored
refactor: keep overlay open when pressing Enter (#3651)
1 parent 9c232d5 commit d50ae15

2 files changed

Lines changed: 47 additions & 0 deletions

File tree

‎packages/multi-select-combo-box/src/vaadin-multi-select-combo-box-internal.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,38 @@ class MultiSelectComboBoxInternal extends ComboBoxDataProviderMixin(ComboBoxMixi
102102
}
103103
}
104104

105+
/**
106+
* Override Enter handler to keep overlay open
107+
* when item is selected or unselected.
108+
* @param {!Event} event
109+
* @protected
110+
* @override
111+
*/
112+
_onEnter(event) {
113+
this.__enterPressed = true;
114+
115+
super._onEnter(event);
116+
}
117+
118+
/**
119+
* @protected
120+
* @override
121+
*/
122+
_closeOrCommit() {
123+
if (this.__enterPressed) {
124+
this.__enterPressed = null;
125+
126+
// Keep focused index after committing
127+
const focusedIndex = this._focusedIndex;
128+
this._commitValue();
129+
this._focusedIndex = focusedIndex;
130+
131+
return;
132+
}
133+
134+
super._closeOrCommit();
135+
}
136+
105137
/**
106138
* @param {CustomEvent} event
107139
* @protected

‎packages/multi-select-combo-box/test/basic.test.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,21 @@ describe('basic', () => {
174174
await sendKeys({ down: 'Enter' });
175175
expect(spy.calledOnce).to.be.false;
176176
});
177+
178+
it('should keep overlay open when selecting an item', async () => {
179+
await sendKeys({ down: 'ArrowDown' });
180+
await sendKeys({ down: 'ArrowDown' });
181+
await sendKeys({ down: 'Enter' });
182+
expect(internal.opened).to.be.true;
183+
});
184+
185+
it('should keep overlay focused index when selecting an item', async () => {
186+
await sendKeys({ down: 'ArrowDown' });
187+
await sendKeys({ down: 'ArrowDown' });
188+
await sendKeys({ down: 'Enter' });
189+
const item = document.querySelector('vaadin-multi-select-combo-box-item');
190+
expect(item.hasAttribute('focused')).to.be.true;
191+
});
177192
});
178193

179194
describe('pageSize', () => {

0 commit comments

Comments
 (0)