From 97755f0d79d87fec2167871c9dd1d7b4c6eff10b Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Wed, 29 Sep 2021 11:17:14 +0300
Subject: [PATCH 1/6] [DE PE SSE] Fix Bug 51652

---
 .../mobile/src/view/settings/DocumentSettings.jsx               | 2 +-
 .../mobile/src/view/settings/PresentationSettings.jsx           | 2 +-
 .../mobile/src/view/settings/SpreadsheetSettings.jsx            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
index dd620d449..87d99925f 100644
--- a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
@@ -176,7 +176,7 @@ const PageDocumentColorSchemes = props => {
                                 onChange={() => {
                                     if(index !== curScheme) {
                                         setScheme(index);
-                                        props.onColorSchemeChange(index);
+                                        setTimeout(() => props.onColorSchemeChange(index), 10);
                                     };
                             }}>
                                 <div slot="before-title">
diff --git a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
index 0f5b4d39d..d34cee681 100644
--- a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
+++ b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
@@ -58,7 +58,7 @@ const PagePresentationColorSchemes = props => {
                                 onChange={() => {
                                     if(index !== curScheme) {
                                         setScheme(index);
-                                        props.onColorSchemeChange(index);
+                                        setTimeout(() => props.onColorSchemeChange(index), 10);
                                     };
                             }}>
                                 <div slot="before-title">
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
index be2a38fee..867460a86 100644
--- a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
@@ -31,7 +31,7 @@ const PageSpreadsheetColorSchemes = props => {
                             onChange={() => {
                                 if(index !== curScheme) {
                                     setScheme(index);
-                                    props.onColorSchemeChange(index);
+                                    setTimeout(() => props.onColorSchemeChange(index), 15);
                                 };
                         }}>
                             <div slot="before-title">

From ba27f4d38ad6964ba3c60dd62dea571264948f12 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Wed, 29 Sep 2021 11:43:42 +0300
Subject: [PATCH 2/6] Fix Bug 52824

---
 apps/common/mobile/resources/less/search.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/common/mobile/resources/less/search.less b/apps/common/mobile/resources/less/search.less
index f322929d1..076b7d4a7 100644
--- a/apps/common/mobile/resources/less/search.less
+++ b/apps/common/mobile/resources/less/search.less
@@ -43,6 +43,10 @@
             height: auto;
             display: block;
             line-height: normal;
+
+            &:before{
+                display: none;
+            }
         }
     }
 

From 113dcc58f163b63e365a1f0fa686e92e30a58b9f Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Thu, 30 Sep 2021 13:13:27 +0300
Subject: [PATCH 3/6] [DE PE SSE] Fix Bug 52819

---
 .../mobile/src/view/edit/EditShape.jsx           | 16 ++++++++++++----
 .../mobile/src/view/edit/EditShape.jsx           | 15 ++++++++++++---
 .../mobile/src/view/edit/EditShape.jsx           | 14 +++++++++++---
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
index 85095537b..f15ee3cab 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx
@@ -508,7 +508,13 @@ const EditShape = props => {
     const canFill = props.storeFocusObjects.shapeObject.get_ShapeProperties().get_CanFill();
     const shapeObject = props.storeFocusObjects.shapeObject;
     const wrapType = props.storeShapeSettings.getWrapType(shapeObject);
-    
+
+    const shapeType = shapeObject.get_ShapeProperties().asc_getType();
+    const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
+    || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
+    || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
+    || shapeType=='straightConnector1';
+
     let disableRemove = !!props.storeFocusObjects.paragraphObject;
 
     return (
@@ -533,9 +539,11 @@ const EditShape = props => {
                     onOverlap: props.onOverlap,
                     onWrapDistance: props.onWrapDistance
                 }}></ListItem>
-                <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
-                    onReplace: props.onReplace
-                }}></ListItem>
+                { !hideChangeType &&
+                    <ListItem title={_t.textReplace} link='/edit-shape-replace/' routeProps={{
+                        onReplace: props.onReplace
+                    }}></ListItem>
+                }
                 { wrapType !== 'inline' && <ListItem  title={_t.textReorder} link='/edit-shape-reorder/' routeProps={{
                     onReorder: props.onReorder
                 }}></ListItem> }
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
index 39a55a8b4..d476f12cd 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx
@@ -12,6 +12,12 @@ const EditShape = props => {
     const shapeObject = storeFocusObjects.shapeObject;
     const canFill = shapeObject && shapeObject.get_CanFill();
 
+    const shapeType = shapeObject.asc_getType();
+    const hideChangeType = shapeObject.get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
+    || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
+    || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
+    || shapeType=='straightConnector1';
+
     let disableRemove = !!props.storeFocusObjects.paragraphObject;
 
     return (
@@ -30,9 +36,12 @@ const EditShape = props => {
                         onBorderColor: props.onBorderColor
                     }}></ListItem>
                 }
