diff --git a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx index 79b2e36a1..d1c950bb6 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx @@ -37,8 +37,8 @@ const FilterOptionsController = () => { setConfig(config); setClearDisable(config); - const sort = config.asc_getSortState(); - sort == Asc.c_oAscSortOptions.Ascending ? setCheckSort(true) : setCheckSort(false); + setCheckSort((config.asc_getSortState() === Asc.c_oAscSortOptions.Ascending ? 'down' : '') || + (config.asc_getSortState() === Asc.c_oAscSortOptions.Descending ? 'up' : '')); if (Device.phone) { f7.sheet.open('.picker__sheet'); diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less index 1a908bcff..719610da7 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-ios.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-ios.less @@ -299,12 +299,12 @@ &.sortdown { width: 22px; height: 22px; - .encoded-svg-background(''); + .encoded-svg-mask(''); } &.sortup { width: 22px; height: 22px; - .encoded-svg-background(''); + .encoded-svg-mask(''); } // Formats diff --git a/apps/spreadsheeteditor/mobile/src/less/icons-material.less b/apps/spreadsheeteditor/mobile/src/less/icons-material.less index 8c80a42f0..74821ae31 100644 --- a/apps/spreadsheeteditor/mobile/src/less/icons-material.less +++ b/apps/spreadsheeteditor/mobile/src/less/icons-material.less @@ -278,12 +278,12 @@ &.sortdown { width: 22px; height: 22px; - .encoded-svg-background(''); + .encoded-svg-mask(''); } &.sortup { width: 22px; height: 22px; - .encoded-svg-background(''); + .encoded-svg-mask(''); } // Formats diff --git a/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx index ffdf7ba1f..621b5afb9 100644 --- a/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx @@ -6,7 +6,6 @@ import { Device } from '../../../../common/mobile/utils/device'; const FilterOptions = (props) => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); - const isAndroid = Device.android; useEffect(() => { const is_all_checked = props.listVal.every(item => item.check); @@ -33,21 +32,20 @@ const FilterOptions = (props) => { } + - props.onSort('sortdown')} - after={isAndroid ? : null}> - {!isAndroid ? - : null - } - - - props.onSort('sortup')} - after={isAndroid ? : null}> - {!isAndroid ? - : null - } + + + props.onSort('sortdown')}> + + + props.onSort('sortup')}> + + + + {_t.textClearFilter} props.onDeleteFilter()} id="btn-delete-filter">{_t.textDeleteFilter}