IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web.Common: Filter: fix work with selectors

Browse Source
This commit is contained in:
Daniil Senkiv 2020-03-19 14:52:02 +03:00
parent df76148505
commit e9243547e2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/ASC.Web.Common/src/components/FilterInput/FilterInput.js
View File

@ -390,7 +390,7 @@ class FilterInput extends React.Component {
: filterItem.key.includes('group') ? 'group'
: null;
const itemId = filterItem.key.indexOf('_') !== filterItem.key.lastIndexOf('_') ? filterItem.key.slice(0, filterItem.key.lastIndexOf('_')) : filterItem.key;
const itemKey = filterItem.selectedItem && filterItem.selectedItem.key ? itemId + "_" + filterItem.selectedItem.key : filterItem.key;
const itemKey = filterItem.selectedItem && filterItem.selectedItem.key && filterItem.typeSelector === typeSelector ? itemId + "_" + filterItem.selectedItem.key : filterItem.key + '_-1';
const selectedItem = filterItem.typeSelector === typeSelector ? filterItem.selectedItem : {};
const selectFilterItem = {
key: itemKey,
@ -518,7 +518,7 @@ class FilterInput extends React.Component {
const { searchText, filterValues, openFilterItems,
hideFilterItems, sortId, sortDirection } = this.state;
// console.log("FilterInput render", this.state.openFilterItems);
// console.log("filter input render, openFilterItems", openFilterItems, 'hideFilterItems', hideFilterItems);
let iconSize = 33;
switch (size) {
case 'base':

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

@ -35,6 +35,7 @@ class FilterItem extends React.Component {
selectedOption
};
}
componentDidUpdate(prevProps, prevState) {
@ -121,13 +122,9 @@ class FilterItem extends React.Component {
onPeopleSelectorClick = () => this.setState({ isOpenSelector: !this.state.isOpenSelector });
// shouldComponentUpdate(nextProps, nextState) {
// if (nextProps.selectedItem && nextProps.selectedItem.key && this.props.selectedItem)
// }
render() {
const { id, isOpen, isOpenSelector, selectedOption } = this.state;
const { block, opened, isDisabled, groupLabel,
groupItems, label, typeSelector, defaultOptionLabel, groupsCaption, defaultOption } = this.props;