fix(newTitleEdit): not being able to edit current task properly

johannesjo · Jul 29, 2024 · 4cef14d · 4cef14d
1 parent 9170959
commit 4cef14d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/src/app/features/tasks/task-additional-info/task-additional-info.component.html b/src/app/features/tasks/task-additional-info/task-additional-info.component.html
@@ -4,7 +4,7 @@
     class="task-title-wrapper"
   >
     <inline-multiline-input
-      [resetToInitialValueTrigger]="task"
+      [resetToLastExternalValueTrigger]="task"
       (valueEdited)="updateTaskTitleIfChanged($event.wasChanged, $event.newVal)"
       [value]="task.title"
       class="task-title"

diff --git a/src/app/features/tasks/task/task.component.html b/src/app/features/tasks/task/task.component.html
@@ -145,7 +145,7 @@
         </div>
 
         <inline-multiline-input
-          [resetToInitialValueTrigger]="task"
+          [resetToLastExternalValueTrigger]="task"
           [style.pointer-events]="IS_TOUCH_PRIMARY && (task.title.length) ? 'none' : 'auto'"
           #taskTitleEditEl
           (valueEdited)="updateTaskTitleIfChanged($event)"

diff --git a/src/app/pages/schedule-page/schedule-page.component.html b/src/app/pages/schedule-page/schedule-page.component.html
@@ -31,7 +31,7 @@ <h2>{{T.SCHEDULE.SCHEDULED_TASKS|translate}}</h2>
             <div class="task-info">
               <div class="title">
                 <inline-multiline-input
-                  [resetToInitialValueTrigger]="task"
+                  [resetToLastExternalValueTrigger]="task"
                   (valueEdited)="updateTaskTitleIfChanged($event.wasChanged, $event.newVal, task)"
                   [value]="task.title"
                   class="task-title"

diff --git a/src/app/ui/inline-multiline-input/inline-multiline-input.component.ts b/src/app/ui/inline-multiline-input/inline-multiline-input.component.ts
@@ -25,18 +25,27 @@ export class InlineMultilineInputComponent {
   @HostBinding('class.is-focused') isFocused = false;
 
   // NOTE: we only need this for tasks since, sometimes with the short syntax there are no changes to the title as they are stripped away
-  @Input() set resetToInitialValueTrigger(value: unknown) {
-    this.tmpValue = this.initialValue;
+  @Input() set resetToLastExternalValueTrigger(value: unknown) {
+    // console.log({
+    //   tmp: this.tmpValue,
+    //   last: this.lastExternalValue,
+    // });
+    // never update while editing
+    if (!this.isFocused && this.tmpValue !== this.lastExternalValue) {
+      // NOTE: this works because set value is called after this, for non-short syntax only changes
+      this.tmpValue = this.lastExternalValue;
+      console.log('new tmp', this.tmpValue);
+    }
   }
 
   @Input() set value(value: string) {
     this.tmpValue = value;
-    this.initialValue = value;
+    this.lastExternalValue = value;
     this._setTxtHeight();
-    console.log(value);
+    // console.log('setValue', value);
   }
 
-  initialValue?: string;
+  lastExternalValue?: string;
   tmpValue?: string;
 
   @ViewChild('textAreaElement') textarea!: ElementRef<HTMLTextAreaElement>;
@@ -123,9 +132,15 @@ export class InlineMultilineInputComponent {
     const cleanVal = this._cleanValue(this.tmpValue);
     this.valueEdited.emit({
       newVal: cleanVal,
-      wasChanged: cleanVal !== this.initialValue,
+      wasChanged: cleanVal !== this.lastExternalValue,
     });
-    this.tmpValue = cleanVal;
+    // console.log(
+    //   'submit',
+    //   this.tmpValue,
+    //   'wasChanged',
+    //   cleanVal !== this.lastExternalValue,
+    // );
+
     // android needs the delay for the linebreaks to be removed
     setTimeout(() => {
       this._setTxtHeight();