-                <ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{
-                    onReplace: props.onReplace
-                }}></ListItem>
+                { !hideChangeType &&
+                    <ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{
+                        onReplace: props.onReplace
+                    }}></ListItem>
+                }
+                
                 <ListItem title={_t.textReorder} link="/edit-reorder-shape/" routeProps={{
                     onReorder: props.onReorder
                 }}></ListItem>
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
index ef6ffd9d7..b8a17a049 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx
@@ -12,6 +12,12 @@ const EditShape = props => {
     const shapeObject = storeFocusObjects.shapeObject;
     const canFill = shapeObject && shapeObject.get_ShapeProperties().asc_getCanFill();
 
+    const shapeType = shapeObject.get_ShapeProperties().asc_getType();
+    const hideChangeType = shapeObject.get_ShapeProperties().get_FromChart() || shapeType=='line' || shapeType=='bentConnector2' || shapeType=='bentConnector3'
+    || shapeType=='bentConnector4' || shapeType=='bentConnector5' || shapeType=='curvedConnector2'
+    || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5'
+    || shapeType=='straightConnector1';
+
     let disableRemove = storeFocusObjects.selections.indexOf('text') > -1;
 
     return (
@@ -30,9 +36,11 @@ const EditShape = props => {
                         onBorderColor: props.onBorderColor
                     }}></ListItem>
                 }
-                <ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{
-                    onReplace: props.onReplace
-                }}></ListItem>
+                { !hideChangeType &&
+                    <ListItem title={_t.textReplace} link="/edit-replace-shape/" routeProps={{
+                        onReplace: props.onReplace
+                    }}></ListItem>
+                }
                 <ListItem title={_t.textReorder} link="/edit-reorder-shape/" routeProps={{
                     onReorder: props.onReorder
                 }}></ListItem>

From 5d0a1b5e00737bc23268537f8014ec49086369e6 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Thu, 30 Sep 2021 15:03:39 +0300
Subject: [PATCH 4/6] [SSE] Fix Bug 52808

---
 .../mobile/src/controller/ContextMenu.jsx     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
