From 192add376c8350bc9edff54c21be6796162877dd Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 8 Jan 2023 11:47:16 +0900 Subject: [PATCH] fix MkModal animation --- packages/frontend/src/components/MkModal.vue | 30 +++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/frontend/src/components/MkModal.vue b/packages/frontend/src/components/MkModal.vue index a83545ac15..492c281e98 100644 --- a/packages/frontend/src/components/MkModal.vue +++ b/packages/frontend/src/components/MkModal.vue @@ -63,6 +63,7 @@ let transformOrigin = $ref('center'); let showing = $ref(true); let content = $shallowRef(); const zIndex = os.claimZIndex(props.zPriority); +let useSendAnime = $ref(false); const type = $computed(() => { if (props.preferType === 'auto') { if (!defaultStore.state.disableDrawer && isTouchUsing && deviceKind === 'smartphone') { @@ -76,29 +77,32 @@ const type = $computed(() => { }); let transitionName = $computed((() => defaultStore.state.animation - ? (type === 'drawer') - ? 'modal-drawer' - : (type === 'popup') - ? 'modal-popup' - : 'modal' + ? useSendAnime + ? 'send' + : type === 'drawer' + ? 'modal-drawer' + : type === 'popup' + ? 'modal-popup' + : 'modal' : '' )); let transitionDuration = $computed((() => - transitionName === 'modal-popup' - ? 100 - : transitionName === 'modal' - ? 200 - : transitionName === 'modal-drawer' + transitionName === 'send' + ? 400 + : transitionName === 'modal-popup' + ? 100 + : transitionName === 'modal' ? 200 - : 0 + : transitionName === 'modal-drawer' + ? 200 + : 0 )); let contentClicking = false; function close(opts: { useSendAnimation?: boolean } = {}) { if (opts.useSendAnimation) { - transitionName = 'send'; - transitionDuration = 400; + useSendAnime = true; } // eslint-disable-next-line vue/no-mutating-props