@trebco/treb 29.5.1 → 29.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "29.5.1",
+  "version": "29.5.4",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {

package/treb-data-model/src/serialize_options.ts

@@ -74,4 +74,9 @@ export interface SerializeOptions {
    */
   export_functions?: boolean;
 
+  /**
+   * @internal
+   */
+  apply_row_pattern?: boolean;
+
 }

package/treb-data-model/src/sheet.ts

@@ -2519,8 +2519,6 @@ export class Sheet {
 
     // same here (note broken naming)
     const sheet_style = JSON.parse(JSON.stringify(this.sheet_style));
-    // const row_style = JSON.parse(JSON.stringify(this.row_styles));
-    // const column_style = JSON.parse(JSON.stringify(this.column_styles));
     const row_pattern = JSON.parse(JSON.stringify(this.row_pattern));
 
     // row and column styles are Record<number, props> and not arrays.
@@ -2545,13 +2543,36 @@ export class Sheet {
       }
     }
 
-    for (const key of Object.keys(this.row_styles)) {
-      const index = Number(key);
-      const style = this.row_styles[index];
-      if (style) {
-        const reference = StyleToRef(style);
+    if (this.row_pattern && this.row_pattern.length && options.apply_row_pattern) {
+
+      let count = this.rows + 1;
+
+      for (const key of Object.keys(this.row_styles)) {
+        const index = Number(key);
+        if (!isNaN(index) && index >= count) { count = index + 1; }
+      }
+
+      for (let i = 0; i< count; i++) {
+        const pattern = this.row_pattern[i % this.row_pattern.length];
+        const style = this.row_styles[i] || {}; 
+        const composite = Style.Composite([pattern, style]);      
+        const reference = StyleToRef(composite);
+
         if (reference) {
-          row_style[index] = reference;
+          row_style[i] = reference;
+        }
+      }
+      
+    }
+    else {
+      for (const key of Object.keys(this.row_styles)) {
+        const index = Number(key);
+        const style = this.row_styles[index];
+        if (style) {
+          const reference = StyleToRef(style);
+          if (reference) {
+            row_style[index] = reference;
+          }
         }
       }
     }

package/treb-embed/src/embedded-spreadsheet.ts

@@ -2822,6 +2822,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
           tables: true,
           share_resources: false,
           export_functions: true,
+          apply_row_pattern: true, // if there's a row pattern, set it on rows so they export properly
         });
 
         // why do _we_ put this in, instead of the grid method? 

package/treb-export/src/export.ts

@@ -296,7 +296,7 @@ export class Exporter {
       if (edge.rgba) {
         return { rgb: edge.rgba };
       }
-      if (edge.theme) {
+      if (typeof edge.theme !== 'undefined') {
         return {
           theme: edge.theme,
           tint: edge.tint,
@@ -393,6 +393,8 @@ export class Exporter {
 
     };
 
+    // console.info({style_cache});
+
     const fonts: DOMContent[] = style_cache.fonts.map(font => {
 
       return {
@@ -413,7 +415,7 @@ export class Exporter {
 
         color: font.color_argb ? {
           a$: { rgb: font.color_argb },
-        } : font.color_theme ? {
+        } : (typeof font.color_theme !== 'undefined') ? {
           a$: { 
             theme: font.color_theme,
             tint: font.color_tint,
@@ -501,6 +503,8 @@ export class Exporter {
     };
 
     const xml = XMLDeclaration + this.xmlbuilder1.build(dom);
+    // console.info(xml);
+
     this.zip?.Set('xl/styles.xml', xml);
 
   }
@@ -607,9 +611,13 @@ export class Exporter {
 
     const list: CellStyle[] = [sheet.sheet_style];
 
+    /*
+    // should apply to rows, not cells 
+
     if (sheet.row_pattern && sheet.row_pattern.length) {
       list.push(sheet.row_pattern[row % sheet.row_pattern.length]);
     }
+    */
 
     // is this backwards, vis a vis our rendering? I think it might be...
     // YES: should be row pattern -> row -> column -> cell [corrected]

package/treb-export/src/workbook-style2.ts

@@ -274,6 +274,10 @@ export class StyleCache {
         symbolic_name: composite.number_format, // for reference later
       };
 
+      if (/Scientific/i.test(composite.number_format)) {
+        options.number_format.format = '0.00E+00'
+      }
+
     }
 
 
@@ -305,6 +309,7 @@ export class StyleCache {
     //}
 
     if (composite.text) {
+
       if (IsHTMLColor(composite.text)) {
         font.color_argb = composite.text.text;
       }