index 86d2dffaa..47212dde2 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
@@ -114,13 +114,24 @@ class ContextMenu extends ContextMenuController {
 
     onMergeCells() {
         const { t } = this.props;
-        const _t = t("ContextMenu", { returnObjects: true });
         const api = Common.EditorApi.get();
         if (api.asc_mergeCellsDataLost(Asc.c_oAscMergeOptions.Merge)) {
             setTimeout(() => {
-                f7.dialog.confirm(_t.warnMergeLostData, _t.notcriticalErrorTitle, () => {
-                    api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
-                });
+                f7.dialog.create({
+                    title: t('ContextMenu.notcriticalErrorTitle'),
+                    text: t('ContextMenu.warnMergeLostData'),
+                    buttons: [
+                        {
+                            text: t('ContextMenu.menuCancel')
+                        },
+                        {
+                            text: 'OK',
+                            onClick: () => {
+                                api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);
+                            }
+                        }
+                ]   
+                }).open();
             }, 0);
         } else {
             api.asc_mergeCells(Asc.c_oAscMergeOptions.Merge);

From d4d07c2ad1b55c1ded3292cdb9e1dbaaeb0b65fc Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Fri, 1 Oct 2021 16:40:49 +0300
Subject: [PATCH 5/6] Fix chekbox's in ColorSchemes

---
 .../mobile/src/view/settings/DocumentSettings.jsx           | 6 ++----
 .../mobile/src/view/settings/PresentationSettings.jsx       | 6 ++----
 .../mobile/src/view/settings/SpreadsheetSettings.jsx        | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
index 87d99925f..6a8ee5c28 100644
--- a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
@@ -174,10 +174,8 @@ const PageDocumentColorSchemes = props => {
                         return (
                             <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
                                 onChange={() => {
-                                    if(index !== curScheme) {
-                                        setScheme(index);
-                                        setTimeout(() => props.onColorSchemeChange(index), 10);
-                                    };
+                                    setScheme(index);
+                                    setTimeout(() => props.onColorSchemeChange(index), 10);
                             }}>
                                 <div slot="before-title">
                                     <span className="color-schema-block">
diff --git a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
index d34cee681..31f4d7f9b 100644
--- a/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
+++ b/apps/presentationeditor/mobile/src/view/settings/PresentationSettings.jsx
@@ -56,10 +56,8 @@ const PagePresentationColorSchemes = props => {
                         return (
                             <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
                                 onChange={() => {
-                                    if(index !== curScheme) {
-                                        setScheme(index);
-                                        setTimeout(() => props.onColorSchemeChange(index), 10);
-                                    };
+                                    setScheme(index);
+                                    setTimeout(() => props.onColorSchemeChange(index), 10);
                             }}>
                                 <div slot="before-title">
                                     <span className="color-schema-block">
diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
index 867460a86..fb35c01a9 100644
--- a/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/settings/SpreadsheetSettings.jsx
@@ -29,10 +29,8 @@ const PageSpreadsheetColorSchemes = props => {
                     return (
                         <ListItem radio={true} className="color-schemes-menu no-fastclick" key={index} title={(index < 22) ? (SchemeNames[index] || name) : name} checked={stateScheme === index}
                             onChange={() => {
-                                if(index !== curScheme) {
-                                    setScheme(index);
-                                    setTimeout(() => props.onColorSchemeChange(index), 15);
-                                };
+                                setScheme(index);
+                                setTimeout(() => props.onColorSchemeChange(index), 15);
                         }}>
                             <div slot="before-title">
                                 <span className="color-schema-block">

From 7ae7a08e7f92d3c3a0feee73aba96103f1c046e7 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Mon, 4 Oct 2021 15:59:28 +0300
Subject: [PATCH 6/6] Fix Bug 52870

---
 apps/common/mobile/resources/less/common-material.less | 9 ++-------
 apps/documenteditor/mobile/src/view/add/AddImage.jsx   | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less
index b762db944..11df30aaa 100644
--- a/apps/common/mobile/resources/less/common-material.less
+++ b/apps/common/mobile/resources/less/common-material.less
@@ -73,13 +73,8 @@
                 margin-bottom: 0;
                 margin-top: 8px;
             }
-            .add-image {
-                ul:before, :after{
-                    display: none;
-                }
-            }
-            .inputs-list {
-                ul:after {
+            .add-image, .inputs-list {
+                ul:after, :before{
                     display: none;
                 }
             }
diff --git a/apps/documenteditor/mobile/src/view/add/AddImage.jsx b/apps/documenteditor/mobile/src/view/add/AddImage.jsx
index aaaf9c31c..9ae7d37fb 100644
--- a/apps/documenteditor/mobile/src/view/add/AddImage.jsx
+++ b/apps/documenteditor/mobile/src/view/add/AddImage.jsx
@@ -11,7 +11,7 @@ const PageLinkSettings = props => {
         <Page>
             <Navbar title={_t.textLinkSettings} backLink={_t.textBack}></Navbar>
             <BlockTitle>{_t.textAddress}</BlockTitle>
-            <List className='inputs-list'>
+            <List className='add-image'>
                 <ListInput
                     type='text'
                     placeholder={_t.textImageURL}