@trebco/treb 29.3.4 → 29.5.0

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

@@ -25,7 +25,7 @@ import type { ICellAddress,
          CellStyle,
          Theme,
          HorizontalAlign} from 'treb-base-types';
-import { TextPartFlag, Style, ValueType, Area, Rectangle, ThemeColor, ThemeColor2 } from 'treb-base-types';
+import { TextPartFlag, Style, ValueType, Area, Rectangle, ResolveThemeColor, IsDefinedColor } from 'treb-base-types';
 
 import type { Tile } from '../types/tile';
 import { FontMetricsCache as FontMetricsCache2 } from '../util/fontmetrics2';
@@ -307,7 +307,7 @@ export class TileRenderer {
     }
 
     context.setTransform(scale, 0, 0, scale, 0, 0);
-    context.fillStyle = this.theme.headers?.fill ? ThemeColor2(this.theme, this.theme.headers.fill) : '';
+    context.fillStyle = this.theme.headers?.fill ? ResolveThemeColor(this.theme, this.theme.headers.fill) : '';
 
     context.fillRect(0, 0, x, header_size.y);
     context.fillRect(0, 0, header_size.x, y);
@@ -354,7 +354,7 @@ export class TileRenderer {
     context.textBaseline = 'middle';
     context.font = Style.Font(this.theme.headers||{}, this.layout.scale);
 
-    context.fillStyle = ThemeColor2(this.theme, this.theme.headers?.text);
+    context.fillStyle = ResolveThemeColor(this.theme, this.theme.headers?.text);
 
     if (this.view.active_sheet.freeze.rows && this.layout.header_offset.x > 1) {
 
@@ -407,7 +407,7 @@ export class TileRenderer {
       return;
     }
 
-    context.fillStyle = ThemeColor2(this.theme, this.theme.headers?.text, 0);
+    context.fillStyle = ResolveThemeColor(this.theme, this.theme.headers?.text, 0);
 
     context.beginPath();
 
@@ -434,7 +434,7 @@ export class TileRenderer {
       return;
     }
     
-    context.fillStyle = ThemeColor2(this.theme, this.theme.headers?.text, 0);
+    context.fillStyle = ResolveThemeColor(this.theme, this.theme.headers?.text, 0);
     
     context.beginPath();
 
@@ -473,7 +473,7 @@ export class TileRenderer {
         context.textBaseline = 'middle';
         context.font = Style.Font(this.theme.headers||{}, this.layout.scale);
 
-        context.fillStyle = this.theme.headers?.fill ? ThemeColor2(this.theme, this.theme.headers.fill) : '';
+        context.fillStyle = this.theme.headers?.fill ? ResolveThemeColor(this.theme, this.theme.headers.fill) : '';
         context.fillRect(0, 0, tile.logical_size.width, this.layout.header_offset.y);
 
         // context.strokeStyle = this.theme.grid_color || '';
@@ -507,7 +507,7 @@ export class TileRenderer {
 
         const context = tile.getContext('2d', { alpha: false });
         if (!context) continue;
-        context.fillStyle = this.theme.headers?.fill ? ThemeColor2(this.theme, this.theme.headers.fill) : '';
+        context.fillStyle = this.theme.headers?.fill ? ResolveThemeColor(this.theme, this.theme.headers.fill) : '';
 
         context.setTransform(scale, 0, 0, scale, 0, 0);
 
@@ -1065,7 +1065,7 @@ export class TileRenderer {
   protected ResolveColors(style: CellStyle): CellStyle {
 
     const resolved = {...style};
-    resolved.text = { text: ThemeColor2(this.theme, style.text, 1) };
+    resolved.text = { text: ResolveThemeColor(this.theme, style.text, 1) };
 
     // TODO: other colors
 
@@ -1126,7 +1126,7 @@ export class TileRenderer {
 
     // paint top background
 
-    let color = ThemeColor2(this.theme, numpad[8].fill);
+    let color = ResolveThemeColor(this.theme, numpad[8].fill);
     if (color) {
       context.fillStyle = color
       context.fillRect(left + 0, top - 1, width, 1);
@@ -1134,7 +1134,7 @@ export class TileRenderer {
 
     // paint left background
 
-    color = ThemeColor2(this.theme, numpad[4].fill);
+    color = ResolveThemeColor(this.theme, numpad[4].fill);
     if (color) {
       context.fillStyle = color
       context.fillRect(left - 1, top, 1, height);
@@ -1142,7 +1142,7 @@ export class TileRenderer {
 
     // paint our background. note this one goes up, left
 
-    color = ThemeColor2(this.theme, style.fill);
+    color = ResolveThemeColor(this.theme, style.fill);
     if (color) {
       context.fillStyle = color;
       context.fillRect(left - 1, top - 1, width + 1, height + 1);
@@ -1150,7 +1150,7 @@ export class TileRenderer {
 
     // fill of cell to the right
 
-    color = ThemeColor2(this.theme, numpad[6].fill);
+    color = ResolveThemeColor(this.theme, numpad[6].fill);
     if (color) {
       context.fillStyle = color;
       context.fillRect(left + width - 1, top - 1, 1, height + 1);
@@ -1159,7 +1159,7 @@ export class TileRenderer {
 
     // fill of cell underneath
 
-    color = ThemeColor2(this.theme, numpad[2].fill);
+    color = ResolveThemeColor(this.theme, numpad[2].fill);
     if (color) {
       context.fillStyle = color;
       context.fillRect(left - 1, top + height - 1, width + 1, 1);
@@ -1168,54 +1168,54 @@ export class TileRenderer {
     // --- corner borders ------------------------------------------------------
 
     if (numpad[6].border_top && !numpad[6].border_left) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[6].border_top_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[6].border_top_fill, 1);
       context.fillRect(left + width - 1, top - 2 + numpad[6].border_top, 1, 1);
     }
     if (numpad[9].border_left) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[9].border_left_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[9].border_left_fill, 1);
       context.fillRect(left + width - 1, top - 1, 1, 1);
     }
     if (numpad[9].border_bottom) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[9].border_bottom_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[9].border_bottom_fill, 1);
       context.fillRect(left + width - 1, top - 2 + numpad[9].border_bottom, 1, 1);
     }
 
     if (numpad[4].border_top && !numpad[4].border_right) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[4].border_right_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[4].border_right_fill, 1);
       context.fillRect(left - 1, top - 2 + numpad[4].border_top, 1, 1);
     }
     if (numpad[7].border_right) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[7].border_right_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[7].border_right_fill, 1);
       context.fillRect(left - 1, top - 1, 1, 1);
     }
     if (numpad[7].border_bottom) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[7].border_bottom_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[7].border_bottom_fill, 1);
       context.fillRect(left - 1, top - 2 + numpad[7].border_bottom, 1, 1);
     }
 
     if (numpad[6].border_bottom && !numpad[6].border_left) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[6].border_bottom_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[6].border_bottom_fill, 1);
       context.fillRect(left + width - 1, top + height - numpad[6].border_bottom, 1, 1);
     }
     if (numpad[3].border_left) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[3].border_left_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[3].border_left_fill, 1);
       context.fillRect(left + width - 1, top + height - 1, 1, 1);
     }
     if (numpad[3].border_top) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[3].border_top_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[3].border_top_fill, 1);
       context.fillRect(left + width - 1, top + height - numpad[3].border_top, 1, 1);
     }
 
     if (numpad[4].border_bottom && !numpad[4].border_right) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[4].border_bottom_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[4].border_bottom_fill, 1);
       context.fillRect(left - 1, top + height - numpad[4].border_bottom, 1, 1);
     }
     if (numpad[1].border_right) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[1].border_right_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[1].border_right_fill, 1);
       context.fillRect(left - 1, top + height - 1, 1, 1);
     }
     if (numpad[1].border_top) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[1].border_top_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[1].border_top_fill, 1);
       context.fillRect(left - 1, top + height - numpad[1].border_top, 1, 1);
     }
 
