From f8248de4620f74979a84cf907345cb0fab5cd84a Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 21 Jul 2023 18:25:42 +0300 Subject: [PATCH 1/4] [SSE mobile] Fix Bug 63286 --- .../spreadsheeteditor/mobile/src/controller/Statusbar.jsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx index 1278e22347..dd87b5c50e 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Statusbar.jsx @@ -263,7 +263,13 @@ const Statusbar = inject('storeWorksheets', 'storeAppOptions', 'users')(observer { text: _t.textCancel } - ] + ], + on: { + opened: () => { + const nameField = document.querySelector('input[name="modal-sheet-name"]'); + nameField.select(); + }, + } }).open(); } }; From d9e8ca6bcb31065c5e90d199275fd5dea68fed9f Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Fri, 21 Jul 2023 18:55:06 +0300 Subject: [PATCH 2/4] [DE mobile] For Bug 63235 --- apps/documenteditor/mobile/src/controller/ContextMenu.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx index 4431cbfb78..5e1e56015a 100644 --- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx @@ -362,7 +362,7 @@ class ContextMenu extends ContextMenuController { event: 'openlink' }); - if(isAllowedEditing) { + if(isAllowedEditing && !isViewer) { itemsText.push({ caption: t('ContextMenu.menuEditLink'), event: 'editlink' From 25e98908ee4adce84f0b9dc7c4bab28f6fbe7a57 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sun, 23 Jul 2023 18:08:41 +0300 Subject: [PATCH 3/4] [PE SSE mobile] Fix Bug 62895 --- .../resources/less/common-material.less | 4 +++ .../mobile/src/view/add/AddLink.jsx | 26 +++++++------------ .../mobile/src/view/add/AddLink.jsx | 17 +++++++----- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index 69b841a1a8..d174e0ac60 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -534,6 +534,10 @@ .navbar-link-settings { .navbar-inner { background: @background-primary; + + .icon-back { + color: @text-normal; + } } .title, a { color: @text-normal; diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx index 1f9085bbfe..e3d06702db 100644 --- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx @@ -8,13 +8,14 @@ const PageTypeLink = props => { const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); const [typeLink, setTypeLink] = useState(props.curType); + const isNavigate = props.isNavigate; return ( {Device.phone && - + } @@ -30,6 +31,7 @@ const PageLinkTo = props => { const isAndroid = Device.android; const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); + const isNavigate = props.isNavigate; const [stateTypeTo, setTypeTo] = useState(props.curTo); const changeTypeTo = (type) => { @@ -55,7 +57,7 @@ const PageLinkTo = props => { {Device.phone && - + } @@ -87,7 +89,7 @@ const PageLink = props => { const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); const regx = /["https://"]/g - + const isNavigate = props.isNavigate; const [typeLink, setTypeLink] = useState(1); const textType = typeLink === 1 ? _t.textExternalLink : _t.textSlideInThisPresentation; const changeType = (newType) => { @@ -121,7 +123,7 @@ const PageLink = props => { { - props.isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); + isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); }}> {Device.android && } @@ -140,7 +142,8 @@ const PageLink = props => { {typeLink === 1 ? { /> : } { onChange={(event) => {setScreenTip(event.target.value)}} /> - {/* - { - props.onInsertLink(typeLink, (typeLink === 1 ? - {url: link, display: stateDisplay, displayDisabled: displayDisabled, tip: screenTip } : - {linkTo: linkTo, numberTo: numberTo, display: stateDisplay, displayDisabled: displayDisabled, tip: screenTip})); - }} - /> - */} ) }; diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx index 63383b80ee..faa20a4646 100644 --- a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx @@ -3,7 +3,7 @@ import {Page, Navbar, BlockTitle, List, ListItem, ListInput, ListButton, Icon, L import { useTranslation } from 'react-i18next'; import {Device} from "../../../../../common/mobile/utils/device"; -const PageTypeLink = ({curType, changeType}) => { +const PageTypeLink = ({curType, changeType, isNavigate}) => { const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); const [typeLink, setTypeLink] = useState(curType); @@ -13,7 +13,7 @@ const PageTypeLink = ({curType, changeType}) => { {Device.phone && - + } @@ -25,7 +25,7 @@ const PageTypeLink = ({curType, changeType}) => { ) }; -const PageSheet = ({curSheet, sheets, changeSheet}) => { +const PageSheet = ({curSheet, sheets, changeSheet, isNavigate}) => { const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); const [stateSheet, setSheet] = useState(curSheet.value); @@ -35,7 +35,7 @@ const PageSheet = ({curSheet, sheets, changeSheet}) => { {Device.phone && - + } @@ -63,6 +63,7 @@ const AddLink = props => { const isIos = Device.ios; const { t } = useTranslation(); const _t = t('View.Add', {returnObjects: true}); + const isNavigate = props.isNavigate; const [typeLink, setTypeLink] = useState('ext'); const textType = typeLink === 'ext' ? _t.textExternalLink : _t.textInternalDataRange; @@ -93,7 +94,7 @@ const AddLink = props => { { - props.isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); + isNavigate ? f7.views.current.router.back() : props.closeModal('#add-link-popup', '#add-link-popover'); }}> {Device.android && } @@ -113,7 +114,8 @@ const AddLink = props => { {props.allowInternal && } {typeLink === 'ext' && @@ -132,7 +134,8 @@ const AddLink = props => { } {typeLink === 'int' && From ff9d705b52a7fc012ffb1453174ee35fdf7cb59e Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sun, 23 Jul 2023 20:39:16 +0300 Subject: [PATCH 4/4] [DE mobile] Fix Bug 62978 --- .../mobile/lib/view/collaboration/Review.jsx | 18 +++++++++--------- apps/common/mobile/resources/less/common.less | 5 +++++ apps/documenteditor/mobile/src/less/app.less | 6 +++--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/apps/common/mobile/lib/view/collaboration/Review.jsx b/apps/common/mobile/lib/view/collaboration/Review.jsx index 5d6b9d6904..39d9763817 100644 --- a/apps/common/mobile/lib/view/collaboration/Review.jsx +++ b/apps/common/mobile/lib/view/collaboration/Review.jsx @@ -116,30 +116,30 @@ const PageReviewChange = inject("storeAppOptions")(observer(props => { {Device.phone && - - - - - + + + + + } - {!props.isReviewOnly && + {(!props.isReviewOnly && !isProtected) && {props.onAcceptCurrentChange()}} >{_t.textAccept} {props.onRejectCurrentChange()}} >{_t.textReject} } - {props.isReviewOnly && change && change.editable && + {!props.isReviewOnly && change && change?.editable && {props.onDeleteChange()}}>{_t.textDelete} diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 91e97c2777..c8277582f1 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -1166,6 +1166,11 @@ input[type="number"]::-webkit-inner-spin-button { } } +// Review change +.accept-reject .link { + margin-right: 20px; +} + diff --git a/apps/documenteditor/mobile/src/less/app.less b/apps/documenteditor/mobile/src/less/app.less index 41f7cfb42d..d4776ed112 100644 --- a/apps/documenteditor/mobile/src/less/app.less +++ b/apps/documenteditor/mobile/src/less/app.less @@ -83,16 +83,16 @@ // Review .page-review { --f7-toolbar-link-color: @brandColor; + .toolbar { background-color: @background-secondary; box-shadow: 0 1px 10px rgba(0, 0, 0, 0.2); position: absolute; - #btn-reject-change { - margin-left: 20px; - } + #btn-goto-change { margin-left: 10px; } + .next-prev { .link { width: 44px;