@trebco/treb 32.4.1 → 32.6.4

package/treb-export/src/{workbook2.ts → workbook.ts}

@@ -28,16 +28,17 @@ const xmlparser2 = new XMLParser(XMLOptions2);
 
 // import * as he from 'he';
 
-import type { TwoCellAnchor, CellAnchor } from './drawing2/drawing2';
+import type { TwoCellAnchor, CellAnchor } from './drawing/drawing';
 
-import { SharedStrings } from './shared-strings2';
-import { StyleCache } from './workbook-style2';
-import { Theme } from './workbook-theme2';
-import { Sheet, VisibleState } from './workbook-sheet2';
+import { SharedStrings } from './shared-strings';
+import { StyleCache } from './workbook-style';
+import { Theme } from './workbook-theme';
+import { Sheet, VisibleState } from './workbook-sheet';
 import type { RelationshipMap } from './relationship';
 import { ZipWrapper } from './zip-wrapper';
-import type { CellStyle, ICellAddress, ThemeColor } from 'treb-base-types';
+import type { CellStyle, ThemeColor } from 'treb-base-types';
 import type { SerializedNamed } from 'treb-data-model';
+import { type Metadata, ParseMetadataXML } from './metadata';
 
 /**
  * @privateRemarks -- FIXME: not sure about the equal/equals thing. need to check.
@@ -53,20 +54,42 @@ export const ConditionalFormatOperators: Record<string, string> = {
   notEqual: '<>',
 };
 
+//
+// enums? really? in 2025? FIXME
+//
 export enum ChartType {
-  Unknown = 0, Column, Bar, Line, Scatter, Donut, Pie, Bubble, Box
+  Null = 0, 
+  Column, 
+  Bar, 
+  Line, 
+  Scatter, 
+  Donut, 
+  Pie, 
+  Bubble, 
+  Box, 
+  Histogram, 
+  Unknown
 }
 
 export interface ChartSeries {
   values?: string;
   categories?: string;
   bubble_size?: string;
+
+  /** special for histogram */
+  bin_count?: number;
+
   title?: string;
 }
 
+type ChartFlags =
+  'stacked'
+  ;
+
 export interface ChartDescription {
   title?: string;
   type: ChartType; 
+  flags?: ChartFlags[];
   series?: ChartSeries[];
 }
 
