Skip to content

Commit

Permalink
Merge pull request #1175 from Choices-js/conditional-item-select-text
Browse files Browse the repository at this point in the history
If itemSelectText is an empty, do not reserve space for the "press to select" text phrase. Resolves #820
  • Loading branch information
Xon authored Aug 25, 2024
2 parents ad5a704 + 1c43069 commit 2e3ce96
Show file tree
Hide file tree
Showing 18 changed files with 98 additions and 36 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ For backward compatibility, `<option value="">This is a placeholder</option>` an
**Input types affected:** `select-multiple`, `select-one`
**Usage:** The text that is shown when a user hovers over a selectable choice.
**Usage:** The text that is shown when a user hovers over a selectable choice. Set to empty to not reserve space for this text.
### addItemText
Expand Down
4 changes: 3 additions & 1 deletion public/assets/scripts/choices.js
Original file line number Diff line number Diff line change
Expand Up @@ -3181,7 +3181,9 @@
dataset.choice = '';
dataset.id = choice.id;
dataset.value = rawValue;
dataset.selectText = selectText;
if (selectText) {
dataset.selectText = selectText;
}
assignCustomProperties(div, choice, false);
if (choice.disabled) {
(_e = div.classList).add.apply(_e, getClassNames(itemDisabled));
Expand Down
2 changes: 1 addition & 1 deletion public/assets/scripts/choices.min.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion public/assets/scripts/choices.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3175,7 +3175,9 @@ var templates = {
dataset.choice = '';
dataset.id = choice.id;
dataset.value = rawValue;
dataset.selectText = selectText;
if (selectText) {
dataset.selectText = selectText;
}
assignCustomProperties(div, choice, false);
if (choice.disabled) {
(_e = div.classList).add.apply(_e, getClassNames(itemDisabled));
Expand Down
4 changes: 3 additions & 1 deletion public/assets/scripts/choices.search-basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -2699,7 +2699,9 @@
dataset.choice = '';
dataset.id = choice.id;
dataset.value = rawValue;
dataset.selectText = selectText;
if (selectText) {
dataset.selectText = selectText;
}
assignCustomProperties(div, choice, false);
if (choice.disabled) {
(_e = div.classList).add.apply(_e, getClassNames(itemDisabled));
Expand Down
2 changes: 1 addition & 1 deletion public/assets/scripts/choices.search-basic.min.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion public/assets/scripts/choices.search-basic.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2693,7 +2693,9 @@ var templates = {
dataset.choice = '';
dataset.id = choice.id;
dataset.value = rawValue;
dataset.selectText = selectText;
if (selectText) {
dataset.selectText = selectText;
}
assignCustomProperties(div, choice, false);
if (choice.disabled) {
(_e = div.classList).add.apply(_e, getClassNames(itemDisabled));
Expand Down
4 changes: 3 additions & 1 deletion public/assets/scripts/choices.search-prefix.js
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,9 @@
dataset.choice = '';
dataset.id = choice.id;
dataset.value = rawValue;
dataset.selectText = selectText;
if (selectText) {
dataset.selectText = selectText;
}
assignCustomProperties(div, choice, false);
if (choice.disabled) {
(_e = div.classList).add.apply(_e, getClassNames(itemDisabled));
Expand Down
2 changes: 1 addition & 1 deletion public/assets/scripts/choices.search-prefix.min.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion public/assets/scripts/choices.search-prefix.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,9 @@ var templates = {
dataset.choice = '';
dataset.id = choice.id;
dataset.value = rawValue;
dataset.selectText = selectText;
if (selectText) {
dataset.selectText = selectText;
}
assignCustomProperties(div, choice, false);
if (choice.disabled) {
(_e = div.classList).add.apply(_e, getClassNames(itemDisabled));
Expand Down
8 changes: 4 additions & 4 deletions public/assets/styles/choices.css
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@
text-align: right;
}
@media (min-width: 640px) {
.choices__list--dropdown .choices__item--selectable, .choices__list[aria-expanded] .choices__item--selectable {
.choices__list--dropdown .choices__item--selectable[data-select-text], .choices__list[aria-expanded] .choices__item--selectable[data-select-text] {
padding-right: 100px;
}
.choices__list--dropdown .choices__item--selectable::after, .choices__list[aria-expanded] .choices__item--selectable::after {
.choices__list--dropdown .choices__item--selectable[data-select-text]::after, .choices__list[aria-expanded] .choices__item--selectable[data-select-text]::after {
content: attr(data-select-text);
font-size: 12px;
opacity: 0;
Expand All @@ -252,12 +252,12 @@
top: 50%;
transform: translateY(-50%);
}
[dir=rtl] .choices__list--dropdown .choices__item--selectable, [dir=rtl] .choices__list[aria-expanded] .choices__item--selectable {
[dir=rtl] .choices__list--dropdown .choices__item--selectable[data-select-text], [dir=rtl] .choices__list[aria-expanded] .choices__item--selectable[data-select-text] {
text-align: right;
padding-left: 100px;
padding-right: 10px;
}
[dir=rtl] .choices__list--dropdown .choices__item--selectable::after, [dir=rtl] .choices__list[aria-expanded] .choices__item--selectable::after {
[dir=rtl] .choices__list--dropdown .choices__item--selectable[data-select-text]::after, [dir=rtl] .choices__list[aria-expanded] .choices__item--selectable[data-select-text]::after {
right: auto;
left: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion public/assets/styles/choices.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2e3ce96

Please sign in to comment.