@trebco/treb 29.1.2 → 29.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "29.1.2",
+  "version": "29.1.4",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {

package/treb-base-types/src/text_part.ts

@@ -46,6 +46,13 @@ export enum TextPartFlag {
   italic = 7,
   */
 
+  /** 
+   * this is an indent component. we want to keep track of this
+   * so we don't add it more than once if we're indenting dynamically.
+   * maybe this is not the way to indent.
+   */
+  indent = 8,
+
 }
 
 export interface TextPart {

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

@@ -735,11 +735,17 @@ export class TileRenderer {
     let override_formatting: string | undefined;
     let formatted = cell.editing ? '' : cell.formatted; // <-- empty on editing, to remove overflows
 
+    // remove existing indent, if any
+    
+    if (Array.isArray(formatted)) {
+      formatted = formatted.filter(test => test.flag !== TextPartFlag.indent);
+    }
+
     // precalculate indent as string so we can use layout
 
     let indent = '';
     let align: HorizontalAlign|undefined;
-
+   
     if (style.indent) {
 
       for (let i = 0; i < style.indent; i++) {
@@ -751,9 +757,14 @@ export class TileRenderer {
       // default might be left or right based on type
 
       if (!align) {
-        align = (cell.type === ValueType.number || cell.calculated_type === ValueType.number) ? 'right' : 'left';
+        align = (
+          cell.type === ValueType.number || 
+          cell.calculated_type === ValueType.number ||
+          cell.type === ValueType.complex || 
+          cell.calculated_type === ValueType.complex
+        ) ? 'right' : 'left';
       }
-      
+     
     }
 
     if (Array.isArray(formatted)) {
@@ -767,12 +778,11 @@ export class TileRenderer {
       // this is a single line, with number formatting
 
       if (indent) {
-
         if (align === 'right') {
-          formatted.push({ text: indent });
+          formatted.push({ text: indent, flag: TextPartFlag.indent });
         }
-        else if (align === 'left') {
-          formatted.unshift({ text: indent });
+        else if (align === 'left' || typeof align === 'undefined') {
+          formatted.unshift({ text: indent, flag: TextPartFlag.indent });
         }
       }
 

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

@@ -2081,7 +2081,7 @@ export class Grid extends GridBase {
 
     if (!area) {
       if (this.primary_selection.empty) { return; }
-      area = this.primary_selection.area;
+      area = this.active_sheet.RealArea(this.primary_selection.area);
     }
 
     this.ExecCommand({