From 02a88b340a897c6b7fc02d620140ce0a3e0576b2 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Mon, 20 Jun 2022 10:34:01 +0300
Subject: [PATCH 1/3] [DE] Fix Bug 57472

---
 apps/common/mobile/resources/less/common-ios.less          | 1 +
 apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less
index 3921ef9bb..053b0b571 100644
--- a/apps/common/mobile/resources/less/common-ios.less
+++ b/apps/common/mobile/resources/less/common-ios.less
@@ -181,6 +181,7 @@
                 margin-top: 21px;
                 box-sizing: border-box;
                 box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset;
+                background: @fill-white;
             }
             .item-after {
                 .color-preview {
diff --git a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
index dd6b5764e..6f7ebb5df 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditParagraph.jsx
@@ -196,7 +196,7 @@ const EditParagraph = props => {
 
     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;
+    const background = curBackColor !== 'transparent' ? `#${(typeof curBackColor === "object" ? curBackColor.color : curBackColor)}` : '';
     const activeStyle = Device.android ? 'link no-active-state' : 'no-active-state';
     
     return (

From 618553a03dbcd8420066b46e834ba4eb0ac4016b Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Wed, 22 Jun 2022 09:33:01 +0300
Subject: [PATCH 2/3] [DE PE] Fix Bug 57696

---
 .../mobile/src/view/edit/EditText.jsx         | 21 +++++--------
 .../mobile/src/view/edit/EditText.jsx         | 31 +++++++------------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index b77b024e0..4a085bd69 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -243,25 +243,18 @@ const PageNumbers = observer( props => {
     
     return (
         <View className='numbers dataview'>
-            {numberArrays.map((numbers, index) => (
-                <List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
-                    {numbers.map((number) => (
-                        <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
+            <List className="row" style={{listStyle: 'none'}}>
+            {numberArrays.map( number => (
+                        <ListItem key={'number-' + number.subtype} data-type={number.subtype} className={(number.subtype === typeNumbers) && 
                             (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
                             onClick={() => {
-                                storeTextSettings.resetNumbers(number.type);
-                                props.onNumber(number.type);
+                                storeTextSettings.resetNumbers(number.subtype);
+                                props.onNumber(number.subtype);
                             }}>
-                            {number.thumb.length < 1 ?
-                                <Icon className="thumb" style={{position: 'relative'}}>
-                                    <label>{t('Edit.textNone')}</label>
-                                </Icon> :
-                                <Icon className="thumb" icon={`icon-numbers-${number.type}`} />
-                            }
+                            <div id={`id-numbers-${number.subtype}`} className='item-number'></div>
                         </ListItem>
                     ))}
-                </List>
-            ))}
+            </List>
         </View>
     );
 });
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
index 778473eb0..4e003d176 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditText.jsx
@@ -570,25 +570,18 @@ const PageNumbers = observer(props => {
 
     return (
         <View className='numbers dataview'>
-            {numberArrays.map((numbers, index) => (
-                <List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
-                    {numbers.map((number) => (
-                        <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) && 
-                            (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
-                            onClick={() => {
-                                storeTextSettings.resetNumbers(number.type);
-                                props.onNumber(number.type);
-                            }}>
-                            {number.thumb.length < 1 ?
-                                <Icon className="thumb" style={{position: 'relative'}}>
-                                    <label>{_t.textNone}</label>
-                                </Icon> :
-                                <Icon className="thumb" icon={`icon-numbers-${number.type}`} />
-                            }
-                        </ListItem>
-                    ))}
-                </List>
-            ))}
+            <List className="row" style={{listStyle: 'none'}}>
+                {numberArrays.map( number => (
+                    <ListItem key={'number-' + number.subtype} data-type={number.subtype} className={(number.subtype === typeNumbers) && 
+                        (storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
+                        onClick={() => {
+                            storeTextSettings.resetNumbers(number.subtype);
+                            props.onNumber(number.subtype);
+                        }}>
+                        <div id={number.id} className='item-number'></div>
+                    </ListItem>
+                ))}
+            </List>
         </View>
     );
 });

From 43018a168c5f2e32686a6135e7563cf76cdee972 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Wed, 22 Jun 2022 10:04:59 +0300
Subject: [PATCH 3/3] [PE] Fix Bug 57708

---
 apps/presentationeditor/mobile/src/less/app.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/presentationeditor/mobile/src/less/app.less b/apps/presentationeditor/mobile/src/less/app.less
index 52f98b332..5fadef946 100644
--- a/apps/presentationeditor/mobile/src/less/app.less
+++ b/apps/presentationeditor/mobile/src/less/app.less
@@ -141,6 +141,7 @@
             display: flex;
             justify-content: space-between;
             flex-wrap: wrap;
+            width: auto;
             padding-left: 18px;
             padding-right: 18px;
             padding-bottom: 14px;