Skip to content

Commit 31f9da7

Browse files
authored
Merge pull request #5114 from cardstack/cs-11326-standardize-dropdown-arrow
2 parents 46e9fa5 + 157f837 commit 31f9da7

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

packages/boxel-ui/addon/src/components/selection-menu/index.gts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
22

33
import type { MenuDivider } from '../../helpers/menu-divider.ts';
44
import type { MenuItem } from '../../helpers/menu-item.ts';
5-
import { DropdownArrowDown } from '../../icons.gts';
5+
import CaretDown from '../../icons/caret-down.gts';
66
import BoxelButton from '../button/index.gts';
77
import BoxelDropdown from '../dropdown/index.gts';
88
import Menu from '../menu/index.gts';
@@ -66,7 +66,7 @@ export default class SelectionMenu extends Component<Signature> {
6666
>
6767
<SelectionCheckmark class='selection-menu-icon' />
6868
<span class='selection-menu-count'>{{@selectedCount}}</span>
69-
<DropdownArrowDown
69+
<CaretDown
7070
class='selection-menu-caret'
7171
width='13px'
7272
height='13px'

packages/boxel-ui/addon/src/components/sort-dropdown/index.gts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
22

33
import { MenuDivider } from '../../helpers/menu-divider.ts';
44
import { MenuItem } from '../../helpers/menu-item.ts';
5-
import DropdownIcon from '../../icons/dropdown-arrow-down.gts';
5+
import CaretDown from '../../icons/caret-down.gts';
66
import BoxelButton from '../button/index.gts';
77
import BoxelDropdown from '../dropdown/index.gts';
88
import BoxelMenu from '../menu/index.gts';
@@ -34,7 +34,7 @@ export default class SortDropdown extends Component<Signature> {
3434
{{bindings}}
3535
>
3636
{{if @selectedOption @selectedOption.displayName 'Please Select'}}
37-
<DropdownIcon width='12px' height='12px' />
37+
<CaretDown class='sort-button-caret' width='12px' height='12px' />
3838
</BoxelButton>
3939
</:trigger>
4040
<:content as |dd|>
@@ -65,8 +65,15 @@ export default class SortDropdown extends Component<Signature> {
6565
padding-left: var(--boxel-sp-sm);
6666
padding-right: var(--boxel-sp-sm);
6767
}
68-
.sort-button > svg {
68+
.sort-button-caret {
6969
margin-left: auto;
70+
transition: transform var(--boxel-transition);
71+
}
72+
/* Flip the caret while the menu is open, matching boxel-ui's
73+
select/dropdown triggers. BoxelDropdown sets aria-expanded on the
74+
trigger button via the yielded bindings. */
75+
.sort-button[aria-expanded='true'] .sort-button-caret {
76+
transform: rotate(180deg);
7077
}
7178
}
7279
</style>

0 commit comments

Comments
 (0)