@@ -151,6 +174,9 @@ export class Workbook {
   /** the workbook "rels" */
   public rels: RelationshipMap = {};
 
+  /** metadata reference; new and WIP */
+  public metadata?: Metadata;
+  
   public sheets: Sheet[] = [];
 
   public active_tab = 0;
@@ -200,6 +226,13 @@ export class Workbook {
     let xml = xmlparser2.parse(data || '');
     this.shared_strings.FromXML(xml);
 
+    // new(ish) metadata
+    if (this.zip.Has('xl/metadata.xml')) {
+      data = this.zip.Get('xl/metadata.xml');
+      xml = xmlparser2.parse(data);
+      this.metadata = ParseMetadataXML(xml);
+    }
+
     // theme
     data = this.zip.Get('xl/theme/theme1.xml');
     xml = xmlparser2.parse(data);
@@ -542,7 +575,7 @@ export class Workbook {
     const xml = xmlparser2.parse(data);
 
     const result: ChartDescription = {
-      type: ChartType.Unknown
+      type: ChartType.Null
     };
 
     // console.info("RC", xml);
@@ -562,8 +595,29 @@ export class Workbook {
         }
       }
       else {
+
+        // there's a bug in FindAll -- seems to have to do with the nodes
+        // here being strings
+
+        const nodes: (string | { t$: string })[] = [];
+        const parents = XMLUtils.FindAll(title_node, 'c:tx/c:rich/a:p/a:r');
+        for (const entry of parents) {
+          if (entry['a:t']) {
+            nodes.push(entry['a:t'])
+          }
+        }
+
+        /*
+        const xx = XMLUtils.FindAll(title_node, 'c:tx/c:rich/a:p/a:r');
+        const yy = XMLUtils.FindAll(title_node, 'c:tx/c:rich/a:p/a:r/a:t');
+        console.info({xx, yy});
+
         const nodes = XMLUtils.FindAll(title_node, 'c:tx/c:rich/a:p/a:r/a:t');
-        result.title = '"' + nodes.join('') + '"';
+        */
+
+        result.title = '"' + nodes.map(node => {
+          return typeof node === 'string' ? node : (node.t$ || '');
+        }).join('') + '"';
       }
 
     }
@@ -653,6 +707,14 @@ export class Workbook {
       if (node['c:barDir']) {
         if (node['c:barDir'].a$?.val === 'col') {
           result.type = ChartType.Column;
+
+          if (node['c:grouping']?.a$?.val === 'stacked') {
+            if (!result.flags) {
+              result.flags = [];
+            }
+            result.flags.push('stacked');
+          }
+
         }
       }
       
@@ -705,9 +767,92 @@ export class Workbook {
       // box plot uses "extended chart" which is totally different... but we 
       // might need it again later? for the time being it's just inlined
 
+      // hmmm also used for histogram... histograms aren't named, they are 
+      // clustered column type with a binning element, which has some attributes
+
       const ex_series = XMLUtils.FindAll(xml, 'cx:chartSpace/cx:chart/cx:plotArea/cx:plotAreaRegion/cx:series');
       if (ex_series?.length) {
-        if (ex_series.every(test => test.a$?.layoutId === 'boxWhisker')) {
+
+        // testing seems to require looping, so let's try to merge loops
+
+        let clustered_column = true;
+        let histogram = true;
+        let box_whisker = true;
+
+        for (const series of ex_series) {
+
+          const layout = series.a$?.layoutId;
+
+          if (clustered_column && layout !== 'clusteredColumn') {
+            clustered_column = false;
+          }
+          if (box_whisker && layout !== 'boxWhisker') {
+            box_whisker = false;
+          }
+          if (clustered_column && histogram) {
+            const binning = XMLUtils.FindAll(series, `cx:layoutPr/cx:binning`);
+            if (!binning.length) {
+              histogram = false;
+            }
+          }
+
+        }
+
+        // ok that's what we know so far...
+
+        if (histogram) {
+          result.type = ChartType.Histogram;
+          result.series = [];
+
+          for (const series_entry of ex_series) {
+
+            if (series_entry.a$?.hidden === '1') {
+              continue;
+            }
+            
+            const series: ChartSeries = {};
+
+            const data = XMLUtils.FindAll(xml, 'cx:chartSpace/cx:chartData/cx:data');
+
+            // so there are multiple series, and multiple datasets,
+            // but they are all merged together? no idea how this design
+            // works
+
+            const values_list: string[] = [];
+            for (const data_series of data) {
+              values_list.push(data_series['cx:numDim']?.['cx:f'] || '');
+            }
+            series.values = values_list.join(',');
+
+            const bin_count = XMLUtils.FindAll(series_entry, `cx:layoutPr/cx:binning/cx:binCount`);
+            if (bin_count[0]) {
+              const count = Number(bin_count[0].a$?.val || 0);
+              if (count) {
+                series.bin_count = count;
+              }
+            }
+
+            result.series.push(series);
+
+          }
+
+          const title = XMLUtils.FindAll(xml, 'cx:chartSpace/cx:chart/cx:title/cx:tx/cx:txData');
+          if (title) {
+            if (title[0]?.['cx:f']) {
+              result.title = title[0]['cx:f'];
+            }
+            else if (title[0]?.['cx:v']) {
+              result.title = '"' + title[0]['cx:v'] + '"';
+            }
+          }
+
+          console.info("histogram", result);
+          return result;
+          
+        }
+
+        if (box_whisker) {
+
           result.type = ChartType.Box;
           result.series = [];
           const data = XMLUtils.FindAll(xml, 'cx:chartSpace/cx:chartData/cx:data'); // /cx:data/cx:numDim/cx:f');
@@ -758,7 +903,8 @@ export class Workbook {
     }
 
     if (!node) {
-      console.info("Chart type not handled");
+      console.info("Chart type not handled", {xml});
+      result.type = ChartType.Unknown;
     }
 
     // console.info("RX?", result);

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

@@ -1311,7 +1311,7 @@ export class Grid extends GridBase {
     }
 
     if (this.tab_bar) {
-      this.tab_bar.Update();
+      this.tab_bar.Update(false); // !user
     }
 
   }
@@ -1320,7 +1320,7 @@ export class Grid extends GridBase {
    * This function is called via Shift+PageUp/PageDown. We need
    * to update to account for hidden sheets, which can't be activated.
    */
-  public NextSheet(step = 1): void {
+  public NextSheet(step = 1, user = false): void {
 
     if (this.model.sheets.length === 1) {
       return;
@@ -1344,7 +1344,7 @@ export class Grid extends GridBase {
       if (visible[i].sheet === this.active_sheet) {
         let index = (i + step) % visible.length;
         while (index < 0) { index += visible.length; }
-        this.ActivateSheet(visible[index].index);
+        this.ActivateSheet(visible[index].index, user);
         return;
       }
     }
@@ -1430,7 +1430,7 @@ export class Grid extends GridBase {
     }
 
     if (this.tab_bar) {
-      this.tab_bar.Update();
+      this.tab_bar.Update(false); // !user
     }
 
   }
@@ -1453,7 +1453,7 @@ export class Grid extends GridBase {
    */
   public UpdateTabBar(): void {
     if (this.tab_bar) {
-      this.tab_bar.Update();
+      this.tab_bar.Update(true); // user? ...
     }
   }
 
@@ -1730,7 +1730,7 @@ export class Grid extends GridBase {
       //  this.tab_bar.Update(); 
       //}
 
-      this.tab_bar?.Update();
+      this.tab_bar?.Update(false);
 
       this.Repaint(true);
     }
@@ -2673,7 +2673,7 @@ export class Grid extends GridBase {
 
   protected RenameSheetInternal(target: Sheet, name: string) {
     super.RenameSheetInternal(target, name);
-    this.tab_bar?.Update();
+    this.tab_bar?.Update(false);
 
   }
 
@@ -2898,7 +2898,7 @@ export class Grid extends GridBase {
       activate: this.active_sheet,
     });
 
-    if (this.tab_bar) { this.tab_bar.Update(); }
+    if (this.tab_bar) { this.tab_bar.Update(!!command.user); }
 
     this.layout.scroll_offset = this.active_sheet.scroll_offset;
 
@@ -5237,7 +5237,7 @@ export class Grid extends GridBase {
         case 'PageUp':
         case 'PageDown':
           if (event.shiftKey) {
-            this.NextSheet(event.key === 'PageUp' ? -1 : 1);
+            this.NextSheet(event.key === 'PageUp' ? -1 : 1, true);
             break;
           }
 

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

@@ -254,7 +254,7 @@ export class GridBase {
    * activate sheet, by name or index number
    * @param sheet number (index into the array) or string (name)
    */
-  public ActivateSheet(sheet: number | string): void {
+  public ActivateSheet(sheet: number | string, user?: boolean): void {
 
     const index = (typeof sheet === 'number') ? sheet : undefined;
     const name = (typeof sheet === 'string') ? sheet : undefined;
@@ -263,6 +263,7 @@ export class GridBase {
       key: CommandKey.ActivateSheet,
       index,
       name,
+      user,
     });
 
   }

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

@@ -431,6 +431,9 @@ export interface ActivateSheetCommand extends SheetSelection {
   tab_bar_event?: boolean;
 
   force?: boolean;
+
+  /** user action; use smooth scrolling */
+  user?: boolean;
 }
 
 /**

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

@@ -235,7 +235,8 @@ export class TabBar extends EventSource<TabEvent> {
 
   }
 
-  public SetActive(tab: HTMLElement, active: boolean): void {
+  public SetActive(tab: HTMLElement, active: boolean, user = false): void {
+
     if (active) {
       // tab.classList.add('treb-selected');
       tab.setAttribute('selected', '');
@@ -245,8 +246,33 @@ export class TabBar extends EventSource<TabEvent> {
         tab.style.color = '';
       }
 
+      // this is forcing the page to scroll if the sheet is below
+      // the fold. this is not useful behavior. at the same time, 
+      // we do need this to work... we probably have to do it manually
+      // instead of using scrollIntoView. would be nice if we could
+      // toggle this on manual/auto, so user clicks would still be 
+      // smooth. call that a TODO
+
       requestAnimationFrame(() => {
-        tab.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'nearest'});
+        if (user) {
+          tab.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'nearest'});
+        }
+        else {
+          if (tab.parentElement) {
+            const left = tab.offsetLeft;
+            const width = tab.offsetWidth;
+            const container_width = tab.parentElement.clientWidth || 0;
+            const scroll_left = tab.parentElement.scrollLeft || 0;
+
+            if (left > container_width) {
+              tab.parentElement.scrollLeft = left - width;
+            }
+            else if (scroll_left > left) {
+              tab.parentElement.scrollLeft = left;
+            }
+
+          }
+        }
       });
 
     }
@@ -298,7 +324,7 @@ export class TabBar extends EventSource<TabEvent> {
         case 'Escape':
           tab.innerText = sheet.name;
           this.Publish({ type: 'cancel' });
-          this.Update();
+          this.Update(true);
           break;
 
         default:
@@ -314,7 +340,7 @@ export class TabBar extends EventSource<TabEvent> {
         this.Publish({ type: 'rename-sheet', name, sheet });
       }
       else {
-        this.Update();
+        this.Update(true);
       }
     });
 
@@ -350,7 +376,7 @@ export class TabBar extends EventSource<TabEvent> {
     // then the classes won't change.
 
     for (const candidate of tabs) {
-      this.SetActive(candidate, candidate === tab);
+      this.SetActive(candidate, candidate === tab, true);
     }
 
     this.dragging = true;
@@ -445,8 +471,11 @@ export class TabBar extends EventSource<TabEvent> {
 
   /**
    * update tabs from model.
+   * 
+   * @param user - this is a user action, so use smooth scrolling
+   * when activating the tab. otherwise it's automatic so jump.
    */
-  public Update(): void {
+  public Update(user = false): void {
 
     this.tab_color_cache.clear(); // we're setting tab color but it's not getting updated otherwise
 
@@ -512,7 +541,7 @@ export class TabBar extends EventSource<TabEvent> {
       tab.style.order = (index * 2).toString();
       tab.role = 'tab';
 
-      this.SetActive(tab, sheet === this.view.active_sheet);
+      this.SetActive(tab, sheet === this.view.active_sheet, user);
 
       const mousedown = (event: MouseEvent) => this.MouseDownTab(event, tab, sheet, index, tabs);