From 3068b3d23049d4f860f497f588735b44faddcdc3 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Wed, 7 Dec 2022 13:26:43 +0300
Subject: [PATCH 1/3] Web: Components: Selector: fixed row clickability

---
 packages/components/selector/sub-components/Item/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/components/selector/sub-components/Item/index.js b/packages/components/selector/sub-components/Item/index.js
index 0af823591e..872b026e48 100644
--- a/packages/components/selector/sub-components/Item/index.js
+++ b/packages/components/selector/sub-components/Item/index.js
@@ -94,8 +94,10 @@ const Item = React.memo(({ index, style, data }) => {
       onSelect && onSelect(item);
     };
 
-    const onClick = () => {
-      !isMultiSelect && onSelect && onSelect(item);
+    const onClick = (e) => {
+      if (e.target.closest(".checkbox")) return;
+
+      onSelect && onSelect(item);
     };
 
     return (

From d8fc76e78993e69d6a9501bb958394244761cdb0 Mon Sep 17 00:00:00 2001
From: Akmal Isomadinov <isomadinovakmal1997@gmail.com>
Date: Wed, 7 Dec 2022 16:13:36 +0500
Subject: [PATCH 2/3] Web:Components:Selector-Add-Button Fixed the color theme

---
 .../styled-selector-add-button.js             | 21 ++++++++++++++-----
 packages/components/themes/base.js            |  7 ++++++-
 packages/components/themes/dark.js            |  9 ++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/packages/components/selector-add-button/styled-selector-add-button.js b/packages/components/selector-add-button/styled-selector-add-button.js
index 47a71f312e..df87ac43f1 100644
--- a/packages/components/selector-add-button/styled-selector-add-button.js
+++ b/packages/components/selector-add-button/styled-selector-add-button.js
@@ -18,27 +18,38 @@ const StyledButton = styled.div`
       ${(props) =>
         !props.isDisabled &&
         css`
-          fill: ${props.theme.selectorAddButton.color};
+          fill: ${props.theme.selectorAddButton.iconColor};
         `}
     }
   }
 
   &:hover {
+    background: ${(props) =>
+      !props.isDisabled && props.theme.selectorAddButton.hoverBackground};
+
     svg {
       path {
         ${(props) =>
           !props.isDisabled &&
           css`
-            fill: ${props.theme.selectorAddButton.hoverColor};
+            fill: ${props.theme.selectorAddButton.iconColorHover};
           `}
       }
     }
   }
 
   &:active {
-    ${(props) =>
-      !props.isDisabled &&
-      `background-color: ${props.theme.selectorAddButton.activeBackground};`}
+    background: ${(props) =>
+      !props.isDisabled && props.theme.selectorAddButton.activeBackground};
+    svg {
+      path {
+        ${(props) =>
+          !props.isDisabled &&
+          css`
+            fill: ${props.theme.selectorAddButton.iconColorActive};
+          `}
+      }
+    }
   }
 
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
diff --git a/packages/components/themes/base.js b/packages/components/themes/base.js
index f5473f2770..2e7db18db9 100644
--- a/packages/components/themes/base.js
+++ b/packages/components/themes/base.js
@@ -383,7 +383,12 @@ const Base = {
   },
   selectorAddButton: {
     background: grayLightMid,
-    activeBackground: grayLightMid,
+    hoverBackground: lightGrayishStrongBlue,
+    activeBackground: grayMid,
+
+    iconColor: grayMain,
+    iconColorHover: grayMain,
+    iconColorActive: grayMain,
 
     border: `none`,
     boxSizing: "border-box",
diff --git a/packages/components/themes/dark.js b/packages/components/themes/dark.js
index 015544ddaa..b8b48901df 100644
--- a/packages/components/themes/dark.js
+++ b/packages/components/themes/dark.js
@@ -376,8 +376,13 @@ const Dark = {
 
   iconButton: { color: "#858585", hoverColor: grayMaxLight },
   selectorAddButton: {
-    background: "#292929",
-    activeBackground: "#292929",
+    background: "#242424",
+    hoverBackground: "#282828",
+    activeBackground: "#242424",
+
+    iconColor: "#858585",
+    iconColorHover: "#FFFFFF",
+    iconColorActive: "#CCCCCC",
 
     border: `none`,
     boxSizing: "border-box",

From 017bb3da763feb0305235cb23876c7bd67b6ec5d Mon Sep 17 00:00:00 2001
From: Tatiana Lopaeva <tatiana.lopaeva@onlyoffice.com>
Date: Wed, 7 Dec 2022 14:29:17 +0300
Subject: [PATCH 3/3] Web: CreateEditRoomDialog: Added theme provider to the
 link.

---
 .../sub-components/IconEditor/Dropzone.js                  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/IconEditor/Dropzone.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/IconEditor/Dropzone.js
index 810cf56f12..143f61bbe9 100644
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/IconEditor/Dropzone.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/IconEditor/Dropzone.js
@@ -3,6 +3,7 @@ import styled from "styled-components";
 import { useDropzone } from "react-dropzone";
 import resizeImage from "resize-image";
 import { Base } from "@docspace/components/themes";
+import { ColorTheme, ThemeType } from "@docspace/common/components/ColorTheme";
 
 const StyledDropzone = styled.div`
   cursor: pointer;
@@ -33,8 +34,6 @@ const StyledDropzone = styled.div`
       font-size: 13px;
       line-height: 20px;
       &-main {
-        color: ${(props) =>
-          props.theme.createEditRoomDialog.dropzone.linkMainColor};
         font-weight: 600;
         text-decoration: underline;
         text-decoration-style: dashed;
@@ -103,7 +102,9 @@ const Dropzone = ({ t, setUploadedFile, isDisabled }) => {
       <div {...getRootProps({ className: "dropzone" })}>
         <input {...getInputProps()} />
         <div className="dropzone-link">
-          <span className="dropzone-link-main">{t("DropzoneTitleLink")}</span>
+          <ColorTheme className="dropzone-link-main" themeId={ThemeType.Link}>
+            {t("DropzoneTitleLink")}
+          </ColorTheme>
           <span className="dropzone-link-secondary">
             {t("DropzoneTitleSecondary")}
           </span>