@progress/kendo-spreadsheet-common 1.2.7-develop.3 → 1.2.7

package/dist/index-esm.js

@@ -20811,58 +20811,66 @@ const parseXML = function parseXML() {
     }
 };
 
-class Deferred {
-    constructor() {
-        this._progressHandlers = [];
-        this._resolved = false;
-        this._rejected = false;
-        this.promise = new window.Promise((resolve, reject) => {
-            this._resolve = (value) => {
-                if (!this._resolved && !this._rejected) {
-                    this._resolved = true;
-                    resolve(value);
-                }
-            };
-            this._reject = (reason) => {
-                if (!this._resolved && !this._rejected) {
-                    this._rejected = true;
-                    reject(reason);
-                }
-            };
-        });
-    }
-
-    resolve(value) {
-        this._resolve(value);
-        return this;
-    }
-
-    reject(reason) {
-        this._reject(reason);
-        return this;
-    }
-
-    notify(value) {
-        if (!this._resolved && !this._rejected) {
-            this._progressHandlers.forEach(handler => handler(value));
-        }
-    }
-
-    progress(callback) {
-        this._progressHandlers.push(callback);
-        return this;
-    }
-
-    then(onFulfilled, onRejected, onProgress) {
-        if (onProgress) {
-            this.progress(onProgress);
-        }
-        return this.promise.then(onFulfilled, onRejected);
-    }
-
-    promise() {
-        return this.promise;
-    }
+class Deferred {
+    constructor() {
+        this._progressHandlers = [];
+        this._resolved = false;
+        this._rejected = false;
+        this.promise = new window.Promise((resolve, reject) => {
+            this._resolve = (value) => {
+                if (!this._resolved && !this._rejected) {
+                    this._resolved = true;
+                    resolve(value);
+                }
+            };
+            this._reject = (reason) => {
+                if (!this._resolved && !this._rejected) {
+                    this._rejected = true;
+                    reject(reason);
+                }
+            };
+        });
+    }
+
+    resolve(value) {
+        this._resolve(value);
+        return this;
+    }
+
+    reject(reason) {
+        this._reject(reason);
+        return this;
+    }
+
+    notify(value) {
+        if (!this._resolved && !this._rejected) {
+            this._progressHandlers.forEach(handler => handler(value));
+        }
+    }
+
+    progress(callback) {
+        this._progressHandlers.push(callback);
+        return this;
+    }
+
+    then(onFulfilled, onRejected, onProgress) {
+        if (onProgress) {
+            this.progress(onProgress);
+        }
+        return this.promise.then(onFulfilled, onRejected);
+    }
+
+    catch(onRejected) {
+        return this.promise.catch(onRejected);
+    }
+
+    finally(onFinally) {
+        return this.promise.finally(onFinally);
+    }
+
+    promise() {
+        return this.promise;
+    }
 }
 
 /* eslint-disable complexity */
@@ -20883,8 +20891,16 @@ let ERROR_LOG = null;
 function readExcel(file, workbook, deferred) {
     let reader = new FileReader();
     reader.onload = async function(e) {
-        JSZip.loadAsync(e.target.result)
-            .then(async zip => await readWorkbook(zip, workbook, deferred));
+        try {
+            const zip = await JSZip.loadAsync(e.target.result);
+            await readWorkbook(zip, workbook, deferred);
+        } catch (error) {
+            deferred.reject(error);
+        }
+    };
+
+    reader.onerror = function() {
+        deferred.reject(new Error('Failed to read file: ' + (reader.error?.message || 'Unknown error')));
     };
 
     reader.readAsArrayBuffer(file);
@@ -20971,6 +20987,9 @@ function xl(file) {
 async function readWorkbook(zip, workbook, progress) {
     ERROR_LOG = workbook.excelImportErrors = [];
 
+    // Clear sheets only after confirming the file is a valid ZIP
+    workbook._clearSheets();
+
     let strings = await readStrings(zip);
     let relationships = await readRelationships(zip, "_rels/workbook.xml");
     let theme = await readTheme(zip, relationships.byType.theme[0]);
@@ -22903,7 +22922,6 @@ class Workbook extends Observable {
         const deferred = new Deferred();
 
         if (file && !this.trigger("excelImport", { file, deferred })) {
-            this._clearSheets();
             this._readExcel(file, this, deferred);
         }
 

package/dist/index.js

@@ -20812,58 +20812,66 @@
         }
     };
 
-    class Deferred {
-        constructor() {
-            this._progressHandlers = [];
-            this._resolved = false;
-            this._rejected = false;
-            this.promise = new window.Promise((resolve, reject) => {
-                this._resolve = (value) => {
-                    if (!this._resolved && !this._rejected) {
-                        this._resolved = true;
-                        resolve(value);
-                    }
-                };
-                this._reject = (reason) => {
-                    if (!this._resolved && !this._rejected) {
-                        this._rejected = true;
-                        reject(reason);
-                    }
-                };
-            });
-        }
-
-        resolve(value) {
-            this._resolve(value);
-            return this;
-        }
-
-        reject(reason) {
-            this._reject(reason);
-            return this;
-        }
-
-        notify(value) {
-            if (!this._resolved && !this._rejected) {
-                this._progressHandlers.forEach(handler => handler(value));
-            }
-        }
-
-        progress(callback) {
-            this._progressHandlers.push(callback);
-            return this;
-        }
-
-        then(onFulfilled, onRejected, onProgress) {
-            if (onProgress) {
-                this.progress(onProgress);
-            }
-            return this.promise.then(onFulfilled, onRejected);
-        }
-
-        promise() {
-            return this.promise;
-        }
+    class Deferred {
+        constructor() {
+            this._progressHandlers = [];
+            this._resolved = false;
+            this._rejected = false;
+            this.promise = new window.Promise((resolve, reject) => {
+                this._resolve = (value) => {
+                    if (!this._resolved && !this._rejected) {
+                        this._resolved = true;
+                        resolve(value);
+                    }
+                };
+                this._reject = (reason) => {
+                    if (!this._resolved && !this._rejected) {
+                        this._rejected = true;
+                        reject(reason);
+                    }
+                };
+            });
+        }
+
+        resolve(value) {
+            this._resolve(value);
+            return this;
+        }
+
+        reject(reason) {
+            this._reject(reason);
+            return this;
+        }
+
+        notify(value) {
+            if (!this._resolved && !this._rejected) {
+                this._progressHandlers.forEach(handler => handler(value));
+            }
+        }
+
+        progress(callback) {
+            this._progressHandlers.push(callback);
+            return this;
+        }
+
+        then(onFulfilled, onRejected, onProgress) {
+            if (onProgress) {
+                this.progress(onProgress);
+            }
+            return this.promise.then(onFulfilled, onRejected);
+        }
+
+        catch(onRejected) {
+            return this.promise.catch(onRejected);
+        }
+
+        finally(onFinally) {
+            return this.promise.finally(onFinally);
+        }
+
+        promise() {
+            return this.promise;
+        }
     }
 
     /* eslint-disable complexity */
@@ -20884,8 +20892,16 @@
     function readExcel(file, workbook, deferred) {
         let reader = new FileReader();
         reader.onload = async function(e) {
-            JSZip.loadAsync(e.target.result)
-                .then(async zip => await readWorkbook(zip, workbook, deferred));
+            try {
+                const zip = await JSZip.loadAsync(e.target.result);
+                await readWorkbook(zip, workbook, deferred);
+            } catch (error) {
+                deferred.reject(error);
+            }
+        };
+
+        reader.onerror = function() {
+            deferred.reject(new Error('Failed to read file: ' + (reader.error?.message || 'Unknown error')));
         };
 
         reader.readAsArrayBuffer(file);
@@ -20972,6 +20988,9 @@
     async function readWorkbook(zip, workbook, progress) {
         ERROR_LOG = workbook.excelImportErrors = [];
 
+        // Clear sheets only after confirming the file is a valid ZIP
+        workbook._clearSheets();
+
         let strings = await readStrings(zip);
         let relationships = await readRelationships(zip, "_rels/workbook.xml");
         let theme = await readTheme(zip, relationships.byType.theme[0]);
@@ -22904,7 +22923,6 @@
             const deferred = new Deferred();
 
             if (file && !this.trigger("excelImport", { file, deferred })) {
-                this._clearSheets();
                 this._readExcel(file, this, deferred);
             }
 

package/package.json

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