From 88eeac1dfd4e701e5a86d2a949bc47f9f6433405 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Mon, 22 Jul 2024 15:24:39 -0600
Subject: [PATCH] Small CodeBlock in Modal fixes (#2225)

* Make sure handleCancel is only called once by only triggering dialog close once

* Destroy codeblock editor view on unmount
---
 src/lib/holocene/code-block.svelte |  1 +
 src/lib/holocene/modal.svelte      | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/holocene/code-block.svelte b/src/lib/holocene/code-block.svelte
index 91ccc5167..15eefdb71 100644
--- a/src/lib/holocene/code-block.svelte
+++ b/src/lib/holocene/code-block.svelte
@@ -153,6 +153,7 @@
 
   onMount(() => {
     view = createEditorView();
+    return () => view.destroy();
   });
 
   export const resetView = (value = '', format = true) => {
diff --git a/src/lib/holocene/modal.svelte b/src/lib/holocene/modal.svelte
index 9b0816410..558f6cf1b 100644
--- a/src/lib/holocene/modal.svelte
+++ b/src/lib/holocene/modal.svelte
@@ -66,8 +66,12 @@
     dispatch('confirmModal');
   };
 
+  const closeModal = () => {
+    open = false;
+  };
+
   const handleClick = (event: MouseEvent) => {
-    if (event.target === modalElement) handleCancel();
+    if (event.target === modalElement) closeModal();
   };
 
   $: {
@@ -97,7 +101,7 @@
       label={cancelText}
       icon="close"
       class="float-right m-4"
-      on:click={handleCancel}
+      on:click={closeModal}
     />
   {/if}
   <div id="modal-title-{id}" class="title">
@@ -115,7 +119,7 @@
       </p>
     </div>
     <div class="flex items-center justify-end space-x-2 p-6">
-      <Button variant="ghost" disabled={loading} on:click={handleCancel}
+      <Button variant="ghost" disabled={loading} on:click={closeModal}
         >{cancelText}</Button
       >
       {#if !hideConfirm}