From ff5b1cf090f986e976e66830d35d2a1796e66519 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 23 Jun 2022 00:20:16 +0400 Subject: [PATCH 1/6] [SSE mobile] Fix Bug 57699 --- apps/common/mobile/resources/less/common.less | 3 +++ .../mobile/src/controller/CellEditor.jsx | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index b54e508d6..a46dc527a 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -1086,6 +1086,9 @@ input[type="number"]::-webkit-inner-spin-button { .view { transition: .2s height; } + .popover-angle.on-bottom { + display: none; + } } .target-function-list { diff --git a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx index 4d3e89c39..9b67440ba 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/CellEditor.jsx @@ -93,14 +93,22 @@ const CellEditor = inject("storeFunctions")(observer(props => { return {name, type, descr, caption, args}; }); - - setHintArr(hintArr); + setFuncArr(funcArr); + setHintArr(hintArr); f7.popover.open('#idx-functions-list', '#idx-list-target'); + + const listTarget = document.querySelector('#idx-list-target'); + const rect = listTarget.getBoundingClientRect(); + const popoverList = document.querySelector('#idx-functions-list'); + + popoverList.style.top = `${rect.bottom}px`; + popoverList.style.left = `${rect.left}px`; } else { f7.popover.close('#idx-functions-list'); setFuncArr(''); + setHintArr(''); } } From 2c433a9621b21f202dba7c5b98f3a13aed9f4170 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 24 Jun 2022 20:39:29 +0400 Subject: [PATCH 2/6] [DE mobile] Fix Bug 57755 --- apps/documenteditor/mobile/src/view/edit/Edit.jsx | 14 +++++++------- .../mobile/src/view/edit/EditParagraph.jsx | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index c568acec3..c8434cc21 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -284,6 +284,13 @@ const EditTabs = props => { component: }); } else { + if(inToc) { + editors.push({ + caption: _t.textTableOfCont, + id: 'edit-table-contents', + component: + }) + } if (settings.indexOf('text') > -1) { editors.push({ caption: _t.textText, @@ -333,13 +340,6 @@ const EditTabs = props => { component: }) } - if(inToc) { - editors.push({ - caption: _t.textTableOfCont, - id: 'edit-table-contents', - component: - }) - } if (settings.indexOf('hyperlink') > -1) { editors.push({ caption: _t.textHyperlink, diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx index dd6b5764e..bec2b3377 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx @@ -193,7 +193,6 @@ const EditParagraph = props => { const curStyleName = storeParagraphSettings.styleName; const curStyle = paragraphStyles.find(style => style.name === curStyleName); const thumbSize = storeParagraphSettings.styleThumbSize; - const paragraph = props.storeFocusObjects.paragraphObject; const curBackColor = storeParagraphSettings.backColor ? storeParagraphSettings.backColor : storeParagraphSettings.getBackgroundColor(paragraph); const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : curBackColor; @@ -203,14 +202,14 @@ const EditParagraph = props => { {t('Edit.textParagraphStyle')} - -
+ {curStyle && +
+ } From 55f3b79061e05fe12cee76fcfaf8d2d9a5de052f Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 29 Jun 2022 18:48:35 +0400 Subject: [PATCH 3/6] For Bug 57739 --- .../mobile/src/view/settings/Navigation.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx index 87d626c9c..365b1246b 100644 --- a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx @@ -8,8 +8,13 @@ const NavigationPopover = props => { const _t = t('Settings', {returnObjects: true}); const api = Common.EditorApi.get(); const navigationObject = api.asc_ShowDocumentOutline(); - const [currentPosition, setCurrentPosition] = useState(navigationObject.get_CurrentPosition()); - const arrHeaders = props.updateNavigation(); + const [currentPosition, setCurrentPosition] = useState(navigationObject ? navigationObject.get_CurrentPosition() : null); + + let arrHeaders = []; + + if(currentPosition) { + arrHeaders = props.updateNavigation(); + } return ( From b2fc41911ab9092f01f97c451255ae3e5ad1e10f Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 29 Jun 2022 19:10:40 +0400 Subject: [PATCH 4/6] [DE mobile] Fix Bug 57859 --- apps/documenteditor/mobile/src/less/app.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 8f9fb566d..3a1c0d9b4 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -215,11 +215,12 @@ } } -.navigation-sheet { +.sheet-modal.navigation-sheet { box-shadow: 0px -2px 20px rgba(0, 0, 0, 0.2); overflow: hidden; .sheet-modal-inner { background: @background-tertiary; + overflow-y: auto; } &.sheet-modal-bottom:before, &.sheet-modal:not(.sheet-modal-top):before { display: none; @@ -324,3 +325,4 @@ color: @brandColor; } } + From 5c5ffb447af3a3b76f130c1b20ad14f42b42ba50 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 30 Jun 2022 11:17:28 +0400 Subject: [PATCH 5/6] [DE mobile] Fix Bug 57841 --- apps/documenteditor/mobile/src/less/app.less | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 3a1c0d9b4..a5eb9c577 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -198,6 +198,7 @@ &__text { margin: 0 32px; text-align: center; + color: @text-normal; } } From 288ddae9f86c82d2ab74faffec06ee14c8e9172e Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 30 Jun 2022 11:20:24 +0400 Subject: [PATCH 6/6] [DE mobile] For Bug 57739 --- .../mobile/src/view/settings/Navigation.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx index 365b1246b..b466eb1b0 100644 --- a/apps/documenteditor/mobile/src/view/settings/Navigation.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Navigation.jsx @@ -9,7 +9,6 @@ const NavigationPopover = props => { const api = Common.EditorApi.get(); const navigationObject = api.asc_ShowDocumentOutline(); const [currentPosition, setCurrentPosition] = useState(navigationObject ? navigationObject.get_CurrentPosition() : null); - let arrHeaders = []; if(currentPosition) { @@ -44,8 +43,12 @@ const NavigationSheet = props => { const { t } = useTranslation(); const api = Common.EditorApi.get(); const navigationObject = api.asc_ShowDocumentOutline(); - const [currentPosition, setCurrentPosition] = useState(navigationObject.get_CurrentPosition()); - const arrHeaders = props.updateNavigation(); + const [currentPosition, setCurrentPosition] = useState(navigationObject ? navigationObject.get_CurrentPosition() : null); + let arrHeaders = []; + + if(currentPosition) { + arrHeaders = props.updateNavigation(); + } const [stateHeight, setHeight] = useState('45%'); const [stateOpacity, setOpacity] = useState(1);