Web: Common: Added application of columnCount parameter inside FilterInput component

web/ASC.Web.Common/src/components/FilterInput/FilterInput.js

@@ -512,7 +512,8 @@ class FilterInput extends React.Component {
         /* eslint-disable react/prop-types */
         const { className, id, style, size,
             isDisabled, scale, getFilterData, placeholder,
-            getSortData, directionAscLabel, directionDescLabel } = this.props;
+            getSortData, directionAscLabel, directionDescLabel,
+            filterColumnCount } = this.props;
         /* eslint-enable react/prop-types */
 
         const { searchText, filterValues, openFilterItems,
@@ -562,6 +563,7 @@ class FilterInput extends React.Component {
                                 isResizeUpdate={this.isResizeUpdate}
                                 onRender={this.onFilterRender}
                                 isDisabled={isDisabled}
+                                columnCount={filterColumnCount}
                             />
                         </div>
 
@@ -594,7 +596,8 @@ FilterInput.protoTypes = {
     className: PropTypes.string,
     id: PropTypes.string,
     style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
-    needForUpdate: PropTypes.bool
+    needForUpdate: PropTypes.bool,
+    filterColumnCount: PropTypes.number
 };
 
 FilterInput.defaultProps = {

web/ASC.Web.Common/src/components/FilterInput/sub-components/FilterBlock.js

@@ -375,7 +375,7 @@ class FilterBlock extends React.Component {
         <div className='styled-filter-block' ref={this.filterWrapper} id='filter-items-container'>
           {filterItems}
         </div>
-        {filterData.length > 0 && <FilterButton id='filter-button' iconSize={iconSize} getData={_this.getData} isDisabled={isDisabled} />}
+        {filterData.length > 0 && <FilterButton columnCount={this.props.columnCount} id='filter-button' iconSize={iconSize} getData={_this.getData} isDisabled={isDisabled} />}
       </>
     );
   }
@@ -389,6 +389,7 @@ FilterBlock.propTypes = {
   onDeleteFilterItem: PropTypes.func,
   onRender: PropTypes.func,
   openFilterItems: PropTypes.array,
+  columnCount: PropTypes.number
 }
 
 export default FilterBlock;

web/ASC.Web.Common/src/components/FilterInput/sub-components/FilterButton.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 class FilterButton extends React.PureComponent {
   render() {
-    const { getData, id, isDisabled, iconSize } = this.props;
+    const { getData, id, isDisabled, iconSize, columnCount } = this.props;
     //console.log('render FilterButton)
     return (
       <ContextMenuButton
@@ -18,6 +18,7 @@ class FilterButton extends React.PureComponent {
         isDisabled={isDisabled}
         size={iconSize}
         title='Actions'
+        columnCount={columnCount}
       ></ContextMenuButton>
     )
   }
@@ -27,5 +28,6 @@ FilterButton.propTypes = {
   iconSize: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   id: PropTypes.string,
   isDisabled: PropTypes.bool,
+  columnCount: PropTypes.number
 }
 export default FilterButton