ooxml-core 1.8.1 → 1.8.3

package/dist/automation/index.cjs

@@ -16570,10 +16570,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color2 ? `<a:solidFill>${drawingColorXml(color2)}</a:solidFill>` : void 0;
         let spPr = first(point2, "spPr", NS.c);
         if (!xml) {
-          let paint2 = fillElementOf(spPr);
-          while (paint2 && spPr) {
-            spPr.removeChild(paint2);
-            paint2 = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint2 = fillElementOf(spPr); paint2; paint2 = fillElementOf(spPr)) {
+              spPr.removeChild(paint2);
+            }
           }
           continue;
         }
@@ -18312,7 +18312,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -21546,7 +21546,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -30146,8 +30146,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection2.sheet || void 0;
   const allow = new Set(protection2.allow ?? []);
   if (protection2.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name3 of allow) values2[name3] = false;
   return el3("sheetProtection", values2);
@@ -33196,6 +33196,7 @@ function sortRows2(sheet, range2, keys, hasHeader) {
   const sortKeys2 = keys.length ? keys : [{ col: r.start.col }];
   const rows = [];
   for (let row3 = firstRow; row3 <= lastRow; row3++) {
+    if (sheet.rowInfo.get(row3)?.hidden) continue;
     const cells3 = /* @__PURE__ */ new Map();
     for (const [col, cell] of sheet.rows.get(row3) ?? [])
       if (col >= r.start.col && col <= r.end.col) cells3.set(col, cell);
@@ -33213,9 +33214,9 @@ function sortRows2(sheet, range2, keys, hasHeader) {
     return 0;
   });
   for (const { row: row3, cells: cells3 } of rows) for (const col of cells3.keys()) deleteCell(sheet, row3, col);
-  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, firstRow + i2])));
+  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, rows[i2].row])));
   sorted2.forEach((source2, i2) => {
-    const row3 = firstRow + i2;
+    const row3 = rows[i2].row;
     const dRow = row3 - source2.row;
     for (const [col, cell] of source2.cells) {
       if (cell.formula !== void 0 && dRow) {

package/dist/automation/index.mjs

@@ -16564,10 +16564,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color2 ? `<a:solidFill>${drawingColorXml(color2)}</a:solidFill>` : void 0;
         let spPr = first(point2, "spPr", NS.c);
         if (!xml) {
-          let paint2 = fillElementOf(spPr);
-          while (paint2 && spPr) {
-            spPr.removeChild(paint2);
-            paint2 = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint2 = fillElementOf(spPr); paint2; paint2 = fillElementOf(spPr)) {
+              spPr.removeChild(paint2);
+            }
           }
           continue;
         }
@@ -18306,7 +18306,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -21540,7 +21540,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -30140,8 +30140,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection2.sheet || void 0;
   const allow = new Set(protection2.allow ?? []);
   if (protection2.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name3 of allow) values2[name3] = false;
   return el3("sheetProtection", values2);
@@ -33190,6 +33190,7 @@ function sortRows2(sheet, range2, keys, hasHeader) {
   const sortKeys2 = keys.length ? keys : [{ col: r.start.col }];
   const rows = [];
   for (let row3 = firstRow; row3 <= lastRow; row3++) {
+    if (sheet.rowInfo.get(row3)?.hidden) continue;
     const cells3 = /* @__PURE__ */ new Map();
     for (const [col, cell] of sheet.rows.get(row3) ?? [])
       if (col >= r.start.col && col <= r.end.col) cells3.set(col, cell);
@@ -33207,9 +33208,9 @@ function sortRows2(sheet, range2, keys, hasHeader) {
     return 0;
   });
   for (const { row: row3, cells: cells3 } of rows) for (const col of cells3.keys()) deleteCell(sheet, row3, col);
-  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, firstRow + i2])));
+  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, rows[i2].row])));
   sorted2.forEach((source2, i2) => {
-    const row3 = firstRow + i2;
+    const row3 = rows[i2].row;
     const dRow = row3 - source2.row;
     for (const [col, cell] of source2.cells) {
       if (cell.formula !== void 0 && dRow) {

package/dist/teams/index.cjs

@@ -3935,10 +3935,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color ? `<a:solidFill>${drawingColorXml(color)}</a:solidFill>` : void 0;
         let spPr = first(point, "spPr", NS.c);
         if (!xml) {
-          let paint = fillElementOf(spPr);
-          while (paint && spPr) {
-            spPr.removeChild(paint);
-            paint = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint = fillElementOf(spPr); paint; paint = fillElementOf(spPr)) {
+              spPr.removeChild(paint);
+            }
           }
           continue;
         }
@@ -7961,7 +7961,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -11087,7 +11087,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -19629,8 +19629,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection.sheet || void 0;
   const allow = new Set(protection.allow ?? []);
   if (protection.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name of allow) values2[name] = false;
   return el("sheetProtection", values2);

package/dist/teams/index.mjs

@@ -3908,10 +3908,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color ? `<a:solidFill>${drawingColorXml(color)}</a:solidFill>` : void 0;
         let spPr = first(point, "spPr", NS.c);
         if (!xml) {
-          let paint = fillElementOf(spPr);
-          while (paint && spPr) {
-            spPr.removeChild(paint);
-            paint = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint = fillElementOf(spPr); paint; paint = fillElementOf(spPr)) {
+              spPr.removeChild(paint);
+            }
           }
           continue;
         }
@@ -7934,7 +7934,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -11060,7 +11060,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -19602,8 +19602,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection.sheet || void 0;
   const allow = new Set(protection.allow ?? []);
   if (protection.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name of allow) values2[name] = false;
   return el("sheetProtection", values2);

package/dist/visio/ui/index.cjs

@@ -29385,7 +29385,9 @@ function step2(density, spacing, zoom) {
   if (density === 0 && spacing > 0) return spacing;
   const level = Math.max(-6, Math.min(6, Math.floor(Math.log2(zoom > 0 ? zoom : 1) + 1e-9)));
   let value = base2 / 2 ** level;
-  while (spacing > 0 && value < spacing - 1e-9) value *= 2;
+  if (spacing > 0) {
+    while (value < spacing - 1e-9) value *= 2;
+  }
   return value;
 }
 function visioGridSteps(page, zoom = 1) {

package/dist/visio/ui/index.mjs

@@ -29379,7 +29379,9 @@ function step2(density, spacing, zoom) {
   if (density === 0 && spacing > 0) return spacing;
   const level = Math.max(-6, Math.min(6, Math.floor(Math.log2(zoom > 0 ? zoom : 1) + 1e-9)));
   let value = base2 / 2 ** level;
-  while (spacing > 0 && value < spacing - 1e-9) value *= 2;
+  if (spacing > 0) {
+    while (value < spacing - 1e-9) value *= 2;
+  }
   return value;
 }
 function visioGridSteps(page, zoom = 1) {

package/dist/visio/ui/ruler-grid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ruler-grid.d.ts","sourceRoot":"","sources":["../../../visio/ui/ruler-grid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEvE,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B;oBAC7B,CAAC;oBAAS,MAAM;;oBAChB,CAAC;oBAAS,QAAQ;;oBAClB,CAAC;oBAAS,QAAQ;;oBAClB,CAAC;oBAAS,OAAO;EAChB,CAAC;AACZ,eAAO,MAAM,2BAA2B;oBAC9B,EAAE;oBAAS,MAAM;;oBACjB,EAAE;oBAAS,QAAQ;;oBACnB,CAAC;oBAAS,QAAQ;EACjB,CAAC;AAEZ,kGAAkG;AAClG,MAAM,WAAW,cAAc;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CAChB;AAiBD,wBAAgB,cAAc,CAC7B,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;CAAE,EAC3C,IAAI,SAAI,GACN,cAAc,CAQhB;AAED,yGAAyG;AACzG,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED,wCAAwC;AACxC,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACtC,eAAe,EACb,eAAe,GACf,eAAe,GACf,cAAc,GACd,cAAc,GACd,cAAc,GACd,cAAc,GACd,cAAc,GACd,cAAc,GACd,aAAa,GACb,aAAa,CACf,CAAC;AAcF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,oBAAoB,CAG1E;AAED,gGAAgG;AAChG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,oBAAoB,GAAG,SAAS,EAAE,CAW9F"}
+{"version":3,"file":"ruler-grid.d.ts","sourceRoot":"","sources":["../../../visio/ui/ruler-grid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEvE,2DAA2D;AAC3D,eAAO,MAAM,0BAA0B;oBAC7B,CAAC;oBAAS,MAAM;;oBAChB,CAAC;oBAAS,QAAQ;;oBAClB,CAAC;oBAAS,QAAQ;;oBAClB,CAAC;oBAAS,OAAO;EAChB,CAAC;AACZ,eAAO,MAAM,2BAA2B;oBAC9B,EAAE;oBAAS,MAAM;;oBACjB,EAAE;oBAAS,QAAQ;;oBACnB,CAAC;oBAAS,QAAQ;EACjB,CAAC;AAEZ,kGAAkG;AAClG,MAAM,WAAW,cAAc;IAC9B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CAChB;AAmBD,wBAAgB,cAAc,CAC7B,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;CAAE,EAC3C,IAAI,SAAI,GACN,cAAc,CAQhB;AAED,yGAAyG;AACzG,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED,wCAAwC;AACxC,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACtC,eAAe,EACb,eAAe,GACf,eAAe,GACf,cAAc,GACd,cAAc,GACd,cAAc,GACd,cAAc,GACd,cAAc,GACd,cAAc,GACd,aAAa,GACb,aAAa,CACf,CAAC;AAcF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,oBAAoB,CAG1E;AAED,gGAAgG;AAChG,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,oBAAoB,GAAG,SAAS,EAAE,CAW9F"}

package/dist/xlsx/edit/sort.d.ts

@@ -10,7 +10,7 @@ export interface SortKey {
  * text compares case-insensitively.
  */
 export declare function compareCellValues(a: CellValue, b: CellValue, descending?: boolean): number;
-/** Sorts rows of a range in place (no undo step). Exported for the auto-filter sort. */
+/** Sorts visible rows in place, leaving hidden rows untouched. Used by the auto-filter sort. */
 export declare function sortRows(sheet: Worksheet, range: CellRange, keys: SortKey[], hasHeader: boolean): void;
 /** Sorts the rows of `range` by `keys` (absolute column indices), stable, header kept in place. */
 export declare function sortRange(ctx: EditContext, s: number, range: CellRange, keys: SortKey[], hasHeader: boolean): void;

package/dist/xlsx/edit/sort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../xlsx/edit/sort.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAmC,MAAM,YAAY,CAAC;AAE7E,OAAO,KAAK,EAAQ,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAAW,MAAM,WAAW,CAAC;AAItD,MAAM,WAAW,OAAO;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAeD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,UAAQ,GAAG,MAAM,CAaxF;AAED,wFAAwF;AACxF,wBAAgB,QAAQ,CACvB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,SAAS,EAAE,OAAO,GAChB,IAAI,CAiDN;AAsBD,mGAAmG;AACnG,wBAAgB,SAAS,CACxB,GAAG,EAAE,WAAW,EAChB,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,SAAS,EAAE,OAAO,GAChB,IAAI,CAUN"}
+{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../xlsx/edit/sort.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAmC,MAAM,YAAY,CAAC;AAE7E,OAAO,KAAK,EAAQ,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,KAAK,WAAW,EAAW,MAAM,WAAW,CAAC;AAItD,MAAM,WAAW,OAAO;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAeD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,UAAQ,GAAG,MAAM,CAaxF;AAED,gGAAgG;AAChG,wBAAgB,QAAQ,CACvB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,SAAS,EAAE,OAAO,GAChB,IAAI,CAkDN;AAsBD,mGAAmG;AACnG,wBAAgB,SAAS,CACxB,GAAG,EAAE,WAAW,EAChB,CAAC,EAAE,MAAM,EACT,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,SAAS,EAAE,OAAO,GAChB,IAAI,CAUN"}

package/dist/xlsx/index.cjs

@@ -3561,7 +3561,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -6795,7 +6795,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -21950,10 +21950,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color ? `<a:solidFill>${drawingColorXml(color)}</a:solidFill>` : void 0;
         let spPr = first(point, "spPr", NS.c);
         if (!xml) {
-          let paint = fillElementOf(spPr);
-          while (paint && spPr) {
-            spPr.removeChild(paint);
-            paint = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint = fillElementOf(spPr); paint; paint = fillElementOf(spPr)) {
+              spPr.removeChild(paint);
+            }
           }
           continue;
         }
@@ -24347,8 +24347,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection.sheet || void 0;
   const allow = new Set(protection.allow ?? []);
   if (protection.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name of allow) values2[name] = false;
   return el("sheetProtection", values2);
@@ -27397,6 +27397,7 @@ function sortRows2(sheet, range, keys, hasHeader) {
   const sortKeys2 = keys.length ? keys : [{ col: r.start.col }];
   const rows = [];
   for (let row2 = firstRow; row2 <= lastRow; row2++) {
+    if (sheet.rowInfo.get(row2)?.hidden) continue;
     const cells = /* @__PURE__ */ new Map();
     for (const [col, cell] of sheet.rows.get(row2) ?? [])
       if (col >= r.start.col && col <= r.end.col) cells.set(col, cell);
@@ -27414,9 +27415,9 @@ function sortRows2(sheet, range, keys, hasHeader) {
     return 0;
   });
   for (const { row: row2, cells } of rows) for (const col of cells.keys()) deleteCell(sheet, row2, col);
-  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, firstRow + i2])));
+  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, rows[i2].row])));
   sorted2.forEach((source2, i2) => {
-    const row2 = firstRow + i2;
+    const row2 = rows[i2].row;
     const dRow = row2 - source2.row;
     for (const [col, cell] of source2.cells) {
       if (cell.formula !== void 0 && dRow) {

package/dist/xlsx/index.mjs

@@ -3555,7 +3555,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -6789,7 +6789,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -21944,10 +21944,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color ? `<a:solidFill>${drawingColorXml(color)}</a:solidFill>` : void 0;
         let spPr = first(point, "spPr", NS.c);
         if (!xml) {
-          let paint = fillElementOf(spPr);
-          while (paint && spPr) {
-            spPr.removeChild(paint);
-            paint = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint = fillElementOf(spPr); paint; paint = fillElementOf(spPr)) {
+              spPr.removeChild(paint);
+            }
           }
           continue;
         }
@@ -24341,8 +24341,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection.sheet || void 0;
   const allow = new Set(protection.allow ?? []);
   if (protection.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name of allow) values2[name] = false;
   return el("sheetProtection", values2);
@@ -27391,6 +27391,7 @@ function sortRows2(sheet, range, keys, hasHeader) {
   const sortKeys2 = keys.length ? keys : [{ col: r.start.col }];
   const rows = [];
   for (let row2 = firstRow; row2 <= lastRow; row2++) {
+    if (sheet.rowInfo.get(row2)?.hidden) continue;
     const cells = /* @__PURE__ */ new Map();
     for (const [col, cell] of sheet.rows.get(row2) ?? [])
       if (col >= r.start.col && col <= r.end.col) cells.set(col, cell);
@@ -27408,9 +27409,9 @@ function sortRows2(sheet, range, keys, hasHeader) {
     return 0;
   });
   for (const { row: row2, cells } of rows) for (const col of cells.keys()) deleteCell(sheet, row2, col);
-  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, firstRow + i2])));
+  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source2, i2) => [source2.row, rows[i2].row])));
   sorted2.forEach((source2, i2) => {
-    const row2 = firstRow + i2;
+    const row2 = rows[i2].row;
     const dRow = row2 - source2.row;
     for (const [col, cell] of source2.cells) {
       if (cell.formula !== void 0 && dRow) {

package/dist/xlsx/load/index.cjs

@@ -11827,10 +11827,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color ? `<a:solidFill>${drawingColorXml(color)}</a:solidFill>` : void 0;
         let spPr = first(point, "spPr", NS.c);
         if (!xml) {
-          let paint = fillElementOf(spPr);
-          while (paint && spPr) {
-            spPr.removeChild(paint);
-            paint = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint = fillElementOf(spPr); paint; paint = fillElementOf(spPr)) {
+              spPr.removeChild(paint);
+            }
           }
           continue;
         }
@@ -13344,7 +13344,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -16300,7 +16300,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -22840,8 +22840,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection.sheet || void 0;
   const allow = new Set(protection.allow ?? []);
   if (protection.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name of allow) values2[name] = false;
   return el("sheetProtection", values2);

package/dist/xlsx/load/index.mjs

@@ -11821,10 +11821,10 @@ function patchChartColors(doc, chartNode, model, before) {
         const xml = fill ? drawingFillXml(fill) : color ? `<a:solidFill>${drawingColorXml(color)}</a:solidFill>` : void 0;
         let spPr = first(point, "spPr", NS.c);
         if (!xml) {
-          let paint = fillElementOf(spPr);
-          while (paint && spPr) {
-            spPr.removeChild(paint);
-            paint = fillElementOf(spPr);
+          if (spPr) {
+            for (let paint = fillElementOf(spPr); paint; paint = fillElementOf(spPr)) {
+              spPr.removeChild(paint);
+            }
           }
           continue;
         }
@@ -13338,7 +13338,7 @@ function stack(ctx, args, vertical) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -16294,7 +16294,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -22834,8 +22834,8 @@ function protectionXml2(sheet) {
   values2["sheet"] = protection.sheet || void 0;
   const allow = new Set(protection.allow ?? []);
   if (protection.sheet) {
-    values2["objects"] = allow.has("objects") ? false : true;
-    values2["scenarios"] = allow.has("scenarios") ? false : true;
+    values2["objects"] = !allow.has("objects");
+    values2["scenarios"] = !allow.has("scenarios");
   }
   for (const name of allow) values2[name] = false;
   return el("sheetProtection", values2);

package/dist/xlsx/ui/index.cjs

@@ -3496,7 +3496,7 @@ function stack(ctx, args, vertical2) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows2 = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -6730,7 +6730,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -17049,6 +17049,7 @@ function sortRows2(sheet, range2, keys, hasHeader) {
   const sortKeys2 = keys.length ? keys : [{ col: r.start.col }];
   const rows2 = [];
   for (let row2 = firstRow; row2 <= lastRow; row2++) {
+    if (sheet.rowInfo.get(row2)?.hidden) continue;
     const cells = /* @__PURE__ */ new Map();
     for (const [col, cell] of sheet.rows.get(row2) ?? [])
       if (col >= r.start.col && col <= r.end.col) cells.set(col, cell);
@@ -17066,9 +17067,9 @@ function sortRows2(sheet, range2, keys, hasHeader) {
     return 0;
   });
   for (const { row: row2, cells } of rows2) for (const col of cells.keys()) deleteCell(sheet, row2, col);
-  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source, i2) => [source.row, firstRow + i2])));
+  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source, i2) => [source.row, rows2[i2].row])));
   sorted2.forEach((source, i2) => {
-    const row2 = firstRow + i2;
+    const row2 = rows2[i2].row;
     const dRow = row2 - source.row;
     for (const [col, cell] of source.cells) {
       if (cell.formula !== void 0 && dRow) {

package/dist/xlsx/ui/index.mjs

@@ -3494,7 +3494,7 @@ function stack(ctx, args, vertical2) {
 function flatten(ctx, args) {
   const m = ctx.toMatrix(args[0] ?? null);
   const ignore = intAt(ctx, args, 1) ?? 0;
-  const byCol = intAt(ctx, args, 2) ? true : false;
+  const byCol = Boolean(intAt(ctx, args, 2));
   const values2 = [];
   const rows2 = byCol ? m.cols : m.rows;
   const cols = byCol ? m.rows : m.cols;
@@ -6728,7 +6728,7 @@ function ifFn(args, ctx) {
   const branch = (truthy) => {
     const arg = args[truthy ? 1 : 2];
     if (arg) return arg.get();
-    return truthy ? true : false;
+    return truthy;
   };
   if (cond instanceof Matrix) return elementwise(cond, branch, ctx);
   if (isError(cond)) return cond;
@@ -17047,6 +17047,7 @@ function sortRows2(sheet, range2, keys, hasHeader) {
   const sortKeys2 = keys.length ? keys : [{ col: r.start.col }];
   const rows2 = [];
   for (let row2 = firstRow; row2 <= lastRow; row2++) {
+    if (sheet.rowInfo.get(row2)?.hidden) continue;
     const cells = /* @__PURE__ */ new Map();
     for (const [col, cell] of sheet.rows.get(row2) ?? [])
       if (col >= r.start.col && col <= r.end.col) cells.set(col, cell);
@@ -17064,9 +17065,9 @@ function sortRows2(sheet, range2, keys, hasHeader) {
     return 0;
   });
   for (const { row: row2, cells } of rows2) for (const col of cells.keys()) deleteCell(sheet, row2, col);
-  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source, i2) => [source.row, firstRow + i2])));
+  moveAnnotations(sheet, dataArea, new Map(sorted2.map((source, i2) => [source.row, rows2[i2].row])));
   sorted2.forEach((source, i2) => {
-    const row2 = firstRow + i2;
+    const row2 = rows2[i2].row;
     const dRow = row2 - source.row;
     for (const [col, cell] of source.cells) {
       if (cell.formula !== void 0 && dRow) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ooxml-core",
-	"version": "1.8.1",
+	"version": "1.8.3",
 	"description": "Shared OOXML logic for the Word, PowerPoint and Excel viewers: everything except the UI",
 	"keywords": [
 		"charts",