1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-07-25 10:54:56 +02:00
This commit is contained in:
syuilo
2026-07-10 15:48:39 +09:00
parent f3dcca2d31
commit 3ecb2b4d13
3 changed files with 42 additions and 5 deletions

View File

@@ -17,7 +17,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div
:class="[$style.transformer, { [$style.transition]: enableTransition }]"
:style="{ translate: `${transform.x}px ${transform.y}px`, scale: transform.scale }"
@transitionend="enableTransition = false"
@transitionend.self="enableTransition = false"
@transitioncancel.self="enableTransition = false"
>
<img
v-if="!originalImageLoaded || !thumbnailImageLoaded"
@@ -41,9 +42,16 @@ SPDX-License-Identifier: AGPL-3.0-only
@load="originalImageLoaded = true"
>
</div>
<div v-if="activated && !originalImageLoaded" :class="$style.loading">
<MkLoading/>
</div>
<div :class="[$style.footer, { [$style.infoShowing]: infoShowing }]">
<div :class="$style.footerText">
{{ image.filename }}
</div>
</div>
</div>
</template>
@@ -60,14 +68,13 @@ export type Image = {
thumbnailUrl: string;
width: number;
height: number;
filename?: string;
sourceElement?: HTMLElement;
};
const props = withDefaults(defineProps<{
image: Image;
activated: boolean;
openAnimDuration: number;
closeAnimDuration: number;
}>(), {
});
@@ -85,6 +92,12 @@ const imageEl = useTemplateRef('imageEl');
const originalImageLoaded = ref(false);
const thumbnailImageLoaded = ref(false);
const enableTransition = ref(false);
const infoShowing = ref(false);
onMounted(() => {
rootEl.value.offsetHeight; // reflow
infoShowing.value = true;
});
const padding = 30;
const ANIMATION_DURATION = 200;
@@ -306,6 +319,8 @@ function onPointerup(ev: PointerEvent) {
if (shouldCloseByUpwardSwipe || shouldCloseByDownwardSwipe) {
emit('close');
infoShowing.value = false;
const sourceTransform = getScaleAndTranslationForSourceElement();
enableTransition.value = true;
@@ -441,4 +456,27 @@ watch(thumbnailImageLoaded, () => {
.transition {
transition: translate 200ms ease, scale 200ms ease;
}
.footer {
position: absolute;
bottom: -30px;
left: 0;
width: 100%;
height: 30px;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
pointer-events: none;
font-size: 85%;
color: #fff;
opacity: 0;
transition: opacity 200ms ease, bottom 200ms ease;
}
.footer.infoShowing {
bottom: 0;
opacity: 1;
}
.footerText {
}
</style>

View File

@@ -29,8 +29,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<XItem
:image="image"
:activated="activatedIndexes.has(i)"
:openAnimDuration="openAnimDuration"
:closeAnimDuration="closeAnimDuration"
@close="onItemClose"
@horizontalSwipe="onHorizontalSwipe"
@prev="onPrev"

View File

@@ -102,6 +102,7 @@ async function openGallery(id: string) {
thumbnailUrl: media.thumbnailUrl,
width: media.properties.width ?? 0,
height: media.properties.height ?? 0,
filename: media.name,
sourceElement: markRaw(gallery.value?.querySelector(`[data-marker="${markerId}:${media.id}"]`)),
}));
const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkImageGallery.vue').then(x => x.default), {