@progress/kendo-spreadsheet-common 1.2.2-develop.1 → 1.2.2-develop.2

package/dist/index-esm.js

@@ -18978,9 +18978,10 @@ class Clipboard {
                 doc.open();
                 doc.write(data.html);
                 doc.close();
-                let table = doc.querySelector("table");
+                let table = doc.querySelector("table"),
+                    program = doc.head.querySelector("meta[name=ProgId]")?.getAttribute("content");
                 if (table) {
-                    let richState = parseHTML(table);
+                    let richState = parseHTML(table, program);
 
                     // fixup #### values that are sent by Excel when the column is too
                     // narrow. It turns out that the plain text clipboard data contains the
@@ -19067,23 +19068,24 @@ function borderObject(element, styles) {
     return obj;
 }
 
-function cellState(row, col, element, hBorders, vBorders) {
-    let styles = window.getComputedStyle(element);
+function cellState(row, col, element, hBorders, vBorders, program) {
+    let styles = window.getComputedStyle(element),
+        isExcel = typeof program === "string" && program.indexOf("Excel") > -1;
     let value, format, formula;
 
     // google sheets
-    if ((value = element.getAttribute("data-sheets-value"))) {
+    if (!isExcel && (value = element.getAttribute("data-sheets-value"))) {
         value = JSON.parse(value);
         value = value[value[1]];
     }
-    if ((format = element.getAttribute("data-sheets-numberformat"))) {
+    if (!isExcel && (format = element.getAttribute("data-sheets-numberformat"))) {
         format = JSON.parse(format);
         format = format[format[1]];
     }
     formula = element.getAttribute("data-sheets-formula");
 
     // libre office
-    if (value == null && format == null && formula == null) {
+    if (!isExcel && value == null && format == null && formula == null) {
         value = element.getAttribute("sdval");
         format = element.getAttribute("sdnum");
         if (format) {
@@ -19159,7 +19161,7 @@ function cellState(row, col, element, hBorders, vBorders) {
     return state;
 }
 
-function parseHTML(table) {
+function parseHTML(table, program) {
     let state = newState();
 
     let done = [], row = 0, col = 0;
@@ -19187,7 +19189,7 @@ function parseHTML(table) {
             let style = td.getAttribute("style");
             let ignoreColspan = /mso-ignore:colspan/.test(style);
 
-            setStateData(state, row, col, cellState(row, col, td, hBorders, vBorders));
+            setStateData(state, row, col, cellState(row, col, td, hBorders, vBorders, program));
             if (rowSpan > 1 || (colSpan > 1 && !ignoreColspan)) {
                 state.mergedCells.push(
                     new RangeRef(

package/dist/index.js

@@ -18979,9 +18979,10 @@
                     doc.open();
                     doc.write(data.html);
                     doc.close();
-                    let table = doc.querySelector("table");
+                    let table = doc.querySelector("table"),
+                        program = doc.head.querySelector("meta[name=ProgId]")?.getAttribute("content");
                     if (table) {
-                        let richState = parseHTML(table);
+                        let richState = parseHTML(table, program);
 
                         // fixup #### values that are sent by Excel when the column is too
                         // narrow. It turns out that the plain text clipboard data contains the
@@ -19068,23 +19069,24 @@
         return obj;
     }
 
-    function cellState(row, col, element, hBorders, vBorders) {
-        let styles = window.getComputedStyle(element);
+    function cellState(row, col, element, hBorders, vBorders, program) {
+        let styles = window.getComputedStyle(element),
+            isExcel = typeof program === "string" && program.indexOf("Excel") > -1;
         let value, format, formula;
 
         // google sheets
-        if ((value = element.getAttribute("data-sheets-value"))) {
+        if (!isExcel && (value = element.getAttribute("data-sheets-value"))) {
             value = JSON.parse(value);
             value = value[value[1]];
         }
-        if ((format = element.getAttribute("data-sheets-numberformat"))) {
+        if (!isExcel && (format = element.getAttribute("data-sheets-numberformat"))) {
             format = JSON.parse(format);
             format = format[format[1]];
         }
         formula = element.getAttribute("data-sheets-formula");
 
         // libre office
-        if (value == null && format == null && formula == null) {
+        if (!isExcel && value == null && format == null && formula == null) {
             value = element.getAttribute("sdval");
             format = element.getAttribute("sdnum");
             if (format) {
@@ -19160,7 +19162,7 @@
         return state;
     }
 
-    function parseHTML(table) {
+    function parseHTML(table, program) {
         let state = newState();
 
         let done = [], row = 0, col = 0;
@@ -19188,7 +19190,7 @@
                 let style = td.getAttribute("style");
                 let ignoreColspan = /mso-ignore:colspan/.test(style);
 
-                setStateData(state, row, col, cellState(row, col, td, hBorders, vBorders));
+                setStateData(state, row, col, cellState(row, col, td, hBorders, vBorders, program));
                 if (rowSpan > 1 || (colSpan > 1 && !ignoreColspan)) {
                     state.mergedCells.push(
                         new RangeRef(

package/package.json

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