@progress/kendo-spreadsheet-common 1.2.6-develop.2 → 1.2.6

package/dist/index-esm.js

@@ -21,7 +21,7 @@ function displaySheet(sheet) {
     if (/^[a-z_][a-z0-9_]*$/i.test(sheet)) {
         return sheet;
     }
-    return "'" + sheet.replace(/\x27/g, "\\'") + "'";
+    return "'" + sheet.replace(/\\/g, "\\\\").replace(/\x27/g, "\\'") + "'";
 }
 function displayRef(sheet, row, col, rel) {
     let aa = "";
@@ -5721,7 +5721,7 @@ class FormulaContext {
         if (/^[a-z_][a-z0-9_]*$/i.test(val)) {
             return val;
         }
-        return "'" + val.replace(/\x27/g, "\\'") + "'";
+        return "'" + val.replace(/\\/g, "\\\\").replace(/\x27/g, "\\'") + "'";
     }
 }
 
@@ -7837,8 +7837,10 @@ const propertyBagSpec = [
     { property: ValueProperty, name: "value", value: null, sortable: true, serializable: true, depends: "format" },
     { property: Property, name: "formula", value: null, sortable: true, serializable: true },
     { property: Property, name: "background", value: null, sortable: true, serializable: true },
-    { property: JsonProperty, name: "vBorders", value: null, sortable: false, serializable: false },
-    { property: JsonProperty, name: "hBorders", value: null, sortable: false, serializable: false },
+    { property: JsonProperty, name: "borderLeft", value: null, sortable: false, serializable: true },
+    { property: JsonProperty, name: "borderRight", value: null, sortable: false, serializable: true },
+    { property: JsonProperty, name: "borderTop", value: null, sortable: false, serializable: true },
+    { property: JsonProperty, name: "borderBottom", value: null, sortable: false, serializable: true },
     { property: JsonProperty, name: "dBorders", value: null, sortable: false, serializable: true },
     { property: Property, name: "color", value: null, sortable: true, serializable: true },
     { property: Property, name: "fontFamily", value: null, sortable: true, serializable: true },
@@ -7937,44 +7939,41 @@ class PropertyBag {
         if (index === undefined) {
             return this.lists[name];
         }
-
-        switch (name) {
-        case "borderRight":
-            index += this.rowCount;
-            /* falls through */
-        case "borderLeft":
-            name = "vBorders";
-            break;
-
-        case "borderBottom":
-            index++;
-            /* falls through */
-        case "borderTop":
-            name = "hBorders";
-            break;
-        }
         return index > this.cellCount ? null : this.properties[name].get(index);
     }
 
     set(name, start, end, value) {
+        this._set(name, start, end, value);
         switch (name) {
-        case "borderRight":
-            start += this.rowCount;
-            end += this.rowCount;
-            /* falls through */
-        case "borderLeft":
-            name = "vBorders";
+          case "borderLeft":
+            this._set("borderRight", start - this.rowCount, end - this.rowCount, value);
             break;
-
-        case "borderBottom":
-            start++;
-            end++;
-            /* falls through */
-        case "borderTop":
-            name = "hBorders";
+          case "borderRight":
+            this._set("borderLeft", start + this.rowCount, end + this.rowCount, value);
+            break;
+          case "borderTop":
+            intervals(start, end, this.rowCount).forEach((a) => {
+                var start = a[0] - 1, end = a[1] - 1;
+                if ((start + 1) % this.rowCount == 0) {
+                    start++;
+                }
+                this._set("borderBottom", start, end, value);
+            });
+            break;
+          case "borderBottom":
+            intervals(start, end, this.rowCount).forEach((a) => {
+                var start = a[0] + 1, end = a[1] + 1;
+                if (end % this.rowCount == 0) {
+                    end--;
+                }
+                this._set("borderTop", start, end, value);
+            });
             break;
         }
-        if (start <= end && end <= this.cellCount) {
+    }
+
+    _set(name, start, end, value) {
+        if (start >= 0 && start <= end && end <= this.cellCount) {
             this.properties[name].set(start, end, value);
         }
     }
@@ -7982,19 +7981,12 @@ class PropertyBag {
     fromJSON(index, value) {
         for (let si = 0; si < this.specs.length; si++) {
             let spec = this.specs[si];
-
             if (spec.serializable) {
                 if (value[spec.name] !== undefined) {
                     this.set(spec.name, index, index, value[spec.name], false);
                 }
             }
         }
-
-        [ "borderLeft", "borderRight", "borderTop", "borderBottom" ].forEach(function(b) {
-            if (value[b] !== undefined) {
-                this.set(b, index, index, value[b]);
-            }
-        }, this);
     }
 
     copy(sourceStart, sourceEnd, targetStart) {
@@ -8033,18 +8025,8 @@ class PropertyBag {
 
     forEach(start, end, callback) {
         let iterators = this.iterators(start, end);
-        let hBorders = this.iterator("hBorders", start, end + 1);
-        let leftBorders = this.iterator("vBorders", start, end);
-        let rightBorders = this.iterator("vBorders", start + this.rowCount, end + this.rowCount);
         let values, index;
 
-        function addBorder(name, iterator, index) {
-            let val = iterator.at(index);
-            if (val !== iterator.value) {
-                values[name] = val;
-            }
-        }
-
         for (index = start; index <= end; index++) {
             values = {};
 
@@ -8057,13 +8039,6 @@ class PropertyBag {
                 }
             }
 
-            addBorder("borderLeft", leftBorders, index);
-            addBorder("borderRight", rightBorders, index + this.rowCount);
-            addBorder("borderTop", hBorders, index);
-            if ((index + 1) % this.rowCount) {
-                addBorder("borderBottom", hBorders, index + 1);
-            }
-
             callback(values);
         }
     }
@@ -8074,6 +8049,15 @@ class PropertyBag {
         }
     }
 }
+function intervals(start, end, rows) {
+    var a = [];
+    while (start <= end) {
+        var lastrow = Math.min(end, rows * (1 + Math.floor(start / rows)) - 1);
+        a.push([ start, lastrow ]);
+        start = lastrow + 1;
+    }
+    return a;
+}
 function cloneFormulaValue(x) {
     x = x.clone();
     x.value = x.value.deepClone(); // x.value is Formula or Validation
@@ -9331,7 +9315,7 @@ let Range$1 = class Range {
             if (ref instanceof RangeRef && ref.width() > 1) {
                 ref = ref.clone();
                 ref.topLeft.col++;
-                this._sheet.range(ref)._set("vBorders", value);
+                this._sheet.range(ref).borderLeft(value);
             }
         }, this);
         return this;
@@ -9342,7 +9326,7 @@ let Range$1 = class Range {
             if (ref instanceof RangeRef && ref.height() > 1) {
                 ref = ref.clone();
                 ref.topLeft.row++;
-                this._sheet.range(ref)._set("hBorders", value);
+                this._sheet.range(ref).borderTop(value);
             }
         }, this);
         return this;
@@ -12675,7 +12659,7 @@ function sameWeek(a, b) {
 }
 
 /* eslint-disable max-params */
- 
+
 
 // This is a “dynamic variable” (see Greenspun's 10th rule).  It's
 // bound to an array via sheet._saveModifiedFormulas (which see)
@@ -12930,11 +12914,32 @@ class Sheet extends Observable {
         this._properties._resize(newRows, newCols);
         this._sheetRef = this._grid.normalize(SHEETREF);
         if (newRows > oldRows) {
-            this.range(oldRows, 0, newRows - oldRows, newCols).clear();
+            this.range(oldRows, 0, newRows - oldRows, newCols)
+                .clear({ clearAll: true, keepBorders: true })
+                .borderLeft(null)
+                .borderBottom(null)
+                .borderRight(null);
+            // The apparent nonsense with the borders is necessary so that we correctly sync the
+            // borderTop of the first newly added row with the borderBottom of the row above
+            // it. Borders are a PITA.
+            for (let i = 0; i < newCols; ++i) {
+                let r = this.range(oldRows - 1, i, 1, 1);
+                r.borderBottom(r.borderBottom());
+            }
             this._filteredRows.value(oldRows, newRows - 1, false);
         }
         if (newCols > oldCols) {
-            this.range(0, oldCols, newRows, newCols - oldCols).clear();
+            this.range(0, oldCols, newRows, newCols - oldCols)
+                .clear({ clearAll: true, keepBorders: true })
+                .borderTop(null)
+                .borderRight(null)
+                .borderBottom(null);
+            // See comment above; this is about syncing borderLeft of the newly added column
+            // with the borderRight of the last existing column.
+            for (let i = 0; i < newRows; ++i) {
+                let r = this.range(i, oldCols - 1, 1, 1);
+                r.borderRight(r.borderRight());
+            }
         }
         this.triggerChange({ layout: true });
     }
@@ -15620,16 +15625,6 @@ function Borders() {
     let horiz = new Container();
     let vert = new Container();
     function add(cell, sheet) {
-        if (sheet) {
-            // reset borders here; the propertybag doesn't keep track of merged cells :-/ this
-            // is ugly, but the inner details of data storage have leaked everywhere anyway.
-            let pb = sheet._properties;
-            let grid = sheet._grid;
-            cell.borderLeft = pb.get("vBorders", grid.index(cell.row, cell.col));
-            cell.borderRight = pb.get("vBorders", grid.index(cell.row, cell.col + cell.colspan));
-            cell.borderTop = pb.get("hBorders", grid.index(cell.row, cell.col));
-            cell.borderBottom = pb.get("hBorders", grid.index(cell.row + cell.rowspan, cell.col));
-        }
         if (cell.borderLeft) {
             addVert(cell.row, cell.col, cell.borderLeft,
                     cell.left, cell.top, cell.bottom);
@@ -15649,7 +15644,7 @@ function Borders() {
     }
 
     function isUnwantedProp(propName){
-        return propName === '__proto__' || propName === 'constructor' || propName === 'prototype' 
+        return propName === '__proto__' || propName === 'constructor' || propName === 'prototype';
     }
 
     function addVert(row, col, border, x, top, bottom) {
@@ -21027,7 +21022,7 @@ async function readWorkbook(zip, workbook, progress) {
                 let name = attrs.name;
                 if (name !== "_xlnm._FilterDatabase") {
                     if (sheet) {
-                        name = "'" + sheet.replace(/\'/g, "\\'") + "'!" + name;
+                        name = "'" + sheet.replace(/\\/g, "\\\\").replace(/\'/g, "\\'") + "'!" + name;
                     }
                     withErrorLog(sheet, null, function() {
                         workbook.defineName(name, text, bool(attrs.hidden));

package/dist/index.js

@@ -22,7 +22,7 @@
         if (/^[a-z_][a-z0-9_]*$/i.test(sheet)) {
             return sheet;
         }
-        return "'" + sheet.replace(/\x27/g, "\\'") + "'";
+        return "'" + sheet.replace(/\\/g, "\\\\").replace(/\x27/g, "\\'") + "'";
     }
     function displayRef(sheet, row, col, rel) {
         let aa = "";
@@ -5722,7 +5722,7 @@
             if (/^[a-z_][a-z0-9_]*$/i.test(val)) {
                 return val;
             }
-            return "'" + val.replace(/\x27/g, "\\'") + "'";
+            return "'" + val.replace(/\\/g, "\\\\").replace(/\x27/g, "\\'") + "'";
         }
     }
 
@@ -7838,8 +7838,10 @@
         { property: ValueProperty, name: "value", value: null, sortable: true, serializable: true, depends: "format" },
         { property: Property, name: "formula", value: null, sortable: true, serializable: true },
         { property: Property, name: "background", value: null, sortable: true, serializable: true },
-        { property: JsonProperty, name: "vBorders", value: null, sortable: false, serializable: false },
-        { property: JsonProperty, name: "hBorders", value: null, sortable: false, serializable: false },
+        { property: JsonProperty, name: "borderLeft", value: null, sortable: false, serializable: true },
+        { property: JsonProperty, name: "borderRight", value: null, sortable: false, serializable: true },
+        { property: JsonProperty, name: "borderTop", value: null, sortable: false, serializable: true },
+        { property: JsonProperty, name: "borderBottom", value: null, sortable: false, serializable: true },
         { property: JsonProperty, name: "dBorders", value: null, sortable: false, serializable: true },
         { property: Property, name: "color", value: null, sortable: true, serializable: true },
         { property: Property, name: "fontFamily", value: null, sortable: true, serializable: true },
@@ -7938,44 +7940,41 @@
             if (index === undefined) {
                 return this.lists[name];
             }
-
-            switch (name) {
-            case "borderRight":
-                index += this.rowCount;
-                /* falls through */
-            case "borderLeft":
-                name = "vBorders";
-                break;
-
-            case "borderBottom":
-                index++;
-                /* falls through */
-            case "borderTop":
-                name = "hBorders";
-                break;
-            }
             return index > this.cellCount ? null : this.properties[name].get(index);
         }
 
         set(name, start, end, value) {
+            this._set(name, start, end, value);
             switch (name) {
-            case "borderRight":
-                start += this.rowCount;
-                end += this.rowCount;
-                /* falls through */
-            case "borderLeft":
-                name = "vBorders";
+              case "borderLeft":
+                this._set("borderRight", start - this.rowCount, end - this.rowCount, value);
                 break;
-
-            case "borderBottom":
-                start++;
-                end++;
-                /* falls through */
-            case "borderTop":
-                name = "hBorders";
+              case "borderRight":
+                this._set("borderLeft", start + this.rowCount, end + this.rowCount, value);
+                break;
+              case "borderTop":
+                intervals(start, end, this.rowCount).forEach((a) => {
+                    var start = a[0] - 1, end = a[1] - 1;
+                    if ((start + 1) % this.rowCount == 0) {
+                        start++;
+                    }
+                    this._set("borderBottom", start, end, value);
+                });
+                break;
+              case "borderBottom":
+                intervals(start, end, this.rowCount).forEach((a) => {
+                    var start = a[0] + 1, end = a[1] + 1;
+                    if (end % this.rowCount == 0) {
+                        end--;
+                    }
+                    this._set("borderTop", start, end, value);
+                });
                 break;
             }
-            if (start <= end && end <= this.cellCount) {
+        }
+
+        _set(name, start, end, value) {
+            if (start >= 0 && start <= end && end <= this.cellCount) {
                 this.properties[name].set(start, end, value);
             }
         }
@@ -7983,19 +7982,12 @@
         fromJSON(index, value) {
             for (let si = 0; si < this.specs.length; si++) {
                 let spec = this.specs[si];
-
                 if (spec.serializable) {
                     if (value[spec.name] !== undefined) {
                         this.set(spec.name, index, index, value[spec.name], false);
                     }
                 }
             }
-
-            [ "borderLeft", "borderRight", "borderTop", "borderBottom" ].forEach(function(b) {
-                if (value[b] !== undefined) {
-                    this.set(b, index, index, value[b]);
-                }
-            }, this);
         }
 
         copy(sourceStart, sourceEnd, targetStart) {
@@ -8034,18 +8026,8 @@
 
         forEach(start, end, callback) {
             let iterators = this.iterators(start, end);
-            let hBorders = this.iterator("hBorders", start, end + 1);
-            let leftBorders = this.iterator("vBorders", start, end);
-            let rightBorders = this.iterator("vBorders", start + this.rowCount, end + this.rowCount);
             let values, index;
 
-            function addBorder(name, iterator, index) {
-                let val = iterator.at(index);
-                if (val !== iterator.value) {
-                    values[name] = val;
-                }
-            }
-
             for (index = start; index <= end; index++) {
                 values = {};
 
@@ -8058,13 +8040,6 @@
                     }
                 }
 
-                addBorder("borderLeft", leftBorders, index);
-                addBorder("borderRight", rightBorders, index + this.rowCount);
-                addBorder("borderTop", hBorders, index);
-                if ((index + 1) % this.rowCount) {
-                    addBorder("borderBottom", hBorders, index + 1);
-                }
-
                 callback(values);
             }
         }
@@ -8075,6 +8050,15 @@
             }
         }
     }
+    function intervals(start, end, rows) {
+        var a = [];
+        while (start <= end) {
+            var lastrow = Math.min(end, rows * (1 + Math.floor(start / rows)) - 1);
+            a.push([ start, lastrow ]);
+            start = lastrow + 1;
+        }
+        return a;
+    }
     function cloneFormulaValue(x) {
         x = x.clone();
         x.value = x.value.deepClone(); // x.value is Formula or Validation
@@ -9332,7 +9316,7 @@
                 if (ref instanceof RangeRef && ref.width() > 1) {
                     ref = ref.clone();
                     ref.topLeft.col++;
-                    this._sheet.range(ref)._set("vBorders", value);
+                    this._sheet.range(ref).borderLeft(value);
                 }
             }, this);
             return this;
@@ -9343,7 +9327,7 @@
                 if (ref instanceof RangeRef && ref.height() > 1) {
                     ref = ref.clone();
                     ref.topLeft.row++;
-                    this._sheet.range(ref)._set("hBorders", value);
+                    this._sheet.range(ref).borderTop(value);
                 }
             }, this);
             return this;
@@ -12676,7 +12660,7 @@
     }
 
     /* eslint-disable max-params */
-     
+
 
     // This is a “dynamic variable” (see Greenspun's 10th rule).  It's
     // bound to an array via sheet._saveModifiedFormulas (which see)
@@ -12931,11 +12915,32 @@
             this._properties._resize(newRows, newCols);
             this._sheetRef = this._grid.normalize(SHEETREF);
             if (newRows > oldRows) {
-                this.range(oldRows, 0, newRows - oldRows, newCols).clear();
+                this.range(oldRows, 0, newRows - oldRows, newCols)
+                    .clear({ clearAll: true, keepBorders: true })
+                    .borderLeft(null)
+                    .borderBottom(null)
+                    .borderRight(null);
+                // The apparent nonsense with the borders is necessary so that we correctly sync the
+                // borderTop of the first newly added row with the borderBottom of the row above
+                // it. Borders are a PITA.
+                for (let i = 0; i < newCols; ++i) {
+                    let r = this.range(oldRows - 1, i, 1, 1);
+                    r.borderBottom(r.borderBottom());
+                }
                 this._filteredRows.value(oldRows, newRows - 1, false);
             }
             if (newCols > oldCols) {
-                this.range(0, oldCols, newRows, newCols - oldCols).clear();
+                this.range(0, oldCols, newRows, newCols - oldCols)
+                    .clear({ clearAll: true, keepBorders: true })
+                    .borderTop(null)
+                    .borderRight(null)
+                    .borderBottom(null);
+                // See comment above; this is about syncing borderLeft of the newly added column
+                // with the borderRight of the last existing column.
+                for (let i = 0; i < newRows; ++i) {
+                    let r = this.range(i, oldCols - 1, 1, 1);
+                    r.borderRight(r.borderRight());
+                }
             }
             this.triggerChange({ layout: true });
         }
