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

Fix wrong event in single-select and combobox #7442

Merged
merged 1 commit into from
Mar 7, 2025
+41 −14
Merged

Fix wrong event in single-select and combobox #7442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions packages/components/src/components/combobox/shadow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import KolInputContainerFc from '../../functional-component-wrappers/InputContai
import CustomSuggestionsToggleFc from '../../functional-components/CustomSuggestionsToggle';
import CustomSuggestionsOptionFc from '../../functional-components/CustomSuggestionsOption/CustomSuggestionsOption';
import CustomSuggestionsOptionsGroupFc from '../../functional-components/CustomSuggestionsOptionsGroup';
import { EventDetail } from '../../schema/interfaces/EventDetail';

/**
* @slot - Die Beschriftung des Eingabefeldes.
Expand Down Expand Up @@ -77,9 +78,16 @@ export class KolCombobox implements ComboboxAPI {
this.refInput = ref;
};

private selectOption(event: Event, option: string) {
this.controller.onFacade.onInput(event, true, option);
this.controller.onFacade.onChange(event, option);
private selectOption(option: string) {
this.controller.onFacade.onInput(
new CustomEvent<EventDetail>('input', { bubbles: true, detail: { name: this.state._name as string, value: option } }),
true,
option,
);
this.controller.onFacade.onChange(
new CustomEvent<EventDetail>('change', { bubbles: true, detail: { name: this.state._name as string, value: option } }),
option,
);
this.controller.setFormAssociatedValue(option);
this.state._value = option;
this.refInput?.focus();
Expand Down Expand Up @@ -224,8 +232,8 @@ export class KolCombobox implements ComboboxAPI {
if (el) this.refSuggestions[index] = el;
}}
selected={this.state._value === option}
onClick={(e) => {
this.selectOption(e, option as string);
onClick={() => {
this.selectOption(option as string);
this.toggleListbox();
}}
onMouseOver={() => {
Expand All @@ -238,7 +246,7 @@ export class KolCombobox implements ComboboxAPI {
}}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === 'NumpadEnter') {
this.selectOption(e, option as string);
this.selectOption(option as string);
this.toggleListbox();
e.preventDefault();
}
Expand Down
31 changes: 23 additions & 8 deletions packages/components/src/components/single-select/shadow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import CustomSuggestionsToggleFc from '../../functional-components/CustomSuggest
import KolFormFieldStateWrapperFc, { type FormFieldStateWrapperProps } from '../../functional-component-wrappers/FormFieldStateWrapper';
import KolInputContainerFc from '../../functional-component-wrappers/InputContainerStateWrapper';
import KolInputStateWrapperFc from '../../functional-component-wrappers/InputStateWrapper/InputStateWrapper';
import { EventDetail } from '../../schema/interfaces/EventDetail';

/**
* @slot - The input field label.
Expand Down Expand Up @@ -99,16 +100,30 @@ export class KolSingleSelect implements SingleSelectAPI {
this._inputValue = emptyValue;
this._filteredOptions = [...this.state._options];

this.controller.onFacade.onInput(new Event('input'), true, emptyValue);
this.controller.onFacade.onChange(new Event('change'), emptyValue);
this.controller.onFacade.onInput(
new CustomEvent<EventDetail>('input', { bubbles: true, detail: { name: this.state._name as string, value: emptyValue } }),
true,
emptyValue,
);
this.controller.onFacade.onChange(
new CustomEvent<EventDetail>('change', { bubbles: true, detail: { name: this.state._name as string, value: emptyValue } }),
emptyValue,
);
}
}

private selectOption(event: Event, option: Option<string>) {
private selectOption(option: Option<string>) {
this._value = option.value;
this._inputValue = option.label as string;
this.controller.onFacade.onInput(event, false, option.value);
this.controller.onFacade.onChange(event, option.value);
this.controller.onFacade.onInput(
new CustomEvent<EventDetail>('input', { bubbles: true, detail: { name: this.state._name as string, value: option.value } }),
false,
option.value,
);
this.controller.onFacade.onChange(
new CustomEvent<EventDetail>('change', { bubbles: true, detail: { name: this.state._name as string, value: option.value } }),
option.value,
);

this._filteredOptions = [...this.state._options];

Expand Down Expand Up @@ -259,7 +274,7 @@ export class KolSingleSelect implements SingleSelectAPI {
}}
selected={this._value === (option as Option<string>).value}
onClick={(event: Event) => {
this.selectOption(event, option as Option<string>);
this.selectOption(option as Option<string>);
this.refInput?.focus();
this.toggleListbox(event);
}}
Expand All @@ -275,7 +290,7 @@ export class KolSingleSelect implements SingleSelectAPI {
}}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === 'NumpadEnter') {
this.selectOption(e, option as Option<string>);
this.selectOption(option as Option<string>);
this.refInput?.focus();
this.toggleListbox(e);
e.preventDefault();
Expand Down Expand Up @@ -347,7 +362,7 @@ export class KolSingleSelect implements SingleSelectAPI {
case ' ': {
if (this._isOpen) {
if (Array.isArray(this._filteredOptions) && this._filteredOptions.length > 0) {
this.selectOption(event, this._filteredOptions[this._focusedOptionIndex] as Option<string>);
this.selectOption(this._filteredOptions[this._focusedOptionIndex] as Option<string>);
this.refInput?.focus();
handleEvent(false);
}
Expand Down
4 changes: 4 additions & 0 deletions packages/components/src/schema/interfaces/EventDetail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export interface EventDetail {
name: string;
value: string;
}
Loading