From 5fad9c2ccf3b9ce04f78226fadd598d446e3cc74 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 24 Nov 2021 19:29:19 +0400 Subject: [PATCH 1/2] [DE mobile] Fix Bug 53890 --- apps/common/mobile/lib/controller/ContextMenu.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index 73af1007a..ce193e119 100644 --- a/apps/common/mobile/lib/controller/ContextMenu.jsx +++ b/apps/common/mobile/lib/controller/ContextMenu.jsx @@ -111,6 +111,8 @@ class ContextMenuController extends Component { }); if ( this.state.items.length > 0 ) { + const api = Common.EditorApi.get(); + this.$targetEl.css({left: `${x}px`, top: `${y}px`}); const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement); @@ -120,6 +122,8 @@ class ContextMenuController extends Component { this.setState(state => { return {opened: true} }); + + api.asc_enableKeyEvents(true); } } } From e1d90a205f4074079250ff173dd6488b5710914f Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 25 Nov 2021 00:57:37 +0400 Subject: [PATCH 2/2] [DE mobile] Fix Bug 53432 --- .../mobile/src/view/settings/Download.jsx | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/Download.jsx b/apps/documenteditor/mobile/src/view/settings/Download.jsx index 14227e8aa..82d2ded93 100644 --- a/apps/documenteditor/mobile/src/view/settings/Download.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Download.jsx @@ -1,11 +1,13 @@ import React from 'react'; -// import { observer } from "mobx-react"; +import { observer, inject } from "mobx-react"; import { Page, Navbar, List, ListItem, BlockTitle, Icon } from "framework7-react"; import { useTranslation } from "react-i18next"; const Download = props => { const { t } = useTranslation(); const _t = t("Settings", { returnObjects: true }); + const storeDocumentInfo = props.storeDocumentInfo; + const dataDoc = storeDocumentInfo.dataDoc; return ( @@ -18,30 +20,33 @@ const Download = props => { props.onSaveFormat(Asc.c_oAscFileType.PDF)}> - props.onSaveFormat(Asc.c_oAscFileType.PDFA)}> - - - props.onSaveFormat(Asc.c_oAscFileType.TXT)}> - - - props.onSaveFormat(Asc.c_oAscFileType.RTF)}> - - - props.onSaveFormat(Asc.c_oAscFileType.ODT)}> - - - props.onSaveFormat(Asc.c_oAscFileType.HTML)}> - - - props.onSaveFormat(Asc.c_oAscFileType.DOTX)}> - - - props.onSaveFormat(Asc.c_oAscFileType.OTT)}> - - + {dataDoc.fileType !== 'oform' ? [ + props.onSaveFormat(Asc.c_oAscFileType.PDFA)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.TXT)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.RTF)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.ODT)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.HTML)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.DOTX)}> + + , + props.onSaveFormat(Asc.c_oAscFileType.OTT)}> + + + ] + : null} ) } -export default Download; \ No newline at end of file +export default inject('storeDocumentInfo')(observer(Download)); \ No newline at end of file