windmill-components 1.472.2 → 1.472.4

package/package/components/ScriptBuilder.svelte

@@ -1,7 +1,6 @@
 <script>import { DraftService, ScriptService, ScheduleService, PostgresTriggerService } from '../gen';
 import { inferArgs } from '../infer';
 import { initialCode } from '../script_helpers';
-import { page } from '$app/stores';
 import { defaultScripts, enterpriseLicense, userStore, workspaceStore } from '../stores';
 import { cleanValueProperties, emptySchema, emptyString, encodeState, formatCron, orderedJsonStringify, replaceFalseWithUndefined } from '../utils';
 import Path from './Path.svelte';
@@ -175,16 +174,17 @@ if (script.content == '') {
     initContent(script.language, script.kind, template);
 }
 async function isTemplateScript() {
-    let getInitBlockTemplate = $page.url.searchParams.get('id');
-    if (getInitBlockTemplate === null) {
+    const params = new URLSearchParams(window.location.search);
+    const templateId = params.get('id');
+    if (templateId === null) {
         return undefined;
     }
     try {
-        getInitBlockTemplate = await PostgresTriggerService.getTemplateScript({
+        const templateScript = await PostgresTriggerService.getTemplateScript({
             workspace: $workspaceStore,
-            id: getInitBlockTemplate
+            id: templateId
         });
-        return getInitBlockTemplate;
+        return templateScript;
     }
     catch (error) {
         sendUserToast('An error occured when trying to load your template script, please try again later', true);

package/package/components/apps/components/layout/AppModal.svelte

@@ -62,6 +62,9 @@ $: containerHeight = Math.min(
 maxHeight($app.subgrids?.[`${id}-0`] ?? [], 0, $breakpoint) * (ROW_HEIGHT + ROW_GAP_Y) + 16, 
 // 32px (2rem) of top and bottom margin
 wrapperHeight - headerHeight - 64);
+async function getMenuElements() {
+    return Array.from(document.querySelectorAll('[data-menu]'));
+}
 </script>
 
 <InitializeComponent {id} />
@@ -148,7 +151,11 @@ wrapperHeight - headerHeight - 64);
 				<div
 					style={css?.popup?.style}
 					class={twMerge('mx-24 mt-8 bg-surface rounded-lg relative', css?.popup?.class)}
-					use:clickOutside={false}
+					use:clickOutside={{
+						capture: false,
+						stopPropagation: false,
+						exclude: getMenuElements
+					}}
 					on:click_outside={(e) => {
 						if ($mode !== 'dnd' && !unclickableOutside) {
 							handleClickAway(e)

package/package/components/meltComponents/Menu.svelte

@@ -54,7 +54,7 @@ async function getMenuElements() {
 
 	<!--svelte-ignore a11y-no-static-element-interactions-->
 	{#if open}
-		<div {...$menuElement} use:$menuElement.action data-menu class="z-[6000]" on:click|stopPropagation>
+		<div {...$menuElement} use:$menuElement.action data-menu class="z-[6000]" on:click>
 			<div
 				class={twMerge(
 					'border w-56 origin-top-right rounded-md shadow-md focus:outline-none overflow-y-auto py-1',

package/package/components/meltComponents/MenuItem.svelte

@@ -1,15 +1,8 @@
 <script>import { melt } from '@melt-ui/svelte';
-import { goto } from '$app/navigation';
 export let href = undefined;
 export let disabled = false;
 export let target = undefined;
 export let item;
-function handleClick(e) {
-    if (href && !target) {
-        e.preventDefault();
-        goto(href);
-    }
-}
 </script>
 
 {#if href}
@@ -21,7 +14,6 @@ function handleClick(e) {
 		aria-disabled={disabled}
 		tabindex={disabled ? -1 : undefined}
 		{target}
-		on:click={handleClick}
 		on:m-focusin
 		on:m-focusout
 	>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.472.2",
+	"version": "1.472.4",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",