diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 221f011588..2081b747da 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -450,6 +450,7 @@ "textSheetName": "Sheet Name", "textTabColor": "Tab Color", "textUnhide": "Unhide", + "textUnhideSheets": "Unhide sheets", "textWarnDeleteSheet": "The sheet maybe has data. Proceed operation?", "warnAddSheetCsv": "The CSV format does not support saving a multi-sheet file. Only the active sheet will be saved. To keep all sheets, please save the file in a different format." }, diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx index d2d3f4bbac..c7de79c430 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx @@ -330,7 +330,6 @@ const Statusbar = inject('storeWorksheets', 'storeAppOptions', 'users', 'storeSp f7.dialog.alert(_t.textErrorLastSheet, _t.notcriticalErrorTitle) : api['asc_hideWorksheet']([index]); } else { - f7.popover.close('#idx-hidden-sheets-popover'); api['asc_showWorksheet'](index); } }; @@ -363,13 +362,14 @@ const Statusbar = inject('storeWorksheets', 'storeAppOptions', 'users', 'storeSp } break; case 'unhide': - f7.popover.open('#idx-hidden-sheets-popover', '.active'); + Device.phone ? f7.sheet.open('.hidden-sheet') : f7.popover.open('.hidden-sheet', targetRef.current); break; case 'showMore': f7.actions.open('#idx-tab-menu-actions'); break; default: let _re = /reveal\:(\d+)/.exec(event); + f7.sheet.close('.hidden-sheet'); if (_re && !!_re[1]) { hideWorksheet(false, parseInt(_re[1])); } diff --git a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx index 39466c589f..1f74ab7bcf 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx @@ -45,6 +45,44 @@ const PageListMove = props => { ) }; +const PageListHidden = props => { + const { t } = useTranslation(); + const { sheets, onTabMenu } = props; + const allSheets = sheets.sheets; + + return ( + + + + {Device.phone && + + + {Device.ios ? + : + + } + + + } + + + + { allSheets.map((sheet, index) => + sheet.hidden ? + onTabMenu(`reveal:${index}`)} /> + : null + )} + + + + + ) +}; + const PageAllList = observer((props) => { const { t } = useTranslation(); const { sheets, onTabListClick } = props; @@ -339,23 +377,17 @@ const StatusbarView = inject('storeAppOptions', 'storeWorksheets', 'users', 'sto } - {hiddenSheets.length ? ( - + + + : + - - {hiddenSheets.map(sheet => { - return ( - props.onTabMenu(`reveal:${sheet.index}`)} /> - ) - })} - + - ) : null} + + } ) }));