@trebco/treb 28.11.1 → 28.15.0

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

@@ -34,6 +34,7 @@ import type { BaseLayout, TileRange } from '../layout/base_layout';
 import type { DataModel, ViewModel } from '../types/data_model';
 import type { GridOptions } from '../types/grid_options';
 
+const DEFAULT_INDENT = '  '; // two spaces in the current font
 const BASELINE = 'bottom';
 const WK = /webkit/i.test(typeof navigator === 'undefined' ? '' : navigator?.userAgent || '') ? 1 : 0;
 
@@ -723,6 +724,15 @@ export class TileRenderer {
     let override_formatting: string | undefined;
     let formatted = cell.editing ? '' : cell.formatted; // <-- empty on editing, to remove overflows
 
+    // precalculate indent as string so we can use layout
+
+    let indent = '';
+    if (style.indent) {
+      for (let i = 0; i < style.indent; i++) {
+        indent += DEFAULT_INDENT;
+      }
+    }
+
     if (Array.isArray(formatted)) {
 
       // type 1 is a multi-part formatted string; used for number formats.
@@ -733,6 +743,15 @@ export class TileRenderer {
 
       // this is a single line, with number formatting
 
+      if (indent) {
+        if (style.horizontal_align === 'left') {
+          formatted.unshift({ text: indent });
+        }
+        else if (style.horizontal_align === 'right') {
+          formatted.push({ text: indent });
+        }
+      }
+
       for (const part of formatted) {
         if (part.flag === TextPartFlag.formatting) {
           override_formatting = part.text;
@@ -810,11 +829,14 @@ export class TileRenderer {
 
       // for wrapping
 
-      const bound = cell_width - (2 * this.cell_edge_buffer);
+      let bound = cell_width - (2 * this.cell_edge_buffer);
       const strings: RenderTextPart[][] = [];
 
       if (style.wrap) {
 
+        const indent_width = (indent && style.horizontal_align !== 'center') ? context.measureText(indent).width : 0;
+        bound -= indent_width;
+
         for (const line of md) {
 
           // we should probably normalize whitespace -- because formatting
@@ -921,14 +943,25 @@ export class TileRenderer {
 
             max_width = Math.max(max_width, last.width);
 
-            strings.push(line2.map((metric) => {
+            const line_string = line2.map((metric) => {
               return {
                 ...metric.part,
                 hidden: false, 
                 width: metric.width, 
                 text: metric.text, 
               };
-            }));
+            });
+
+            if (style.indent) {
+              if (style.horizontal_align === 'left') {
+                line_string.unshift({ text: indent, hidden: false, width: indent_width });
+              }
+              else if (style.horizontal_align === 'right') {
+                line_string.push({ text: indent, hidden: false, width: indent_width });
+              }
+            }
+
+            strings.push(line_string);
 
           }
 
@@ -939,9 +972,19 @@ export class TileRenderer {
 
         // simple case
 
+
         for (const line of md) {
           const parts: RenderTextPart[] = [];
 
+          if (style.indent) {
+            if (style.horizontal_align === 'left') {
+              line.unshift({ text: indent });
+            }
+            else if (style.horizontal_align === 'right') {
+              line.push({ text: indent });
+            }
+          }
+
           let line_width = 0;
 
           for (const element of line) {

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

@@ -19,7 +19,7 @@
  * 
  */
 
-import type { ICellAddress, AnnotationLayout, IRectangle } from 'treb-base-types';
+import type { ICellAddress, AnnotationLayout, IRectangle, CellStyle } from 'treb-base-types';
 import { Rectangle } from 'treb-base-types';
 
 /**
@@ -97,7 +97,7 @@ export interface ImageAnnotationData {
   
 }
 
-export type AnnotationType = 'treb-chart'|'image'|'external';
+export type AnnotationType = 'treb-chart'|'image'|'textbox'|'external';
 
 /**
  * splitting persisted data from the annotation class. that class might
@@ -182,12 +182,26 @@ export interface AnnotationChartData extends AnnotationDataBase {
   type: 'treb-chart';
 }
 
+export interface AnnotationTextBoxData extends AnnotationDataBase {
+  type: 'textbox';
+  data: {
+    style?: CellStyle;
+    paragraphs: { 
+      style?: CellStyle,
+      content: {
+        text: string, 
+        style?: CellStyle 
+      }[],
+    }[];
+  };
+};
+
 export interface AnnotationExternalData extends AnnotationDataBase {
   type: 'external';
   data: Record<string, string>;
 }
 
-export type AnnotationData = AnnotationChartData | AnnotationImageData | AnnotationExternalData;
+export type AnnotationData = AnnotationChartData | AnnotationImageData | AnnotationExternalData | AnnotationTextBoxData;
 
 /**
  * why is this a class? it doesn't do anything.

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

@@ -634,6 +634,14 @@ export class Grid extends GridBase {
               this.editing_annotation = annotation;
               this.layout.ShowSelections(true);
             }
+            else if (this.formula_bar?.IsExpandButton(event.relatedTarget as HTMLElement)) {
+
+              // for this particular case, do nothing. basically you are 
+              // expanding/contracting the formula bar. we want to preserve
+              // the selected annotation, if any. after the operation we'll
+              // restore focus.
+
+            }
             else {
               if (this.selected_annotation === annotation) {
                 this.selected_annotation = undefined;
@@ -835,9 +843,9 @@ export class Grid extends GridBase {
     }
   }
 
-  /**
+  /* *
    * specialization: update selection, scroll offset
-   */
+   * /
   public Serialize(options: SerializeOptions = {}): SerializedModel {
 
     // selection moved to sheet, but it's not "live"; so we need to
@@ -855,6 +863,7 @@ export class Grid extends GridBase {
     return super.Serialize(options);
 
   }
+  */
 
   /**
    * show or hide headers
@@ -1830,18 +1839,23 @@ export class Grid extends GridBase {
         argument_separator: this.parser.argument_separator,
         decimal_mark: this.parser.decimal_mark,
       }
+
+      this.parser.Save();
+
       let convert = false;
 
       if (options.argument_separator === ',' && this.parser.argument_separator !== ArgumentSeparatorType.Comma) {
-        this.parser.argument_separator = ArgumentSeparatorType.Comma;
-        this.parser.decimal_mark = DecimalMarkType.Period;
+        // this.parser.argument_separator = ArgumentSeparatorType.Comma;
+        // this.parser.decimal_mark = DecimalMarkType.Period;
+        this.parser.SetLocaleSettings(DecimalMarkType.Period);
 
         convert = true;
       }
        
       if (options.argument_separator === ';' && this.parser.argument_separator !== ArgumentSeparatorType.Semicolon) {
-        this.parser.argument_separator = ArgumentSeparatorType.Semicolon;
-        this.parser.decimal_mark = DecimalMarkType.Comma;
+        // this.parser.argument_separator = ArgumentSeparatorType.Semicolon;
+        // this.parser.decimal_mark = DecimalMarkType.Comma;
+        this.parser.SetLocaleSettings(DecimalMarkType.Comma);
 
         convert = true;
       }
@@ -1882,8 +1896,10 @@ export class Grid extends GridBase {
 
       // reset
 
-      this.parser.argument_separator = current.argument_separator;
-      this.parser.decimal_mark = current.decimal_mark;
+      // this.parser.argument_separator = current.argument_separator;
+      // this.parser.decimal_mark = current.decimal_mark;
+
+      this.parser.Restore();
 
     }
       
@@ -4439,7 +4455,10 @@ export class Grid extends GridBase {
 
           if (this.overlay_editor?.selection) {
             const value = this.overlay_editor?.edit_node.textContent || undefined;
-            const array = (event.key === 'Enter' && event.ctrlKey && event.shiftKey);
+
+            // let's support command+shift+enter on mac
+            const array = (event.key === 'Enter' && (event.ctrlKey || (UA.is_mac && event.metaKey)) && event.shiftKey);
+
             this.SetInferredType(this.overlay_editor.selection, value, array);
           }
           

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

@@ -461,13 +461,19 @@ export class GridBase {
     // CSV assumes dot-decimal, correct? if we want to use the
     // parser we will have to check (and set/reset) the separator
 
+    this.parser.Save();
+    this.parser.SetLocaleSettings(DecimalMarkType.Period);
+
+    /*
     const toggle_separator = this.parser.decimal_mark === DecimalMarkType.Comma;
 
-    if (toggle_separator) {
+    if (toggle_separator) 
+    {
       // swap
       this.parser.argument_separator = ArgumentSeparatorType.Comma;
       this.parser.decimal_mark = DecimalMarkType.Period;
     }
+    */
 
     const records = ParseCSV(text);
     const arr = records.map((record) =>
@@ -481,11 +487,14 @@ export class GridBase {
         return ValueParser.TryParse(field).value;
       }));
 
+    /*
     if (toggle_separator) {
       // reset
       this.parser.argument_separator = ArgumentSeparatorType.Semicolon;
       this.parser.decimal_mark = DecimalMarkType.Comma;
     }
+    */
+   this.parser.Restore();
   
     const end = {
       row: Math.max(0, arr.length - 1),
@@ -735,110 +744,6 @@ export class GridBase {
     this.model.user_data = undefined;
   }
 
-  /**
-   * serialize data. this function used to (optionally) stringify
-   * by typescript has a problem figuring this out, so we will simplify
-   * the function.
-   */
-  public Serialize(options: SerializeOptions = {}): SerializedModel {
-
-    // (removed UI stuff, that goes in subclass)
-
-    // selection moved to sheet, but it's not "live"; so we need to
-    // capture the primary selection in the current active sheet before
-    // we serialize it
-
-    // this.active_sheet.selection = JSON.parse(JSON.stringify(this.primary_selection));
-
-    // same for scroll offset
-
-    // this.active_sheet.scroll_offset = this.layout.scroll_offset;
-
-    // NOTE: annotations moved to sheets, they will be serialized in the sheets
-
-    const sheet_data = this.model.sheets.list.map((sheet) => sheet.toJSON(options));
-
-    // OK, not serializing tables in cells anymore. old comment about this:
-    // 
-    // at the moment, tables are being serialized in cells. if we put them
-    // in here, then we have two records of the same data. that would be bad.
-    // I think this is probably the correct place, but if we put them here
-    // we need to stop serializing in cells. and I'm not sure that there are 
-    // not some side-effects to that. hopefully not, but (...)
-    // 
-
-    let tables: Table[] | undefined;
-    if (this.model.tables.size > 0) {
-      tables = Array.from(this.model.tables.values());
-    }
-
-    // NOTE: moving into a structured object (the sheet data is also structured,
-    // of course) but we are moving things out of sheet (just  named ranges atm))
-
-    let macro_functions: MacroFunction[] | undefined;
-
-    if (this.model.macro_functions.size) {
-      macro_functions = [];
-      for (const macro of this.model.macro_functions.values()) {
-        macro_functions.push({
-          ...macro,
-          expression: undefined,
-        });
-      }
-    }
-
-    // when serializing named expressions, we have to make sure
-    // that there's a sheet name in any address/range. 
-
-    const named_expressions: SerializedNamedExpression[] = [];
-    if (this.model.named_expressions) {
-
-      for (const [name, expr] of this.model.named_expressions) {
-        this.parser.Walk(expr, unit => {
-          if (unit.type === 'address' || unit.type === 'range') {
-            const test = unit.type === 'range' ? unit.start : unit;
-
-            test.absolute_column = test.absolute_row = true;
-
-            if (!test.sheet) {
-              if (test.sheet_id) {
-                const sheet = this.model.sheets.Find(test.sheet_id);
-                if (sheet) {
-                  test.sheet = sheet.name;
-                }
-              }
-              if (!test.sheet) {
-                test.sheet = this.active_sheet.name;
-              }
-            }
-
-            if (unit.type === 'range') {
-              unit.end.absolute_column = unit.end.absolute_row = true;
-            }
-
-            return false;
-          }
-          return true;
-        });
-        const rendered = this.parser.Render(expr, { missing: '' });
-        named_expressions.push({
-          name, expression: rendered
-        });
-      }
-    }
-
-    return {
-      sheet_data,
-      active_sheet: this.active_sheet.id,
-      named_ranges: this.model.named_ranges.Count() ?
-        this.model.named_ranges.Serialize() :
-        undefined,
-      macro_functions,
-      tables,
-      named_expressions: named_expressions.length ? named_expressions : undefined,
-    };
-
-  }
 
   // --- protected methods -----------------------------------------------------
  

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

@@ -68,8 +68,9 @@ export interface GridOptions {
   /* * show delete tab in the tab bar */
   // delete_tab?: boolean;
 
-  /** show the "insert function" button. requires formula bar. */
+  /* * show the "insert function" button. requires formula bar. * /
   insert_function_button?: boolean;
+  */
 
   /** button to increase/reduce size of formula editor */
   expand_formula_button?: boolean;
@@ -97,7 +98,7 @@ export const DefaultGridOptions: GridOptions = {
   formula_bar: true,
   add_tab: false,
   tab_bar: 'auto',
-  insert_function_button: false,
+  // insert_function_button: false,
   expand_formula_button: false,
   expand: true,
   repaint_on_cell_change: true,

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

@@ -92,10 +92,17 @@ export class NamedRangeCollection {
       console.warn('invalid name');
       return false;
     }
+
+    // why is this considered invalid here? I've seen it done. 
+    // maybe something we're doing with these ranges doesn't 
+    // collapse them? (...)
+
     if (range.entire_column || range.entire_row) {
-      console.warn('invalid range');
+      console.info({range});
+      console.warn(`invalid range`);
       return false;
     }
+
     this.forward[validated] = range;
     if (apply) {
       this.RebuildList();

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

@@ -69,4 +69,9 @@ export interface SerializeOptions {
   /** share resources (images, for now) to prevent writing data URIs more than once */
   share_resources?: boolean;
 
+  /**
+   * if a function has an export() handler, call that
+   */
+  export_functions?: boolean;
+
 }

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

@@ -305,9 +305,19 @@ export interface ParseResult {
   full_reference_list?: Array<UnitRange | UnitAddress | UnitIdentifier | UnitStructuredReference>;
 }
 
+/**
+ * moving these settings into flags, but we want to ensure that 
+ * they're available so we'll have some required flags
+ * 
+ */
+export interface RequiredParserFlags {
+  decimal_mark: DecimalMarkType;
+  argument_separator: ArgumentSeparatorType;
+}
+
 // 
 
-export interface ParserFlags {
+export interface OptionalParserFlags {
 
   /**
    * flag: support spreadsheet addresses (e.g. "A1"). this is the default,
@@ -386,6 +396,8 @@ export interface ParserFlags {
 
 }
 
+export type ParserFlags = Partial<OptionalParserFlags> & RequiredParserFlags;
+
 export interface RenderOptions {
   offset: { rows: number; columns: number };
   missing: string;
@@ -396,8 +408,19 @@ export interface RenderOptions {
   table_name: string;
 }
 
+/*
 export interface PersistedParserConfig {
-  flags: Partial<ParserFlags>;
-  argument_separator: ArgumentSeparatorType;
-  decimal_mark: DecimalMarkType;
+  flags: Partial<ParserFlags> & RequiredParserFlags;
+  // argument_separator: ArgumentSeparatorType;
+  // decimal_mark: DecimalMarkType;
 }
+*/
+
+export const DefaultParserConfig: ParserFlags = {
+  spreadsheet_semantics: true,
+  dimensioned_quantities: false,
+  fractions: true,
+  decimal_mark: DecimalMarkType.Period,
+  argument_separator: ArgumentSeparatorType.Comma,
+};
+