@trebco/treb 30.16.0 → 31.0.2

package/treb-calculator/src/functions/base-functions.ts

@@ -41,6 +41,8 @@ import { CoerceComplex } from './function-utilities';
 import type { UnitAddress, UnitRange } from 'treb-parser';
 import { ConstructDate } from './date-utils';
 
+// import type { CalculationContext } from '../descriptors';
+
 /**
  * BaseFunctionLibrary is a static object that has basic spreadsheet
  * functions and associated metadata (there's also a list of aliases).
@@ -1253,10 +1255,35 @@ export const BaseFunctionLibrary: FunctionMap = {
     },
     */
    
-
     Row: {
       arguments: [{ name: 'reference', metadata: true }],
-      fn: (ref: UnionValue): UnionValue => {
+      fn: function(ref?: UnionValue): UnionValue {
+
+        if (!ref) {
+          if (this?.area) {
+            const value: UnionValue[][] = [];
+            for (let c = this.area.start.column; c <= this.area.end.column; c++) {
+              const col: UnionValue[] = [];
+              for (let r = this.area.start.row; r <= this.area.end.row; r++) {
+                col.push({
+                  type: ValueType.number,
+                  value: r + 1, 
+                });
+              }
+              value.push(col);
+            }
+            return {
+              type: ValueType.array, value,
+            }
+          }
+          else {
+            return {
+              type: ValueType.number,
+              value: this ? this.address.row + 1 : -1,
+            };
+          }
+        }
+        
         if (ref.type === ValueType.array) {
           const arr = ref.value;
           const first = arr[0][0];
@@ -1283,7 +1310,33 @@ export const BaseFunctionLibrary: FunctionMap = {
 
     Column: {
       arguments: [{ name: 'reference', metadata: true }],
-      fn: (ref: UnionValue): UnionValue => {
+      fn: function(ref?: UnionValue): UnionValue {
+
+        if (!ref) {
+          if (this?.area) {
+            const value: UnionValue[][] = [];
+            for (let c = this.area.start.column; c <= this.area.end.column; c++) {
+              const col: UnionValue[] = [];
+              for (let r = this.area.start.row; r <= this.area.end.row; r++) {
+                col.push({
+                  type: ValueType.number,
+                  value: c + 1, 
+                });
+              }
+              value.push(col);
+            }
+            return {
+              type: ValueType.array, value,
+            }
+          }
+          else {
+            return {
+              type: ValueType.number,
+              value: this ? this.address.column + 1 : -1,
+            };
+          }
+        }
+
         if (ref.type === ValueType.array) {
           const arr = ref.value;
           const first = arr[0][0];
@@ -1307,7 +1360,7 @@ export const BaseFunctionLibrary: FunctionMap = {
         return ArgumentError();
       },
     },
-    
+
     Choose: {
       arguments: [
         { name: 'Selected index', },

package/treb-calculator/src/functions/statistics-functions.ts

@@ -409,6 +409,7 @@ export const StatisticsFunctionLibrary: FunctionMap = {
     },
   },
 
+  /* use alias instead 
   'NormsInv': {
     
     description: 'Inverse of the normal cumulative distribution', 
@@ -423,7 +424,8 @@ export const StatisticsFunctionLibrary: FunctionMap = {
       }
     }
   },
-  
+  */
+
   'Norm.Inv': {
     description: 'Inverse of the normal cumulative distribution', 
     arguments: [
@@ -441,17 +443,15 @@ export const StatisticsFunctionLibrary: FunctionMap = {
   },
 
   'Norm.S.Inv': {
-    description: 'Inverse of the normal cumulative distribution', 
+    description: 'Inverse of the standard normal cumulative distribution', 
     arguments: [
       {name: 'probability'},
-      {name: 'mean', default: 0},
-      {name: 'standard deviation', default: 1},
     ],
     xlfn: true,
-    fn: (q: number, mean = 0, stdev = 1): UnionValue => {
+    fn: (q: number): UnionValue => {
       return {
         type: ValueType.number,
-        value: inverse_normal(q) * stdev + mean,
+        value: inverse_normal(q),
       }
     }
   }, 
@@ -1073,4 +1073,7 @@ export const StatisticsFunctionAliases: {[index: string]: string} = {
   'StDevPA': 'StDev.P',
   'Var': 'Var.S',
   'Quartile': 'Quartile.Inc',
+  'NormSInv': 'Norm.S.Inv',
+  'NormSDist': 'Norm.S.Dist',
+
 };

package/treb-calculator/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../tsproject.json",
+  "references": [
+    { "path": "../treb-grid/tsconfig.json" },
+    { "path": "../treb-utils/tsconfig.json" }
+  ],
+  "include": [
+    "../treb-base-types/**/*.ts"
+  ]
+}
+

package/treb-charts/style/charts.scss

@@ -43,8 +43,14 @@
   // this was getting lost by the new higher-specificity reset
   background: var(--treb-chart-background, #fff);
 
-}
+ }
 
+ /**
+  * new override allows inheriting fonts in annotations (at least for charts)
+  */
+.treb-main.treb-main .treb-inherit-font .treb-chart {
+  font-family: inherit;
+}
 
 /* container style */
 .treb-chart {

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

@@ -117,6 +117,12 @@ export interface AnnotationDataBase {
   /** the new layout, persisted and takes preference over the old one */
   layout?: AnnotationLayout;
 
+  /** 
+   * adding cell style as a convenient store for font stack; atm we are
+   * ignoring everything but the font_face attribute
+   */
+  style?: CellStyle;
+
   /** 
    * the old layout used rectangles, and we need to keep support for
    * that. this is not the layout rectangle. this rectangle is just

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

@@ -435,8 +435,8 @@ export class DataModel {
   }
 
   /** wrapper method ensures it always returns an Area (instance, not interface) */
-  public ResolveArea(address: string|ICellAddress|IArea, active_sheet: Sheet): Area {
-    const resolved = this.ResolveAddress(address, active_sheet);
+  public ResolveArea(address: string|ICellAddress|IArea, active_sheet: Sheet, options?: { r1c1?: boolean }): Area {
+    const resolved = this.ResolveAddress(address, active_sheet, options);
     return IsCellAddress(resolved) ? new Area(resolved) : new Area(resolved.start, resolved.end);
   }
 
@@ -449,10 +449,21 @@ export class DataModel {
    * Q: why are we not preserving absoute/relative? (...)
    * 
    */
-  public ResolveAddress(address: string|ICellAddress|IArea, active_sheet: Sheet): ICellAddress|IArea {
+  public ResolveAddress(address: string|ICellAddress|IArea, active_sheet: Sheet, options? : { r1c1?: boolean }): ICellAddress|IArea {
     
     if (typeof address === 'string') {
+
+      if (options?.r1c1) {
+        this.parser.Save();
+        this.parser.flags.r1c1 = true;
+      }
+
       const parse_result = this.parser.Parse(address);
+
+      if (options?.r1c1) {
+        this.parser.Restore();
+      }
+
       if (parse_result.expression && parse_result.expression.type === 'address') {
         this.ResolveSheetID(parse_result.expression, undefined, active_sheet);
         return {

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

@@ -33,7 +33,10 @@ import { Measurement, ValidateURI } from 'treb-utils';
 
 import type { TextPart ,
   Cell, ICellAddress, CellSerializationOptions, CellValue, ImportedSheetData, Complex, 
-  DimensionedQuantity, IArea, Table, TableTheme, HorizontalAlign, VerticalAlign} from 'treb-base-types';
+  DimensionedQuantity, IArea, Table, TableTheme, HorizontalAlign, VerticalAlign,
+  Theme} from 'treb-base-types';
+
+import { Get as GetFonrMetrics } from 'treb-grid/src/util/fontmetrics';
 
 // --- local imports ----------------------------------------------------------
 
@@ -299,7 +302,8 @@ export class Sheet {
 
     this.default_column_width = DEFAULT_COLUMN_WIDTH;
     this.row_header_width = DEFAULT_ROW_HEADER_WIDTH;
-    this.UpdateDefaultRowHeight();
+
+    // this.UpdateDefaultRowHeight();
 
     this.id_ = Sheet.base_id++;
 
@@ -314,10 +318,14 @@ export class Sheet {
   /**
    * factory method creates a new sheet
    */
-  public static Blank(style_defaults: CellStyle, name?: string, rows = 30, columns = 20): Sheet {
+  public static Blank(style_defaults: CellStyle, name?: string, rows = 30, columns = 20, theme?: Theme): Sheet {
 
     const sheet = new Sheet(style_defaults);
 
+    if (theme) {
+      sheet.UpdateDefaultRowHeight(theme);
+    }
+
     if (name) {
       sheet.name = name;
     }
@@ -905,71 +913,45 @@ export class Sheet {
 
   }
 
-  /**
-   * FIXME: measure the font.
-   * 
-   * Can we use the same metrics as renderer? That uses a canvas. Obviously
-   * canvas won't work if there's no DOM but it's OK if this method fails in
-   * that case; the only question is will it break if it's running headless?
-   */
-  public StyleFontSize(style: CellStyle, default_properties: CellStyle = {}): number {
-
-    let font_height = (style.font_size?.value || 0);
-
-    let scale = 0;
-
-    switch (style.font_size?.unit) {
-      case 'px':
-        font_height *= (75 / 100);
-        break;
-
-      case 'em':
-        scale = style.font_size.value || 1;
-        break;
-
-      case '%':
-        scale = (style.font_size.value || 100) / 100;
-        break;
-    }
-
-    if (scale) {
-      font_height = scale * (default_properties.font_size?.value || 10);
-      if (default_properties.font_size?.unit === 'px') {
-        font_height *= (75 / 100);
-      }
-    }
-
-    return font_height || 10;
-
-  }
-
   /**
    * FIXME: this is called in the ctor, which made sense when sheets
    * were more ephemeral. now that we update a single instance, rather
    * than create new instances, we lose this behavior. we should call
    * this when we change sheet style.
    * 
-   * removing parameter, event
+   * actually this should just move to theme, no? as long as sheet has
+   * a reference to theme. for headless instances that would just use 
+   * theme defaults, which should be appropriate.
+   * 
+   * I guess the original idea was that sheet style might be used to
+   * base row height on sheet font size? not sure if that's how it actually
+   * plays out, since this is only called in the ctor (or equivalent) or when
+   * theme is updated (but not when sheet style is updated). might need some
+   * thought.
+   * 
    */
-  public UpdateDefaultRowHeight(): void {
+  public UpdateDefaultRowHeight(theme: Theme, scale = 1): void {
 
-    const composite = Style.Composite([this.default_style_properties, this.sheet_style]);
+    // this guard is here because this is called by sheet directly, so maybe
+    // in headless context? would make more sense to just not call it
 
     if (typeof window !== 'undefined') {
 
-      const measurement = Measurement.MeasureText(Style.Font(composite), 'M');
-      const height = Math.round(measurement.height * 1.4);
+      const composite = Style.Composite([this.default_style_properties, this.sheet_style]);
+      const font_info = Style.CompositeFont(theme.grid_cell_font_size, composite, scale, theme);
+      const metrics = GetFonrMetrics(font_info.font, font_info.variants);
+      const height = metrics.height * 1.25; // ??
+
+      // const measurement = Measurement.MeasureText(Style.Font2(composite, 1, theme).font, 'M');
+      // const height = Math.round(measurement.height * 1.4);
+
+      // console.info({height, default: this.default_row_height});
 
       if (this.default_row_height < height) {
         this.default_row_height = height;
       }
 
     }
-    /*
-    else {
-      // console.info('worker?');
-    }
-    */
 
   }
 
@@ -1658,14 +1640,14 @@ export class Sheet {
     this.column_header_height = column_header_height;
   }
 
-  /**
+  /* *
    * resize row to match character hight, taking into
    * account multi-line values.
    * 
    * UPDATE: since the only caller calls with inline = true, removing 
    * parameter, test, and extra behavior.
-   */
-  public AutoSizeRow(row: number, default_properties: CellStyle = {}, allow_shrink = true): void {
+   * /
+  public AutoSizeRow(row: number, theme?: Theme, allow_shrink = true, scale = 1): void {
 
     let height = this.default_row_height;
     const padding = 9; // 9?
@@ -1673,7 +1655,7 @@ export class Sheet {
     for (let column = 0; column < this.cells.columns; column++) {
 
       const cell = this.CellData({ row, column });
-      const style = cell.style;
+      const style = JSON.parse(JSON.stringify(cell.style));
       let text = cell.formatted || '';
 
       if (typeof text !== 'string') {
@@ -1682,7 +1664,25 @@ export class Sheet {
 
       if (style && text && text.length) {
         const lines = text.split(/\n/);
-        const font_height = Math.round(this.StyleFontSize(style, default_properties) * 1.5); // it's a start, we still need to measure properly
+
+        if (style.font_size) {
+          if (style.font_size.unit === 'em') {
+            const base = theme?.grid_cell_font_size || { unit: 'pt', value: 10 };
+            style.font_size.unit = base.unit;
+            style.font_size.value *= base.value;
+          }
+        }
+        else {
+          style.font_size = theme?.grid_cell_font_size || { unit: 'pt', value: 10 };
+        }
+
+        let target = style.font_size.value;
+        if (style.font_size.unit === 'px') {
+          target = Math.round((style.font_size.value||16) * 300 / 4) / 100;
+        }
+
+        const font_height = // Math.round(this.StyleFontSize(style, default_properties) * 1.5); // it's a start, we still need to measure properly
+          Math.round(target * 1.5 * scale);
         height = Math.max(height, ((font_height || 10) + padding) * lines.length);
       }
     }
@@ -1695,6 +1695,7 @@ export class Sheet {
     this.SetRowHeight(row, height);
 
   }
+  */
 
   /** returns the style properties for a given style index */
   public GetStyle(index: number): CellStyle {

package/treb-embed/markup/toolbar.html

@@ -130,13 +130,27 @@
         <button data-command="font-scale" data-scale="0.9">0.90</button>
         <button data-command="font-scale" data-scale="1.0">1.00</button>
         <button data-command="font-scale" data-scale="1.1">1.10</button>
-        <button data-command="font-scale" data-scale="1.2">1.20</button>
+        <button data-command="font-scale" data-scale="1.25">1.25</button>
         <button data-command="font-scale" data-scale="1.5">1.50</button>
         <button data-command="font-scale" data-scale="2.0">2.00</button>
       </div>
     </div>
   </div>
 
+  <div composite font-stack>
+    <button class="treb-font-stack" data-command="font-stack" data-font-stack="" title="Font stack"></button>
+    <div class="treb-menu">
+      <button dropdown title="Font stack options"></button>
+      <div>
+        <button data-command="font-stack" data-font-stack="default"></button>
+        <button data-command="font-stack" data-font-stack="transitional"></button>
+        <button data-command="font-stack" data-font-stack="monospace"></button>
+        <button data-command="font-stack" data-font-stack="handwritten"></button>
+        <button data-command="font-stack" data-font-stack="ui"></button>
+      </div>
+    </div>
+  </div>
+
   <div composite>
     <input class="treb-number-format" title="Number format">
     <div class="treb-menu">

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

@@ -12,6 +12,7 @@ import { Measurement } from 'treb-utils';
 import type { ToolbarMessage } from '../toolbar-message';
 
 import { DOMContext } from 'treb-base-types';
+import { font_stack_labels, type FontStackType } from 'treb-base-types/src/font-stack';
 
 /** with a view towards i18n */
 const default_titles: Record<string, string> = {
@@ -668,6 +669,24 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
       }
     }
 
+    if (this.toolbar_controls.stack) {
+      if (state.style?.font_face) {
+        if (state.style.font_face.startsWith('stack:')) {
+          const stack_name = state.style.font_face.substring(6) as FontStackType;
+          this.toolbar_controls.stack.textContent = font_stack_labels[stack_name] || '';
+          this.toolbar_controls.stack.dataset.fontStack = stack_name;
+        }
+        else {
+          this.toolbar_controls.stack.textContent = '';
+          this.toolbar_controls.stack.dataset.fontStack = '';
+        }
+      }
+      else { // } if (!state.empty) {
+        this.toolbar_controls.stack.textContent = font_stack_labels.default || '';
+        this.toolbar_controls.stack.dataset.fontStack = 'default';
+      }
+    }
+    
     const format = this.toolbar_controls.format as HTMLInputElement;
     if (format) {
       if (state.style?.number_format) {
@@ -914,6 +933,19 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
     if (!sheet.options.font_scale) {
       remove.push(toolbar.querySelector('[font-scale]'));
     }
+    if (!sheet.options.font_stack) {
+      remove.push(toolbar.querySelector('[font-stack]'));
+    }
+    else {
+      const buttons = toolbar.querySelectorAll(`[font-stack] button[data-font-stack]`) as NodeListOf<HTMLElement>;
+      for (const button of buttons) {
+        if (button.dataset.fontStack) {
+          const label = font_stack_labels[button.dataset.fontStack as FontStackType];
+          button.textContent = label || '';
+        }
+      }
+    }
+
     if (!sheet.options.chart_menu) {
       remove.push(toolbar.querySelector('[chart-menu]'));
     }
@@ -967,6 +999,8 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
         'format': 'input.treb-number-format',
         'scale': 'input.treb-font-scale',
 
+        'stack': 'button.treb-font-stack',
+
       })) {
 
       const element = toolbar.querySelector(value) as HTMLElement;
@@ -1029,9 +1063,11 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
         color?: Color;
         format?: string;
         scale?: string;
+        font_stack?: string;
       } = {
         format: target.dataset.format,
         scale: target.dataset.scale,
+        font_stack: target.dataset.fontStack,
       };
 
       let command = target?.dataset.command;
@@ -1376,9 +1412,11 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
             this.UpdateSelectionStyle(sheet, toolbar, comment_box);
             break;
 
+          case 'annotation-selection':
           case 'selection':
             this.UpdateSelectionStyle(sheet, toolbar, comment_box);
             break;
+
         }
       });