@trebco/treb 30.6.0 → 30.6.2

package/package.json

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

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

@@ -567,7 +567,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
    * that's fine, but it needs a new name.
    * 
    */
-  protected UpdateColors(force_event = false) {
+  protected UpdateColors(force_event = false, toll_update = false) {
 
     // const view = this.active_editor?.node.ownerDocument.defaultView as (Window & typeof globalThis);
 
@@ -623,8 +623,10 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     this.composite_dependencies = list;
 
-    this.Publish({ type: 'update', dependencies: this.composite_dependencies });
-
+    if (!toll_update) {
+      this.Publish({ type: 'update', dependencies: this.composite_dependencies });
+    }
+    
   }
 
   /**

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

@@ -57,6 +57,8 @@ export type FormulaBar2Event
 export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
 
 
+  public committed = false;
+
   /** is the _editor_ currently focused */
   // tslint:disable-next-line:variable-name
   public focused_ = false;
@@ -219,7 +221,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
     this.active_editor.node.spellcheck = false; // change the default back
 
     this.RegisterListener(descriptor, 'focusin', () => {
-
+     
       // this.editor_node.addEventListener('focusin', () => {
 
       // can't happen
@@ -239,7 +241,9 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
       this.autocomplete?.ResetBlock();
 
       this.UpdateText(this.active_editor);
-      this.UpdateColors();
+      this.UpdateColors(undefined, true); // toll update event -- we will send in order, below
+
+      this.committed = false;
 
       this.Publish([
         { type: 'start-editing', editor: 'formula-bar' },
@@ -256,11 +260,32 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
         console.info('focusout, but selecting...');
       }
 
-      // console.info('focus out');
-
       this.autocomplete?.Hide();
+      
+      const text = (this.active_editor ? 
+        this.GetTextContent(this.active_editor.node).join('') : '').trim();
+
+      if (this.committed) {
+        this.Publish([
+          { type: 'stop-editing' },
+        ]);
+      }
+      else {
+        this.committed = true;
+        this.Publish({
+          type: 'commit',
+          value: text,
+        });
+      }
+
       this.Publish([
         { type: 'stop-editing' },
+        /*
+        {
+          type: 'commit',
+          value: text,
+        }
+          */
       ]);
 
       this.focused_ = false;
@@ -441,6 +466,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
         const text = (this.active_editor ? 
           this.GetTextContent(this.active_editor.node).join('') : '').trim();
 
+        this.committed = true;
         this.Publish({
           type: 'commit',
           // selection: this.selection,

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

@@ -193,6 +193,9 @@ export class Grid extends GridBase {
   /** if we are editing, what is the cell? */
   private editing_cell: ICellAddress = { row: -1, column: -1, sheet_id: 0 };
 
+  /**  */
+  private editing_selection: GridSelection|undefined;
+
   /**  */
   private selected_annotation?: Annotation;
 
@@ -2859,6 +2862,7 @@ export class Grid extends GridBase {
 
           this.editing_state = EditingState.FormulaBar;
           this.editing_cell = { ...this.primary_selection.target };
+          this.editing_selection = { ...this.primary_selection };
           break;
 
         case 'discard':
@@ -2924,7 +2928,15 @@ export class Grid extends GridBase {
 
           if (this.container) this.Focus();
 
-          this.SetInferredType(this.primary_selection, event.value, event.array);
+          if (event.event) {
+            this.SetInferredType(this.primary_selection, event.value, event.array);
+          }
+          else {
+            if (this.editing_selection) {
+              this.SetInferredType(this.editing_selection, event.value, event.array);
+            }
+          }
+
           this.ClearAdditionalSelections();
           this.ClearSelection(this.active_selection);