Merge branch 'main' into releases/0.0.43

onlook-dev · Oct 15, 2024 · da88fa1 · da88fa1
2 parents 9afca32 + 29270d5
commit da88fa1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/app/src/lib/editor/engine/code/index.ts b/app/src/lib/editor/engine/code/index.ts
@@ -57,6 +57,7 @@ export class CodeManager {
     }
 
     async write(action: Action) {
+        // TODO: These can all be processed at once at the getCodeDiffRequests level
         this.writeQueue.push(action);
         if (!this.isExecuting) {
             await this.processWriteQueue();
@@ -65,13 +66,18 @@ export class CodeManager {
 
     private async processWriteQueue() {
         this.isExecuting = true;
-        while (this.writeQueue.length > 0) {
+        if (this.writeQueue.length > 0) {
             const action = this.writeQueue.shift();
             if (action) {
                 await this.executeWrite(action);
             }
         }
-        this.isExecuting = false;
+        setTimeout(() => {
+            this.isExecuting = false;
+            if (this.writeQueue.length > 0) {
+                this.processWriteQueue();
+            }
+        }, 1000);
     }
 
     private async executeWrite(action: Action) {

diff --git a/app/src/routes/editor/EditPanel/inputs/compound/BorderInput.tsx b/app/src/routes/editor/EditPanel/inputs/compound/BorderInput.tsx
@@ -58,7 +58,16 @@ const BorderInput = observer(({ compoundStyle }: { compoundStyle: CompoundStyle
         }
 
         setShowGroup(!colorIsEmpty);
-        editorEngine.style.updateElementStyle('borderWidth', newBorderWidth);
+        if (newBorderWidth !== originalBorderWidth) {
+            const inTransaction = editorEngine.history.isInTransaction;
+            if (inTransaction) {
+                editorEngine.history.commitTransaction();
+            }
+            editorEngine.style.updateElementStyle('borderWidth', newBorderWidth);
+            if (inTransaction) {
+                editorEngine.history.startTransaction();
+            }
+        }
     };
 
     function renderTopInput() {