Skip to content

refactor: update js modal customisation & design #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2023
Merged

refactor: update js modal customisation & design #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions resources/assets/css/_components.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,6 @@
.modal-content {
max-width: 100% !important;
}

.modal-content-wrapper {
max-width: 100% !important;
}
}

@screen md {
Expand Down
47 changes: 33 additions & 14 deletions resources/views/js-modal.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'init' => false,
'xData' => '{}',
'class' => '',
'widthClass' => 'max-w-2xl',
'widthClass' => 'max-w-full md:max-w-2xl',
'contentClass' => null,
'title' => null,
'titleClass' => 'inline-block pb-3 font-bold dark:text-theme-secondary-200',
Expand All @@ -15,21 +15,32 @@
'backdrop' => null,
'square' => false,
'hideCross' => false,
'padding' => 'p-8 sm:p-10',
'breakpoint' => 'md',
'closeButtonClass' => 'absolute top-0 right-0 p-0 mt-0 mr-0 w-11 h-11 rounded-none sm:mt-6 sm:mr-6 sm:rounded button button-secondary text-theme-secondary-900',
])

@php
$contentWrapperBreakpointClass = [
'sm' => 'sm:m-auto',
'md' => 'md:m-auto',
][$breakpoint] ?? 'md:m-auto';
@endphp

<div
{{ $attributes }}
x-ref="modal"
data-modal="{{ $name }}"
x-cloak
@if($init)
x-data="Modal.alpine({{ $xData }}, '{{ $name }}')"
x-data="Modal.alpine({{ $xData }}, '{{ $name }}')"
@else
x-data="{{ $xData }}"
x-data="{{ $xData }}"
@endif

@if(!$closeButtonOnly && $escToClose)
@keydown.escape="hide"
tabindex="0"
@keydown.escape="hide"
tabindex="0"
@endif
x-show="shown"
class="flex overflow-y-auto fixed inset-0 z-50 md:py-10 md:px-8"
Expand All @@ -41,9 +52,14 @@ class="flex overflow-y-auto fixed inset-0 z-50 md:py-10 md:px-8"
@endif

<div
class="modal-content-wrapper md:m-auto w-full {{ $class }} {{ $widthClass }}"
@class([
'w-full',
$class,
$widthClass,
$contentWrapperBreakpointClass,
])"
@if(! $closeButtonOnly && ! $disableOutsideClick)
@click.outside="hide"
@click.outside="hide"
@endif
>
<div @class([
Expand All @@ -53,14 +69,17 @@ class="modal-content-wrapper md:m-auto w-full {{ $class }} {{ $widthClass }}"
$widthClass,
$contentClass,
])>
<div class="p-8 sm:p-10">
<div @class($padding)>
@if(! $closeButtonOnly && ! $hideCross)
<button
class="modal-close"
@click="hide"
>
<x-ark-icon name="cross" size="sm" class="m-auto" />
</button>
<button
@class([
'transition-default',
$closeButtonClass,
])
@click="hide"
>
<x-ark-icon name="cross" size="sm" class="m-auto" />
</button>
@endif

@if ($title)
Expand Down