@trebco/treb 29.3.4 → 29.5.0

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

@@ -26,7 +26,7 @@ import { ValueType, Cells, Style,
   type PropertyKeys,
   type Color,
   Area, IsFlatDataArray, 
-  IsNestedRowArray, IsCellAddress, DOMContext
+  IsNestedRowArray, IsCellAddress, DOMContext, IsHTMLColor, IsThemeColor
 } from 'treb-base-types';
 import { NumberFormatCache } from 'treb-format';
 import { Measurement, ValidateURI } from 'treb-utils';
@@ -43,6 +43,7 @@ import type { GridSelection } from './sheet_selection';
 import { CreateSelection } from './sheet_selection';
 import { Annotation } from './annotation';
 import type { ConditionalFormatList } from './conditional_format';
+import type { DataValidation } from './data-validation';
 
 // --- constants --------------------------------------------------------------
 
@@ -163,6 +164,11 @@ export class Sheet {
    */
   public conditional_formats: ConditionalFormatList = [];
 
+  /**
+   * @internal
+   */
+  public data_validation: DataValidation[] = [];
+
   /**
    * @internal
    * 
@@ -255,6 +261,7 @@ export class Sheet {
    */
   private conditional_format_checklist: IArea[] = [];
 
+
   // --- accessors ------------------------------------------------------------
 
   // public get column_header_count() { return this.column_header_count_; }
@@ -383,6 +390,11 @@ export class Sheet {
       sheet.conditional_formats = source.conditional_formats;
     }
 
+    sheet.data_validation = (source.data_validations || []).map(validation => ({
+      ...validation,
+      target: (validation.target||[]).map(target => new Area(target.start, target.end)),
+    }));
+
     // persist ID, name
 
     if (source.id) {
@@ -740,6 +752,45 @@ export class Sheet {
 
   }
 
+  /** add a data validation. */
+  public AddValidation(validation: DataValidation) {
+    this.data_validation.push({
+      ...validation,
+      target: (validation.target||[]).map(target => new Area(target.start, target.end)), // ensure class instance
+    });
+  }
+
+  /** 
+   * remove validations from area. must be an exact match (FIXME).
+   * if there are multiple areas, only remove the matching area.
+   */
+  public RemoveValidations(area: IArea) {
+
+    const check = new Area(area.start, area.end);
+    this.data_validation = this.data_validation.filter(validation => {
+      validation.target = validation.target.filter(compare => !check.Equals2(compare));
+      return validation.target.length > 0;
+    });
+  }
+
+  /** return data validation(s) that apply to a given address */
+  public GetValidation(address: ICellAddress) {
+
+    // switch to imperative
+
+    const list: DataValidation[] = [];
+    for (const entry of this.data_validation) {
+      for (const area of entry.target) {
+        if ((area as Area).Contains(address)) {
+          list.push(entry);
+          break;
+        }
+      }
+    }
+
+    return list;
+
+  }
 
   public Activate(DOM: DOMContext) {
 
@@ -2260,12 +2311,11 @@ export class Sheet {
         number_format_map[style.number_format] = 1;
       }
 
-      if (style.text?.text && style.text.text !== 'none') {
-        // const color = Measurement.MeasureColorARGB(style.text_color);
+      if (IsHTMLColor(style.text)) {
         color_map[style.text.text] = 1;
       }
 
-      if (style.fill?.text) {
+      if (IsHTMLColor(style.fill)) {
         color_map[style.fill.text] = 1;
       }
 
@@ -2273,16 +2323,16 @@ export class Sheet {
       //  color_map[style.background] = 1;
       //}
 
-      if (style.border_top_fill?.text) {
+      if (IsHTMLColor(style.border_top_fill)) {
         color_map[style.border_top_fill.text] = 1;
       }
-      if (style.border_left_fill?.text) {
+      if (IsHTMLColor(style.border_left_fill)) {
         color_map[style.border_left_fill.text] = 1;
       }
-      if (style.border_right_fill?.text) {
+      if (IsHTMLColor(style.border_right_fill)) {
         color_map[style.border_right_fill.text] = 1;
       }
-      if (style.border_bottom_fill?.text) {
+      if (IsHTMLColor(style.border_bottom_fill)) {
         color_map[style.border_bottom_fill.text] = 1;
       }
 
@@ -2525,13 +2575,15 @@ export class Sheet {
         ...default_color,
         ...color,
       };
-      if (result.text) {
+
+      if (IsHTMLColor(result)) {
         result.text = Measurement.MeasureColorARGB(result.text);
         return result;
       }
-      else if (typeof result.theme === 'number') {
+      else if (IsThemeColor(result)) {
         return result;
       }
+
       return undefined;
     };
 
@@ -2566,7 +2618,7 @@ export class Sheet {
         fill = translate_border_fill(style.border_bottom_fill, Style.DefaultProperties.border_bottom_fill);
         if (fill !== undefined) { style.border_bottom_fill = fill; }
 
-        if (style.fill?.text) {
+        if (IsHTMLColor(style.fill)) {
           style.fill.text = Measurement.MeasureColorARGB(style.fill.text);
         }
 
@@ -2574,10 +2626,8 @@ export class Sheet {
         //  style.background = Measurement.MeasureColorARGB(style.background);
         //}
 
-        if (style.text) {
-          if (style.text.text && style.text.text !== 'none') {
-            style.text.text = Measurement.MeasureColorARGB(style.text.text);
-          }
+        if (IsHTMLColor(style.text)) {
+          style.text.text = Measurement.MeasureColorARGB(style.text.text);
         }
 
       }
@@ -2665,6 +2715,11 @@ export class Sheet {
       JSON.parse(JSON.stringify(this.conditional_formats.map(format => ({...format, internal: undefined })))) : 
       undefined;
 
+    // yes, here. we should have a serialized type so we know to convert. TODO
+
+    const data_validations = this.data_validation.length ? JSON.parse(JSON.stringify(this.data_validation)) : undefined;
+     
+
     const result: SerializedSheet = {
 
       // not used atm, but in the event we need to gate
@@ -2688,6 +2743,7 @@ export class Sheet {
       column_style,
 
       conditional_formats,
+      data_validations,
 
       row_pattern: row_pattern.length ? row_pattern : undefined,
 
@@ -2886,6 +2942,10 @@ export class Sheet {
       this.conditional_formats.push(format);
     }
 
+    for (const validation of data.data_validations || []) {
+      this.AddValidation(validation);
+    }
+
     if (data.hidden) {
       this.visible = false;
     }

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

@@ -23,6 +23,7 @@ import type { IArea, SerializedCellData, CellStyle } from 'treb-base-types';
 import type { AnnotationData } from './annotation';
 import type { GridSelection, SerializedGridSelection } from './sheet_selection';
 import type { ConditionalFormatList } from './conditional_format';
+import type { DataValidation } from './data-validation';
 
 export interface UpdateHints {
   data?: boolean;
@@ -72,6 +73,9 @@ export interface SerializedSheet {
   /** @internal */
   conditional_formats?: ConditionalFormatList;
 
+  /** @internal */
+  data_validations?: DataValidation[];
+
   /** 
    * @deprecated use `styles` instead
    */

package/treb-embed/src/custom-element/spreadsheet-constructor.ts

@@ -7,7 +7,7 @@ import html from '../../markup/layout.html';
 import toolbar_html from '../../markup/toolbar.html';
 
 import { NumberFormatCache } from 'treb-format';
-import { ColorFunctions, type Color } from 'treb-base-types';
+import { ColorFunctions, type Color, IsThemeColor } from 'treb-base-types';
 import { Measurement } from 'treb-utils';
 import type { ToolbarMessage } from '../toolbar-message';
 
@@ -729,8 +729,7 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
             const entry = sheet.document_styles.theme_colors[j][i];
             const style = `background: ${entry.resolved};`;
             let title = themes[j] || themes[4];
-            if (entry.color.tint) {
-              // title += ` (${Math.abs(entry.color.tint) * 100}% ${ entry.color.tint > 0 ? 'lighter' : 'darker'})`;
+            if (IsThemeColor(entry.color) && entry.color.tint) {
               title += ` (${(entry.color.tint > 0 ? '+' : '') + (entry.color.tint) * 100}%)`;
             }
             else {
@@ -1372,6 +1371,11 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
             this.UpdateRevertState(sheet);
             break;
 
+          case 'theme-change':
+            this.UpdateDocumentStyles(sheet, format_menu);
+            this.UpdateSelectionStyle(sheet, toolbar, comment_box);
+            break;
+
           case 'selection':
             this.UpdateSelectionStyle(sheet, toolbar, comment_box);
             break;

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

@@ -21,9 +21,6 @@
 
 // --- imports -----------------------------------------------------------------
 
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="./content-types.d.ts" />
-
 import type {
   GridEvent, 
   SheetChangeEvent, GridOptions, 
@@ -76,7 +73,7 @@ import type {
 
 import {
   IsArea, ThemeColorTable, ComplexToString, Rectangle, IsComplex, type CellStyle,
-  Localization, Style, type Color, ThemeColor2, IsCellAddress, Area, IsFlatData, IsFlatDataArray, Gradient, DOMContext, 
+  Localization, Style, type Color, ResolveThemeColor, IsCellAddress, Area, IsFlatData, IsFlatDataArray, Gradient, DOMContext, 
 } from 'treb-base-types';
 
 import { EventSource, ValidateURI } from 'treb-utils';
@@ -103,6 +100,11 @@ import type { StateLeafVertex } from 'treb-calculator';
 
 // --- worker ------------------------------------------------------------------
 
+/**
+ * import type for our worker, plus markup files
+ */
+import './content-types.d.ts';
+
 /**
  * import the worker as a script file. tsc will read this on typecheck but 
  * that's actually to the good; when we build with esbuild we will inline
@@ -192,14 +194,22 @@ export interface LoadDocumentOptions {
   formula?: boolean;
 
   /**
-   * optional style for returned values (replaces old flags).
+   * by default, GetRange returns cell values. the optional type field 
+   * can be used to returns data in different formats.
    * 
    * @remarks
    * 
    * `formatted` returns formatted values, applying number formatting and
-   * returning strings. `formula` returns cell formulas instead of values.
+   * returning strings.
+   * 
+   * `A1` returns cell formulas instead of values, in A1 format.
+   * 
+   * `R1C1` returns cell formauls in R1C1 format.
+   * 
+   * `formula` is an alias for 'A1', for backwards compatibility.
+   * 
    */
-  type?: 'formatted'|'formula';
+  type?: 'formatted'|'A1'|'R1C1'|'formula';
 
 }
 
@@ -2113,6 +2123,8 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     this.ApplyConditionalFormats(this.grid.active_sheet, false);
     this.grid.Update(true);
 
+    this.Publish({ type: 'theme-change' });
+
   }
 
   /**
@@ -2586,9 +2598,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
    * @public
    */
   public SetColumnWidth(column?: number | number[], width?: number): void {
-
-    // API v1 OK
-
+   
     this.grid.SetColumnWidth(column, width);
   }
 
@@ -3005,7 +3015,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
     this.grid.Reset();
     this.ResetInternal();
-    this.calculator.AttachModel();
+    // this.calculator.AttachModel();
     this.UpdateAC();
 
     this.Publish({ type: 'reset' });
@@ -3491,25 +3501,30 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
   /**
    * set or clear cell valiation.
    * 
-   * @param address - target cell
+   * @param target - target cell/area
    * @param validation - a spreadsheet range, list of data, or undefined. pass
    * undefined to remove existing cell validation. 
    * @param error - setting an invalid value in the target cell is an error (and
    * is blocked). defaults to false.
    */
-  public SetValidation(address: AddressReference, validation?: RangeReference|CellValue[], error?: boolean) {
+  public SetValidation(target: RangeReference, validation?: RangeReference|CellValue[], error?: boolean) {
 
-    if (typeof address === 'string') {
-      const reference = this.model.ResolveAddress(address, this.grid.active_sheet);
-      address = IsCellAddress(reference) ? reference : reference.start;
+    if (typeof target === 'string') {
+      const reference = this.model.ResolveAddress(target, this.grid.active_sheet);
+      target = IsArea(reference) ? new Area(reference.start, reference.end) : new Area(reference);
+      // address = IsCellAddress(reference) ? reference : reference.start;
+    }
+
+    if (IsCellAddress(target)) {
+      target = new Area(target);
     }
 
     if (typeof validation === 'undefined' || Array.isArray(validation)) {
-      this.grid.SetValidation(address, validation, error);
+      this.grid.SetValidation(target, validation, error);
     }
     else {
       const range = this.model.ResolveArea(validation, this.grid.active_sheet);
-      this.grid.SetValidation(address, range, error);
+      this.grid.SetValidation(target, range, error);
     }
 
   }
@@ -4294,16 +4309,24 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
     // handle the old flags and the precedence rule. type takes precedence.
 
-    if (!options.type) {
+    let type = options.type;
+
+    if (!type) {
       if (options.formatted) {
-        options.type = 'formatted';
+        type = 'formatted';
       }
       if (options.formula) {
-        options.type = 'formula';
+        type = 'A1';
       }
     }
 
-    return this.grid.GetRange(this.model.ResolveAddress(range, this.grid.active_sheet), options.type);
+    // alias
+    
+    if (type === 'formula') {
+      type = 'A1';
+    }
+
+    return this.grid.GetRange(this.model.ResolveAddress(range, this.grid.active_sheet), type);
 
   }
 
@@ -4626,7 +4649,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
             // this one _is_ the grid cells
 
-            this.calculator.AttachModel();
+            // this.calculator.AttachModel();
             this.Publish({ type: 'load', source, });
             this.UpdateDocumentStyles();
 
@@ -5324,7 +5347,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
             const update_textbox = () => {
 
               if (style.fill) {
-                const color = ThemeColor2(this.grid.theme, style.fill);
+                const color = ResolveThemeColor(this.grid.theme, style.fill);
                 container.style.background = color;
               }
 
@@ -5590,7 +5613,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     for (let i = 0; i < 10; i++) {
       this.document_styles.theme_colors.push(tints.map(tint => {
         const color: Color = { theme: i, tint };
-        const resolved = ThemeColor2(this.grid.theme, color);
+        const resolved = ResolveThemeColor(this.grid.theme, color);
         return { color, resolved };
       }));
     }
@@ -5845,9 +5868,8 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
     this.grid.UpdateSheets(sheets, undefined, override_sheet || data.active_sheet);
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    for (const [name, table] of this.model.tables.entries()) {
-      if (table.area.start.sheet_id) {
+    for (const table of this.model.tables.values()) {
+        if (table.area.start.sheet_id) {
         const sheet = model.sheets.Find(table.area.start.sheet_id);
         if (sheet) {
           for (let row = table.area.start.row; row <= table.area.end.row; row++) {

package/treb-embed/src/progress-dialog.ts

@@ -57,7 +57,6 @@ export type ResolutionFunction = () => void;
  */
 export class Dialog {
 
-  // private model: NodeModel;
   private model: Record<string, HTMLElement> = {};
 
   private layout_element: HTMLElement;
@@ -192,6 +191,10 @@ export class Dialog {
 
   }
 
+  public Node(name: string): HTMLElement|undefined {
+    return this.model[name];
+  }
+
   public Update(options: Partial<MessageDialogOptions>, delta = true): void {
     if (delta) {
       options = { ...this.options_, ... options};

package/treb-embed/src/types.ts

@@ -144,6 +144,14 @@ export interface ViewChangeEvent {
   type: 'view-change';
 }
 
+/**
+ * this event is sent when the theme is updated. it's intended for any 
+ * subscribers to update corresponding colors or fonts.
+ */
+export interface ThemeChangeEvent {
+  type: 'theme-change';
+}
+
 /**
  * This event is sent when a document is loaded, and also on undo. The 
  * source field can help determine if it was triggered by an undo operation.
@@ -206,6 +214,7 @@ export type EmbeddedSheetEvent
   = DocumentChangeEvent
   | DocumentResetEvent
   | DocumentLoadEvent
+  | ThemeChangeEvent
   | ViewChangeEvent
   | DataChangeEvent
   | FocusViewEvent

package/treb-export/src/drawing2/chart2.ts

@@ -19,8 +19,6 @@
  * 
  */
 
-// import * as ElementTree from 'elementtree';
-// import { Element, ElementTree as Tree } from 'elementtree';
 import type { UnitAddress, UnitRange, UnitLiteral, ExpressionUnit } from 'treb-parser';
 
 import { static_title, ref_title, chart_template } from './chart-template-components2';
@@ -29,18 +27,6 @@ import { donut_json } from './donut-chart-template2';
 import { scatter_json, scatter_series } from './scatter-chart-template2';
 import { bubble_json, bubble_series } from './bubble-chart-template';
 
-import { XMLUtils } from '../xml-utils';
-
-/*
-import { donut_json } from './donut-chart-template';
-import { static_title, ref_title, chart_template } from './chart-template-components';
-import { column_json, column_series } from './column-chart-template';
-import { scatter_json, scatter_series } from './scatter-chart-template';
-import { scatter_series as scatter2_series } from './scatter2-chart-template';
-*/
-
-// import { v4 as uuidv4 } from 'uuid';
-
 import { Localization } from 'treb-base-types';
 import type { RelationshipMap } from '../relationship';
 
@@ -73,31 +59,27 @@ export class Chart {
       type: 'literal', value: '',
     };
 
-    // const CC = this.FindNode('c:chart', obj);
-    // if (CC) {
-      if (unit && unit.type === 'literal') {
-        const title = JSON.parse(JSON.stringify(static_title));
-        //const AP = this.FindNode('a:p', title);
-        const AP = title['c:tx']['c:rich']['a:p'];
-
-        AP['a:r'] = {
-          'a:rPr': {
-            a$: {
-              lang: Localization.locale,
-            },
+    if (unit && unit.type === 'literal') {
+      const title = JSON.parse(JSON.stringify(static_title));
+      const AP = title['c:tx']['c:rich']['a:p'];
+
+      AP['a:r'] = {
+        'a:rPr': {
+          a$: {
+            lang: Localization.locale,
           },
-          'a:t': unit.value,
-        };
-        chartnode['c:title'] = title;
-      }
-      else if (unit) {
-        const title = JSON.parse(JSON.stringify(ref_title));
-        //const CF = title['c:tx']['c:strRef']['c:f'];
-        //CF.t$ = unit.label;
-        title['c:tx']['c:strRef']['c:f'] = unit.label;
-        chartnode['c:title'] = title;
-      }
-    //}
+        },
+        'a:t': unit.value,
+      };
+      chartnode['c:title'] = title;
+    }
+    else if (unit) {
+      const title = JSON.parse(JSON.stringify(ref_title));
+      //const CF = title['c:tx']['c:strRef']['c:f'];
+      //CF.t$ = unit.label;
+      title['c:tx']['c:strRef']['c:f'] = unit.label;
+      chartnode['c:title'] = title;
+    }
 
   }