@trebco/treb 28.11.1 → 28.15.0

package/treb-export/src/export2.ts

@@ -224,9 +224,10 @@ export class Exporter {
         },
       };
 
-      if (xf.horizontal_alignment || xf.vertical_alignment || xf.wrap_text) {
+      if (xf.horizontal_alignment || xf.vertical_alignment || xf.wrap_text || xf.indent) {
         // block.a$.applyAlignment = 1;
         block.alignment = { a$: {}};
+
         if (xf.horizontal_alignment) {
           block.alignment.a$.horizontal = xf.horizontal_alignment;
         }
@@ -236,6 +237,10 @@ export class Exporter {
         if (xf.wrap_text) {
           block.alignment.a$.wrapText = 1;
         }
+        if (xf.indent && xf.horizontal_alignment !== 'center') {
+          block.alignment.a$.indent = xf.indent;
+        }
+
       }
 
       return block;

package/treb-export/src/import2.ts

@@ -24,7 +24,7 @@
 import UZip from 'uzip';
 import Base64JS from 'base64-js';
 
-import type { AnchoredChartDescription, AnchoredImageDescription} from './workbook2';
+import type { AnchoredChartDescription, AnchoredImageDescription, AnchoredTextBoxDescription} from './workbook2';
 import { ChartType, ConditionalFormatOperators, Workbook } from './workbook2';
 import type { ParseResult } from 'treb-parser';
 import { Parser } from 'treb-parser';
@@ -81,7 +81,10 @@ export class Importer {
         t?: string;
         s?: string;
       };
-      v?: string|number; // is this never an object? (note: booleans are numbers in Excel)
+      v?: string|number|{
+        t$: string;
+        a$?: any;
+      }; 
       f?: string|{ 
         t$: string;
         a$?: {
@@ -167,8 +170,13 @@ export class Importer {
           const parse_result = this.parser.Parse(formula); // l10n?
           if (parse_result.expression) {
             this.parser.Walk(parse_result.expression, (unit) => {
-              if (unit.type === 'call' && /^_xll\./.test(unit.name)) {
-                unit.name = unit.name.substr(5);
+              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;
             });
@@ -214,14 +222,17 @@ export class Importer {
         }
 
         if (typeof element.v !== 'undefined') {
-          const num = Number(element.v.toString());
+
+          const V = (typeof element.v === 'object') ? element.v?.t$ : element.v;
+
+          const num = Number(V.toString());
           if (!isNaN(num)) {
             calculated_type = 'number'; // ValueType.number;
             calculated_value = num;
           }
           else {
             calculated_type = 'string'; // ValueType.string;
-            calculated_value = element.v.toString();
+            calculated_value = V.toString();
           }
         }
 
@@ -384,6 +395,20 @@ export class Importer {
 
       case 'expression':
         if (rule.formula) {
+
+          if (typeof rule.formula !== 'string') {
+            console.info("conditional expression", {rule});
+            if (rule.formula.t$) {
+
+              // the only case (to date) we've seen here is that the attribute 
+              // is "xml:space=preserve", which we can ignore (are you sure?)
+              // (should we check that?)
+
+              rule.formula = rule.formula.t$;
+
+            }
+          }
+
           let style = {};
           
           if (rule.a$.dxfId) {
@@ -492,6 +517,26 @@ export class Importer {
     const conditional_formatting = FindAll('worksheet/conditionalFormatting');
     for (const element of conditional_formatting) {
       if (element.a$?.sqref ){
+
+        // FIXME: this attribute might include multiple ranges? e.g.:
+        //
+        // <conditionalFormatting sqref="B31:I31 B10:E30 G10:I30 F14:F15">
+
+        const parts = element.a$.sqref.split(/\s+/);
+        for (const part of parts) {
+          const area = sheet.TranslateAddress(part);
+          if (element.cfRule) {
+            const rules = Array.isArray(element.cfRule) ? element.cfRule : [element.cfRule];
+            for (const rule of rules) {
+              const format = this.ParseConditionalFormat(area, rule);
+              if (format) {
+                conditional_formats.push(format);
+              }
+            }
+          }
+        }
+
+        /*
         const area = sheet.TranslateAddress(element.a$.sqref);
         if (element.cfRule) {
           const rules = Array.isArray(element.cfRule) ? element.cfRule : [element.cfRule];
@@ -502,6 +547,7 @@ export class Importer {
             }
           }
         }
+        */
       }
     }
     
@@ -802,6 +848,7 @@ export class Importer {
     const drawings = FindAll('worksheet/drawing');
     const chart_descriptors: AnchoredChartDescription[] = [];
     const image_descriptors: AnchoredImageDescription[] = [];
+    const textbox_descriptors: AnchoredTextBoxDescription[] = [];
 
     for (const child of drawings) {
       
@@ -826,6 +873,9 @@ export class Importer {
                 case 'image':
                   image_descriptors.push(entry);
                   break;
+                case 'textbox':
+                  textbox_descriptors.push(entry);
+                  break;
               }
             }
           }
@@ -867,6 +917,26 @@ export class Importer {
 
     };
 
+    for (const descriptor of textbox_descriptors) {
+
+      const layout: AnnotationLayout = {
+        tl: AnchorToCorner(descriptor.anchor.from),
+        br: AnchorToCorner(descriptor.anchor.to),
+      };
+
+      // console.info({descriptor});
+
+      annotations.push({
+        layout, 
+        type: 'textbox',
+        data: {
+          style: descriptor.style,
+          paragraphs: descriptor.paragraphs,
+        }
+      });
+      
+    }
+
     for (const descriptor of image_descriptors) {
       if (descriptor && descriptor.image) {
 

package/treb-export/src/shared-strings2.ts

@@ -44,7 +44,7 @@ export class SharedStrings {
       //   <t>text here!</t>
       // </si>
 
-      if (si.t) {
+      if (si.t !== undefined) {
 
         // seen recently in the wild, text with leading (or trailing) spaces
         // has an attribute xml:space=preserve (which makes sense, but was not

package/treb-export/src/workbook-style2.ts

@@ -29,6 +29,9 @@ import { XMLUtils } from './xml-utils';
 
 import { Unescape } from './unescape_xml';
 
+// what's the default font size? ... 11pt?
+const DEFAULT_FONT_SIZE = 11;
+
 export interface Font {
   size?: number;
   name?: string;
@@ -73,6 +76,7 @@ export interface CellXf {
   horizontal_alignment?: string;
   vertical_alignment?: string;
   xfid?: number;
+  indent?: number;
 
   // FIXME // apply_font?: boolean;
   // FIXME // apply_border?: boolean;
@@ -154,6 +158,7 @@ export interface StyleOptions {
   vertical_alignment?: string;
   wrap?: boolean;
   fill?: Fill;
+  indent?: number;
 }
 
 
@@ -269,13 +274,24 @@ export class StyleCache {
 
     }
 
+
     if (composite.font_size?.unit && composite.font_size.value) {
-      if (composite.font_size.unit !== 'pt') {
-        console.warn(`can't handle non-point font (FIXME)`);
+      if (composite.font_size.unit === 'em') {
+        font.size = composite.font_size.value * DEFAULT_FONT_SIZE;
       }
-      else {
+      else if (composite.font_size.unit === '%') {
+        font.size = composite.font_size.value * DEFAULT_FONT_SIZE / 100;
+      }
+      else if (composite.font_size.unit === 'pt' ){
         font.size = composite.font_size.value;
       }
+      else if (composite.font_size.unit === 'px' ){
+        font.size = composite.font_size.value * .75; // ?
+      }
+      else {
+        console.warn(`Unhandled font size unit`, composite.font_size);
+      }
+
     }
 
     if (composite.bold) font.bold = true;
@@ -420,6 +436,8 @@ export class StyleCache {
         break;
     }
 
+    options.indent = composite.indent;
+
     if (composite.fill) {
       fill.pattern_type = 'solid';
       if (composite.fill.text) {
@@ -649,6 +667,10 @@ export class StyleCache {
         break;
     }
 
+    // indent
+
+    props.indent = xf.indent;
+
     // wrap
 
     if (xf.wrap_text) {
@@ -657,6 +679,19 @@ export class StyleCache {
 
     // borders
 
+    const BorderEdgeToColor = (edge: BorderEdge): Color|undefined => {
+
+      // TODO: indexed
+
+      if (typeof edge.theme !== 'undefined') {
+        return {
+          theme: edge.theme,
+          tint: edge.tint,
+        };
+      }
+
+    };
+
     const border = this.borders[xf.border || 0];
     if (border) {
       if (border.bottom.style) {
@@ -666,10 +701,20 @@ export class StyleCache {
         else {
           props.border_bottom = 1;
         }
+        props.border_bottom_fill = BorderEdgeToColor(border.bottom);
+      }
+      if (border.left.style) {
+        props.border_left = 1;
+        props.border_left_fill = BorderEdgeToColor(border.left);
+      }
+      if (border.top.style) {
+        props.border_top = 1;
+        props.border_top_fill = BorderEdgeToColor(border.top);
+      }
+      if (border.right.style) {
+        props.border_right = 1;
+        props.border_right_fill = BorderEdgeToColor(border.right);
       }
-      if (border.left.style) props.border_left = 1;
-      if (border.top.style) props.border_top = 1;
-      if (border.right.style) props.border_right = 1;
     }
 
     return props;
@@ -1054,6 +1099,7 @@ export class StyleCache {
           xf.border === border_index &&
           xf.number_format === number_format_index &&
           !!xf.wrap_text === !!options.wrap &&
+          xf.indent === options.indent &&
           ((!options.horizontal_alignment && !xf.horizontal_alignment) || options.horizontal_alignment === xf.horizontal_alignment) &&
           ((!options.vertical_alignment && !xf.vertical_alignment) || options.vertical_alignment === xf.vertical_alignment)) {
           
@@ -1069,6 +1115,7 @@ export class StyleCache {
       fill: fill_index,
       border: border_index,
       number_format: number_format_index,
+      indent: options.indent,
     };
 
     if (options.horizontal_alignment) {
@@ -1083,44 +1130,6 @@ export class StyleCache {
 
     this.cell_xfs.push(new_xf);
 
-    /*
-
-    // add the node structure
-
-    if (!this.dom) throw new Error('missing dom');
-    const xfs = this.dom.find('./cellXfs');
-
-    if (!xfs) throw new Error('xfs not found');
-    xfs.attrib.count = (Number(xfs.attrib.count || 0) + 1).toString();
-
-    const new_element = Element('xf', {
-      borderId: new_xf.border.toString(),
-      fillId: new_xf.fill.toString(),
-      fontId: new_xf.font.toString(),
-      numFmtId: new_xf.number_format.toString(),
-    });
-
-    if (new_xf.horizontal_alignment || new_xf.vertical_alignment) {
-      const attrs: {[index: string]: string} = {};
-      if (new_xf.horizontal_alignment) {
-        attrs.horizontal = new_xf.horizontal_alignment;
-      }
-      if (new_xf.vertical_alignment) {
-        attrs.vertical = new_xf.vertical_alignment;
-      }
-      if (new_xf.wrap_text) {
-        attrs.wrapText = '1';
-      }
-      new_element.append(Element('alignment', attrs));
-    }
-
-    if (typeof new_xf.xfid !== 'undefined') {
-      new_element.attrib.xfId = new_xf.xfid.toString();
-    }
-
-    xfs.append(new_element);
-    */
-
     return this.cell_xfs.length - 1;
 
   }
@@ -1144,31 +1153,58 @@ export class StyleCache {
 
     composite = FindAll('styleSheet/borders/border');
 
+    const ElementToBorderEdge = (element: any, edge: BorderEdge) => {
+
+      if (element?.a$) {
+        edge.style = element.a$.style;
+        if (typeof element.color === 'object') {
+          if (typeof element.color.a$?.indexed !== 'undefined') {
+            edge.color = Number(element.color.a$.indexed);
+          }
+          if (typeof element.color.a$?.theme !== 'undefined') {
+            edge.theme = Number(element.color.a$.theme);
+          }
+          if (typeof element.color.a$?.tint !== 'undefined') {
+            edge.tint = Number(element.color.a$.tint);
+          }
+        }
+      }
+
+    };
+    
+
     this.borders = composite.map(element => {
 
       const border: BorderStyle = JSON.parse(JSON.stringify(default_border));
 
+      /*
       // we're relying on these being empty strings -> falsy, not a good look
 
       if (element.left) {
-        border.left.style = element.left.a$.style;
-        border.left.color = Number(element.left.color?.a$?.indexed);
+        // border.left.style = element.left.a$.style;
+        // border.left.color = Number(element.left.color?.a$?.indexed);
       }
 
       if (element.right) {
-        border.right.style = element.right.a$.style;
-        border.right.color = Number(element.right.color?.a$?.indexed);
+        // border.right.style = element.right.a$.style;
+        // border.right.color = Number(element.right.color?.a$?.indexed);
       }
 
       if (element.top) {
-        border.top.style = element.top.a$.style;
-        border.top.color = Number(element.top.color?.a$?.indexed);
+        // border.top.style = element.top.a$.style;
+        // border.top.color = Number(element.top.color?.a$?.indexed);
       }
 
       if (element.bottom) {
-        border.bottom.style = element.bottom.a$.style;
-        border.bottom.color = Number(element.bottom.color?.a$?.indexed);
+        // border.bottom.style = element.bottom.a$.style;
+        // border.bottom.color = Number(element.bottom.color?.a$?.indexed);
       }
+      */
+
+      ElementToBorderEdge(element.left, border.left);
+      ElementToBorderEdge(element.right, border.right);
+      ElementToBorderEdge(element.top, border.top);
+      ElementToBorderEdge(element.bottom, border.bottom);
       
       return border;
 
@@ -1191,6 +1227,7 @@ export class StyleCache {
         xf.horizontal_alignment = element.alignment.a$.horizontal;
         xf.vertical_alignment = element.alignment.a$.vertical;
         xf.wrap_text = !!element.alignment.a$.wrapText;
+        xf.indent = element.alignment.a$.indent || undefined;
       }
 
       return xf;

package/treb-export/src/workbook2.ts

@@ -44,6 +44,7 @@ import { Theme } from './workbook-theme2';
 import { Sheet, VisibleState } from './workbook-sheet2';
 import type { RelationshipMap } from './relationship';
 import { ZipWrapper } from './zip-wrapper';
+import type { CellStyle } from 'treb-base-types';
 
 
 /*
@@ -98,7 +99,23 @@ export interface AnchoredChartDescription {
   anchor: TwoCellAnchor,
 }
 
-export type AnchoredDrawingPart = AnchoredChartDescription|AnchoredImageDescription;
+export interface AnchoredTextBoxDescription {
+  type: 'textbox';
+  style?: CellStyle;
+  paragraphs: { 
+    style?: CellStyle,
+    content: {
+      text: string, 
+      style?: CellStyle 
+    }[],
+  }[];
+  anchor: TwoCellAnchor,
+}
+
+export type AnchoredDrawingPart = 
+    AnchoredChartDescription | 
+    AnchoredTextBoxDescription |
+    AnchoredImageDescription ;
 
 export interface TableFooterType {
   type: 'label'|'formula';
@@ -363,6 +380,107 @@ export class Workbook {
           }
 
         }
+        else {
+
+          let style: CellStyle|undefined;
+
+          const sppr = XMLUtils.FindAll(anchor_node, 'xdr:sp/xdr:spPr')[0];
+          if (sppr) {
+            style = {};
+            const fill = sppr['a:solidFill'];
+            if (fill) {
+              if (fill['a:schemeClr']?.a$?.val) {
+                let m = (fill['a:schemeClr'].a$.val).match(/accent(\d+)/);
+                if (m) {
+                  style.fill = { theme: Number(m[1]) + 3 }
+                  if (fill['a:schemeClr']['a:lumOff']?.a$?.val) {
+                    const num = Number(fill['a:schemeClr']['a:lumOff'].a$.val);
+                    if (!isNaN(num)) {
+                      style.fill.tint = num / 1e5;
+                    }
+                  }
+                }
+
+              }
+            }
+          }
+
+          const tx = XMLUtils.FindAll(anchor_node, 'xdr:sp/xdr:txBody')[0];
+          if (tx) {
+
+            const paragraphs: { 
+              style?: CellStyle,
+              content: {
+                text: string, 
+                style?: CellStyle 
+              }[],
+            }[] = [];
+
+            /*
+            const content: {
+              text: string,
+              style?: CellStyle,
+            }[][] = [];
+            */
+
+            const p_list = XMLUtils.FindAll(tx, 'a:p');
+            for (const paragraph of p_list) {
+              const para: { text: string, style?: CellStyle }[] = [];
+              let style: CellStyle|undefined;
+
+              let appr = paragraph['a:pPr'];
+              if (appr) {
+                style = {};
+                if (appr.a$?.algn === 'r') {
+                  style.horizontal_align = 'right';
+                }
+                else if (appr.a$?.algn === 'ctr') {
+                  style.horizontal_align = 'center';
+                }
+              }
+
+              let ar = paragraph['a:r'];
+              if (ar) {
+                if (!Array.isArray(ar)) {
+                  ar = [ar];
+                }
+                for (const line of ar) {
+
+                  const entry: { text: string, style?: CellStyle } = { 
+                    text: line['a:t'] || '',
+                  };
+
+                  // format
+                  const fmt = line['a:rPr'];
+                  if (fmt) {
+                    entry.style = {};
+                    if (fmt.a$?.b === '1') {
+                      entry.style.bold = true;
+                    }
+                    if (fmt.a$?.i === '1') {
+                      entry.style.italic = true;
+                    }
+                  }
+
+                  para.push(entry);
+
+                }
+              }
+
+              paragraphs.push({ content: para, style });
+
+            }
+            
+            results.push({
+              type: 'textbox', 
+              style,
+              paragraphs,
+              anchor,
+            });
+
+          }
+
+        }
 
 
       }

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

@@ -789,6 +789,13 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     if (this.active_editor && !this.assume_formula) {
       this.active_editor.node.spellcheck = !(this.text_formula);
+
+      // if not assuming formula, and it's not a formula, then exit.
+
+      if (!this.text_formula) {
+        return;
+      }
+
     }
 
     // this is a short-circuit so we don't format the same text twice. 

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

@@ -29,9 +29,11 @@ import { DOMContext } from 'treb-base-types';
 
 // --- from formula_bar ---
 
+/*
 export interface FormulaBarResizeEvent {
   type: 'formula-bar-resize';
 }
+*/
 
 export interface FormulaButtonEvent {
   type: 'formula-button';
@@ -46,7 +48,7 @@ export interface AddressLabelEvent {
 
 export type FormulaBar2Event
   = FormulaButtonEvent
-  | FormulaBarResizeEvent
+  // | FormulaBarResizeEvent
   | AddressLabelEvent
   ;
 
@@ -172,6 +174,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
 
     this.InitAddressLabel();
 
+    /*
     if (this.options.insert_function_button) {
       this.button = DOM.Create('button', 'formula-button', inner_node);
       this.button.addEventListener('click', () => {
@@ -179,6 +182,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
         this.Publish({ type: 'formula-button', formula });
       });
     }
+    */
 
     this.container_node = container.querySelector('.treb-editor-container') as HTMLDivElement;
     const target = this.container_node.firstElementChild as HTMLDivElement;
@@ -270,9 +274,18 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
     this.RegisterListener(descriptor, 'keydown', this.FormulaKeyDown.bind(this));
     this.RegisterListener(descriptor, 'keyup', this.FormulaKeyUp.bind(this));
 
+    // why is this here, instead of in markup? just an oversight?
+
     if (this.options.expand_formula_button) {
+
+      let focus_related_target: HTMLElement|undefined;
+
       this.expand_button = DOM.Create('button', 'expand-button', inner_node, { 
         events: {
+          focus: (event: FocusEvent) => {
+            focus_related_target = event.relatedTarget instanceof HTMLElement ? event.relatedTarget : undefined;
+          },
+
           click: (event: MouseEvent) => {
             event.stopPropagation();
             event.preventDefault();
@@ -285,6 +298,11 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
             else {
               inner_node.setAttribute('expanded', '');
             }
+
+            if (focus_related_target) {
+              focus_related_target.focus();
+            }
+
           },
         },
       });
@@ -297,6 +315,10 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
     return element === this.active_editor?.node;
   }
 
+  public IsExpandButton(element: HTMLElement): boolean {
+    return this.expand_button && (element === this.expand_button);
+  }
+
   public InitAddressLabel() {
 
     this.address_label.contentEditable = 'true';