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(combobox): ensure truncated text appears for longer strings when in fixed-width container #3342

Merged
merged 6 commits into from
Oct 26, 2021
Merged

fix(combobox): ensure truncated text appears for longer strings when in fixed-width container #3342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb3e027
fix(combobox): ensure text ellipsis displays when nested in small wid…
caripizza Oct 22, 2021
e6f72fc
test(combobox): add longer strings for testing truncated text
caripizza Oct 22, 2021
670463e
improve markup to match demo page styles
caripizza Oct 23, 2021
275cdcf
empty commit try to trigger tests
caripizza Oct 25, 2021
3b7f2ab
Merge branch 'master' into caripizza/hotfix-combobox-truncated-text-f…
caripizza Oct 25, 2021
bb0a96d
Merge branch 'master' into caripizza/hotfix-combobox-truncated-text-f…
caripizza Oct 25, 2021
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
8 changes: 6 additions & 2 deletions src/components/calcite-combobox/calcite-combobox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@
}

.grid-input {
@apply flex flex-grow flex-wrap items-center;
padding: 0;
@apply flex
flex-grow
flex-wrap
items-center
p-0
truncate;
}

.input {
Expand Down
5 changes: 5 additions & 0 deletions src/components/calcite-combobox/calcite-combobox.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ export const Multiple = (): string => html`
<calcite-combobox-item value="Rocks" text-label="Rocks"></calcite-combobox-item>
<calcite-combobox-item value="Insects" text-label="Insects"></calcite-combobox-item>
<calcite-combobox-item value="Rivers" text-label="Rivers"></calcite-combobox-item>
<calcite-combobox-item
value="CommercialDamageAssessment - Damage to Commercial Buildings & Damage to Commercial Buildings"
text-label="CommercialDamageAssessment - Damage to Commercial Buildings & Damage to Commercial Buildings"
selected
></calcite-combobox-item>
</calcite-combobox>
</div>
`;
Expand Down
57 changes: 57 additions & 0 deletions src/demos/calcite-combobox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,5 +612,62 @@ <h1 style="margin: 0 auto; text-align: center">Combobox</h1>
</calcite-combobox>
</div>
</div>

<hr />

<div class="parent">
<h3 class="child right-aligned-text">With truncated text effect in smaller fixed-width container</h3>
<div class="child" style="align-self: flex-start">
<div style="width: 20vw">
<p>Multi</p>
<calcite-combobox label="demo combobox 1" selection-mode="multi" allow-custom-values>
<calcite-combobox-item value="Trees" text-label="Trees">
<calcite-combobox-item
value="CommercialDamageAssessment - Damage to Commercial Buildings & Damage to Commercial Buildings"
text-label="CommercialDamageAssessment - Damage to Commercial Buildings & Damage to Commercial Buildings"
selected
></calcite-combobox-item>
<calcite-combobox-item value="Sequoia" disabled text-label="Sequoia"></calcite-combobox-item>
<calcite-combobox-item value="Douglas Fir" text-label="Douglas Fir"></calcite-combobox-item>
</calcite-combobox-item>
</calcite-combobox>
</div>
</div>

<div class="child" style="align-self: flex-start">
<div style="width: 20vw">
<p>Ancestors</p>
<calcite-combobox label="demo combobox 2" selection-mode="ancestors" allow-custom-values>
<calcite-combobox-item value="Trees" text-label="Trees">
<calcite-combobox-item
value="CommercialDamageAssessment - Damage to Commercial Buildings & Damage to Commercial Buildings"
text-label="CommercialDamageAssessment - Damage to Commercial Buildings & Damage to Commercial Buildings"
selected
></calcite-combobox-item>
<calcite-combobox-item value="Sequoia" disabled text-label="Sequoia"></calcite-combobox-item>
<calcite-combobox-item value="Douglas Fir" text-label="Douglas Fir"></calcite-combobox-item>
</calcite-combobox-item>
</calcite-combobox>
</div>
</div>

<div class="child" style="align-self: flex-start">
<div style="width: 20vw">
<p>Single</p>
<calcite-combobox label="demo combobox 3" selection-mode="single" allow-custom-values>
<calcite-combobox-item value="Trees" text-label="Trees">
<calcite-combobox-item
value="CommercialDamageAssessment - Damage to Commercial Buildings"
text-label="CommercialDamageAssessment - Damage to Commercial Buildings"
selected
></calcite-combobox-item>
<calcite-combobox-item value="Sequoia" disabled text-label="Sequoia"></calcite-combobox-item>
<calcite-combobox-item value="Douglas Fir" text-label="Douglas Fir"></calcite-combobox-item>
</calcite-combobox-item>
<calcite-combobox-item value="Rivers" text-label="Rivers"></calcite-combobox-item>
</calcite-combobox>
</div>
</div>
</div>
</body>
</html>