From d478d44bcd43f2682c302e9a56ac0c517c00089c Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 15 Nov 2021 14:37:24 +0300 Subject: [PATCH] [PE] Fix Bug 53517 --- .../presentationeditor/mobile/src/view/edit/EditText.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx index 8aff80308..80dfa4753 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx @@ -241,7 +241,8 @@ const PageFonts = props => { }; const paragraph = props.storeFocusObjects.paragraphObject; - if (!paragraph && Device.phone) { + const shapeObj = props.storeFocusObjects.shapeObject; + if (!shapeObj && !paragraph && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); return null; } @@ -325,7 +326,8 @@ const PageFontColor = props => { }; const paragraph = props.storeFocusObjects.paragraphObject; - if (!paragraph && Device.phone) { + const shapeObj = props.storeFocusObjects.shapeObject; + if (!shapeObj && !paragraph && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); return null; } @@ -391,6 +393,7 @@ const PageAdditionalFormatting = props => { const storeTextSettings = props.storeTextSettings; const storeFocusObjects = props.storeFocusObjects; const paragraphObj = storeFocusObjects.paragraphObject; + const shapeObj = storeFocusObjects.shapeObject; const isSuperscript = storeTextSettings.isSuperscript; const isSubscript = storeTextSettings.isSubscript; @@ -408,7 +411,7 @@ const PageAdditionalFormatting = props => { letterSpacing = (paragraphObj.get_TextSpacing() === null || paragraphObj.get_TextSpacing() === undefined) ? paragraphObj.get_TextSpacing() : Common.Utils.Metric.fnRecalcFromMM(paragraphObj.get_TextSpacing()); } - if (!paragraphObj && Device.phone) { + if (!shapeObj && !paragraphObj && Device.phone) { $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close(); return null; }