summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/MkModal.vue
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-01-08 09:58:35 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-01-08 09:58:35 +0900
commit8709574f3d4690873cc4f66053f8139ea4855fdf (patch)
tree190245d09b5c719383d6ce4ba1147fd8686bd430 /packages/frontend/src/components/MkModal.vue
parent:art: (diff)
downloadsharkey-8709574f3d4690873cc4f66053f8139ea4855fdf.tar.gz
sharkey-8709574f3d4690873cc4f66053f8139ea4855fdf.tar.bz2
sharkey-8709574f3d4690873cc4f66053f8139ea4855fdf.zip
:art:
Diffstat (limited to 'packages/frontend/src/components/MkModal.vue')
-rw-r--r--packages/frontend/src/components/MkModal.vue24
1 files changed, 20 insertions, 4 deletions
diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue
index f323de605f..83b40fd01f 100644
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@@ -74,8 +74,24 @@ const type = $computed<ModalTypes>(() => {
return props.preferType!;
}
});
-let transitionName = $ref(defaultStore.state.animation ? (type === 'drawer') ? 'modal-drawer' : (type === 'popup') ? 'modal-popup' : 'modal' : '');
-let transitionDuration = $ref(defaultStore.state.animation ? 200 : 0);
+let transitionName = $computed((() =>
+ defaultStore.state.animation
+ ? (type === 'drawer')
+ ? 'modal-drawer'
+ : (type === 'popup')
+ ? 'modal-popup'
+ : 'modal'
+ : ''
+));
+let transitionDuration = $computed((() =>
+ transitionName === 'modal-popup'
+ ? 100
+ : transitionName === 'modal'
+ ? 200
+ : transitionName === 'modal-drawer'
+ ? 200
+ : 0
+));
let contentClicking = false;
@@ -308,12 +324,12 @@ defineExpose({
.modal-popup-enter-active, .modal-popup-leave-active {
> .bg {
- transition: opacity 0.2s !important;
+ transition: opacity 0.1s !important;
}
> .content {
transform-origin: var(--transformOrigin);
- transition: opacity 0.2s cubic-bezier(0, 0, 0.2, 1), transform 0.2s cubic-bezier(0, 0, 0.2, 1) !important;
+ transition: opacity 0.1s cubic-bezier(0, 0, 0.2, 1), transform 0.1s cubic-bezier(0, 0, 0.2, 1) !important;
}
}
.modal-popup-enter-from, .modal-popup-leave-to {