Skip to content

Commit 12281fd

Browse files
authored
fix: issue1178 (#1179)
1 parent 7b052ff commit 12281fd

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/lib/modal/Modal.svelte

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,27 +124,29 @@
124124
<div on:keydown={handleKeys} on:wheel|preventDefault|nonpassive use:prepareFocus use:focusTrap on:click={onAutoClose} on:mousedown={onOutsideClose} class={twMerge(dialogClass, $$props.classDialog, ...getPlacementClasses())} tabindex="-1" aria-modal="true" role="dialog">
125125
<div class="flex relative {sizes[size]} w-full max-h-full">
126126
<!-- Modal content -->
127+
127128
<Frame rounded shadow {...$$restProps} class={frameClass}>
128129
<!-- Modal header -->
129130
{#if $$slots.header || title}
130-
<Frame color={$$restProps.color} class="flex justify-between items-center p-4 rounded-t">
131+
<Frame color={$$restProps.color} class="flex justify-between items-center p-4 rounded-t-lg">
131132
<slot name="header">
132133
<h3 class="text-xl font-semibold {$$restProps.color ? '' : 'text-gray-900 dark:text-white'} p-0">
133134
{title}
134135
</h3>
135136
</slot>
136137
{#if dismissable}<CloseButton name="Close modal" on:click={hide} color={$$restProps.color} />{/if}
137138
</Frame>
138-
{:else if dismissable}
139-
<CloseButton name="Close modal" class="absolute top-3 end-2.5" on:click={hide} color={$$restProps.color} />
140139
{/if}
141140
<!-- Modal body -->
142141
<div class={twMerge('p-6 space-y-6 flex-1 overflow-y-auto overscroll-contain', $$props.bodyClass)} on:keydown|stopPropagation={handleKeys} role="document" on:wheel|stopPropagation|passive>
142+
{#if dismissable && !$$slots.header && !title}
143+
<CloseButton name="Close modal" class="absolute top-3 end-2.5" on:click={hide} color={$$restProps.color} />
144+
{/if}
143145
<slot />
144146
</div>
145147
<!-- Modal footer -->
146148
{#if $$slots.footer}
147-
<Frame color={$$restProps.color} class="flex items-center p-6 space-x-2 rtl:space-x-reverse rounded-b">
149+
<Frame color={$$restProps.color} class="flex items-center p-6 space-x-2 rtl:space-x-reverse rounded-b-lg">
148150
<slot name="footer" />
149151
</Frame>
150152
{/if}

0 commit comments

Comments
 (0)