@trebco/treb 32.3.3 → 32.5.0

package/treb-grid/src/layout/mock-layout.ts

@@ -1,3 +1,24 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2025 trebco, llc. 
+ * info@treb.app
+ * 
+ */
+
 
 import type { DataModel, ViewModel } from 'treb-data-model';
 import { BaseLayout } from './base_layout';

package/treb-grid/src/render/selection-renderer.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -24,7 +24,8 @@ import type { ICellAddress,
          Cell, Size, 
          CellStyle,
          Theme,
-         HorizontalAlign} from 'treb-base-types';
+         HorizontalAlign,
+         ExtendedCelLStyle} from 'treb-base-types';
 import { TextPartFlag, Style, ValueType, Area, Rectangle, ResolveThemeColor, IsDefinedColor } from 'treb-base-types';
 
 import type { Tile } from '../types/tile';
@@ -2017,6 +2018,44 @@ export class TileRenderer {
       }
 
     }
+  
+    if ((style as ExtendedCelLStyle).databar && height > 7 && width > 9) { // FIXME: buffers
+
+      const db = (style as ExtendedCelLStyle).databar;
+      if (db) {
+
+        const margin = { x: 4, y: 3}; // FIXME: parameterize, move out of this function/block
+        context.fillStyle = ResolveThemeColor(this.theme, db.fill);
+
+        const bar_top = margin.y;
+        const bar_height = height - (margin.y * 2 + 1);
+        let bar_left = margin.x;
+        let bar_width = 0;
+
+        if (db.zero > 0) {
+          bar_left = bar_left + db.zero * (width - (margin.x * 2 + 1));
+          if (db.value > db.zero) {
+            bar_width = (width - (margin.x * 2 + 1)) * (db.value - db.zero);
+          }
+          else {
+
+            if (db.negative) {
+              context.fillStyle = ResolveThemeColor(this.theme, db.negative);
+            }
+
+            bar_width = (width - (margin.x * 2 + 1)) * (db.zero - db.value);
+            bar_left -= bar_width;
+          }
+        } 
+        else {
+          bar_width = (width - (margin.x * 2 + 1)) * db.value;
+        }
+
+        context.fillRect(bar_left, bar_top, bar_width, bar_height);
+
+      }
+
+    }
 
     // NOTE: we are getting fontmetrics based on the base font (so ignoring italic 
     // and bold variants). this should be OK because we use it for height, mostly.
@@ -2095,7 +2134,10 @@ export class TileRenderer {
         break;
     }
 
-    if ((cell.type === ValueType.number || 
+    if ((style as ExtendedCelLStyle).databar?.hide_values) {
+      // ...
+    }
+    else if ((cell.type === ValueType.number || 
          cell.calculated_type === ValueType.number || 
          cell.type === ValueType.complex || 
          cell.calculated_type === ValueType.complex) && overflow) {

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -1,3 +1,24 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2025 trebco, llc. 
+ * info@treb.app
+ * 
+ */
+
 
 import type { IArea, ICellAddress } from 'treb-base-types';
 

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -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/grid_events.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -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);
 

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/util/fontmetrics.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/util/ua.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-parser/src/index.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -393,6 +393,12 @@ export interface OptionalParserFlags {
    */
   r1c1: boolean,
 
+  /**
+   * handle r1c1 properly, which is to say use absolute addressing
+   * for absolute references and relative addressing otherwise. this should 
+   * be the default, but I don't want to break anything.
+   */
+  r1c1_proper_semantics: boolean;
 
   /* *
    * what if we do want =1/2 to be a fraction? more importantly, if we are
@@ -448,6 +454,14 @@ export interface RenderOptions {
   /** force addresses to be relative */
   r1c1_force_relative?: boolean;
 
+  /**
+   * handle r1c1 properly, which is to say use absolute addressing
+   * for absolute references and relative addressing otherwise (assuming
+   * there's a base set). this should be the default, but I don't want
+   * to break anything.
+   */
+  r1c1_proper_semantics?: boolean;
+
   /** if we're just translating, don't have to render addresses */
   pass_through_addresses?: boolean;
 

package/treb-parser/src/parser.ts

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License along 
  * with TREB. If not, see <https://www.gnu.org/licenses/>. 
  *
- * Copyright 2022-2024 trebco, llc. 
+ * Copyright 2022-2025 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -602,15 +602,15 @@ export class Parser {
         if (options.pass_through_addresses) { 
           return unit.label;
         }
-        return options.r1c1 ? this.R1C1Label(unit, options.r1c1_base, options.r1c1_force_relative) : this.AddressLabel(unit, offset);
+        return options.r1c1 ? this.R1C1Label(unit, options) : this.AddressLabel(unit, offset);
 
       case 'range':
         if (options.pass_through_addresses) { 
           return unit.label;
         }
         return options.r1c1 ? 
-          this.R1C1Label(unit.start, options.r1c1_base, options.r1c1_force_relative) + ':' + 
-            this.R1C1Label(unit.end, options.r1c1_base, options.r1c1_force_relative) : 
+          this.R1C1Label(unit.start, options) + ':' + 
+            this.R1C1Label(unit.end, options) : 
           this.AddressLabel(unit.start, offset) + ':' + this.AddressLabel(unit.end, offset);
 
       case 'missing':
@@ -962,10 +962,14 @@ export class Parser {
    */
   protected R1C1Label(
     address: UnitAddress,
-    base?: UnitAddress,
-    force_relative = false,
+    options: Partial<RenderOptions>,
+    // base?: UnitAddress,
+    // force_relative = false,
   ): string {
 
+    const force_relative = !!options.r1c1_force_relative;
+    const base = options.r1c1_base;
+
     let label = '';
 
     if (address.sheet) { // && (!base?.sheet || base?.sheet !== address.sheet)) {
@@ -976,7 +980,30 @@ export class Parser {
     let row = '';
     let column = '';
 
-    if (force_relative && base) { 
+    if (force_relative && options.r1c1_proper_semantics && base) {
+
+      if (address.absolute_row) {
+        row = (address.row + 1).toString();
+      }
+      else {
+        const delta_row = address.row - base.row;
+        if (delta_row) {
+          row = `[${delta_row}]`;
+        }
+      }
+
+      if (address.absolute_column) {
+        column = (address.column + 1).toString();
+      }
+      else {
+        const delta_column = address.column - base.column;
+        if (delta_column) {
+          column = `[${delta_column}]`;
+        }
+      }
+
+    }
+    else if (force_relative && base) { 
       const delta_row = address.row - base.row;
       const delta_column = address.column - base.column;
 
@@ -2527,6 +2554,9 @@ export class Parser {
         }
         else if (match[1]){ // absolute
           r1c1.row = Number(match[1]) - 1; // R1C1 is 1-based
+          if (this.flags.r1c1_proper_semantics) {
+            r1c1.absolute_row = true;
+          }
         }
         else {
           r1c1.offset_row = true;
@@ -2539,6 +2569,9 @@ export class Parser {
         }
         else if (match[2]) { // absolute
           r1c1.column = Number(match[2]) - 1; // R1C1 is 1-based
+          if (this.flags.r1c1_proper_semantics) {
+            r1c1.absolute_column = true;
+          }
         }
         else {
           r1c1.offset_column = true;