@progress/kendo-spreadsheet-common 1.1.2-develop.1 → 1.1.2-develop.3

package/dist/index-esm.js

@@ -25019,7 +25019,7 @@ class SaveAsCommand extends Command {
     exec() {
         let fileName = this.options.name + this.options.extension;
         if (this.options.extension === ".xlsx") {
-            this.options.workbook.saveAsExcel({
+            return this.options.workbook.saveAsExcel({
                 fileName: fileName
             });
         } else if (this.options.extension === ".pdf") {
@@ -25660,6 +25660,11 @@ async function loadSheets(items, workbook) {
     for (let i = 0; i < items.length; i++) {
         const ctx = items[i];
         let sheet = workbook.insertSheet(ctx.options);
+
+        if (!sheet) {
+            continue;
+        }
+
         sheet.suspendChanges(true);
         await readSheet(ctx.zip, ctx.file, sheet, ctx.strings, ctx.styles);
     }
@@ -27447,29 +27452,47 @@ class Workbook extends Observable {
         });
         let count = ids.length;
         let images = count ? {} : null;
+        const promises = [];
+
         if (count) {
             ids.forEach(function(id) {
                 let img = self._images[id];
+
                 if (img.blob) {
-                    let reader = new FileReader();
-                    reader.onload = function() {
-                        images[id] = {
-                            type: img.blob.type,
-                            name: img.blob.name,
-                            data: reader.result
+                    const promise = new Promise((resolve) => {
+                        let reader = new FileReader();
+                        reader.onload = function() {
+                            images[id] = {
+                                type: img.blob.type,
+                                name: img.blob.name,
+                                data: reader.result
+                            };
+
+                            count--;
+                            resolve();
                         };
-                        next();
-                    };
-                    reader.readAsArrayBuffer(img.blob);
+                        reader.readAsArrayBuffer(img.blob);
+                    });
+
+                    promises.push(promise);
                 } else {
-                    loadBinary(img.url, function(data, type) {
-                        images[id] = { type: type, data: data };
-                        next();
+                    const promise = new Promise((resolve) => {
+                        loadBinary(img.url, function(data, type) {
+                            images[id] = { type: type, data: data };
+                            count--;
+                            resolve();
+                        });
                     });
+                    promises.push(promise);
                 }
             });
+
+            return Promise.all(promises)
+                    .then(() => {
+                        return next();
+                    });
         } else {
-            next();
+            return next();
         }
 
         function next() {
@@ -27477,13 +27500,20 @@ class Workbook extends Observable {
                 data.images = images;
                 let workbook = new options.Workbook(data);
                 const promise = options.forceProxy ? workbook.toDataURL() : workbook.toBlob();
-                promise.then(blob => {
+
+                if (!options.saveAs) {
+                    return promise;
+                }
+
+                return promise.then(blob => {
                     options.saveAs(blob, data.fileName || options.fileName, {
                         proxyURL: options.proxyURL,
                         forceProxy: options.forceProxy
                     });
                 });
             }
+
+            return Promise.resolve();
         }
     }
 
@@ -28026,7 +28056,7 @@ class SpreadsheetWidget extends Widget {
     }
 
     saveAsExcel(options) {
-        this._workbook.saveAsExcel(options);
+        return this._workbook.saveAsExcel(options);
     }
 
     draw(options, callback) {
@@ -28169,7 +28199,7 @@ class SpreadsheetWidget extends Widget {
         // kendo.ui.progress(this.element, e.toggle);
     }
 
-    _onContextMenu(e) {        
+    _onContextMenu(e) {
         this.trigger("contextmenu", e);
     }
 

package/dist/index.js

@@ -25020,7 +25020,7 @@
         exec() {
             let fileName = this.options.name + this.options.extension;
             if (this.options.extension === ".xlsx") {
-                this.options.workbook.saveAsExcel({
+                return this.options.workbook.saveAsExcel({
                     fileName: fileName
                 });
             } else if (this.options.extension === ".pdf") {
@@ -25661,6 +25661,11 @@
         for (let i = 0; i < items.length; i++) {
             const ctx = items[i];
             let sheet = workbook.insertSheet(ctx.options);
+
+            if (!sheet) {
+                continue;
+            }
+
             sheet.suspendChanges(true);
             await readSheet(ctx.zip, ctx.file, sheet, ctx.strings, ctx.styles);
         }
@@ -27448,29 +27453,47 @@
             });
             let count = ids.length;
             let images = count ? {} : null;
+            const promises = [];
+
             if (count) {
                 ids.forEach(function(id) {
                     let img = self._images[id];
+
                     if (img.blob) {
-                        let reader = new FileReader();
-                        reader.onload = function() {
-                            images[id] = {
-                                type: img.blob.type,
-                                name: img.blob.name,
-                                data: reader.result
+                        const promise = new Promise((resolve) => {
+                            let reader = new FileReader();
+                            reader.onload = function() {
+                                images[id] = {
+                                    type: img.blob.type,
+                                    name: img.blob.name,
+                                    data: reader.result
+                                };
+
+                                count--;
+                                resolve();
                             };
-                            next();
-                        };
-                        reader.readAsArrayBuffer(img.blob);
+                            reader.readAsArrayBuffer(img.blob);
+                        });
+
+                        promises.push(promise);
                     } else {
-                        loadBinary(img.url, function(data, type) {
-                            images[id] = { type: type, data: data };
-                            next();
+                        const promise = new Promise((resolve) => {
+                            loadBinary(img.url, function(data, type) {
+                                images[id] = { type: type, data: data };
+                                count--;
+                                resolve();
+                            });
                         });
+                        promises.push(promise);
                     }
                 });
+
+                return Promise.all(promises)
+                        .then(() => {
+                            return next();
+                        });
             } else {
-                next();
+                return next();
             }
 
             function next() {
@@ -27478,13 +27501,20 @@
                     data.images = images;
                     let workbook = new options.Workbook(data);
                     const promise = options.forceProxy ? workbook.toDataURL() : workbook.toBlob();
-                    promise.then(blob => {
+
+                    if (!options.saveAs) {
+                        return promise;
+                    }
+
+                    return promise.then(blob => {
                         options.saveAs(blob, data.fileName || options.fileName, {
                             proxyURL: options.proxyURL,
                             forceProxy: options.forceProxy
                         });
                     });
                 }
+
+                return Promise.resolve();
             }
         }
 
@@ -28027,7 +28057,7 @@
         }
 
         saveAsExcel(options) {
-            this._workbook.saveAsExcel(options);
+            return this._workbook.saveAsExcel(options);
         }
 
         draw(options, callback) {
@@ -28170,7 +28200,7 @@
             // kendo.ui.progress(this.element, e.toggle);
         }
 
-        _onContextMenu(e) {        
+        _onContextMenu(e) {
             this.trigger("contextmenu", e);
         }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-spreadsheet-common",
   "description": "Kendo UI platform-independent Spreadsheet library",
-  "version": "1.1.2-develop.1",
+  "version": "1.1.2-develop.3",
   "keywords": [
     "Kendo UI"
   ],

package/src/index.d.ts

@@ -754,7 +754,7 @@ export class SpreadsheetWidget {
      * Note: Calling this method may trigger the built-in popup blocker of the browser.
      * To avoid that, always call it as a response to an end-user action, for example, a button click.
      */
-    saveAsExcel(options: any): void;
+    saveAsExcel(options: any): Promise<Blob | string>;
 
     /**
      * Gets or sets the active sheet.