@trebco/treb 29.8.1 → 29.8.4

package/package.json

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

package/treb-calculator/src/functions/base-functions.ts

@@ -923,6 +923,91 @@ export const BaseFunctionLibrary: FunctionMap = {
 
     },
 
+    /**
+     * 
+     */
+    Filter: {
+      description: "Filter an array using a second array.",
+      arguments: [
+        { name: 'source', description: 'Source array' },
+        { name: 'filter', description: 'Filter array' },
+        // if_empty
+      ],
+
+      fn: (source: CellValue|CellValue[][], filter: CellValue|CellValue[][]) => {
+
+        if (typeof source === 'undefined' || typeof filter === 'undefined') {
+          return ArgumentError();
+        }
+
+        if (!Array.isArray(source)) {
+          source = [[source]];
+        }
+        if (!Array.isArray(filter)) {
+          filter = [[filter]];
+        }
+
+        const source_cols = source.length;
+        const source_rows = source[0].length;
+
+        const filter_cols = filter.length;
+        const filter_rows = filter[0].length;
+
+        // prefer rows
+
+        if (source_rows === filter_rows) {
+
+          const result: UnionValue[][] = [];
+
+          for (let i = 0; i < source_cols; i++) {
+            result.push([]);
+          }
+
+          for (const [index, entry] of filter[0].entries()) {
+
+            // FIXME: don't allow strings? errors? (...)
+
+            if (entry) {
+              for (let i = 0; i < source_cols; i++) {
+                result[i].push(Box(source[i][index]));
+              }
+            }
+ 
+          }
+          
+          return {
+            type: ValueType.array,
+            value: result,
+          }
+
+        }
+        else if (source_cols === filter_cols) {
+
+          const result: UnionValue[][] = [];
+
+          for (const [index, [entry]] of filter.entries()) {
+
+            // FIXME: don't allow strings? errors? (...)
+
+            if (entry) {
+              result.push(source[index].map(value => Box(value)));
+            }
+ 
+          }
+          
+          return {
+            type: ValueType.array,
+            value: result,
+          }
+
+        }
+
+        return ArgumentError();
+
+      },
+
+    },
+
     /**
      * sort arguments, but ensure we return empty strings to
      * fill up the result array

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

@@ -48,7 +48,7 @@ import {
   IsArea,
 } from 'treb-base-types';
 
-import type { ExpressionUnit, UnitAddress } from 'treb-parser';
+import type { ExpressionUnit, RenderOptions, UnitAddress } from 'treb-parser';
 import { 
   DecimalMarkType, 
   ArgumentSeparatorType, 
@@ -4614,9 +4614,17 @@ export class Grid extends GridBase {
         }
 
         for (let row = start; row >= 0 && row < target_rows; row += step, offset += step, pattern_increment += pattern) {
+
+          const render_options: Partial<RenderOptions> = {
+            offset: transposed ? {
+              rows: 0, columns: offset,
+            } : {
+              rows: offset, columns: 0,
+            }
+          };
+
           if (translate) {
-            data[row][column] = '=' + this.parser.Render(translate, {
-              offset: { rows: offset, columns: 0 }});
+            data[row][column] = '=' + this.parser.Render(translate, render_options);
           }
           else {
             const cell = cells[source_row][column];
@@ -6885,6 +6893,27 @@ export class Grid extends GridBase {
     else {
 
       const area = this.active_sheet.RealArea(this.primary_selection.area);
+
+      const column_width: number[] = [];
+      const row_height: number[] = [];
+
+      if (this.primary_selection.area.entire_column) {
+        for (let c = area.start.column; c <= area.end.column; c++) {
+          const width = this.active_sheet.GetColumnWidth(c);
+          if (width !== this.active_sheet.default_column_width) {
+            column_width[c - area.start.column] = width;
+          }
+        }
+      }
+      if (this.primary_selection.area.entire_row) {
+        for (let r = area.start.row; r <= area.end.row; r++) {
+          const height = this.active_sheet.GetRowHeight(r);
+          if (height !== this.active_sheet.default_row_height) {
+            row_height[r - area.start.row] = height;
+          }
+        }
+      }
+
       const columns = area.columns;
       const rows = area.rows;
 
@@ -6961,7 +6990,12 @@ export class Grid extends GridBase {
       if (event.clipboardData) {
         event.clipboardData.clearData();
         event.clipboardData.setData('text/plain', tsv);
-        event.clipboardData.setData('text/x-treb', JSON.stringify({ source: area, data: treb_data }));
+        event.clipboardData.setData('text/x-treb', JSON.stringify({ 
+          source: area, 
+          data: treb_data,
+          column_width, 
+          row_height,
+        }));
       }
     }
 
@@ -7114,7 +7148,14 @@ export class Grid extends GridBase {
     if (treb_data) {
 
       try {
-        const object_data = JSON.parse(treb_data);
+
+        const object_data: {
+          source: Area, 
+          data: ClipboardCellData[],
+          column_width?: number[], 
+          row_height?: number[],
+        } = JSON.parse(treb_data);
+
         const source_area = new Area(object_data.source.start, object_data.source.end);
 
         // recycle...
@@ -7220,6 +7261,32 @@ export class Grid extends GridBase {
 
           });
 
+          if (object_data.column_width?.length) {
+            for (const [index, width] of object_data.column_width.entries()) {
+              if (typeof width === 'number') {
+                const column = index + paste_area.start.column;
+                commands.push({
+                  key: CommandKey.ResizeColumns, 
+                  column, 
+                  width,
+                });
+              }
+            }
+          }
+
+          if (object_data.row_height?.length) {
+            for (const [index, height] of object_data.row_height.entries()) {
+              if (typeof height === 'number') {
+                const row = index + paste_area.start.row;
+                commands.push({
+                  key: CommandKey.ResizeRows,
+                  row,
+                  height,
+                });
+              }
+            }
+          }
+          
         }
 
       }