From 200049cceeb3e10b002afdd7a709e07e0fdb48d4 Mon Sep 17 00:00:00 2001
From: TatianaLopaeva <talopaeva@gmail.com>
Date: Mon, 1 Mar 2021 15:50:16 +0300
Subject: [PATCH 1/2] Web: Components: input-block: Fix icons displaying &
 added search.react icon.

---
 packages/asc-web-components/input-block/index.js | 6 +++---
 public/images/search.react.svg                   | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 public/images/search.react.svg

diff --git a/packages/asc-web-components/input-block/index.js b/packages/asc-web-components/input-block/index.js
index 7921aa1898..59652b59d2 100644
--- a/packages/asc-web-components/input-block/index.js
+++ b/packages/asc-web-components/input-block/index.js
@@ -10,7 +10,7 @@ import {
   StyledIconBlock,
 } from "./styled-input-block";
 
-const iconNames = Object.keys(Icons);
+//const iconNames = Object.keys(Icons);
 
 class InputBlock extends React.Component {
   constructor(props) {
@@ -116,7 +116,7 @@ class InputBlock extends React.Component {
           mask={mask}
           keepCharPositions={keepCharPositions}
         />
-        {iconNames.includes(iconName) && (
+        {//iconNames.includes(iconName) && (
           <div className="append">
             <StyledIconBlock
               isDisabled={isDisabled}
@@ -135,7 +135,7 @@ class InputBlock extends React.Component {
               />
             </StyledIconBlock>
           </div>
-        )}
+        }
       </StyledInputGroup>
     );
   }
diff --git a/public/images/search.react.svg b/public/images/search.react.svg
new file mode 100644
index 0000000000..49cc89c87c
--- /dev/null
+++ b/public/images/search.react.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5439 1.22742C13.5519 3.35708 14.2643 7.52226 12.1342 10.5302L15.231 13.591C15.2488 13.6077 15.2651 13.624 15.2819 13.6418C15.8127 14.2011 15.7903 15.085 15.231 15.6158C14.6717 16.1471 13.7878 16.1247 13.2566 15.5654L10.0819 12.4202C7.81735 13.7576 4.97881 13.6405 2.83185 12.1205C-0.176644 9.99084 -0.888566 5.82617 1.24109 2.81818C3.37076 -0.190316 7.53593 -0.902238 10.5439 1.22742ZM2.37792 6.68418C2.37945 9.06115 4.30657 10.9868 6.68355 10.9862H6.6866C9.0646 10.9822 10.9892 9.052 10.9851 6.67451C10.9805 4.30059 9.05442 2.37804 6.68049 2.37906C4.30301 2.38008 2.37741 4.3072 2.37792 6.68418Z" fill="#D0D5DA"/>
+</svg>
\ No newline at end of file

From f452b09ecd6cf126906943454571281c190e7e6e Mon Sep 17 00:00:00 2001
From: Vladislav Makhov <vladislav.makhov@onlyoffice.com>
Date: Mon, 1 Mar 2021 16:11:45 +0300
Subject: [PATCH 2/2] web: fix icons

---
 .../FilterInput/sub-components/CloseButton.js         |  2 +-
 packages/asc-web-components/input-block/index.js      |  5 +++--
 .../Client/src/components/Article/Body/index.js       | 11 ++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js b/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js
index 842b3813da..43aed58c4e 100644
--- a/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js
+++ b/packages/asc-web-common/components/FilterInput/sub-components/CloseButton.js
@@ -13,7 +13,7 @@ const CloseButton = (props) => {
         color={"#A3A9AE"}
         clickColor={"#A3A9AE"}
         size={10}
-        iconName={"/static/images/cross.react.svg"}
+        iconName="/static/images/cross.react.svg"
         isFill={true}
         isDisabled={isDisabled}
         onClick={!isDisabled ? onClick : undefined}
diff --git a/packages/asc-web-components/input-block/index.js b/packages/asc-web-components/input-block/index.js
index 7921aa1898..1e72d951c1 100644
--- a/packages/asc-web-components/input-block/index.js
+++ b/packages/asc-web-components/input-block/index.js
@@ -10,7 +10,7 @@ import {
   StyledIconBlock,
 } from "./styled-input-block";
 
-const iconNames = Object.keys(Icons);
+// const iconNames = Object.keys(Icons);
 
 class InputBlock extends React.Component {
   constructor(props) {
@@ -116,7 +116,8 @@ class InputBlock extends React.Component {
           mask={mask}
           keepCharPositions={keepCharPositions}
         />
-        {iconNames.includes(iconName) && (
+        {/* {iconNames.includes(iconName) && ( */}
+        {iconName && (
           <div className="append">
             <StyledIconBlock
               isDisabled={isDisabled}
diff --git a/products/ASC.People/Client/src/components/Article/Body/index.js b/products/ASC.People/Client/src/components/Article/Body/index.js
index 0ddc44f707..43b08da0d2 100644
--- a/products/ASC.People/Client/src/components/Article/Body/index.js
+++ b/products/ASC.People/Client/src/components/Article/Body/index.js
@@ -62,11 +62,12 @@ const getItems = (data) => {
           key={item.key}
           icon={
             item.root ? (
-              <DepartmentsGroupIcon
-                size="scale"
-                isfill={true}
-                color="#657077"
-              />
+              <StyledDepartmentsGroupIcon size="scale" color="#657077" /* isfill={true} */ /> // TODO: Add isFill prop if need
+              // <DepartmentsGroupIcon
+              //   size="scale"
+              //   isfill={true}
+              //   color="#657077"
+              // />
             ) : (
               ""
             )