@trebco/treb 31.7.0 → 31.7.4

package/package.json

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

package/treb-embed/src/embedded-spreadsheet.ts

@@ -945,6 +945,8 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
         switch (event.type) {
 
+          // these messages can stack, they don't have undo effect
+
           case 'error':
             this.dialog?.ShowDialog({
               type: DialogType.error,
@@ -965,6 +967,34 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
             this.UpdateSelectionStyle();
             break;
 
+          case 'scale':
+            this.RebuildAllAnnotations();
+            this.Publish({ type: 'view-change' });
+            break;
+  
+          case 'cell-event':
+            this.HandleCellEvent(event);
+            break;
+
+          // messages that trigger undo need some special handling, 
+          // because we don't want to stack a sequence of messages
+          // and push multiple undo events. that applies to data, 
+          // style, structure, and (maybe?) annotations
+
+          // OK, temp we have a composite event for data+style
+
+          case 'composite':
+            {
+              const cached_selection = this.last_selection;
+              if (this.calculation === CalculationOptions.automatic) {
+                this.Recalculate(event);
+              }
+              this.DocumentChange(cached_selection);
+              this.UpdateDocumentStyles();
+              this.UpdateSelectionStyle();
+            }
+            break;
+
           case 'data':
             {
               // because this is async (more than once), we can't expect the 
@@ -973,13 +1003,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
               const cached_selection = this.last_selection;
 
-              /*
-              ((this.calculation === CalculationOptions.automatic) ?
-                this.Recalculate(event) : Promise.resolve()).then(() => {
-                  this.DocumentChange(cached_selection);
-                });
-              */
-
               // recalc is no longer async
 
               if (this.calculation === CalculationOptions.automatic) {
@@ -988,17 +1011,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
               this.DocumentChange(cached_selection);
 
-              /*
-              if (this.calculation === CalculationOptions.automatic) {
-                this.Recalculate(event).then(() => {
-                  this.DocumentChange(cached_selection);
-                });
-              }
-              else {
-                Promise.resolve().then(() => this.DocumentChange(cached_selection));
-              }
-              */
-
             }
             break;
 
@@ -1008,11 +1020,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
             this.UpdateSelectionStyle();
             break;
 
-          case 'scale':
-            this.RebuildAllAnnotations();
-            this.Publish({ type: 'view-change' });
-            break;
-
           case 'annotation':
             // FIXME: maybe need to update vertices (on create, update, delete,
             // not on move or resize)
@@ -1083,13 +1090,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
               if (event.rebuild_required) {
                 this.calculator.Reset();
 
-                /*
-                ((this.calculation === CalculationOptions.automatic) ?
-                  this.Recalculate(event) : Promise.resolve()).then(() => {
-                    this.DocumentChange(cached_selection);
-                  });
-                */
-
                 // recalculate is no longer async
 
                 if (this.calculation === CalculationOptions.automatic) {
@@ -1105,10 +1105,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
             this.UpdateSelectionStyle();
             break;
 
-          case 'cell-event':
-            this.HandleCellEvent(event);
-            break;
-
         }
       });
 
@@ -5924,6 +5920,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     const selection = last_selection || this.last_selection;
 
     // console.info('push undo', JSON.stringify(selection));
+    // console.trace();
 
     if (this.undo_stack[this.undo_pointer - 1]) {
       this.undo_stack[this.undo_pointer - 1].selection = selection;
@@ -6479,12 +6476,15 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
    */
   protected HandleKeyDown(event: KeyboardEvent): void {
 
-    // can we drop the event.code stuff in 2024? (YES)
-
-    if (event.ctrlKey && (event.code === 'KeyZ' || event.key === 'z')) {
-      event.stopPropagation();
-      event.preventDefault();
-      this.Undo();
+    // handle osx properly, but leave the old combination on osx
+    // in case anyone is using it. we can maybe drop it in the future
+    
+    if (event.key === 'z') {
+      if ((UA.is_mac && event.metaKey) || event.ctrlKey) {
+        event.stopPropagation();
+        event.preventDefault();
+        this.Undo();
+      }
     }
     else if (event.key === 'F9' && this.options.recalculate_on_f9) {
       event.stopPropagation();

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

@@ -51,7 +51,7 @@ import type { FunctionDescriptor} from '../editors/autocomplete_matcher';
 import { AutocompleteMatcher } from '../editors/autocomplete_matcher';
 import { NumberFormat, ValueParser } from 'treb-format';
 
-import type { GridEvent } from './grid_events';
+import type { DataEvent, GridEvent, StyleEvent } from './grid_events';
 import { ErrorCode } from './grid_events';
 import type { CommandRecord, CreateAnnotationCommand, DataValidationCommand, DuplicateSheetCommand, FreezeCommand, InsertColumnsCommand, InsertRowsCommand, RemoveAnnotationCommand, ResizeColumnsCommand, ResizeRowsCommand, SelectCommand, SetRangeCommand, ShowSheetCommand, SortTableCommand } from './grid_command';
 import { DefaultGridOptions, type GridOptions } from './grid_options';
@@ -4525,24 +4525,47 @@ export class GridBase {
 
     // consolidate events and merge areas
 
+    let data_event: DataEvent|undefined;
+    let style_event: StyleEvent|undefined;
+
     if (flags.data_area) {
       if (!flags.data_area.start.sheet_id) {
         flags.data_area.SetSheetID(this.active_sheet.id);
       }
-      events.push({ type: 'data', area: flags.data_area });
+      // events.push({ type: 'data', area: flags.data_area });
+      data_event = { type: 'data', area: flags.data_area };
     }
     else if (flags.data_event) {
-      events.push({ type: 'data' });
+      // events.push({ type: 'data' });
+      data_event = { type: 'data' };
     }
 
     if (flags.style_area) {
       if (!flags.style_area.start.sheet_id) {
         flags.style_area.SetSheetID(this.active_sheet.id);
       }
-      events.push({ type: 'style', area: flags.style_area });
+      // events.push({ type: 'style', area: flags.style_area });
+      style_event = { type: 'style', area: flags.style_area };
     }
     else if (flags.style_event) {
-      events.push({ type: 'style' });
+      // events.push({ type: 'style' });
+      style_event = { type: 'style' };
+    }
+
+    if (data_event && style_event) {
+      events.push({
+        type: 'composite',
+        data_area: data_event.area,
+        style_area: style_event.area,
+      });
+    }
+    else {
+      if (data_event) {
+        events.push(data_event);
+      } 
+      if (style_event) {
+        events.push(style_event);
+      }
     }
 
     if (flags.structure_event) {

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

@@ -112,6 +112,15 @@ export interface CellEvent {
   data?: HyperlinkCellEventData;
 }
 
+/**
+ * data + style. temporary while I figure out a better solution.
+ */
+export interface CompositeEvent {
+  type: 'composite';
+  data_area?: Area;
+  style_area?: Area;
+}
+
 export interface DataEvent {
   type: 'data';
   area?: Area;
@@ -137,6 +146,7 @@ export type GridEvent
   | StyleEvent
   | FlushEvent
   | ScaleEvent
+  | CompositeEvent
   | GridErrorEvent
   | StructureEvent
   | AnnotationEvent