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

Add wrapper div around options & afterOptionsComponent #1156

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+93 −87
Open

Add wrapper div around options & afterOptionsComponent #1156

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
164 changes: 83 additions & 81 deletions addon/components/power-select.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
tabindex={{and (not @disabled) (or @tabindex "0")}}
...attributes
>
{{#let
(if
@triggerComponent
(component (ensure-safe-component @triggerComponent))
{{#let
(if
@triggerComponent
(component (ensure-safe-component @triggerComponent))
(component 'power-select/trigger')
)
)
as |Trigger|}}
<Trigger
@allowClear={{@allowClear}}
Expand All @@ -75,9 +75,9 @@
@onInput={{this.handleInput}}
@onKeydown={{this.handleKeydown}}
@placeholder={{@placeholder}}
@placeholderComponent={{if
@placeholderComponent
(ensure-safe-component @placeholderComponent)
@placeholderComponent={{if
@placeholderComponent
(ensure-safe-component @placeholderComponent)
(component 'power-select/placeholder')
}}
@ariaActiveDescendant={{concat publicAPI.uniqueId "-" this.highlightedIndex}}
Expand All @@ -90,12 +90,12 @@
</dropdown.Trigger>
<dropdown.Content class="ember-power-select-dropdown{{if publicAPI.isActive " ember-power-select-dropdown--active"}} {{@dropdownClass}}">
{{#if (not-eq @beforeOptionsComponent null)}}
{{#let
(if
@beforeOptionsComponent
{{#let
(if
@beforeOptionsComponent
(component (ensure-safe-component @beforeOptionsComponent))
(component 'power-select/before-options')
)
)
as |BeforeOptions|}}
<BeforeOptions
@select={{publicAPI}}
Expand All @@ -116,75 +116,77 @@
/>
{{/let}}
{{/if}}
{{#if this.mustShowSearchMessage}}
{{#let
(if
@searchMessageComponent
(component (ensure-safe-component @searchMessageComponent))
(component 'power-select/search-message')
)
as |SearchMessage|}}
<SearchMessage
@searchMessage={{this.searchMessage}}
@select={{publicAPI}}
id={{listboxId}}
aria-label={{@ariaLabel}}
aria-labelledby={{@ariaLabelledBy}}
/>
{{/let}}
{{else if this.mustShowNoMessages}}
{{#let
(if
@noMatchesMessageComponent
(component (ensure-safe-component @noMatchesMessageComponent))
(component 'power-select/no-matches-message')
)
as |NoMatchesMessage|}}
<NoMatchesMessage
@noMatchesMessage={{this.noMatchesMessage}}
@select={{publicAPI}}
id={{listboxId}}
aria-label={{@ariaLabel}}
aria-labelledby={{@ariaLabelledBy}}
/>
{{/let}}
{{else}}
{{#let
(if
@optionsComponent
(component (ensure-safe-component @optionsComponent))
(component 'power-select/options')
)
(if
@groupComponent
(component (ensure-safe-component @groupComponent))
(component 'power-select/power-select-group')
)
as |Options Group|}}
<Options
@loadingMessage={{or @loadingMessage "Loading options..."}}
@select={{publicAPI}}
@options={{publicAPI.results}}
@groupIndex=""
@optionsComponent={{Options}}
@extra={{@extra}}
@highlightOnHover={{this.highlightOnHover}}
@groupComponent={{Group}}
id={{listboxId}}
class="ember-power-select-options" as |option select|>
{{yield option select}}
</Options>
{{/let}}
{{/if}}

{{#if @afterOptionsComponent}}
{{#let (component (ensure-safe-component @afterOptionsComponent)) as |AfterOptions|}}
<AfterOptions
@extra={{@extra}}
@select={{publicAPI}}
/>
{{/let}}
{{/if}}
<div class="ember-power-select-options-wrapper">
{{#if this.mustShowSearchMessage}}
{{#let
(if
@searchMessageComponent
(component (ensure-safe-component @searchMessageComponent))
(component 'power-select/search-message')
)
as |SearchMessage|}}
<SearchMessage
@searchMessage={{this.searchMessage}}
@select={{publicAPI}}
id={{listboxId}}
aria-label={{@ariaLabel}}
aria-labelledby={{@ariaLabelledBy}}
/>
{{/let}}
{{else if this.mustShowNoMessages}}
{{#let
(if
@noMatchesMessageComponent
(component (ensure-safe-component @noMatchesMessageComponent))
(component 'power-select/no-matches-message')
)
as |NoMatchesMessage|}}
<NoMatchesMessage
@noMatchesMessage={{this.noMatchesMessage}}
@select={{publicAPI}}
id={{listboxId}}
aria-label={{@ariaLabel}}
aria-labelledby={{@ariaLabelledBy}}
/>
{{/let}}
{{else}}
{{#let
(if
@optionsComponent
(component (ensure-safe-component @optionsComponent))
(component 'power-select/options')
)
(if
@groupComponent
(component (ensure-safe-component @groupComponent))
(component 'power-select/power-select-group')
)
as |Options Group|}}
<Options
@loadingMessage={{or @loadingMessage "Loading options..."}}
@select={{publicAPI}}
@options={{publicAPI.results}}
@groupIndex=""
@optionsComponent={{Options}}
@extra={{@extra}}
@highlightOnHover={{this.highlightOnHover}}
@groupComponent={{Group}}
id={{listboxId}}
class="ember-power-select-options" as |option select|>
{{yield option select}}
</Options>
{{/let}}
{{/if}}

{{#if @afterOptionsComponent}}
{{#let (component (ensure-safe-component @afterOptionsComponent)) as |AfterOptions|}}
<AfterOptions
@extra={{@extra}}
@select={{publicAPI}}
/>
{{/let}}
{{/if}}
</div>
</dropdown.Content>
{{/let}}
</BasicDropdown>
Expand Down
8 changes: 6 additions & 2 deletions tests/integration/components/power-select/a11y-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ module(

await clickTrigger();
assert
.dom('.ember-power-select-dropdown > .ember-power-select-options')
.dom(
'.ember-power-select-dropdown > .ember-power-select-options-wrapper > .ember-power-select-options'
)
.hasAttribute(
'role',
'listbox',
Expand All @@ -51,7 +53,9 @@ module(

await clickTrigger();
assert
.dom('.ember-power-select-dropdown > .ember-power-select-options')
.dom(
'.ember-power-select-dropdown > .ember-power-select-options-wrapper > .ember-power-select-options'
)
.hasAttribute(
'role',
'listbox',
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/components/power-select/groups-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ module(
await clickTrigger();

let rootLevelGroups = document.querySelectorAll(
'.ember-power-select-dropdown > .ember-power-select-options > .ember-power-select-group'
' .ember-power-select-dropdown > .ember-power-select-options-wrapper > .ember-power-select-options > .ember-power-select-group'
);
let rootLevelOptions = document.querySelectorAll(
'.ember-power-select-dropdown > .ember-power-select-options > .ember-power-select-option'
' .ember-power-select-dropdown > .ember-power-select-options-wrapper > .ember-power-select-options > .ember-power-select-option'
);
assert
.dom(
'.ember-power-select-dropdown > .ember-power-select-options > .ember-power-select-group'
' .ember-power-select-dropdown > .ember-power-select-options-wrapper > .ember-power-select-options > .ember-power-select-group'
)
.exists({ count: 3 }, 'There is 3 groups in the root level');
assert
.dom(
'.ember-power-select-dropdown > .ember-power-select-options > .ember-power-select-option'
' .ember-power-select-dropdown > .ember-power-select-options-wrapper > .ember-power-select-options > .ember-power-select-option'
)
.exists({ count: 2 }, 'There is 2 options in the root level');
assert
Expand Down