From a9f254522edc4f296a354a509cfecdbdc848687f Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Thu, 13 Jan 2022 01:05:31 +0400
Subject: [PATCH 1/2] [DE mobile] Fix Bug 54406

---
 .../mobile/src/view/edit/EditText.jsx         | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/edit/EditText.jsx b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
index 6a21df4b2..d3351fad1 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditText.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditText.jsx
@@ -188,7 +188,7 @@ const PageAdditionalFormatting = props => {
     )
 };
 
-const PageBullets = props => {
+const PageBullets = observer(props => {
     const { t } = useTranslation();
     const bulletArrays = [
         [
@@ -217,9 +217,10 @@ const PageBullets = props => {
                                 onClick={() => {
                                     if (bullet.type === -1) {
                                         storeTextSettings.resetBullets(-1);
+                                    } else {
+                                        storeTextSettings.resetBullets(bullet.type);
                                     }
-                                    props.onBullet(bullet.type)
-                                    props.f7router.back();
+                                    props.onBullet(bullet.type);
                                 }}>
                                 {bullet.thumb.length < 1 ?
                                     <Icon className="thumb" style={{position: 'relative'}}>
@@ -233,9 +234,9 @@ const PageBullets = props => {
             ))}
         </View>
     )
-};
+});
 
-const PageNumbers = props => {
+const PageNumbers = observer(props => {
     const { t } = useTranslation();
     const numberArrays = [
         [
@@ -265,9 +266,10 @@ const PageNumbers = props => {
                             onClick={() => {
                                 if (number.type === -1) {
                                     storeTextSettings.resetNumbers(-1);
+                                } else {
+                                    storeTextSettings.resetNumbers(number.type);
                                 }
-                                props.onNumber(number.type)
-                                props.f7router.back();
+                                props.onNumber(number.type);
                             }}>
                             {number.thumb.length < 1 ?
                                 <Icon className="thumb" style={{position: 'relative'}}>
@@ -281,9 +283,9 @@ const PageNumbers = props => {
             ))}
         </View>
     )
-};
+});
 
-const PageMultiLevel = props => {
+const PageMultiLevel = observer(props => {
     const { t } = useTranslation();
     
     const arrayMultiLevel = [
@@ -302,9 +304,8 @@ const PageMultiLevel = props => {
                     {arrayMultiLevel.map((item) => (
                         <ListItem key={'multi-level-' + item.type} data-type={item.type} className={item.type === typeMultiLevel ? 'active' : ''}
                         onClick={(e) => {
-                            item.type === -1 ? storeTextSettings.resetMultiLevel(-1) : storeTextSettings.resetMultiLevel(null);
-                            props.onMultiLevelList(item.type);
-                            props.f7router.back();
+                                item.type === -1 ? storeTextSettings.resetMultiLevel(-1) : storeTextSettings.resetMultiLevel(null);
+                                props.onMultiLevelList(item.type);
                             }}>
                             {item.thumb.length < 1 ?
                                 <Icon className="thumb" style={{position: 'relative'}}>
@@ -318,7 +319,7 @@ const PageMultiLevel = props => {
         </View>
     )
         
-}
+});
 
 const PageBulletsAndNumbers = props => {
     const { t } = useTranslation();
@@ -336,9 +337,15 @@ const PageBulletsAndNumbers = props => {
                 }
             </Navbar>
             <Swiper pagination>
-                <SwiperSlide> <PageNumbers f7router={props.f7router}  storeTextSettings={storeTextSettings} onNumber={props.onNumber}/></SwiperSlide> 
-                <SwiperSlide> <PageBullets f7router={props.f7router} storeTextSettings={storeTextSettings} onBullet={props.onBullet}/></SwiperSlide>
-                <SwiperSlide> <PageMultiLevel f7router={props.f7router} storeTextSettings={storeTextSettings} onMultiLevelList={props.onMultiLevelList}/> </SwiperSlide>
+                <SwiperSlide> 
+                    <PageNumbers storeTextSettings={storeTextSettings} onNumber={props.onNumber} />
+                </SwiperSlide> 
+                <SwiperSlide>
+                    <PageBullets storeTextSettings={storeTextSettings} onBullet={props.onBullet} />
+                </SwiperSlide>
+                <SwiperSlide> 
+                    <PageMultiLevel storeTextSettings={storeTextSettings} onMultiLevelList={props.onMultiLevelList} />
+                </SwiperSlide>
             </Swiper>
         </Page>
     )

From 789314a777ed207856c66d6c61750a778baa08a6 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Thu, 13 Jan 2022 01:20:57 +0400
Subject: [PATCH 2/2] [DE mobile] Fix Bug 54001

---
 .../mobile/src/view/settings/DocumentSettings.jsx               | 1 -
 apps/documenteditor/mobile/src/view/settings/Settings.jsx       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
index 6f641b534..6a8ee5c28 100644
--- a/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/DocumentSettings.jsx
@@ -69,7 +69,6 @@ const PageDocumentMargins = props => {
             }
     
             if(errorMsg) {
-                f7.popover.close('#settings-popover');
                 f7.dialog.alert(errorMsg, _t.notcriticalErrorTitle);
                 return;
             }
diff --git a/apps/documenteditor/mobile/src/view/settings/Settings.jsx b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
index 654004353..5802f473e 100644
--- a/apps/documenteditor/mobile/src/view/settings/Settings.jsx
+++ b/apps/documenteditor/mobile/src/view/settings/Settings.jsx
@@ -195,7 +195,7 @@ class SettingsView extends Component {
         const show_popover = this.props.usePopover;
         return (
             show_popover ?
-                <Popover id="settings-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()}>
+                <Popover id="settings-popover" closeByOutsideClick={false} className="popover__titled" onPopoverClosed={() => this.props.onclosed()}>
                     <SettingsList inPopover={true} onOptionClick={this.onoptionclick} openOptions={this.props.openOptions} style={{height: '410px'}} onReaderMode={this.props.onReaderMode} onPrint={this.props.onPrint} showHelp={this.props.showHelp} onOrthographyCheck={this.props.onOrthographyCheck} onDownloadOrigin={this.props.onDownloadOrigin}/>
                 </Popover> :
                 <Popup className="settings-popup" onPopupClosed={() => this.props.onclosed()}>