@@ -1224,12 +1224,12 @@ export class TileRenderer {
     // paint top border
 
     if (numpad[8].border_bottom) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[8].border_bottom_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[8].border_bottom_fill, 1);
       if (numpad[8].border_bottom === 2) {
         context.fillRect(left - 1, top - 2, width + 1, 1);
         context.fillRect(left - 1, top - 0, width + 1, 1);
-        context.fillStyle = ThemeColor2(this.theme, numpad[8].fill) 
-          || ThemeColor(this.theme, this.theme.grid_cell?.fill) || '#fff';
+        context.fillStyle = ResolveThemeColor(this.theme, numpad[8].fill) 
+          || ResolveThemeColor(this.theme, this.theme.grid_cell?.fill, 0) || '#fff';
         context.fillRect(left - 1, top - 1, width + 1, 1);
       }
       else {
@@ -1240,26 +1240,26 @@ export class TileRenderer {
     // paint left border
 
     if (numpad[4].border_right) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[4].border_right_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[4].border_right_fill, 1);
       context.fillRect(left - 1, top - 1, 1, height + 1);
     }
 
     // paint right border?
 
     if (numpad[6].border_left) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[6].border_left_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[6].border_left_fill, 1);
       context.fillRect(left + width - 1, top - 1, 1, height + 1);
     }
 
     // bottom? (...)
 
     if (numpad[2].border_top) {
-      context.fillStyle = ThemeColor2(this.theme, numpad[2].border_top_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, numpad[2].border_top_fill, 1);
       if (numpad[2].border_top === 2) {
         context.fillRect(left - 1, top + height - 2, width + 1, 1);
         context.fillRect(left - 1, top + height - 0, width + 1, 1);
-        context.fillStyle = ThemeColor2(this.theme, numpad[2].fill) 
-          || ThemeColor(this.theme, this.theme.grid_cell?.fill) || '#fff';
+        context.fillStyle = ResolveThemeColor(this.theme, numpad[2].fill) 
+          || ResolveThemeColor(this.theme, this.theme.grid_cell?.fill, 0) || '#fff';
         context.fillRect(left - 1, top + height - 1, width + 1, 1);
       }
       else {
@@ -1270,12 +1270,12 @@ export class TileRenderer {
     // -- our borders ----------------------------------------------------------
 
     if (style.border_top) {
-      context.fillStyle = ThemeColor2(this.theme, style.border_top_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, style.border_top_fill, 1);
       if (style.border_top === 2) {
         context.fillRect(left - 1, top - 2, width + 1, 1);
         context.fillRect(left - 1, top + 0, width + 1, 1);
-        context.fillStyle = ThemeColor2(this.theme, style.fill) 
-          || ThemeColor(this.theme, this.theme.grid_cell?.fill) || '#fff';
+        context.fillStyle = ResolveThemeColor(this.theme, style.fill) 
+          || ResolveThemeColor(this.theme, this.theme.grid_cell?.fill, 0) || '#fff';
         context.fillRect(left - 1, top - 1, width + 1, 1);
       }
       else {
@@ -1284,22 +1284,22 @@ export class TileRenderer {
     }
 
     if (style.border_left) {
-      context.fillStyle = ThemeColor2(this.theme, style.border_left_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, style.border_left_fill, 1);
       context.fillRect(left - 1, top - 1, 1, height + 1);
     }
 
     if (style.border_right) {
-      context.fillStyle = ThemeColor2(this.theme, style.border_right_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, style.border_right_fill, 1);
       context.fillRect(left + width - 1, top - 1, 1, height + 1);
     }
 
     if (style.border_bottom) {
-      context.fillStyle = ThemeColor2(this.theme, style.border_bottom_fill, 1);
+      context.fillStyle = ResolveThemeColor(this.theme, style.border_bottom_fill, 1);
       if (style.border_bottom === 2) {
         context.fillRect(left - 1, top + height - 2, width + 1, 1);
         context.fillRect(left - 1, top + height + 0, width + 1, 1);
-        context.fillStyle = ThemeColor2(this.theme, style.fill) 
-          || ThemeColor(this.theme, this.theme.grid_cell?.fill) || '#fff';
+        context.fillStyle = ResolveThemeColor(this.theme, style.fill) 
+          || ResolveThemeColor(this.theme, this.theme.grid_cell?.fill, 0) || '#fff';
         context.fillRect(left - 1, top + height - 1, width + 1, 1);
       }
       else {
@@ -1412,14 +1412,14 @@ export class TileRenderer {
     }
     else {
 
-      const fill = ThemeColor2(this.theme, style.fill);
+      const fill = ResolveThemeColor(this.theme, style.fill);
 
       if (fill) {
         context.fillStyle = fill;
         context.fillRect(0, 0, width - 1, height - 1);
       }
       else {
-        context.fillStyle = ThemeColor(this.theme, this.theme.grid_cell?.fill) || '#fff';
+        context.fillStyle = ResolveThemeColor(this.theme, this.theme.grid_cell?.fill, 0) || '#fff';
         context.fillRect(0, 0, width - 1, height - 1);
       }
 
@@ -1578,7 +1578,7 @@ export class TileRenderer {
         width, 
         height);
 
-      context.strokeStyle = context.fillStyle = ThemeColor2(this.theme, style.text, 1);
+      context.strokeStyle = context.fillStyle = ResolveThemeColor(this.theme, style.text, 1);
 
       // there's an issue with theme colors, the function may not be able
       // to translate so we need to update the style (using a copy) to
@@ -1871,10 +1871,11 @@ export class TileRenderer {
     for (const element of overflow_backgrounds) {
 
       if ( element.cell.style?.fill &&
-           (element.cell.style.fill.text || element.cell.style.fill.theme || element.cell.style.fill.theme === 0) &&
+            IsDefinedColor(element.cell.style.fill) &&
+          // (element.cell.style.fill.text || element.cell.style.fill.theme || element.cell.style.fill.theme === 0) &&
           !this.options.grid_over_background) {
         
-        context.fillStyle = ThemeColor(this.theme, element.cell.style.fill);
+        context.fillStyle = ResolveThemeColor(this.theme, element.cell.style.fill, 0);
         context.fillRect(element.grid.left, element.grid.top, element.grid.width, element.grid.height);
       }
       else {
@@ -1894,7 +1895,7 @@ export class TileRenderer {
                 0 );
         }
         else {
-          context.fillStyle = this.theme.grid_cell?.fill ? ThemeColor(this.theme, this.theme.grid_cell.fill) : '';
+          context.fillStyle = this.theme.grid_cell?.fill ? ResolveThemeColor(this.theme, this.theme.grid_cell.fill, 0) : '';
           context.fillRect(element.background.left, element.background.top,
             element.background.width, element.background.height);
         }
@@ -1924,7 +1925,7 @@ export class TileRenderer {
     context.lineWidth = 1;
 
     context.strokeStyle = context.fillStyle =
-      text_data.format ? text_data.format : ThemeColor2(this.theme, style.text, 1);
+      text_data.format ? text_data.format : ResolveThemeColor(this.theme, style.text, 1);
 
     context.beginPath();
 

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

@@ -40,15 +40,15 @@ import {
   ValueType, 
   Localization, 
   IsCellAddress, 
-  ValidationType, 
   LoadThemeProperties,
   DefaultTheme,
   ComplexToString,
   IsComplex,
   TextPartFlag,
+  IsArea,
 } from 'treb-base-types';
 
-import type { ExpressionUnit } from 'treb-parser';
+import type { ExpressionUnit, UnitAddress } from 'treb-parser';
 import { 
   DecimalMarkType, 
   ArgumentSeparatorType, 
@@ -1465,20 +1465,22 @@ export class Grid extends GridBase {
    * and will render as a dropdown; the list can be a list of values or
    * a range reference.
    */
-  public SetValidation(target?: ICellAddress, data?: CellValue[]|IArea, error?: boolean): void {
+  public SetValidation(target?: IArea, data?: CellValue[]|IArea, error?: boolean): void {
 
     if (!target) {
       if (this.primary_selection.empty) {
         throw new Error('invalid target in set validation');
       }
-      target = this.primary_selection.target;
+      target = this.primary_selection.area;
     }
 
+    const area = new Area(target.start, target.end);
+
     // console.info({target, data});
 
     const command: DataValidationCommand = {
       key: CommandKey.DataValidation,
-      area: target,
+      area: { start: area.start, end: area.end },
       error,
     };
     
@@ -1502,9 +1504,11 @@ export class Grid extends GridBase {
     //
 
     if (!this.primary_selection.empty &&
-        (!target.sheet_id || target.sheet_id === this.active_sheet.id) && 
-        (this.primary_selection.target.row === target.row) && 
-        (this.primary_selection.target.column === target.column)) {
+        (!target.start.sheet_id || target.start.sheet_id === this.active_sheet.id) && 
+        area.Contains(this.primary_selection.target)) {
+
+        // (this.primary_selection.target.row === target.start.row) && 
+        // (this.primary_selection.target.column === target.start.column)) {
 
       // console.info('repaint selection');
 
@@ -1743,16 +1747,80 @@ export class Grid extends GridBase {
 
   }
 
+  /**
+   * render the given data as R1C1. the source address is a base for 
+   * rendering relative addresses (is there a case for this method
+   * handling absolute offsets as well? ...)
+   * 
+   * NOTE: this method modifies the input data (at least it does if
+   * it's an array). so this method should only be called with scratchpad
+   * data.
+   * 
+   */
+  public FormatR1C1(data: CellValue|CellValue[][], source: ICellAddress|IArea) {
+
+    // normalize
+
+    if (IsArea(source)) {
+      source = source.start;
+    }
+
+    if (!Array.isArray(data)) {
+      data = [[data]];
+    }
+
+    const base: UnitAddress = {
+      type: 'address',
+      label: '',
+      row: source.row,
+      column: source.column, 
+      sheet: source.sheet_id ? this.model.sheets.Name(source.sheet_id) : this.active_sheet.name,
+      position: 0,
+      id: 0,
+    };
+
+    for (let r = 0; r < data.length; r++) {
+      const row = data[r];
+      for (let c = 0; c < row.length; c++) {
+        const cell = row[c];
+        if (typeof cell === 'string' && cell[0] === '=') {
+
+          const parse_result = this.parser.Parse(cell);
+          if (parse_result.expression) {
+            row[c] = '=' + this.parser.Render(parse_result.expression, {
+              missing: '',
+              r1c1: true,
+              r1c1_base: {
+                ...base,
+                row: source.row + r,
+                column: source.column + c,
+              },
+            });
+          }
+        }
+      }
+    }
+
+    return data;
+    
+  }
+
   /**
    * get data in a given range, optionally formulas
    * API method
    */
-   public GetRange(range: ICellAddress | IArea, type?: 'formula'|'formatted'): CellValue|CellValue[][]|undefined {
+   public GetRange(range: ICellAddress | IArea, type?: 'formatted'|'A1'|'R1C1'): CellValue|CellValue[][]|undefined {
 
     if (IsCellAddress(range)) {
       const sheet = this.model.sheets.Find(range.sheet_id || this.active_sheet.id);
       if (sheet) {
-        if (type === 'formula') { return sheet.cells.RawValue(range); }
+        if (type === 'A1' || type === 'R1C1') { 
+          const data = sheet.cells.RawValue(range); 
+          if (type === 'R1C1') {
+            return this.FormatR1C1(data, range);
+          }
+          return data;
+        }
         if (type === 'formatted') { return sheet.GetFormattedRange(range); }
         return sheet.cells.GetRange(range);
       }
@@ -1761,7 +1829,13 @@ export class Grid extends GridBase {
 
     const sheet = this.model.sheets.Find(range.start.sheet_id || this.active_sheet.id);
     if (sheet) {
-      if (type === 'formula') { return sheet.cells.RawValue(range.start, range.end); }
+      if (type === 'A1' || type === 'R1C1') { 
+        const data = sheet.cells.RawValue(range.start, range.end); 
+        if (type === 'R1C1') {
+          return this.FormatR1C1(data, range);
+        }
+        return data;
+      }
       if (type === 'formatted') { return sheet.GetFormattedRange(range.start, range.end); }
       return sheet.cells.GetRange(range.start, range.end);
     }
@@ -1886,6 +1960,9 @@ export class Grid extends GridBase {
 
       if (!Is2DArray(data)) {
 
+        // we don't allow this anymore (at least we say we don't)
+
+
         // flat array -- we can recycle. recycling is R style (values, not rows).
         // in any event convert to [][]
 
@@ -1917,6 +1994,56 @@ export class Grid extends GridBase {
         }
 
       }
+      else {
+        if (recycle) {
+
+          // recycle 2D array. we'll do this if the target range is a multiple
+          // (or larger) of the source array. in blocks.
+
+          if (range.rows > data.length) {
+            const recycle_rows = Math.floor(range.rows / data.length);
+            if (recycle_rows > 1) {
+              const source = [...data];
+              for (let i = 0; i < recycle_rows; i++) {
+                const clone = JSON.parse(JSON.stringify(source));
+                data.push(...clone);
+              }  
+            }
+          }
+
+          let cols = 0;
+          for (const row of data) {
+            cols = Math.max(cols, row.length);
+          }
+
+          if (range.columns > cols) {
+            const recycle_columns = Math.floor(range.columns / cols);
+            if (recycle_columns > 1) {
+
+              for (const row of data) {
+
+                // pad out all rows first, jic
+                while (row.length < cols) {
+                  row.push(undefined);
+                }
+
+                // now recycle
+                const source = [...row];
+                for (let i = 0; i < recycle_columns; i++) {
+                  const clone = JSON.parse(JSON.stringify(source));
+                  row.push(...clone);
+                }
+
+              }
+
+              // ...
+
+              // console.info({recycle_columns});
+            }
+          }
+
+        }
+      }
 
       if (transpose) { data = this.Transpose(data); }
 
@@ -2221,12 +2348,13 @@ export class Grid extends GridBase {
     // const context = Sheet.measurement_canvas.getContext('2d');
     // if (!context) return;
 
-    let width = 12;
-    const padding = 4 * 2; // FIXME: parameterize
+    let width = 0;
+    const padding = 12; // 4 * 2; // FIXME: parameterize
 
     if (!allow_shrink) width = sheet.GetColumnWidth(column);
 
     for (let row = 0; row < sheet.cells.rows; row++) {
+
       const cell = sheet.CellData({ row, column });
       let text = cell.formatted || '';
       if (typeof text !== 'string') {
@@ -2243,7 +2371,9 @@ export class Grid extends GridBase {
       }
     }
 
-    sheet.SetColumnWidth(column, width);
+    if (width > padding + 2) {
+      sheet.SetColumnWidth(column, width);
+    }
 
   }
 
@@ -4966,15 +5096,19 @@ export class Grid extends GridBase {
 
     }
 
-    if (cell.validation && cell.validation.error) {
+    const validation = this.active_sheet.GetValidation(target)[0];
+
+    // only consider the first result
+
+    if (validation && validation.error) {
       
       let list: CellValue[]|undefined;
       
-      if (cell.validation.type === ValidationType.List) {
-        list = cell.validation.list;
+      if (validation.type === 'list') {
+        list = validation.list;
       }
-      else if (cell.validation.type === ValidationType.Range) {
-        list = this.GetValidationRange(cell.validation.area);
+      else if (validation.type === 'range') {
+        list = this.GetValidationRange(validation.area);
       }
 
       if (list && list.length) {
@@ -6216,15 +6350,19 @@ export class Grid extends GridBase {
       // sync up, so it would be a separate function but called at the
       // same time.
 
-      if (data.validation && !data.style?.locked) {
+      // less true now that they're maintained separately
+      
+      const validation = this.active_sheet.GetValidation(this.primary_selection.target)[0];
+
+      if (validation && !data.style?.locked) {
         
         let list: CellValue[] | undefined;
         
-        if (data.validation.type === ValidationType.List) {
-          list = data.validation.list;
+        if (validation.type === 'list') {
+          list = validation.list;
         }
-        else if (data.validation.type === ValidationType.Range) {
-          list = this.GetValidationRange(data.validation.area);
+        else if (validation.type === 'range') {
+          list = this.GetValidationRange(validation.area);
         }
 
         if (list && list.length) {
@@ -6541,7 +6679,7 @@ export class Grid extends GridBase {
           // tsv_row.push(cell.formatted);
 
           let text_value = '';
-          if (cell.calculated) {
+          if (cell.calculated !== undefined) {
             if (cell.calculated_type === ValueType.complex) {
               text_value = ComplexToString(cell.calculated as Complex);
             }
@@ -7130,7 +7268,7 @@ export class Grid extends GridBase {
 
     if (auto) {
       for (const entry of column) {
-        this.AutoSizeColumn(sheet, entry, false);
+        this.AutoSizeColumn(sheet, entry, true);
       }
     }
     else {