Skip to content

feat(toolbar): change active action state #518

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(toolbar): change active action state #518

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
6 changes: 4 additions & 2 deletions src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ export const ToolbarButtonWithPopupMenu: React.FC<ToolbarButtonWithPopupMenuProp
<Button
size="m"
ref={buttonRef}
view={someActive || popupOpen ? 'normal' : 'flat'}
selected={someActive}
// view={someActive || popupOpen ? 'normal' : 'flat'}
view={popupOpen || someActive ? 'flat-action' : 'flat'}
selected={popupOpen}
// selected={someActive}
disabled={everyDisabled}
className={b(null, [className])}
onClick={toggleOpen}
Expand Down
5 changes: 3 additions & 2 deletions src/toolbar/ToolbarButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ export const ToolbarButtonView = React.forwardRef<HTMLElement, ToolbarButtonView
<Button
size="m"
ref={ref}
selected={active}
// selected={active}
disabled={disabled}
view={active ? 'normal' : 'flat'}
// view={active ? 'normal' : 'flat'}
view={active ? 'flat-action' : 'flat'}
onClick={onClick}
className={b(null, [className])}
extraProps={{'aria-label': titleText}}
Expand Down
6 changes: 4 additions & 2 deletions src/toolbar/ToolbarListButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ export function ToolbarListButton<E>({
<Button
size="m"
ref={buttonRef}
view={someActive || popupOpen ? 'normal' : 'flat'}
selected={someActive}
// view={someActive || popupOpen ? 'normal' : 'flat'}
view={popupOpen ? 'normal' : someActive ? 'flat-action' : 'flat'}
selected={popupOpen && someActive}
// selected={someActive}
disabled={everyDisabled}
className={b({arrow: withArrow}, [className])}
onClick={() => {
Expand Down
Loading