Merge branch hotfix/v8.3.1 into master

apps/api/documents/api.js

@@ -212,7 +212,8 @@
                         tabBackground: {
                             mode: 'header'/'toolbar' // init value, 'header' by default
                             change: true/false // show/hide feature
-                        } / 'header'/'toolbar' // if string - use as init value
+                        } / 'header'/'toolbar' // if string - use as init value,
+                        featuresTips: false/true // show tips about new feature
                     },
                     font: {
                         name: "Arial",
@@ -332,7 +333,8 @@
                 url: 'document url',
                 fileType: 'document file type',
                 key: 'key',
-                vkey: 'vkey'
+                vkey: 'vkey',
+                isForm: 'pdf form' / false/true
             },
             editorConfig: {
                 licenseUrl: <url for license>,

apps/common/main/lib/component/LoadMask.js

@@ -77,7 +77,7 @@ define([
             template: _.template([
                 '<div id="<%= id %>" class="asc-loadmask-body <%= cls %>" role="presentation" tabindex="-1">',
                     '<i id="loadmask-spinner" class="asc-loadmask-image"></i>',
-                    '<div class="asc-loadmask-title"><%= title %></div>',
+                    '<div class="asc-loadmask-title"><%- title %></div>',
                 '</div>'
             ].join('')),
 
@@ -129,7 +129,7 @@ define([
                 var me = this;
                 if (me.title != me.options.title) {
                     me.options.title = me.title;
-                    $('.asc-loadmask-title', this.loaderEl).html(me.title);
+                    $('.asc-loadmask-title', this.loaderEl).html(Common.Utils.String.htmlEncode(me.title));
                 }
 
                 if (immediately) {
@@ -168,7 +168,7 @@ define([
 
                 if (this.ownerEl && this.ownerEl.hasloader && this.loaderEl){
                     var el = $('.asc-loadmask-title', this.loaderEl);
-                    el.html(title);
+                    el.html(Common.Utils.String.htmlEncode(title));
                     this.loaderEl.css('min-width', el.width() + 105);
                 }
             },

apps/common/main/lib/controller/Desktop.js

@@ -924,6 +924,14 @@ define([
                     t == utils.defines.FileFormat.FILE_CROSSPLATFORM_PDF ||
                     t == utils.defines.FileFormat.FILE_CROSSPLATFORM_DJVU ||
                     t ==  utils.defines.FileFormat.FILE_CROSSPLATFORM_XPS;
+        } else
+        if ( window.VE ) {
+            return t == utils.defines.FileFormat.FILE_DRAW_VSDX ||
+                    t == utils.defines.FileFormat.FILE_DRAW_VSDM ||
+                    t == utils.defines.FileFormat.FILE_DRAW_VSTX ||
+                    t == utils.defines.FileFormat.FILE_DRAW_VSTM ||
+                    t == utils.defines.FileFormat.FILE_DRAW_VSSX ||
+                    t ==  utils.defines.FileFormat.FILE_DRAW_VSSM;
         }
 
         return false;

apps/common/main/lib/view/Draw.js

@@ -112,6 +112,7 @@ define([
                     ],
                     lock = (this.appPrefix === 'de-') ? [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockViewIns, _set.docLockForms, _set.docLockCommentsIns, _set.viewMode] :
                            (this.appPrefix === 'pe-') ? [_set.slideDeleted, _set.lostConnect, _set.noSlides] :
+                           (this.appPrefix === 'pdfe-') ? [_set.pageDeleted, _set.lostConnect] :
                                                         [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']],
                     me = this;
                 penOptions.forEach(function (props) {

apps/common/mobile/lib/controller/Draw.jsx

@@ -24,6 +24,14 @@ export const DrawController = inject('storeAppOptions')(observer(({ storeAppOpti
     }
     return storageColors
   })
+  const [enableErasing, setEnableErasing] = useState(true);
+
+  const onApiFocusObject = () => {
+    if (storeAppOptions.isDrawMode) {
+      const api = Common.EditorApi.get();
+      setEnableErasing(api.asc_HaveInks());
+    }
+  }
 
   useEffect(() => {
     Common.Notifications.on('draw:start', () => {
@@ -36,9 +44,14 @@ export const DrawController = inject('storeAppOptions')(observer(({ storeAppOpti
       setCurrentToolAndApply('scroll');
     })
 
+    Common.Notifications.on('engineCreated', api => {
+      api.asc_registerCallback(window.editorType === 'sse' ? 'asc_onSelectionChanged' : 'asc_onFocusObject', onApiFocusObject);
+    });
+
     return () => {
       Common.Notifications.off('draw:start');
       Common.Notifications.off('draw:stop');
+      Common.Notifications.off('engineCreated');
     }
   }, []);
 
@@ -53,18 +66,23 @@ export const DrawController = inject('storeAppOptions')(observer(({ storeAppOpti
   };
 
   const toolActions = {
-    pen: (api, settings) => api.asc_StartDrawInk(createStroke(settings.pen.color, settings.pen.lineSize, settings.pen.opacity), 0),
-    highlighter: (api, settings) => api.asc_StartDrawInk(createStroke(settings.highlighter.color, settings.highlighter.lineSize, settings.highlighter.opacity), 1),
+    pen: (api, settings) => api.asc_StartDrawInk(createStroke(settings.pen.color, settings.pen.lineSize, settings.pen.opacity)),
+    highlighter: (api, settings) => api.asc_StartDrawInk(createStroke(settings.highlighter.color, settings.highlighter.lineSize, settings.highlighter.opacity)),
     eraser: (api) => api.asc_StartInkEraser(),
-    eraseEntireScreen: (api) => {/* fixme: method */
-    },
+    eraseEntireScreen: (api) => api.asc_RemoveAllInks(),
     scroll: (api) => api.asc_StopInkDrawer(),
   };
 
   const setCurrentToolAndApply = (tool) => {
     const api = Common.EditorApi.get();
-    toolActions[tool]?.(api, toolSettings);
-    setCurrentTool(tool);
+    if (tool === 'eraseEntireScreen') {
+      toolActions.eraseEntireScreen(api);
+      toolActions[currentTool]?.(api, toolSettings);
+      setEnableErasing(false);
+    } else {
+      setCurrentTool(tool);
+      toolActions[tool]?.(api, toolSettings);
+    }
   };
 
   const updateToolSettings = (newSettings) => {
@@ -91,5 +109,6 @@ export const DrawController = inject('storeAppOptions')(observer(({ storeAppOpti
     setSettings={updateToolSettings}
     colors={colors}
     addCustomColor={addCustomColor}
+    enableErasing={enableErasing}
   /> : null
 }));

apps/common/mobile/lib/view/Draw.jsx

@@ -10,7 +10,7 @@ import IconScroll from '../../../../common/mobile/resources/icons/scroll.svg'
 import { WheelColorPicker } from "../component/WheelColorPicker";
 import { Device } from "../../utils/device";
 
-export const DrawView = ({ currentTool, setTool, settings, setSettings, colors, addCustomColor }) => {
+export const DrawView = ({ currentTool, setTool, settings, setSettings, colors, addCustomColor, enableErasing }) => {
   const { t } = useTranslation();
   const _t = t('Draw', { returnObjects: true });
   const isDrawingTool = currentTool === 'pen' || currentTool === 'highlighter';
@@ -37,8 +37,10 @@ export const DrawView = ({ currentTool, setTool, settings, setSettings, colors,
             <div className="draw-sheet--settings-colors-list">
               {colors.map((color, index) => (
                 <div
-                  key={index} className="draw-sheet--settings-colors-list-item" style={{ backgroundColor: color }}
+                  key={index}
+                  className="draw-sheet--settings-colors-list-item" style={{ backgroundColor: color }}
                   onClick={() => setSettings({ color })}
+                  onTouchStart={() => setSettings({ color })}
                 />
               ))}
               <div
@@ -94,15 +96,15 @@ export const DrawView = ({ currentTool, setTool, settings, setSettings, colors,
           <div className='draw-toolbar-divider'/>
         </div>
         <div className="draw-toolbar-item">
-          <Button type='button' disabled={false} fill={currentTool === 'eraser'} onClick={() => setTool('eraser')}>
+          <Button type='button' disabled={!enableErasing} fill={currentTool === 'eraser'} onClick={() => setTool('eraser')}>
             <SvgIcon symbolId={IconClearObject.id} className='icon icon-svg'/>
           </Button>
         </div>
-        {/*<div className="draw-toolbar-item">*/}
-        {/*  <Button type='button' disabled={false} onClick={() => setTool('eraseEntireScreen')}>*/}
-        {/*    <SvgIcon symbolId={IconClearAll.id} className='icon icon-svg'/>*/}
-        {/*  </Button>*/}
-        {/*</div>*/}
+        <div className="draw-toolbar-item">
+          <Button type='button' disabled={!enableErasing} onClick={() => setTool('eraseEntireScreen')}>
+            <SvgIcon symbolId={IconClearAll.id} className='icon icon-svg'/>
+          </Button>
+        </div>
         <div className="draw-toolbar-item">
           <div className='draw-toolbar-divider'/>
         </div>

apps/common/mobile/resources/less/draw.less

@@ -115,8 +115,7 @@
 
         @media (min-width: 550px) {
             display: grid;
-            // todo: change to 8 later
-            grid-template-columns: repeat(7, 1fr);
+            grid-template-columns: repeat(8, 1fr);
         }
 
         &-item {

apps/documenteditor/embed/locale/el.json

@@ -38,7 +38,7 @@
   "DE.ApplicationController.textConvertFormDownload": "Κατεβάστε το αρχείο ως συμπληρώσιμο PDF για να μπορείτε να το συμπληρώσετε.",
   "DE.ApplicationController.textCtrl": "Ctrl",
   "DE.ApplicationController.textDownloadPdf": "Λήψη PDF",
-  "DE.ApplicationController.textGotIt": "Ελήφθη",
+  "DE.ApplicationController.textGotIt": "Εντάξει",
   "DE.ApplicationController.textGuest": "Επισκέπτης",
   "DE.ApplicationController.textLoadingDocument": "Φόρτωση εγγράφου",
   "DE.ApplicationController.textNext": "Επόμενο Πεδίο",