@trebco/treb 29.1.4 → 29.1.6

package/package.json

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

package/treb-base-types/src/import.ts

@@ -65,6 +65,8 @@ export interface ImportedSheetData {
   sheet_style?: number;
   column_styles?: number[];
 
+  row_styles?: number[];
+
   // new
   annotations?: AnchoredAnnotation[];
 

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

@@ -2834,6 +2834,16 @@ export class Sheet {
       }
     }
 
+    // and row styles...
+    
+    if (data.row_styles) {
+      for (const [row, style] of data.row_styles.entries()) {
+        if (style) {
+          this.UpdateAreaStyle(new Area({ row, column: Infinity }), styles[style]);
+        }
+      }
+    }
+
     // this.cells.FromJSON(cell_data);
     this.cells.FromJSON(data.cells);
     if (data.name) {

package/treb-export/src/import2.ts

@@ -506,6 +506,7 @@ export class Importer {
     const merges: RangeType[] = [];
     const conditional_formats: ConditionalFormat[] = [];
     const links: HyperlinkType[] = [];
+    const row_styles: number[] = []; // may be sparse
     const validations: Array<{
       address: ICellAddress,
       validation: DataValidation,
@@ -696,6 +697,13 @@ export class Importer {
         }
       }
 
+      if (row.a$?.s) {
+        const style_reference = Number(row.a$?.s);
+        if (!isNaN(style_reference)) {
+          row_styles[row_index - 1] = style_reference;
+        }
+      }
+
       // if there's a height which is not === default height, but 
       // the customHeight attribute is not set, then it's been auto-sized.
       // not sure that's something we need to care about necessarily...
@@ -1162,6 +1170,7 @@ export class Importer {
       default_column_width,
       column_widths,
       row_heights,
+      row_styles,
       annotations,
       conditional_formats,
       styles: this.workbook?.style_cache?.CellXfToStyles() || [],

package/treb-grid/src/render/tile_renderer.ts

@@ -594,16 +594,11 @@ export class TileRenderer {
 
     const scale = this.layout.dpr;
 
-    // const render_list: Array<{row: number, column: number, cell: Cell}> = [];
-
-    // this.last_font = undefined;
     context.setTransform(scale, 0, 0, scale, 0, 0);
 
     let left = 0;
     let top = 0;
 
-    // console.info('r', tile.first_cell);
-
     for (let column = tile.first_cell.column; column <= tile.last_cell.column; column++) {
       const width = this.layout.ColumnWidth(column);
       if (!width) continue;
@@ -1126,7 +1121,6 @@ export class TileRenderer {
     // (moved to sheet, using numpad naming)
 
     const numpad = this.view.active_sheet.SurroundingStyle(address, this.theme.table);
-    
 
     // --- start with fills ----------------------------------------------------
 
@@ -1253,7 +1247,7 @@ export class TileRenderer {
     // paint right border?
 
     if (numpad[6].border_left) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[4].border_left_fill, 1);
+      context.fillStyle = ThemeColor2(this.theme, numpad[6].border_left_fill, 1);
       context.fillRect(left + width - 1, top - 1, 1, height + 1);
     }
 

package/treb-grid/src/types/grid.ts

@@ -972,8 +972,7 @@ export class Grid extends GridBase {
     this.model.named.Reset();
     // this.model.named_ranges.Reset();
     // this.model.named_expressions.clear();
-
-    console.info({IDX: import_data.named});
+    // console.info({IDX: import_data.named});
 
     if (import_data.named) {
       this.model.UnserializeComposite(import_data.named, this.active_sheet);