Skip to content
Open
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
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"ember-focus-trap": "^1.1.1",
"ember-get-config": "^2.1.1",
"ember-modifier": "^4.2.2",
"ember-power-select": "^8.7.1",
"ember-power-select": "^8.12.0",
"ember-stargate": "^0.5.0",
"ember-style-modifier": "^4.4.0",
"ember-truth-helpers": "^4.0.3",
Expand Down Expand Up @@ -96,7 +96,7 @@
"@types/prismjs": "^1.26.5",
"babel-plugin-ember-template-compilation": "^2.4.1",
"concurrently": "^9.1.2",
"ember-basic-dropdown": "^8.6.1",
"ember-basic-dropdown": "^8.8.0",
"ember-intl": "^7.3.0",
"ember-source": "^6.4.0",
"ember-template-lint": "^7.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}}
{{! Important: if an argument is added in base.hbs, it must also be added/processed in the Base component used in field.hbs }}
<div class={{this.classNames}} {{style this.styles}}>
<PowerSelectMultiple
<PowerSelect
@afterOptionsComponent={{if
this.showAfterOptions
(or
Expand Down Expand Up @@ -39,6 +39,7 @@
@loadingMessage={{@loadingMessage}}
@matcher={{@matcher}}
@matchTriggerWidth={{if @dropdownMaxWidth false @matchTriggerWidth}}
@multiple={{true}}
@noMatchesMessage={{@noMatchesMessage}}
@onBlur={{@onBlur}}
@onChange={{@onChange}}
Expand Down Expand Up @@ -76,5 +77,5 @@
>
{{! even if technically what is yielded here are _a list_ of options, we've decided to keep the `option` name for consistency with the existing `PowerSelect` API }}
{{yield option select}}
</PowerSelectMultiple>
</PowerSelect>
</div>
225 changes: 125 additions & 100 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import type { TemplateOnlyComponent } from '@ember/component/template-only';
import style from 'ember-style-modifier';
import PowerSelectMultiple from 'ember-power-select/components/power-select-multiple';
import PowerSelect from 'ember-power-select/components/power-select';

import ShwTextH2 from 'showcase/components/shw/text/h2';
import ShwTextH3 from 'showcase/components/shw/text/h3';
Expand Down Expand Up @@ -32,32 +32,35 @@ const SubSectionMultiSelect: TemplateOnlyComponent = <template>
<ShwFlex {{style max-width="50%"}} @direction="column" as |SF|>
<SF.Item @label="Default">
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
@multiple={{true}}
@options={{OPTIONS}}
@onChange={{NOOP}}
@renderInPlace={{true}}
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
</SF.Item>
<SF.Item @label="Selected">
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
@multiple={{true}}
@options={{OPTIONS}}
@selected={{SELECTEDMULTIPLE}}
@onChange={{NOOP}}
@renderInPlace={{true}}
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
</SF.Item>
<SF.Item @label="Search enabled">
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
@multiple={{true}}
@options={{OPTIONS}}
@selected={{SELECTEDMULTIPLE}}
@onChange={{NOOP}}
Expand All @@ -67,7 +70,7 @@ const SubSectionMultiSelect: TemplateOnlyComponent = <template>
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
</SF.Item>
</ShwFlex>
Expand All @@ -77,7 +80,8 @@ const SubSectionMultiSelect: TemplateOnlyComponent = <template>
<ShwFlex {{style max-width="50%"}} @direction="column" as |SF|>
<SF.Item @label="Default">
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
@multiple={{true}}
@options={{OPTIONS}}
@selected={{SELECTEDMULTIPLE}}
@onChange={{NOOP}}
Expand All @@ -86,26 +90,28 @@ const SubSectionMultiSelect: TemplateOnlyComponent = <template>
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
</SF.Item>
<SF.Item @label="Focus">
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
class="mock-focus"
@multiple={{true}}
@options={{OPTIONS}}
@selected={{SELECTEDMULTIPLE}}
@onChange={{NOOP}}
@renderInPlace={{true}}
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
</SF.Item>
<SF.Item @label="Disabled">
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
@multiple={{true}}
@options={{OPTIONS}}
@selected={{SELECTEDMULTIPLE}}
@onChange={{NOOP}}
Expand All @@ -114,7 +120,7 @@ const SubSectionMultiSelect: TemplateOnlyComponent = <template>
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
</SF.Item>
</ShwFlex>
Expand Down
4 changes: 2 additions & 2 deletions showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"concurrently": "^9.1.2",
"ember-a11y-testing": "^7.1.2",
"ember-auto-import": "^2.10.0",
"ember-basic-dropdown": "^8.6.1",
"ember-basic-dropdown": "^8.8.0",
"ember-body-class": "^3.0.0",
"ember-cli": "~6.5.0",
"ember-cli-app-version": "^7.0.0",
Expand All @@ -89,7 +89,7 @@
"ember-math-helpers": "^5.0.0",
"ember-modifier": "^4.2.2",
"ember-page-title": "^9.0.2",
"ember-power-select": "^8.7.1",
"ember-power-select": "^8.12.0",
"ember-qunit": "^9.0.3",
"ember-resolver": "^13.1.1",
"ember-router-generator": "^2.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ The selected items are automatically styled to resemble the [Tag](/components/ta

```handlebars
<div class="hds-power-select">
<PowerSelectMultiple
<PowerSelect
@multiple={{true}}
@options={{this.OPTIONS}}
@selected={{this.SELECTEDMULTIPLE}}
@onChange={{this.noop}}
Expand All @@ -113,6 +114,6 @@ The selected items are automatically styled to resemble the [Tag](/components/ta
as |option|
>
{{option}}
</PowerSelectMultiple>
</PowerSelect>
</div>
```
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"ember-a11y-refocus": "^4.1.4",
"ember-a11y-testing": "^7.1.2",
"ember-auto-import": "^2.10.0",
"ember-basic-dropdown": "^8.6.1",
"ember-basic-dropdown": "^8.8.0",
"ember-body-class": "^3.0.0",
"ember-cli": "~6.4.0",
"ember-cli-app-version": "^7.0.0",
Expand All @@ -96,7 +96,7 @@
"ember-meta": "^2.0.0",
"ember-modifier": "^4.2.2",
"ember-page-title": "^9.0.2",
"ember-power-select": "^8.7.1",
"ember-power-select": "^8.12.0",
"ember-prism": "^0.13.0",
"ember-qunit": "^9.0.3",
"ember-resolver": "^13.1.1",
Expand Down