@trebco/treb 32.13.2 → 36.1.2

package/treb-format/src/number_format_section.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-format/src/value_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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/editors/autocomplete.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/editors/autocomplete_matcher.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/editors/editor.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -374,7 +374,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
   /**
    * 
    */
-  public InsertReference(reference: string) {
+  public InsertReference(reference: string, toggle_reference_type = false, typed_reference_list: string[] = []) {
 
     if (!this.active_editor) {
       return;
@@ -421,6 +421,8 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
         const substrings = this.SubstringToCaret2(this.active_editor.node);
 
+        // console.info("Case 1", substrings);
+
         /*
         // console.info('case 1');
 
@@ -451,7 +453,14 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
         const parent = range.startContainer.parentElement;
         if (parent instanceof view.HTMLElement && parent.dataset.reference) {
 
-          // console.info('case 2');
+          if (toggle_reference_type && typed_reference_list.length) {
+            for (const [index, ref] of typed_reference_list.entries()) {
+              if (ref === parent.textContent) {
+                reference = typed_reference_list[index + 1] || typed_reference_list[0];
+                break;
+              }
+            }
+          }
 
           // replace text
           parent.textContent = reference;
@@ -581,7 +590,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     for (const support of this.nodes) {
       for (const area of support.references || []) {
-        const label = this.model.AddressToLabel(area);
+        const label = this.model.AddressToLabel(area, true);
         if (!map.has(label)) {
           map.set(label, area);
           indexes.set(label, indexes.size);
@@ -733,7 +742,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     for (const entry of reference_list) {
 
-      const label = this.model.AddressToLabel(entry); // , this.view.active_sheet);
+      const label = this.model.AddressToLabel(entry, true); // , this.view.active_sheet);
       const area = IsCellAddress(entry) ? 
           new Area(entry) : 
           new Area(entry.start, entry.end);
@@ -767,7 +776,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
    * @param options 
    */
   protected UpdateReferences(descriptor: NodeDescriptor, references: Area[] = []) {
-    descriptor.node.dataset.references = JSON.stringify(references.map(entry => this.model.AddressToLabel(entry)));
+    descriptor.node.dataset.references = JSON.stringify(references.map(entry => this.model.AddressToLabel(entry, true)));
     descriptor.references = references;
   }
 

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

@@ -14,32 +14,30 @@
  * 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. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
 
-
 import { Editor, type NodeDescriptor } from './editor';
 
+export type KeyEventCallbackType = (event: KeyboardEvent) => void;
+
 export class ExternalEditor extends Editor {
 
+  public key_event_callback?: KeyEventCallbackType;
+
   public get active() {
     return this.nodes.length > 0;
   }
 
   public Reset() {
     this.AttachNodes();
+    this.key_event_callback = undefined;
   }
 
   /**
    * attach to a set of nodes (one is fine). 
-   * 
-   * FIXME: since this is not used in subclasses for ICE and formula bar,
-   * perhaps we should move it into a new subclass specifically for 
-   * external editor. we can add some flags as well. TODO/FIXME
-   * 
-   * update modifying how this works. we will now watch focus ourselves.
    */
   public AttachNodes(nodes: HTMLElement[] = [], assume_formula = true) {
 
@@ -111,6 +109,33 @@ export class ExternalEditor extends Editor {
         this.active_editor = undefined;
       });
 
+      this.RegisterListener(descriptor, 'keydown', (event: KeyboardEvent) => {
+        if (this.selecting) {
+          switch (event.key) {
+            case 'ArrowDown':
+            case 'ArrowUp':
+            case 'ArrowLeft':
+            case 'ArrowRight':
+              break;
+
+            case '/':
+              if (event.ctrlKey) {
+                break;
+              }
+              // otherwise fall through
+
+            default:
+              return;
+          }
+        }
+
+        // we need to pass this event up to grid to handle. we might
+        // also want to filter it (let the handler dp that)
+
+        this.key_event_callback?.(event);
+
+      });
+
       this.RegisterListener(descriptor, 'input', (event: Event) => {
 
         // we're filtering on trusted here because we send an event.

package/treb-grid/src/editors/formula_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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -51,11 +51,16 @@ export interface TollEvent {
   value?: string;
 }
 
+export interface ToggleReferenceEvent {
+  type: 'toggle-reference';
+}
+
 export type FormulaBar2Event
   = FormulaButtonEvent
   // | FormulaBarResizeEvent
   | AddressLabelEvent
   | TollEvent
+  | ToggleReferenceEvent
   ;
 
 // ---
@@ -553,6 +558,12 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
     }
 
     switch (event.key){
+    case 'F4':
+      if (this.selecting) {
+        this.Publish({ type: 'toggle-reference' });
+      }
+      break;
+
     case 'Enter':
     case 'Tab':
       {

package/treb-grid/src/editors/overlay_editor.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -446,6 +446,9 @@ export class OverlayEditor extends Editor<ResetSelectionEvent> {
 
     switch (event.key) {
 
+      case 'F4':
+        return undefined;
+
       case 'Enter':
       case 'Tab':
         return 'commit'; 

package/treb-grid/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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/layout/base_layout.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/layout/grid_layout.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/layout/mock-layout.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

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-2025 trebco, llc. 
+ * Copyright 2022-2026 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-2025 trebco, llc. 
+ * Copyright 2022-2026 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-2025 trebco, llc. 
+ * Copyright 2022-2026 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -886,7 +886,8 @@ export class TileRenderer {
         const render_part: RenderTextPart = { 
           width: mt_width, 
           text: part.text, 
-          hidden: part.flag === TextPartFlag.hidden 
+          hidden: part.flag === TextPartFlag.hidden,
+          indent: part.flag === TextPartFlag.indent,
         };
 
         strings.push(render_part);
@@ -1067,7 +1068,7 @@ export class TileRenderer {
 
             max_width = Math.max(max_width, last.width);
 
-            const line_string = line2.map((metric) => {
+            const line_string: RenderTextPart[] = line2.map((metric) => {
               return {
                 ...metric.part,
                 hidden: false, 
@@ -1078,10 +1079,10 @@ export class TileRenderer {
 
             if (style.indent) {
               if (align === 'right') {
-                line_string.push({ text: indent, hidden: false, width: indent_width });
+                line_string.push({ text: indent, hidden: false, width: indent_width, indent: true });
               }
               else if (align === 'left') {
-                line_string.unshift({ text: indent, hidden: false, width: indent_width });
+                line_string.unshift({ text: indent, hidden: false, width: indent_width, indent: true });
               }
             }
 
@@ -1100,6 +1101,7 @@ export class TileRenderer {
         for (const line of md) {
           const parts: RenderTextPart[] = [];
 
+          /*
           if (style.indent) {
             if (align === 'right') {
               line.push({ text: indent });
@@ -1108,8 +1110,25 @@ export class TileRenderer {
               line.unshift({ text: indent });
             }
           }
+          */
 
           let line_width = 0;
+          let indent_width = 0;
+
+          if (style.indent) {
+            context.font = fonts.base;
+            indent_width = context.measureText(indent).width;
+          }
+
+          if (style.indent && align === 'left') {
+            line_width += indent_width;
+            parts.push({
+              text: indent,
+              hidden: false,
+              width: indent_width,
+              indent: true,
+            });
+          }
 
           for (const element of line) {
 
@@ -1139,6 +1158,16 @@ export class TileRenderer {
 
           }
 
+          if (style.indent && align === 'right') {
+            line_width += indent_width;
+            parts.push({
+              text: indent,
+              hidden: false,
+              width: indent_width,
+              indent: true,
+            });
+          }
+
           max_width = Math.max(max_width, line_width);
 
           strings.push(parts);
@@ -2211,12 +2240,12 @@ export class TileRenderer {
               context.fillText(part.text, x, baseline);
             }
 
-            if (style.underline) {
+            if (style.underline && !part.indent) {
               context.moveTo(x, underline_y);
               context.lineTo(x + part.width, underline_y);
             }
             
-            if (style.strike || part.strike) {
+            if ((style.strike || part.strike) && !part.indent) {
               context.moveTo(x, strike_y);
               context.lineTo(x + part.width, strike_y);
             }

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-2025 trebco, llc. 
+ * Copyright 2022-2026 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-2025 trebco, llc. 
+ * Copyright 2022-2026 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-2025 trebco, llc. 
+ * Copyright 2022-2026 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-grid/src/types/external_editor_config.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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */