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

Jump to bottom

feat(ui5-combobox): аdd two-column layout support #2503

Merged
merged 5 commits into from
Nov 22, 2020
Merged

feat(ui5-combobox): аdd two-column layout support #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5649c52
Add additionalText property to ComboBoxItem
ndeshev Nov 20, 2020
258f11e
Fix adding the info property in the template
ndeshev Nov 20, 2020
b607360
Add sample and test
ndeshev Nov 21, 2020
a642953
Revert info attribute back to the default syntax
ndeshev Nov 21, 2020
315c666
Add since tag to the new property
ndeshev Nov 21, 2020
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
9 changes: 9 additions & 0 deletions packages/main/src/ComboBoxItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ const metadata = {
* @public
*/
text: { type: String },
/**
* Defines the additional text of the <code>ui5-cb-item</code>.
*
ndeshev marked this conversation as resolved.
Show resolved Hide resolved
* @type {string}
* @defaultvalue ""
* @since 1.0.0-rc.11
* @public
*/
additionalText: { type: String },
},
slots: {
//
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/ComboBoxPopover.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
{{#each _filteredItems}}
<ui5-li
type="Active"
info={{this.additionalText}}
._tabIndex={{itemTabIndex}}
.mappedItem={{this}}
?selected={{this.selected}}
Expand Down
16 changes: 16 additions & 0 deletions packages/main/test/pages/ComboBox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,22 @@
<ui5-combobox id="" style="width: 360px;" value-state="Success"></ui5-combobox>
</div>

<div class="demo-section">
<ui5-label id="combo-additional-text">Items with additional text: </ui5-label>
<ui5-combobox id="combobox-two-column-layout" style="width: 360px;" value="Bulgaria" aria-labelledby="countryLabel">
<ui5-cb-item text="Algeria" additional-text="DZ"></ui5-cb-item>
<ui5-cb-item text="Argentina" additional-text="AR"></ui5-cb-item>
<ui5-cb-item text="Australia" additional-text="AU"></ui5-cb-item>
<ui5-cb-item text="Austria" additional-text="AT"></ui5-cb-item>
<ui5-cb-item text="Bahrain" additional-text="BH"></ui5-cb-item>
<ui5-cb-item text="Belgium" additional-text="BE"></ui5-cb-item>
<ui5-cb-item text="Brazil" additional-text="BR"></ui5-cb-item>
<ui5-cb-item text="Bulgaria" additional-text="BG"></ui5-cb-item>
<ui5-cb-item text="Canada" additional-text="CA"></ui5-cb-item>
<ui5-cb-item text="Chile" additional-text="CL"></ui5-cb-item>
</ui5-combobox>
</div>

<div class="demo-section">
<span id="change-event-result"></span>
<br />
Expand Down
28 changes: 28 additions & 0 deletions packages/main/test/samples/ComboBox.sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,34 @@ <h3>Filters (StartsWithPerTerm(default), StartsWith, Contains)</h3>

</section>

<section>
<h3>ComboBox with Two-Column Layout Items</h3>
<div class="snippet responsive-snippet">
<ui5-combobox placeholder="Two-column Layout">
<ui5-cb-item text="Austria" additional-text="AT"></ui5-cb-item>
<ui5-cb-item text="Belgium" additional-text="BE"></ui5-cb-item>
<ui5-cb-item text="Brazil" additional-text="BR"></ui5-cb-item>
<ui5-cb-item text="Bulgaria" additional-text="BG"></ui5-cb-item>
<ui5-cb-item text="Canada" additional-text="CA"></ui5-cb-item>
</ui5-combobox>
</div>

<pre class="prettyprint lang-html"><xmp>

<ui5-combobox placeholder="Two-column layout">
<ui5-cb-item text="Austria" additional-text="AT"></ui5-cb-item>
<ui5-cb-item text="Belgium" additional-text="BE"></ui5-cb-item>
<ui5-cb-item text="Brazil" additional-text="BR"></ui5-cb-item>
<ui5-cb-item text="Bulgaria" additional-text="BG"></ui5-cb-item>
<ui5-cb-item text="Canada" additional-text="CA"></ui5-cb-item>
</ui5-combobox>

</xmp></pre>


</section>


<section>
<h3>Lazy loading</h3>

Expand Down
11 changes: 11 additions & 0 deletions packages/main/test/specs/ComboBox.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,4 +315,15 @@ describe("General interaction", () => {

assert.ok(combo.getProperty("focused"), "property focused should be true");
});

it ("Tests Combo with two-column layout", () => {
const combo = $("#combobox-two-column-layout");
const staticAreaItemClassName = browser.getStaticAreaItemClassName("#combobox-two-column-layout");
const arrow = combo.shadow$("[input-icon]");
const popover = browser.$(`.${staticAreaItemClassName}`).shadow$("ui5-responsive-popover");
const listItem = popover.$("ui5-list").$$("ui5-li")[0];

arrow.click();
assert.strictEqual(listItem.shadow$(".ui5-li-info").getText(), "DZ", "Additional item text should be displayed");
});
});