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.

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 input text - method setValue didn't work #1211

Merged
merged 7 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/browsers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- uses: actions/upload-artifact@v4
if: failure()
with:
name: screenshot-${{ matrix.os }}
name: screenshot-${{ matrix.os }}-${{ matrix.browser }}
path: test-results/**/*.png
- uses: actions/upload-artifact@v4
if: '!cancelled()'
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

## [11.0.2]
## [11.0.3]

### Bug Fixes (from 11.0.0)
* Fix input text - method setValue didn't work [#1207](https://github.com/Choices-js/Choices/issues/1207)

## [11.0.2] (2024-09-05)

### Features (from 11.0.0)
* Pass `getClassNames` as the 3rd argument to `callbackOnCreateTemplates` callback
Expand Down
23 changes: 4 additions & 19 deletions src/scripts/choices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {
removeClassesFromElement,
resolveNoticeFunction,
resolveStringFunction,
sanitise,
sortByRank,
strToEl,
} from './lib/utils';
Expand Down Expand Up @@ -737,7 +736,7 @@ class Choices {
} as InputGroup;
}

this._addGroup(mapInputToChoice(group, true));
this._addGroup(mapInputToChoice<InputGroup>(group, true));
} else {
let choice = groupOrChoice;
if (!isDefaultLabel || !isDefaultValue) {
Expand All @@ -747,7 +746,7 @@ class Choices {
label: choice[label],
} as InputChoice;
}
this._addChoice(mapInputToChoice(choice, false));
this._addChoice(mapInputToChoice<InputChoice>(choice, false));
}
});

Expand Down Expand Up @@ -1324,7 +1323,7 @@ class Choices {
if (this.passedElement.value) {
const elementItems: ChoiceFull[] = this.passedElement.value
.split(config.delimiter)
.map((e: InputChoice | string) => mapInputToChoice(e, false));
.map((e: string) => mapInputToChoice<string>(e, false, this.config.allowHtmlUserInput));
this._presetChoices = this._presetChoices.concat(elementItems);
}
this._presetChoices.forEach((choice: ChoiceFull) => {
Expand Down Expand Up @@ -1740,21 +1739,7 @@ class Choices {
return;
}

const sanitisedValue = sanitise(value);
const userValue =
this.config.allowHtmlUserInput || sanitisedValue === value ? value : { escaped: sanitisedValue, raw: value };
this._addChoice(
mapInputToChoice(
{
value: userValue,
label: userValue,
selected: true,
} as InputChoice,
false,
),
true,
true,
);
this._addChoice(mapInputToChoice<string>(value, false, this.config.allowHtmlUserInput), true, true);
addedItem = true;
}

Expand Down
15 changes: 10 additions & 5 deletions src/scripts/lib/choice-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { InputChoice } from '../interfaces/input-choice';
import { InputGroup } from '../interfaces/input-group';
import { GroupFull } from '../interfaces/group-full';
import { ChoiceFull } from '../interfaces/choice-full';
import { unwrapStringForRaw } from './utils';
import { sanitise, unwrapStringForRaw } from './utils';

type MappedInputTypeToChoiceType<T extends string | InputChoice | InputGroup> = T extends InputGroup
? GroupFull
Expand All @@ -27,13 +27,18 @@ export const stringToHtmlClass = (input: string | string[] | undefined): string[
export const mapInputToChoice = <T extends string | InputChoice | InputGroup>(
value: T,
allowGroup: boolean,
allowRawString: boolean = true,
): MappedInputTypeToChoiceType<T> => {
if (typeof value === 'string') {
const result: ChoiceFull = mapInputToChoice(
const sanitisedValue = sanitise(value);
const userValue = allowRawString || sanitisedValue === value ? value : { escaped: sanitisedValue, raw: value };

const result: ChoiceFull = mapInputToChoice<InputChoice>(
{
value,
label: value,
} as InputChoice,
label: userValue,
selected: true,
},
false,
);

Expand All @@ -47,7 +52,7 @@ export const mapInputToChoice = <T extends string | InputChoice | InputGroup>(
throw new TypeError(`optGroup is not allowed`);
}
const group = groupOrChoice;
const choices = group.choices.map((e) => mapInputToChoice(e, false));
const choices = group.choices.map((e) => mapInputToChoice<InputChoice>(e, false));

const result: GroupFull = {
id: 0, // actual ID will be assigned during _addGroup
Expand Down
Binary file modified test-e2e/__screenshots__/chromium-darwin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-e2e/__screenshots__/chromium-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-e2e/__screenshots__/chromium-win32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed test-e2e/__screenshots__/firefox-darwin.png
Binary file not shown.
Binary file modified test-e2e/__screenshots__/firefox-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed test-e2e/__screenshots__/firefox-win32.png
Binary file not shown.
Binary file modified test-e2e/__screenshots__/webkit-darwin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test-e2e/__screenshots__/webkit-linux.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed test-e2e/__screenshots__/webkit-win32.png
Binary file not shown.