Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Great scrollbar issue #9802

Closed
wants to merge 1 commit into from
Closed

fix: Great scrollbar issue #9802

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions components/common/listingCart/ListingCartModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
modal-max-height="100vh"
:title="title"
content-class="pt-4 pb-5 px-0"
:scrollable="false"
:loading="!autoTeleportLoaded"
@close="onClose">
<div class="px-6 max-h-[50vh] overflow-y-auto">
<div class="px-6">
<ModalIdentityItem />

<ListingCartSingleItemCart
Expand Down
1 change: 0 additions & 1 deletion components/shared/SkeletonLoader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<NeoSkeleton
v-else
id="skeleton-backdrop"
class="z-[2]"
rounded
border-radius="20px"
Expand Down
81 changes: 33 additions & 48 deletions components/shared/modals/ModalBody.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="modal-width">
<div class="modal-body">
<header class="px-6 py-4 flex justify-between border-b items-center">
<NeoSkeleton
v-if="loading"
Expand Down Expand Up @@ -27,23 +27,17 @@
</header>

<div
class="relative"
:class="[
{
'limit-height__scrollabe': scrollable,
'limit-height__loading': loading,
},
contentClass,
]">
<div v-if="loading">
<SkeletonLoader :title="skeletonTitle" class="modal-skeleton" />
</div>
class="modal-body-content"
:class="{
[contentClass]: !loading,
'modal-body-content__scrollable': scrollable && !loading,
'modal-body-content__loading': loading,
}">
<SkeletonLoader v-if="loading" :title="skeletonTitle" />

<div
ref="slot"
class="slot"
:class="{
slot__loading: loading,
'opacity-0 z-[1] pointer-events-none': loading,
}">
<slot />
</div>
Expand All @@ -62,15 +56,12 @@ const props = withDefaults(
title: string
loading?: boolean
modalWidth?: string
modalMaxHeight?: string
contentClass?: string
scrollable?: boolean
customSkeletonTitle?: string
}>(),
{
modalWidth: '25rem',
modalMaxWidth: '30rem',
modalMaxHeight: '70vh',
scrollable: true,
contentClass: 'pt-4 pb-5 px-6',
},
Expand Down Expand Up @@ -120,45 +111,39 @@ watch(
<style lang="scss">
@import '@/assets/styles/abstracts/variables';

$x-padding: 2rem;
$t-padding: 1.5rem;
$b-padding: 1.25rem;
$px: 2rem;
$pt: 1.5rem;
$pb: 1.25rem;
$header-height: 68px;

/* NeoModal overflow */
.o-modal__content:has(.modal-body) {
overflow-y: hidden !important;
}

.modal-width {
.modal-body {
height: 100%;
width: v-bind(modalWidth);
max-width: v-bind(modalMaxHeight);

@include mobile {
width: unset;
}
}

.limit-height {
&__scrollabe {
max-height: v-bind(modalMaxHeight);
overflow-y: auto;
}

&__loading {
max-height: v-bind(modalMaxHeight);
overflow: hidden;
}
}
&-content {
height: calc(100% - $header-height);

.modal-skeleton {
position: unset !important;
#skeleton-backdrop {
top: $t-padding;
left: $x-padding;
width: calc(100% - $x-padding * 2);
height: calc(100% - ($t-padding + $b-padding));
max-height: v-bind(modalMaxHeight) !important;
}
}
&__scrollable {
overflow-y: auto;
}

.slot {
&__loading {
@apply opacity-0 z-[1] pointer-events-none;
&__loading {
overflow-y: unset;
position: relative;
margin-top: $pt;
margin-left: $px;
width: calc(100% - $px * 2);
height: calc(100% - $header-height - ($pt + $pb));
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion libs/ui/src/components/NeoModal/NeoModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const props = withDefaults(
rootClass: '',
noShadow: false,
enableMobile: true,
maxHeight: '80vh',
maxHeight: '90vh',
mobileBreakpoint: '768px',
appendToBody: true,
},
Expand Down