From 665d985de2ac7765ae56546eb009264fab81332d Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Thu, 15 Jul 2021 16:15:32 +0300
Subject: [PATCH 1/2] [PE] Fix Bug 47908

---
 apps/presentationeditor/mobile/src/controller/Toolbar.jsx | 3 ---
 apps/presentationeditor/mobile/src/view/Toolbar.jsx       | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/presentationeditor/mobile/src/controller/Toolbar.jsx b/apps/presentationeditor/mobile/src/controller/Toolbar.jsx
index 87225a53db..5f50b615a7 100644
--- a/apps/presentationeditor/mobile/src/controller/Toolbar.jsx
+++ b/apps/presentationeditor/mobile/src/controller/Toolbar.jsx
@@ -131,7 +131,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(observer(props => {
         }
     }
 
-    const [disabledAdd, setDisabledAdd] = useState(false);
     const [disabledEdit, setDisabledEdit] = useState(false);
     const onApiFocusObject = (objects) => {
         if (isDisconnected) return;
@@ -153,7 +152,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(observer(props => {
                 }
             });
 
-            setDisabledAdd(slide_deleted);
             setDisabledEdit(slide_deleted || (objectLocked || no_object) && slide_lock);
         }
     };
@@ -194,7 +192,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(observer(props => {
                      isCanRedo={isCanRedo}
                      onUndo={onUndo}
                      onRedo={onRedo}
-                     disabledAdd={disabledAdd}
                      disabledEdit={disabledEdit}
                      disabledPreview={disabledPreview}
                      disabledControls={disabledControls}
diff --git a/apps/presentationeditor/mobile/src/view/Toolbar.jsx b/apps/presentationeditor/mobile/src/view/Toolbar.jsx
index 42f93da4f8..d5cc8e5029 100644
--- a/apps/presentationeditor/mobile/src/view/Toolbar.jsx
+++ b/apps/presentationeditor/mobile/src/view/Toolbar.jsx
@@ -29,8 +29,8 @@ const ToolbarView = props => {
                     <Link className={props.disabledControls ? 'disabled' : ''} icon='icon-edit' href={false} onClick={props.onEditDocument}></Link>
                 }
                 {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({
-                    disabledAdd: props.disabledAdd || props.disabledControls || isDisconnected,
-                    disabledEdit: props.disabledEdit || props.disabledControls || isDisconnected,
+                    disabledEdit: props.disabledEdit || props.disabledControls || isDisconnected || props.disabledPreview,
+                    disabledAdd: props.disabledControls || isDisconnected,
                     onEditClick: () => props.openOptions('edit'),
                     onAddClick: () => props.openOptions('add')
                 })}

From 2dce8b8db362c506adf6b5a548610685df3746a6 Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Thu, 15 Jul 2021 18:19:32 +0300
Subject: [PATCH 2/2] [DE PE SSE] Fix Bug 48073

---
 apps/documenteditor/mobile/src/view/add/AddLink.jsx     | 8 ++++++--
 apps/presentationeditor/mobile/src/view/add/AddLink.jsx | 8 +++++---
 apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx  | 8 +++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/add/AddLink.jsx b/apps/documenteditor/mobile/src/view/add/AddLink.jsx
index 479ed36036..d5b6a2edae 100644
--- a/apps/documenteditor/mobile/src/view/add/AddLink.jsx
+++ b/apps/documenteditor/mobile/src/view/add/AddLink.jsx
@@ -13,6 +13,8 @@ const PageLink = props => {
     const [stateLink, setLink] = useState('');
     const [stateDisplay, setDisplay] = useState(display);
     const [stateTip, setTip] = useState('');
+    const [stateAutoUpdate, setAutoUpdate] = useState(true);
+
     return (
         <Page>
             {!props.noNavbar && <Navbar title={_t.textAddLink} backLink={_t.textBack}></Navbar>}
@@ -22,14 +24,16 @@ const PageLink = props => {
                     type="text"
                     placeholder={_t.textLink}
                     value={stateLink}
-                    onChange={(event) => {setLink(event.target.value)}}
+                    onChange={(event) => {setLink(event.target.value); 
+                        if(stateAutoUpdate) setDisplay(event.target.value); }}
                 ></ListInput>
                 <ListInput
                     label={_t.textDisplay}
                     type="text"
                     placeholder={_t.textDisplay}
                     value={stateDisplay}
-                    onChange={(event) => {setDisplay(event.target.value)}}
+                    onChange={(event) => {setDisplay(event.target.value); 
+                        setAutoUpdate(event.target.value == ''); }}
                 ></ListInput>
                 <ListInput
                     label={_t.textScreenTip}
diff --git a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
index fd164ddb69..c99ae87d36 100644
--- a/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
+++ b/apps/presentationeditor/mobile/src/view/add/AddLink.jsx
@@ -99,7 +99,7 @@ const PageLink = props => {
     const display = props.getTextDisplay();
     const displayDisabled = display !== false && display === null;
     const [stateDisplay, setDisplay] = useState(display !== false ? ((display !== null) ? display : _t.textDefault) : "");
-
+    const [stateAutoUpdate, setAutoUpdate] = useState(true);
     const [screenTip, setScreenTip] = useState('');
 
     return (
@@ -116,7 +116,8 @@ const PageLink = props => {
                                placeholder={_t.textLink}
                                value={link}
                                onChange={(event) => {
-                                setLink(event.target.value)
+                                setLink(event.target.value);
+                                if(stateAutoUpdate) setDisplay(event.target.value);
                             }}
                     /> :
                     <ListItem link={'/add-link-to/'} title={_t.textLinkTo} after={displayTo} routeProps={{
@@ -129,7 +130,8 @@ const PageLink = props => {
                            placeholder={_t.textDisplay}
                            value={stateDisplay}
                            disabled={displayDisabled}
-                           onChange={(event) => {setDisplay(event.target.value)}}
+                           onChange={(event) => {setDisplay(event.target.value);
+                            setAutoUpdate(event.target.value == ''); }}
                 />
                 <ListInput label={_t.textScreenTip}
                            type="text"
diff --git a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx
index 57f69fec0a..d300691ebc 100644
--- a/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx
@@ -62,7 +62,7 @@ const AddLinkView = props => {
     const displayDisabled = displayText === 'locked';
     displayText = displayDisabled ? _t.textSelectedRange : displayText;
     const [stateDisplayText, setDisplayText] = useState(displayText);
-
+    const [stateAutoUpdate, setAutoUpdate] = useState(true);
     const [screenTip, setScreenTip] = useState('');
 
     const activeSheet = props.activeSheet;
@@ -88,7 +88,8 @@ const AddLinkView = props => {
                                placeholder={_t.textLink}
                                value={link}
                                onChange={(event) => {
-                                setLink(event.target.value)
+                                setLink(event.target.value);
+                                if(stateAutoUpdate) setDisplayText(event.target.value);
                             }}
                                className={isIos ? 'list-input-right' : ''}
                     />
@@ -114,7 +115,8 @@ const AddLinkView = props => {
                            placeholder={_t.textDisplay}
                            value={stateDisplayText}
                            disabled={displayDisabled}
-                           onChange={(event) => {setDisplayText(event.target.value)}}
+                           onChange={(event) => {setDisplayText(event.target.value);
+                            setAutoUpdate(event.target.value == ''); }}
                            className={isIos ? 'list-input-right' : ''}
                 />
                 <ListInput label={_t.textScreenTip}