@trebco/treb 30.6.3 → 30.9.2

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

@@ -4840,6 +4840,53 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
               return reject(event.data.error || 'unknown error');
             }
 
+            if (this.parser.decimal_mark !== DecimalMarkType.Period) {
+              
+              // console.info("IMPORT WARNING 2", event.data);
+
+              // FIXME: unify w/ the convert locale method
+
+              const target_decimal_mark = this.parser.decimal_mark;
+              const target_argument_separator = this.parser.argument_separator;
+              this.parser.Save();
+              this.parser.SetLocaleSettings(DecimalMarkType.Period);
+
+              const translate = (formula: string): string | undefined => {
+                const parse_result = this.parser.Parse(formula);
+                if (!parse_result.expression) { return undefined; }
+                return '=' + this.parser.Render(
+                  parse_result.expression, { 
+                    missing: '', 
+                    convert_decimal: target_decimal_mark, 
+                    convert_argument_separator: target_argument_separator,
+                  });
+              };
+
+              for (const named of event.data.results) {
+                named.expression = translate(named.expression);                
+              }
+
+              for (const sheet of event.data.results.sheets || []) {
+
+                for (const cell of sheet.cells || []) {
+                  if (cell.type === 'formula' && cell.value) {
+                    cell.value = translate(cell.value);
+                  }
+                }
+
+                if (sheet.annotations){
+                  for (const annotation of sheet.annotations) {
+                    if (annotation.formula) {
+                      annotation.formula = translate(annotation.formula);
+                    }
+                  }
+                }
+              }
+
+              this.parser.Restore();
+
+            }
+
             this.grid.FromImportData(event.data.results);
 
             this.ResetInternal();
@@ -5914,6 +5961,15 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
       }
     }
 
