fix: modal submission issues

This commit is contained in:
Arman committed 2025-03-18 14:49:46 +01:00
1 parent a3e95720cb
commit e90a52ba8b
6 files changed
+13 -43

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@
"@appwrite.io/pink-icons": "0.25.0",
"@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b",
"@appwrite.io/pink-legacy": "^1.0.3",
"@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a0d4aa7",
"@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67237d6",
"@popperjs/core": "^2.11.8",
"@sentry/sveltekit": "^8.38.0",
"@stripe/stripe-js": "^3.5.0",
+9 -9
View File
@@ -21,8 +21,8 @@ importers:
specifier: ^1.0.3
version: 1.0.3
'@appwrite.io/pink-svelte':
specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a0d4aa7
version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a0d4aa7(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)
specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67237d6
version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67237d6(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)
'@popperjs/core':
specifier: ^2.11.8
version: 2.11.8
@@ -215,8 +215,8 @@ packages:
resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@74f9464}
version: 1.2.1
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a0d4aa7b1d41b9ad5ee388e0e038146baddc199a':
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a0d4aa7b1d41b9ad5ee388e0e038146baddc199a}
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67237d6a6f6d8cfc6eb6ece38f85e916d4ed9821':
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67237d6a6f6d8cfc6eb6ece38f85e916d4ed9821}
version: 1.0.0-next.7
peerDependencies:
svelte: ^4.0.0
@@ -236,8 +236,8 @@ packages:
'@appwrite.io/pink-legacy@1.0.3':
resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a0d4aa7':
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a0d4aa7}
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67237d6':
resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67237d6}
version: 1.0.0-next.85
peerDependencies:
react-dom: ^18.0.0
@@ -4099,7 +4099,7 @@ snapshots:
'@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@74f9464': {}
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a0d4aa7b1d41b9ad5ee388e0e038146baddc199a(svelte@4.2.19)':
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67237d6a6f6d8cfc6eb6ece38f85e916d4ed9821(svelte@4.2.19)':
dependencies:
svelte: 4.2.19
@@ -4116,9 +4116,9 @@ snapshots:
'@appwrite.io/pink-icons': 1.0.0
the-new-css-reset: 1.11.3
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@a0d4aa7(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)':
'@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67237d6(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)':
dependencies:
'@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@a0d4aa7b1d41b9ad5ee388e0e038146baddc199a(svelte@4.2.19)
'@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67237d6a6f6d8cfc6eb6ece38f85e916d4ed9821(svelte@4.2.19)
'@floating-ui/dom': 1.6.13
'@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19)
'@melt-ui/svelte': 0.86.3(svelte@4.2.19)
-14
View File
@@ -3,7 +3,6 @@
import { disableCommands } from '$lib/commandCenter';
import { beforeNavigate } from '$app/navigation';
import { Alert, Layout, Modal } from '@appwrite.io/pink-svelte';
import { Click, trackEvent } from '$lib/actions/analytics';
export let show = false;
export let error: string = null;
@@ -13,7 +12,6 @@
};
export let title = '';
export let hideFooter = false;
export let submitOnEnter = true;
let alert: HTMLElement;
let formComponent: Form;
@@ -22,16 +20,6 @@
show = false;
});
function handleKeydown(event: KeyboardEvent) {
if (show && event.key === 'Enter' && submitOnEnter) {
event.preventDefault();
if (show) {
formComponent.triggerSubmit();
trackEvent(Click.SubmitFormClick, { from: 'enter' });
}
}
}
$: $disableCommands(show);
$: if (error) {
@@ -39,8 +27,6 @@
}
</script>
<svelte:window on:keydown={handleKeydown} />
<Form isModal {onSubmit} bind:this={formComponent}>
<Modal {title} bind:open={show} {hideFooter} {dismissible}>
<slot slot="description" name="description" />
@@ -131,12 +131,7 @@
(tab === 'env' && baseEnvCode === envCode) || (tab === 'json' && baseJsonCode === jsonCode);
</script>
<Modal
title="Editor"
bind:show={showEditor}
onSubmit={handleSubmit}
bind:error
submitOnEnter={false}>
<Modal title="Editor" bind:show={showEditor} onSubmit={handleSubmit} bind:error>
<p slot="description">
Edit {isGlobal ? 'global' : 'environment'} variables below or download as a
<InlineCode size="s" code={`.${tab}`} /> file.
@@ -115,12 +115,7 @@
// TODO: merge this component with the rawVariableEditor?
</script>
<Modal
title="Editor"
bind:show={showEditor}
onSubmit={handleSubmit}
bind:error
submitOnEnter={false}>
<Modal title="Editor" bind:show={showEditor} onSubmit={handleSubmit} bind:error>
<p slot="description">Add, edit, or delete environment variables using a raw editor.</p>
<Layout.Stack gap="l">
@@ -17,13 +17,7 @@
let showDomainQR = false;
let selectedDomainURL: string;
$: rules = proxyRuleList?.rules?.filter((rule) => rule.trigger === 'manual');
// $: hasCustomDomain = proxyRuleList?.total
// ? proxyRuleList.rules.some((rule) =>
// rule.domain.includes($consoleVariables._APP_DOMAIN_TARGET)
// )
// : false;
$: rules = proxyRuleList?.rules?.filter((rule) => rule.trigger === 'manual') ?? [];
</script>
<Layout.Stack>