diff --git a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx index 1166dff4e..7cb6ac993 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx @@ -4,8 +4,9 @@ import { f7,Sheet,Popover } from 'framework7-react'; import { Device } from '../../../../common/mobile/utils/device'; import { useTranslation } from 'react-i18next'; -const FilterOptionsController = memo( () => { +const FilterOptionsController = memo(props => { const { t } = useTranslation(); + const wsProps = props.wsProps; const _t = t('View.Edit', {returnObjects: true}); const configRef = useRef(); @@ -32,9 +33,12 @@ const FilterOptionsController = memo( () => { } }, []); - const onApiFilterOptions= (config) => { + const onApiFilterOptions = (config) => { setDataFilterCells(config); configRef.current = config; + + if (wsProps.PivotTables && config.asc_getPivotObj() || + wsProps.AutoFilter && !config.asc_getPivotObj()) return; setCheckSort((config.asc_getSortState() === Asc.c_oAscSortOptions.Ascending ? 'down' : '') || (config.asc_getSortState() === Asc.c_oAscSortOptions.Descending ? 'up' : '')); diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index ff9ab052d..9f12983a0 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -135,7 +135,7 @@ class MainPage extends Component { {appOptions.isDocReady && - + }