Merge branch 'master' of github.com:ONLYOFFICE/AppServer

# Conflicts:
#	web/ASC.Web.Components/package.json

web/ASC.Web.Components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.298",
+  "version": "1.0.299",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.js",

web/ASC.Web.Components/src/components/context-menu-button/index.js

@@ -78,6 +78,7 @@ class ContextMenuButton extends React.Component {
       clickColor,
       size,
       iconName,
+      iconOpenName,
       iconHoverName,
       iconClickName,
       isDisabled,
@@ -92,7 +93,7 @@ class ContextMenuButton extends React.Component {
     } = this.props;
 
     const { isOpen } = this.state;
-
+    const iconButtonName = isOpen && iconOpenName ? iconOpenName : iconName;
     return (
       <StyledOuter ref={this.ref} className={className} id={id} style={style}>
         <IconButton
@@ -100,7 +101,7 @@ class ContextMenuButton extends React.Component {
           hoverColor={hoverColor}
           clickColor={clickColor}
           size={size}
-          iconName={iconName}
+          iconName={iconButtonName}
           iconHoverName={iconHoverName}
           iconClickName={iconClickName}
           isFill={false}
@@ -143,6 +144,7 @@ ContextMenuButton.propTypes = {
 
   iconHoverName: PropTypes.string,
   iconClickName: PropTypes.string,
+  iconOpenName: PropTypes.string,
 
   onMouseEnter: PropTypes.func,
   onMouseLeave: PropTypes.func,

web/ASC.Web.Components/src/components/filter-input/filter-block.js

@@ -206,25 +206,28 @@ class FilterBlock extends React.Component {
       });
     }
     if (this.state.hideFilterItems.length > 0) {
+      var open = false;
+      var hideFilterItemsList = this.state.hideFilterItems.map(function (item) {
+        open = item.key.indexOf('_-1') == -1 ? false : true
+        return <FilterItem
+          block={true}
+          isDisabled={_this.props.isDisabled}
+          key={item.key}
+          groupItems={_this.props.getFilterData().filter(function (t) {
+            return (t.group == item.group && t.group != t.key);
+          })}
+          onSelectFilterItem={_this.props.onClickFilterItem}
+          id={item.key}
+          groupLabel={item.groupLabel}
+          opened={item.key.indexOf('_-1') == -1 ? false : true}
+          label={item.label}
+          onClose={_this.onDeleteFilterItem}>
+        </FilterItem>
+      })
       hideItems.push(
-        <HideFilter key="hide-filter" count={this.state.hideFilterItems.length} isDisabled={this.props.isDisabled}>
+        <HideFilter key="hide-filter" count={this.state.hideFilterItems.length} isDisabled={this.props.isDisabled} open={open}>
           {
-            this.state.hideFilterItems.map(function (item) {
+            hideFilterItemsList
-              return <FilterItem
-                block={true}
-                isDisabled={_this.props.isDisabled}
-                key={item.key}
-                groupItems={_this.props.getFilterData().filter(function (t) {
-                  return (t.group == item.group && t.group != t.key);
-                })}
-                onSelectFilterItem={_this.props.onClickFilterItem}
-                id={item.key}
-                groupLabel={item.groupLabel}
-                opened={false}
-                label={item.label}
-                onClose={_this.onDeleteFilterItem}>
-              </FilterItem>
-            })
           }
         </HideFilter>
       );

web/ASC.Web.Components/src/components/filter-input/filter-button.js

@@ -10,6 +10,7 @@ class FilterButton extends React.PureComponent {
         id={this.props.id}
         title='Actions'
         iconName='RectangleFilterIcon'
+        iconOpenName='RectangleFilterHoverIcon'
         color='#A3A9AE'
         size={this.props.iconSize}
         isDisabled={this.props.isDisabled}

web/ASC.Web.Components/src/components/filter-input/hide-filter.js

@@ -3,6 +3,7 @@ import styled from "styled-components";
 import { Icons } from "../icons";
 import DropDown from "../drop-down";
 import { handleAnyClick } from "../../utils/event";
+import PropTypes from 'prop-types';
 
 const Caret = styled.div`
   width: 7px;
@@ -54,7 +55,7 @@ class HideFilter extends React.Component {
     this.ref = React.createRef();
     this.dropDownRef = React.createRef();
     this.state = {
-      popoverOpen: false
+      popoverOpen: this.props.open
     };
   }
 
@@ -120,5 +121,10 @@ class HideFilter extends React.Component {
     );
   }
 }
-
+HideFilter.propTypes = {
+  children: PropTypes.any,
+  open: PropTypes.bool,
+  isDisabled: PropTypes.bool,
+  count: PropTypes.number
+}
 export default HideFilter;