Merge branch 'master' into new-data-ui

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -1065,7 +1065,12 @@
                 value={inputData[key]}
               />
             {:else if value.customType === "code"}
-              <CodeEditorModal>
+              <CodeEditorModal
+                on:hide={() => {
+                  // Push any pending changes when the window closes
+                  onChange({ [key]: inputData[key] })
+                }}
+              >
                 <div class:js-editor={editingJs}>
                   <div
                     class:js-code={editingJs}
@@ -1075,7 +1080,6 @@
                       value={inputData[key]}
                       on:change={e => {
                         // need to pass without the value inside
-                        onChange({ [key]: e.detail })
                         inputData[key] = e.detail
                       }}
                       completions={stepCompletions}

packages/builder/src/components/automation/SetupPanel/CodeEditorModal.svelte

@@ -11,7 +11,7 @@
   }
 </script>
 
-<Modal bind:this={modal}>
+<Modal bind:this={modal} on:hide>
   <ModalContent
     size="XL"
     title="Edit Code"