From a816765dfbab4e9465a5d2f88c908311ad6176e5 Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Thu, 24 Oct 2024 10:58:28 +0100
Subject: [PATCH] Added zoom text output and rounding to the closest 5. This
 was to accomodate zoom to fit producing irregular zoom levels

---
 .../AutomationBuilder/DraggableCanvas.svelte  | 34 +++++--------------
 .../FlowChart/FlowChart.svelte                | 30 +++++++++++++---
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte b/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
index 25c5b58ec5..3b4af02a6b 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
@@ -1,21 +1,23 @@
 <script>
   import { onDestroy, tick } from "svelte"
   import { writable } from "svelte/store"
-  import { setContext, onMount } from "svelte"
+  import { setContext, onMount, createEventDispatcher } from "svelte"
   import { Utils } from "@budibase/frontend-core"
   import { selectedAutomation, automationStore } from "stores/builder"
 
   export function zoomIn() {
+    const scale = Number(Math.min($view.scale + 0.1, 1).toFixed(2))
     view.update(state => ({
       ...state,
-      scale: Math.min(state.scale + 0.1, 1),
+      scale,
     }))
   }
 
   export function zoomOut() {
+    const scale = Number(Math.max($view.scale - 0.1, 0).toFixed(2))
     view.update(state => ({
       ...state,
-      scale: Math.max(state.scale - 0.1, 0),
+      scale,
     }))
   }
 
@@ -63,6 +65,8 @@
     }))
   }
 
+  const dispatch = createEventDispatcher()
+
   // View State
   const view = writable({
     dragging: false,
@@ -108,6 +112,7 @@
   let scrollInterval
 
   const onScale = async () => {
+    dispatch("zoom", $view.scale)
     await getDims()
   }
 
@@ -170,7 +175,7 @@
 
       view.update(state => ({
         ...state,
-        scale: updatedScale,
+        scale: Number(updatedScale.toFixed(2)),
       }))
     } else {
       yBump = scrollIncrement * (e.deltaY < 0 ? -1 : 1)
@@ -358,19 +363,6 @@
     on:mouseup={onViewDragEnd}
     on:mouseleave={onViewDragEnd}
   >
-    <div class="actions">
-      <!-- debug -->
-      <!-- <span>
-        View Pos [{viewPos.x}, {viewPos.y}]
-      </span>
-      <span>Down {down}</span>
-      <span>Drag {$view.dragging}</span>
-      <span>DragOffset {JSON.stringify(dragOffset)}</span>
-      <span>Dragging {$view?.moveStep?.id || " [no]"}</span>
-      <span>Scale {$view.scale}</span>
-      <span>Content {JSON.stringify(contentPos)}</span> -->
-    </div>
-
     <div
       class="content-wrap"
       style={wrapStyles}
@@ -410,14 +402,6 @@
 </div>
 
 <style>
-  .actions {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    position: fixed;
-    padding: 8px;
-    z-index: 2;
-  }
   .draggable-canvas {
     width: 100%;
     height: 100%;
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index c12852cde8..a301595d2d 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -31,6 +31,7 @@
   let blockRefs = {}
   let treeEle
   let draggable
+  let zoom = 100
 
   // Memo auto - selectedAutomation
   $: memoAutomation.set(automation)
@@ -82,10 +83,15 @@
 <div class="header" class:scrolling>
   <div class="header-left">
     <UndoRedoControl store={automationHistoryStore} showButtonGroup />
-    <div class="group">
-      <ActionButton icon="Add" quiet on:click={draggable.zoomIn} />
-      <ActionButton icon="Remove" quiet on:click={draggable.zoomOut} />
+
+    <div class="zoom">
+      <div class="group">
+        <ActionButton icon="Add" quiet on:click={draggable.zoomIn} />
+        <ActionButton icon="Remove" quiet on:click={draggable.zoomOut} />
+      </div>
+      <div class="zoom-display">{`${zoom}%`}</div>
     </div>
+
     <Button
       secondary
       on:click={() => {
@@ -134,7 +140,17 @@
 </div>
 
 <div class="root" bind:this={treeEle}>
-  <DraggableCanvas bind:this={draggable}>
+  <DraggableCanvas
+    bind:this={draggable}
+    on:zoom={e => {
+      const baseZoom = Math.round(e.detail * 100)
+
+      // Fit to zoom shifts the zoom to explicit values
+      // The interval is in 5 or 10 so rounding to the closest 5 should flatten this out
+      const roundedZoom = 5 * Math.floor((baseZoom + 2) / 5)
+      zoom = roundedZoom
+    }}
+  >
     <span class="main-content" slot="content">
       {#if Object.keys(blockRefs).length}
         {#each blocks as block, idx (block.id)}
@@ -167,6 +183,12 @@
 </Modal>
 
 <style>
+  .zoom {
+    display: flex;
+    align-items: center;
+    gap: var(--spacing-s);
+  }
+
   .toggle-active :global(.spectrum-Switch) {
     margin: 0px;
   }