From da94b750bc5abe1dfaba0a089cfaf3258353cc0e Mon Sep 17 00:00:00 2001
From: d3m1d0v <d3m1d0v@yandex-team.ru>
Date: Thu, 5 Dec 2024 17:21:37 +0300
Subject: [PATCH] feat(toolbar): change active action state

---
 src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx | 6 ++++--
 src/toolbar/ToolbarButton.tsx                     | 5 +++--
 src/toolbar/ToolbarListButton.tsx                 | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx b/src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx
index f225d53e..271fbb79 100644
--- a/src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx
+++ b/src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx
@@ -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}
diff --git a/src/toolbar/ToolbarButton.tsx b/src/toolbar/ToolbarButton.tsx
index 997c7b05..360343f8 100644
--- a/src/toolbar/ToolbarButton.tsx
+++ b/src/toolbar/ToolbarButton.tsx
@@ -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}}
diff --git a/src/toolbar/ToolbarListButton.tsx b/src/toolbar/ToolbarListButton.tsx
index 31c7ce7b..4f5bbf69 100644
--- a/src/toolbar/ToolbarListButton.tsx
+++ b/src/toolbar/ToolbarListButton.tsx
@@ -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={() => {