@@ -15621,16 +15626,6 @@
         let horiz = new Container();
         let vert = new Container();
         function add(cell, sheet) {
-            if (sheet) {
-                // reset borders here; the propertybag doesn't keep track of merged cells :-/ this
-                // is ugly, but the inner details of data storage have leaked everywhere anyway.
-                let pb = sheet._properties;
-                let grid = sheet._grid;
-                cell.borderLeft = pb.get("vBorders", grid.index(cell.row, cell.col));
-                cell.borderRight = pb.get("vBorders", grid.index(cell.row, cell.col + cell.colspan));
-                cell.borderTop = pb.get("hBorders", grid.index(cell.row, cell.col));
-                cell.borderBottom = pb.get("hBorders", grid.index(cell.row + cell.rowspan, cell.col));
-            }
             if (cell.borderLeft) {
                 addVert(cell.row, cell.col, cell.borderLeft,
                         cell.left, cell.top, cell.bottom);
@@ -15650,7 +15645,7 @@
         }
 
         function isUnwantedProp(propName){
-            return propName === '__proto__' || propName === 'constructor' || propName === 'prototype' 
+            return propName === '__proto__' || propName === 'constructor' || propName === 'prototype';
         }
 
         function addVert(row, col, border, x, top, bottom) {
@@ -21028,7 +21023,7 @@
                     let name = attrs.name;
                     if (name !== "_xlnm._FilterDatabase") {
                         if (sheet) {
-                            name = "'" + sheet.replace(/\'/g, "\\'") + "'!" + name;
+                            name = "'" + sheet.replace(/\\/g, "\\\\").replace(/\'/g, "\\'") + "'!" + name;
                         }
                         withErrorLog(sheet, null, function() {
                             workbook.defineName(name, text, bool(attrs.hidden));

package/package.json

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