+    if (data.named) {
+      for (const named of data.named) {
+        const translated = translate(named.expression);
+        if (translated) {
+          named.expression = translated;
+        }
+      }
+    }
+
     if (data.sheet_data) {
 
       const sheets = Array.isArray(data.sheet_data) ? data.sheet_data : [data.sheet_data];

package/treb-embed/style/theme-defaults.scss

@@ -437,6 +437,22 @@ $text-reference-color-5: rgb(254, 47, 1);
       &[selected] {
         background: var(--treb-tab-bar-active-tab-background, #fff);
         color: var(--treb-tab-bar-active-tab-color, var(--treb-ui-color, inherit));
+
+        border-bottom-color: var(--treb-tab-bar-active-tab-border-color, currentColor);
+
+        /*
+        position: relative;
+        &::after {
+          content: '';
+          position: absolute;
+          bottom: 0px;
+          left: 0px;
+          width: 100%;
+          height: 1px;
+          background: currentColor;
+        }
+        */
+
       }
     }
 

package/treb-export/src/export.ts

@@ -439,13 +439,7 @@ export class Exporter {
 
     const dxf: DOMContent[] = style_cache.dxf_styles.map(style => {
 
-      const entry: DOMContent = {
-        fill: style.fill ? {
-          patternFill: {
-            bgColor: ColorAttrs(style.fill),
-          },
-        } : undefined,
-      };
+      const entry: DOMContent = {};
 
       if (style.text || style.bold || style.italic || style.underline) {
         entry.font = {
@@ -457,6 +451,14 @@ export class Exporter {
         };
       }
 
+      if (style.fill) {
+        entry.fill = {
+          patternFill: {
+            bgColor: ColorAttrs(style.fill),
+          }
+        }
+      };
+
       return entry;
 
     });
@@ -2214,6 +2216,34 @@ export class Exporter {
         // delete dom.worksheet.drawing;
       }
 
+      // --- tab color ---------------------------------------------------------
+
+      const tab_color_block: DOMContent = {};
+      if (sheet.tab_color) {
+        if (IsThemeColor(sheet.tab_color)) {
+          tab_color_block.sheetPr = {
+            tabColor: {
+              a$: {
+                theme: sheet.tab_color.theme,
+                tint: sheet.tab_color.tint,
+              }
+            }
+          };
+        }
+        else if (IsHTMLColor(sheet.tab_color)) {
+          const color = sheet.tab_color.text || ''; 
+          if (/^#[0-9a-fA-F]*$/.test(color)) {
+            tab_color_block.sheetPr = {
+              tabColor: {
+                a$: {
+                  rgb: `FF` + color.substring(1)
+                }
+              }
+            };
+          }
+        }
+      }
+
       // --- move page margins -------------------------------------------------
 
       // const margins = dom.worksheet.pageMargins;
@@ -2242,6 +2272,9 @@ export class Exporter {
 
         worksheet: {
           a$: { ...sheet_attributes },
+
+          ...tab_color_block,
+
           dimension: {
             a$: {
               ref: new Area(extent.start, extent.end).spreadsheet_label,

package/treb-export/src/{import2.ts → import.ts}

@@ -27,10 +27,10 @@ import Base64JS from 'base64-js';
 import type { AnchoredChartDescription, AnchoredImageDescription, AnchoredTextBoxDescription} from './workbook2';
 import { ChartType, ConditionalFormatOperators, Workbook } from './workbook2';
 import type { ParseResult } from 'treb-parser';
-import { Parser } from 'treb-parser';
+import { DecimalMarkType, Parser } from 'treb-parser';
 import type { RangeType, AddressType, HyperlinkType } from './address-type';
 import { is_range, ShiftRange, InRange, is_address } from './address-type';
-import type { ImportedSheetData, AnchoredAnnotation, CellParseResult, AnnotationLayout, Corner as LayoutCorner, IArea, GradientStop, Color, HTMLColor, ThemeColor } from 'treb-base-types';
+import { type ImportedSheetData, type AnchoredAnnotation, type CellParseResult, type AnnotationLayout, type Corner as LayoutCorner, type IArea, type GradientStop, type Color, type HTMLColor, type ThemeColor, Area } from 'treb-base-types';
 import type { SerializedValueType } from 'treb-base-types';
 import type { Sheet} from './workbook-sheet2';
 import { VisibleState } from './workbook-sheet2';
@@ -166,20 +166,26 @@ export class Importer {
           // doing it like this is sloppy (also does not work properly).
           value = '=' + formula.replace(/^_xll\./g, '');
 
-          const parse_result = this.parser.Parse(formula); // l10n?
-          if (parse_result.expression) {
-            this.parser.Walk(parse_result.expression, (unit) => {
-              if (unit.type === 'call') {
-                if (/^_xll\./.test(unit.name)) {
-                  unit.name = unit.name.substring(5);
-                }
-                else if (/^_xlfn\./.test(unit.name)) {
-                  unit.name = unit.name.substring(6);
+          // drop the formula if it's a ref error, we can't handle this
+          if (/#REF/.test(formula)) {
+            value = formula;
+          }
+          else {
+            const parse_result = this.parser.Parse(formula); // l10n?
+            if (parse_result.expression) {
+              this.parser.Walk(parse_result.expression, (unit) => {
+                if (unit.type === 'call') {
+                  if (/^_xll\./.test(unit.name)) {
+                    unit.name = unit.name.substring(5);
+                  }
+                  else if (/^_xlfn\./.test(unit.name)) {
+                    unit.name = unit.name.substring(6);
+                  }
                 }
-              }
-              return true;
-            });
-            value = '=' + this.parser.Render(parse_result.expression, { missing: '' });
+                return true;
+              });
+              value = '=' + this.parser.Render(parse_result.expression, { missing: '' });
+            }
           }
 
           if (typeof element.f !== 'string') {
@@ -341,7 +347,7 @@ export class Importer {
 
   }
 
-  public ParseConditionalFormat(address: RangeType|AddressType, rule: any): ConditionalFormat|undefined {
+  public ParseConditionalFormat(address: RangeType|AddressType, rule: any): ConditionalFormat|ConditionalFormat[]|undefined {
 
     const area = this.AddressToArea(address);
     const operators = ConditionalFormatOperators;
@@ -365,11 +371,13 @@ export class Importer {
             area,
             style,
             unique: (rule.a$.type === 'uniqueValues'),
+            priority: rule.a$.priority ? Number(rule.a$.priority) : undefined,
+
           };
         }
 
       case 'cellIs':
-        if (rule.a$.operator && rule.formula) {
+        if (rule.a$.operator && (rule.formula || typeof rule.formula === 'number')) {
           let style = {};
 
           if (rule.a$.dxfId) {
@@ -379,10 +387,26 @@ export class Importer {
             }
           }
 
+          if (rule.a$.operator === 'between') {
+            if (Array.isArray(rule.formula) && rule.formula.length === 2
+                && typeof rule.formula[0] === 'number' && typeof rule.formula[1] === 'number') {
+
+              return {
+                type: 'cell-match',
+                expression: '',
+                between: rule.formula, // special case? ugh
+                area,
+                style,
+                priority: rule.a$.priority ? Number(rule.a$.priority) : undefined,
+              };
+
+            }
+          }
+
           const operator = operators[rule.a$.operator || ''];
 
           if (!operator) {
-            console.info('unhandled cellIs operator:', rule.a$.operator);
+            console.info('unhandled cellIs operator:', rule.a$.operator, {rule});
           }
           else {
             return {
@@ -390,10 +414,14 @@ export class Importer {
               expression: operator + ' ' + rule.formula,
               area,
               style,
+              priority: rule.a$.priority ? Number(rule.a$.priority) : undefined,
             };
           }
 
         }
+        else {
+          console.info("miss?", rule);
+        }
         break;
 
       case 'containsErrors':
@@ -427,11 +455,51 @@ export class Importer {
             }
           }
 
+          if (rule.a$.type === 'expression' && (area.start.row !== area.end.row || area.start.column !== area.end.column)) {
+
+            // (1) this is only required if there are relative references
+            //     in the formula. so we could check and short-circuit.
+            //
+            // (2) I'd like to find a way to apply this as a single formula,
+            //     so there's only one rule required.
+
+            this.parser.Save();
+            this.parser.SetLocaleSettings(DecimalMarkType.Period);
+
+            const list: ConditionalFormat[] = [];
+            const a2 = new Area(area.start, area.end);
+
+            const parse_result = this.parser.Parse(rule.formula);
+            if (parse_result.expression) {
+              for (const cell of a2) {
+                const f = this.parser.Render(parse_result.expression, {
+                  missing: '',
+                  offset: { rows: cell.row - area.start.row, columns: cell.column - area.start.column }
+                });
+
+                list.push({
+                  type: 'expression',
+                  expression: f,
+                  style,
+                  area: { start: cell, end: cell },
+                  priority: rule.a$.priority ? Number(rule.a$.priority) : undefined,
+                })
+
+                // console.info(f);
+              }
+            }
+
+            this.parser.Restore();
+            return list;
+
+          }
+
           return {
             type: 'expression',
             expression: rule.formula,
             area,
             style,
+            priority: rule.a$.priority ? Number(rule.a$.priority) : undefined,
           };
 
         }
@@ -479,6 +547,8 @@ export class Importer {
             stops,
             color_space: 'RGB',
             area,
+            priority: rule.a$.priority ? Number(rule.a$.priority) : undefined,
+
           };
 
         }
@@ -527,6 +597,33 @@ export class Importer {
 
     const FindAll: (path: string) => any[] = XMLUtils.FindAll.bind(XMLUtils, sheet.sheet_data);
 
+    // tab color
+
+    const tab_color_element = FindAll('worksheet/sheetPr/tabColor');
+
+    let tab_color: Color|undefined;
+    
+    if (tab_color_element?.[0]) {
+
+      const element = tab_color_element[0];
+      if (element.a$?.theme) {
+        tab_color = { theme: Number(element.a$.theme) };
+        if (element.a$?.tint) {
+          tab_color.tint = Number(element.a$.tint);
+        }
+      }
+      if (element.a$?.rgb) {
+        const argb = element.a$.rgb;
+        tab_color = {
+          text: '#' + (
+            argb.length > 6 ?
+            argb.substr(argb.length - 6) :
+            argb),
+        };
+      }
+
+    }
+
     // conditionals 
 
     const conditional_formatting = FindAll('worksheet/conditionalFormatting');
@@ -545,7 +642,12 @@ export class Importer {
             for (const rule of rules) {
               const format = this.ParseConditionalFormat(area, rule);
               if (format) {
-                conditional_formats.push(format);
+                if (Array.isArray(format)) {
+                  conditional_formats.push(...format);
+                }
+                else {
+                  conditional_formats.push(format);
+                }
               }
             }
           }
@@ -1051,7 +1153,8 @@ export class Importer {
             type = 'treb-chart';
             func = 'Box.Plot';
             if (series?.length) {
-              args[0] = `Group(${series.map(s => `Series(${s.title || ''},,${s.values||''})` || '').join(', ')})`;
+              args[0] = `Group(${series.map(s => `Series(${s.title || ''},,${s.values||''})`).join(', ')})`;
+              console.info("S?", {series}, args[0])
             }
             args[1] = descriptor.chart.title;
             break;
@@ -1060,7 +1163,7 @@ export class Importer {
             type = 'treb-chart';
             func = 'Scatter.Line';
             if (series && series.length) {
-              args[0] = `Group(${series.map(s => `Series(${s.title || ''},${s.categories||''},${s.values||''})` || '').join(', ')})`;
+              args[0] = `Group(${series.map(s => `Series(${s.title || ''},${s.categories||''},${s.values||''})`).join(', ')})`;
             }
             args[1] = descriptor.chart.title;
             break;
@@ -1096,7 +1199,7 @@ export class Importer {
 
             if (series) {
               if (series.length > 1) {
-                args[0] = `Group(${series.map(s => `Series(${s.title || ''},,${s.values||''})` || '').join(', ')})`;
+                args[0] = `Group(${series.map(s => `Series(${s.title || ''},,${s.values||''})`).join(', ')})`;
               }
               else if (series.length === 1) {
                 if (series[0].title) {
@@ -1220,6 +1323,7 @@ export class Importer {
       default_column_width,
       column_widths,
       row_heights,
+      tab_color,
       row_styles,
       annotations,
       conditional_formats,

package/treb-export/src/index.worker.ts

@@ -23,7 +23,7 @@ import type { ImportedSheetData } from 'treb-base-types';
 import type { SerializedModel } from 'treb-data-model';
 
 import { Exporter } from './export';
-import { Importer } from './import2';
+import { Importer } from './import';
 
 const ctx: Worker = self as unknown as Worker;
 const exporter = new Exporter();

package/treb-export/src/workbook2.ts

@@ -39,11 +39,16 @@ import { ZipWrapper } from './zip-wrapper';
 import type { CellStyle, ThemeColor } from 'treb-base-types';
 import type { SerializedNamed } from 'treb-data-model';
 
+/**
+ * @privateRemarks -- FIXME: not sure about the equal/equals thing. need to check.
+ */
 export const ConditionalFormatOperators: Record<string, string> = {
   greaterThan: '>',
-  greaterThanOrEquals: '>=',
+  greaterThanOrEqual: '>=',
+  // greaterThanOrEquals: '>=',
   lessThan: '<',
-  lessThanOrEquals: '<=',
+  lessThanOrEqual: '<=',
+  // lessThanOrEquals: '<=',
   equal: '=',
   notEqual: '<>',
 };

package/treb-grid/src/editors/editor.ts

@@ -163,7 +163,7 @@ export interface NodeDescriptor {
 
 export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorEvent> {
 
-  protected static readonly FormulaChars = ('$^&*(-+={[<>/~%' + Localization.argument_separator).split(''); // FIXME: i18n
+  protected static readonly FormulaChars = ('$^&*(-+={[<>/~%@' + Localization.argument_separator).split(''); // FIXME: i18n
 
   /**
    * the current edit cell. in the event we're editing a merged or

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

@@ -967,7 +967,7 @@ export class Grid extends GridBase {
     if (add_to_layout) {
       this.layout.AddAnnotation(annotation);
       if (annotation.data.layout) {
-        this.EnsureAddress(annotation.data.layout.br.address, 1);
+        this.EnsureAddress(annotation.data.layout.br.address, 1, toll_events);
       }
     }
     else {
@@ -1190,7 +1190,7 @@ export class Grid extends GridBase {
     this.QueueLayoutUpdate();
 
     this.StyleDefaultFromTheme();
-        
+
     if (render) {
       this.Repaint(false, false); // true, true);
     }
@@ -1403,6 +1403,10 @@ export class Grid extends GridBase {
 
     // this.tile_renderer.UpdateTheme(); // has reference
 
+    if (this.tab_bar) {
+      this.tab_bar.UpdateTheme();
+    }
+
     if (!initial) {
 
       this.UpdateLayout(); // in case we have changed font size
@@ -1454,7 +1458,7 @@ export class Grid extends GridBase {
 
     if (this.options.tab_bar) {
 
-      this.tab_bar = new TabBar(this.layout, this.model, this.view, this.options, view_node);
+      this.tab_bar = new TabBar(this.layout, this.model, this.view, this.options, this.theme, view_node);
       this.tab_bar.Subscribe((event) => {
         switch (event.type) {
           case 'cancel':
@@ -5936,7 +5940,7 @@ export class Grid extends GridBase {
   /** 
    * if the address is outside of current extent, expand 
    */
-  private EnsureAddress(address: ICellAddress, step = 8): boolean {
+  private EnsureAddress(address: ICellAddress, step = 8, toll_layout = false): boolean {
 
     let expanded = false;
 
@@ -5959,7 +5963,7 @@ export class Grid extends GridBase {
         expanded = true;
       }
 
-      if (expanded) {
+      if (expanded && !toll_layout) {
         this.layout.UpdateTiles();
         this.layout.UpdateContentsSize();
         this.Repaint(true, true);

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

@@ -25,7 +25,7 @@ import type { BaseLayout } from '../layout/base_layout';
 import { MouseDrag } from './drag_mask';
 import type { GridOptions } from './grid_options';
 import { type ScaleEvent, ScaleControl } from './scale-control';
-import { DOMContext } from 'treb-base-types';
+import { DOMContext, ResolveThemeColor, type Theme } from 'treb-base-types';
 
 export interface ActivateSheetEvent {
   type: 'activate-sheet';
@@ -100,6 +100,8 @@ export class TabBar extends EventSource<TabEvent> {
     timeout?: number;
   } = {};
 
+  private tab_color_cache: Map<number, { background: string, foreground: string }> = new Map();
+
   // tslint:disable-next-line: variable-name
   private _visible = false;
 
@@ -133,6 +135,7 @@ export class TabBar extends EventSource<TabEvent> {
       private model: DataModel,
       private view: ViewModel,
       private options: GridOptions,
+      private theme: Theme,
       // private container: HTMLElement,
       view_node: HTMLElement,
     ) {
@@ -236,10 +239,21 @@ export class TabBar extends EventSource<TabEvent> {
     if (active) {
       // tab.classList.add('treb-selected');
       tab.setAttribute('selected', '');
+
+      if (tab.dataset.background_color) {
+        tab.style.backgroundColor = `color-mix(in srgb, ${tab.dataset.background_color} 20%, var(--treb-tab-bar-active-tab-background, #fff))`;
+        tab.style.color = '';
+      }
     }
     else {
       // tab.classList.remove('treb-selected');
       tab.removeAttribute('selected');
+      if (tab.dataset.background_color) {
+        tab.style.backgroundColor = tab.dataset.background_color;
+      }
+      if (tab.dataset.foreground_color) {
+        tab.style.color = tab.dataset.foreground_color;
+      }
     }
   }
 
@@ -419,6 +433,11 @@ export class TabBar extends EventSource<TabEvent> {
 
   }
 
+  public UpdateTheme() {
+    this.tab_color_cache.clear();
+    this.Update();
+  }
+
   /**
    * update tabs from model.
    */
@@ -464,6 +483,24 @@ export class TabBar extends EventSource<TabEvent> {
       const tab = this.DOM.Create('li');
       tab.setAttribute('tabindex', '0');
 
+      if (sheet.tab_color) {
+        const id = sheet.id;
+        if (!this.tab_color_cache.has(id)) {
+          const background = ResolveThemeColor(this.theme, sheet.tab_color);
+          const foreground = ResolveThemeColor(this.theme, { offset: sheet.tab_color });
+          if (background && foreground) {
+            this.tab_color_cache.set(id, { background, foreground });
+          }
+        }
+        const color = this.tab_color_cache.get(id);
+        if (color) {
+          tab.style.backgroundColor = color.background;
+          tab.style.color = color.foreground;
+          tab.dataset.background_color = color.background;
+          tab.dataset.foreground_color = color.foreground;
+        }
+      }
+
       // tab.classList.add('tab');
       tab.style.order = (index * 2).toString();
       tab.role = 'tab';

package/treb-parser/src/parser.ts

@@ -136,9 +136,10 @@ const binary_operators_precendence: PrecedenceList = {
   ':': 13, // range operator
 };
 
-/**
+/* *
  * binary ops are sorted by length so we can compare long ops first
- */
+   switching to a composite w/ unary operators
+ * /
 const binary_operators = Object.keys(binary_operators_precendence).sort(
   (a, b) => b.length - a.length,
 );
@@ -147,8 +148,17 @@ const binary_operators = Object.keys(binary_operators_precendence).sort(
  * unary operators. atm we have no precedence issues, unary operators
  * always have absolute precedence. (for numbers, these are properly part
  * of the number, but consider `=-SUM(1,2)` -- this is an operator).
+ * 
+ * implicit intersection operator should now have precedence over +/-.
+ */
+const unary_operators: PrecedenceList = { '@': 50, '-': 100, '+': 100 };
+
+/**
+ * to avoid the double - and +, we're just adding our one extra unary
+ * operator. doing this dynamically would be silly, although this does
+ * make this code more fragile.
  */
-const unary_operators: PrecedenceList = { '-': 100, '+': 100 };
+const composite_operators: string[] = [...Object.keys(binary_operators_precendence), '@'].sort((a, b) => b.length - a.length);
 
 /**
  * parser for spreadsheet language.
@@ -2092,7 +2102,7 @@ export class Parser {
   }
 
   protected ConsumeOperator(): ExpressionUnit | null {
-    for (const operator of binary_operators) {
+    for (const operator of composite_operators) {
       if (this.expression.substr(this.index, operator.length) === operator) {
         const position = this.index;
         this.index += operator.length;