Skip to content

refactor: handle customisation of modal #561

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 2 commits into from
May 16, 2023
Merged

refactor: handle customisation of modal #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3af6272
refactor/handle-customisation-of-modal
alexbarnsley May 16, 2023
399894f
style: resolve style guide violations
alexbarnsley May 16, 2023
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@
"spatie/laravel-permission": "Needed for nova permissions & roles",
"vyuldashev/nova-permission": "Needed for nova permissions & roles"
}
}
}
40 changes: 35 additions & 5 deletions resources/views/modal.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,28 @@
'buttons' => null,
'buttonsStyle' => 'modal-buttons',
'closeButtonOnly' => false,
'closeButtonClass' => 'modal-close',
'wireClose' => false,
'escToClose' => true,
'fixedPosition' => false,
'paddingClass' => 'p-8 sm:p-10'
'paddingClass' => 'p-8 sm:p-10',
'breakpoint' => 'md',
'wrapperClass' => 'modal-content-wrapper',
'contentClass' => 'modal-content',
])

@php
$fixedPositionClass = [
'sm' => 'sm:mx-auto',
'md' => 'md:mx-auto',
][$breakpoint] ?? 'md:mx-auto';

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

<div class="fixed inset-0 z-50 opacity-75 dark:opacity-50 bg-theme-secondary-900 dark:bg-theme-secondary-800"></div>

<div
Expand All @@ -36,15 +52,29 @@ class="flex overflow-y-auto fixed inset-0 z-50 md:py-10 md:px-8"
@endif
>
<div
class="modal-content-wrapper @if($fixedPosition) md:mx-auto @else md:m-auto @endif w-full {{ $class }} {{ $widthClass }}"
@if($style) style="{{ $style }}" @endif
@class([
'w-full',
$wrapperClass,
$fixedPositionClass => $fixedPosition,
$relativePositionClass => ! $fixedPosition,
$class,
$widthClass,
])

@if($style)
style="{{ $style }}"
@endif
>
<div class="modal-content custom-scroll {{ $widthClass }}">
<div @class([
'custom-scroll',
$contentClass,
$widthClass,
])>
<div class="{{ $paddingClass }}">
@if($wireClose)
<button
type="button"
class="modal-close"
@class([$closeButtonClass])
@if($wireClose ?? false) wire:click="{{ $wireClose }}" @endif
>
<x-ark-icon name="cross" size="sm" class="m-auto" />
Expand Down