From ab27132eb55ef7282d036debdc4daa1a055e8247 Mon Sep 17 00:00:00 2001
From: Akmal Isomadinov <isomadinovakmal1997@gmail.com>
Date: Mon, 12 Dec 2022 14:42:15 +0500
Subject: [PATCH] Web:Fixed Sort button

---
 .../components/ColorTheme/styled/comboButton.js  |  3 ++-
 .../sub-components/styled-combobutton.js         | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/common/components/ColorTheme/styled/comboButton.js b/packages/common/components/ColorTheme/styled/comboButton.js
index ca297dc200..c5155567c1 100644
--- a/packages/common/components/ColorTheme/styled/comboButton.js
+++ b/packages/common/components/ColorTheme/styled/comboButton.js
@@ -2,8 +2,9 @@ import styled, { css } from "styled-components";
 import { StyledComboButton } from "@docspace/components/combobox/sub-components/styled-combobutton";
 import Base from "@docspace/components/themes/base";
 
-const getDefaultStyles = ({ $currentColorScheme, isOpen }) =>
+const getDefaultStyles = ({ $currentColorScheme, isOpen, theme }) =>
   $currentColorScheme &&
+  theme.isBase &&
   css`
     border-color: ${isOpen && $currentColorScheme.main.accent};
 
diff --git a/packages/components/combobox/sub-components/styled-combobutton.js b/packages/components/combobox/sub-components/styled-combobutton.js
index 0ddcd1e85b..0ca47d7add 100644
--- a/packages/components/combobox/sub-components/styled-combobutton.js
+++ b/packages/components/combobox/sub-components/styled-combobutton.js
@@ -81,6 +81,17 @@ const StyledComboButton = styled.div`
 
   ${(props) => props.modernView && modernViewButton}
 
+
+  .optionalBlock {
+    svg {
+      path {
+        fill: ${(props) =>
+          props.isOpen
+            ? props.theme.iconButton.hoverColor
+            : props.theme.iconButton.color};
+      }
+    }
+  }
   :hover {
     border-color: ${(props) =>
       props.isOpen
@@ -138,7 +149,10 @@ const StyledComboButton = styled.div`
     .optionalBlock {
       svg {
         path {
-          fill: ${(props) => props.theme.iconButton.hoverColor};
+          fill: ${(props) =>
+            props.isOpen
+              ? props.theme.iconButton.hoverColor
+              : props.theme.iconButton.color};
         }
       }
     }