Merge pull request #2033 from ONLYOFFICE/feature/fix-bugs

Feature/fix bugs

apps/documenteditor/mobile/src/view/edit/Edit.jsx

@@ -378,7 +378,7 @@ const EditView = props => {
             <Popover id="edit-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => props.onClosed()}>
                 <EditTabsContainer inPopover={true} onOptionClick={onOptionClick} style={{height: '410px'}} />
             </Popover> :
-            <Sheet id="edit-sheet" push onSheetClosed={() => props.onClosed()}>
+            <Sheet id="edit-sheet" closeByOutsideClick={true} closeByBackdropClick={false} backdrop={false} push onSheetClosed={() => props.onClosed()}>
                 <EditTabsContainer onOptionClick={onOptionClick} />
             </Sheet>
     )

apps/spreadsheeteditor/mobile/locale/en.json

@@ -243,7 +243,9 @@
     "unknownErrorText": "Unknown error.",
     "uploadImageExtMessage": "Unknown image format.",
     "uploadImageFileCountMessage": "No images uploaded.",
-    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB."
+    "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
+    "textCancel": "Cancel",
+    "textOk": "Ok"
   },
   "LongActions": {
     "advDRMPassword": "Password",

apps/spreadsheeteditor/mobile/src/controller/Error.jsx

@@ -368,12 +368,17 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
             cssClass: 'error-dialog',
             title   : config.title,
             text    : config.msg,
-            buttons: config.buttons.map( button => (
+            buttons: config.buttons ? config.buttons.map(button => (
                 {
-                    text:button,
+                    text: button,
                     onClick: (_, btn) => config.callback(_, btn)
                 }
-            ))
+            )) : [
+                {
+                    text: t('Error.textOk'),
+                    onClick: (dlg, _) => dlg.close()
+                }
+            ]
         }).open();
 
         Common.component.Analytics.trackEvent('Internal Error', id.toString());

apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx

@@ -114,7 +114,7 @@ const EditCell = props => {
                         }}>
                             {!isAndroid && <Icon slot="media" icon="icon-cell-style" />}
                             <div slot="after">
-                                <div className='preview-cell-style' style={{backgroundImage: `url(${curStyle.image})`}}></div>
+                                <div className='preview-cell-style' style={{backgroundImage: `url(${curStyle ? curStyle.image : null})`}}></div>
                             </div>
                         </ListItem>
                     </List>