59255e11b8
* #10781
* fix tsconfig
* fetch image??
* Revert "fetch image??"
This reverts commit 0925c28d5a4f328264c39d5591dc736795541683.
* wip
* Revert "wip"
This reverts commit be97c6cb88318bcea441edeeecb69b6d6ed0dd8f.
* loading="eager"
* loading="eager" 2
* error
* wip
* wip
* wip
* wip
* clean up
* fix
* 生成するworkerを1つにする?
* clean up
* use buraha
* wip
* smaller width, height
* update buraha
* clean up
* fix
* Update MkMediaImage.vue
* Update MkImgWithBlurhash.vue
* Revert "fix(frontend): センシティブ設定された画像を開くとき一瞬レイアウトが崩れる問題を修正"
This reverts commit 41e9aa6f9b
.
* Update MkMediaList.vue
* Update MkMediaList.vue
* Update MkMediaList.vue
* Update CHANGELOG.md
* wait for decode
* fix
* ?
* (test) remove container-type: inline-size;
* Revert "(test) remove container-type: inline-size;"
This reverts commit 9448e64228428175a3d624c04df1bfad0f59cb69.
* container-name
* Revert "container-name"
This reverts commit 94385d32213a00a06a59fbd2296d6ef1b5f91785.
* width: 100%;
* improve performance
* refactor
* wip
* WIP
* wip
* Revert "wip"
This reverts commit 36e3b75cab8114e423544b79a8e2df353880f43b.
* Revert "WIP"
This reverts commit 05b729ef9189aea052ba411ac10f30a46cc668c8.
* Revert "wip"
This reverts commit 0801e7936116c58154d7cecfea955dd15fa61a77.
* #10860
* wip
* no worker
* Revert "no worker"
This reverts commit a9c49e4fb49976958a7594393343d52be0e082d7.
* ✌️
* workerNumber固定は不要
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
309 lines
7.3 KiB
Vue
309 lines
7.3 KiB
Vue
<template>
|
|
<div>
|
|
<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/>
|
|
<div v-if="mediaList.filter(media => previewable(media)).length > 0" :class="$style.container">
|
|
<div
|
|
ref="gallery"
|
|
:class="[
|
|
$style.medias,
|
|
count <= 4 ? $style['n' + count] : $style.nMany,
|
|
$style[`n1${defaultStore.reactiveState.mediaListWithOneImageAppearance.value}`]
|
|
]"
|
|
>
|
|
<template v-for="media in mediaList.filter(media => previewable(media))">
|
|
<XVideo v-if="media.type.startsWith('video')" :key="`video:${media.id}`" :class="$style.media" :video="media"/>
|
|
<XImage v-else-if="media.type.startsWith('image')" :key="`image:${media.id}`" :class="$style.media" class="image" :data-id="media.id" :image="media" :raw="raw"/>
|
|
</template>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { onMounted, ref, useCssModule, watch, shallowRef } from 'vue';
|
|
import * as misskey from 'misskey-js';
|
|
import PhotoSwipeLightbox from 'photoswipe/lightbox';
|
|
import PhotoSwipe from 'photoswipe';
|
|
import 'photoswipe/style.css';
|
|
import XBanner from '@/components/MkMediaBanner.vue';
|
|
import XImage from '@/components/MkMediaImage.vue';
|
|
import XVideo from '@/components/MkMediaVideo.vue';
|
|
import * as os from '@/os';
|
|
import { FILE_TYPE_BROWSERSAFE } from '@/const';
|
|
import { defaultStore } from '@/store';
|
|
|
|
const props = defineProps<{
|
|
mediaList: misskey.entities.DriveFile[];
|
|
raw?: boolean;
|
|
}>();
|
|
|
|
const $style = useCssModule();
|
|
|
|
const gallery = shallowRef<HTMLDivElement>();
|
|
const pswpZIndex = os.claimZIndex('middle');
|
|
document.documentElement.style.setProperty('--mk-pswp-root-z-index', pswpZIndex.toString());
|
|
const count = $computed(() => props.mediaList.filter(media => previewable(media)).length);
|
|
|
|
function calcAspectRatio() {
|
|
if (!gallery.value) return;
|
|
|
|
let img = props.mediaList[0];
|
|
|
|
if (props.mediaList.length !== 1 || !(img.properties.width && img.properties.height)) {
|
|
gallery.value.style.aspectRatio = '';
|
|
return;
|
|
}
|
|
|
|
// アスペクト比上限設定では、横長の場合は高さを縮小させる
|
|
const ratioMax = (ratio: number) => `${Math.max(ratio, img.properties.width / img.properties.height).toString()} / 1`;
|
|
|
|
switch (defaultStore.state.mediaListWithOneImageAppearance) {
|
|
case '16_9':
|
|
gallery.value.style.aspectRatio = ratioMax(16 / 9);
|
|
break;
|
|
case '1_1':
|
|
gallery.value.style.aspectRatio = ratioMax(1);
|
|
break;
|
|
case '2_3':
|
|
gallery.value.style.aspectRatio = ratioMax(2 / 3);
|
|
break;
|
|
default:
|
|
gallery.value.style.aspectRatio = '';
|
|
break;
|
|
}
|
|
}
|
|
|
|
watch([defaultStore.reactiveState.mediaListWithOneImageAppearance, gallery], () => calcAspectRatio());
|
|
|
|
onMounted(() => {
|
|
const lightbox = new PhotoSwipeLightbox({
|
|
dataSource: props.mediaList
|
|
.filter(media => {
|
|
if (media.type === 'image/svg+xml') return true; // svgのwebpublicはpngなのでtrue
|
|
return media.type.startsWith('image') && FILE_TYPE_BROWSERSAFE.includes(media.type);
|
|
})
|
|
.map(media => {
|
|
const item = {
|
|
src: media.url,
|
|
w: media.properties.width,
|
|
h: media.properties.height,
|
|
alt: media.comment ?? media.name,
|
|
comment: media.comment ?? media.name,
|
|
};
|
|
if (media.properties.orientation != null && media.properties.orientation >= 5) {
|
|
[item.w, item.h] = [item.h, item.w];
|
|
}
|
|
return item;
|
|
}),
|
|
gallery: gallery.value,
|
|
mainClass: $style.pswp,
|
|
children: '.image',
|
|
thumbSelector: '.image',
|
|
loop: false,
|
|
padding: window.innerWidth > 500 ? {
|
|
top: 32,
|
|
bottom: 90,
|
|
left: 32,
|
|
right: 32,
|
|
} : {
|
|
top: 0,
|
|
bottom: 78,
|
|
left: 0,
|
|
right: 0,
|
|
},
|
|
imageClickAction: 'close',
|
|
tapAction: 'toggle-controls',
|
|
bgOpacity: 1,
|
|
pswpModule: PhotoSwipe,
|
|
});
|
|
|
|
lightbox.on('itemData', (ev) => {
|
|
const { itemData } = ev;
|
|
|
|
// element is children
|
|
const { element } = itemData;
|
|
|
|
const id = element.dataset.id;
|
|
const file = props.mediaList.find(media => media.id === id);
|
|
if (!file) return;
|
|
|
|
itemData.src = file.url;
|
|
itemData.w = Number(file.properties.width);
|
|
itemData.h = Number(file.properties.height);
|
|
if (file.properties.orientation != null && file.properties.orientation >= 5) {
|
|
[itemData.w, itemData.h] = [itemData.h, itemData.w];
|
|
}
|
|
itemData.msrc = file.thumbnailUrl;
|
|
itemData.alt = file.comment ?? file.name;
|
|
itemData.comment = file.comment ?? file.name;
|
|
itemData.thumbCropped = true;
|
|
});
|
|
|
|
lightbox.on('uiRegister', () => {
|
|
lightbox.pswp.ui.registerElement({
|
|
name: 'altText',
|
|
className: 'pwsp__alt-text-container',
|
|
appendTo: 'wrapper',
|
|
onInit: (el, pwsp) => {
|
|
let textBox = document.createElement('p');
|
|
textBox.className = 'pwsp__alt-text _acrylic';
|
|
el.appendChild(textBox);
|
|
|
|
pwsp.on('change', (a) => {
|
|
textBox.textContent = pwsp.currSlide.data.comment;
|
|
});
|
|
},
|
|
});
|
|
});
|
|
|
|
lightbox.init();
|
|
|
|
window.addEventListener('popstate', () => {
|
|
if (lightbox.pswp && lightbox.pswp.isOpen === true) {
|
|
lightbox.pswp.close();
|
|
return;
|
|
}
|
|
});
|
|
|
|
lightbox.on('beforeOpen', () => {
|
|
history.pushState(null, '', '#pswp');
|
|
});
|
|
|
|
lightbox.on('close', () => {
|
|
if (window.location.hash === '#pswp') {
|
|
history.back();
|
|
}
|
|
});
|
|
});
|
|
|
|
const previewable = (file: misskey.entities.DriveFile): boolean => {
|
|
if (file.type === 'image/svg+xml') return true; // svgのwebpublic/thumbnailはpngなのでtrue
|
|
// FILE_TYPE_BROWSERSAFEに適合しないものはブラウザで表示するのに不適切
|
|
return (file.type.startsWith('video') || file.type.startsWith('image')) && FILE_TYPE_BROWSERSAFE.includes(file.type);
|
|
};
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.container {
|
|
position: relative;
|
|
width: 100%;
|
|
margin-top: 4px;
|
|
}
|
|
|
|
.medias {
|
|
display: grid;
|
|
grid-gap: 8px;
|
|
|
|
height: 100%;
|
|
width: 100%;
|
|
|
|
&.n1 {
|
|
grid-template-rows: 1fr;
|
|
|
|
// default (expand)
|
|
min-height: 64px;
|
|
max-height: clamp(
|
|
64px,
|
|
50cqh,
|
|
min(360px, 50vh)
|
|
);
|
|
|
|
&.n116_9 {
|
|
min-height: none;
|
|
max-height: none;
|
|
aspect-ratio: 16 / 9; // fallback
|
|
}
|
|
|
|
&.n11_1{
|
|
min-height: none;
|
|
max-height: none;
|
|
aspect-ratio: 1 / 1; // fallback
|
|
}
|
|
|
|
&.n12_3 {
|
|
min-height: none;
|
|
max-height: none;
|
|
aspect-ratio: 2 / 3; // fallback
|
|
}
|
|
}
|
|
|
|
&.n2 {
|
|
aspect-ratio: 16/9;
|
|
grid-template-columns: 1fr 1fr;
|
|
grid-template-rows: 1fr;
|
|
}
|
|
|
|
&.n3 {
|
|
aspect-ratio: 16/9;
|
|
grid-template-columns: 1fr 0.5fr;
|
|
grid-template-rows: 1fr 1fr;
|
|
|
|
> .media:nth-child(1) {
|
|
grid-row: 1 / 3;
|
|
}
|
|
|
|
> .media:nth-child(3) {
|
|
grid-column: 2 / 3;
|
|
grid-row: 2 / 3;
|
|
}
|
|
}
|
|
|
|
&.n4 {
|
|
aspect-ratio: 16/9;
|
|
grid-template-columns: 1fr 1fr;
|
|
grid-template-rows: 1fr 1fr;
|
|
}
|
|
|
|
&.nMany {
|
|
grid-template-columns: 1fr 1fr;
|
|
|
|
> .media {
|
|
aspect-ratio: 16/9;
|
|
}
|
|
}
|
|
}
|
|
|
|
.media {
|
|
overflow: hidden; // clipにするとバグる
|
|
border-radius: 8px;
|
|
}
|
|
|
|
.pswp {
|
|
--pswp-root-z-index: var(--mk-pswp-root-z-index, 2000700) !important;
|
|
--pswp-bg: var(--modalBg) !important;
|
|
}
|
|
</style>
|
|
|
|
<style lang="scss">
|
|
.pswp__bg {
|
|
background: var(--modalBg);
|
|
backdrop-filter: var(--modalBgFilter);
|
|
}
|
|
|
|
.pwsp__alt-text-container {
|
|
display: flex;
|
|
flex-direction: row;
|
|
align-items: center;
|
|
|
|
position: absolute;
|
|
bottom: 20px;
|
|
left: 50%;
|
|
transform: translateX(-50%);
|
|
|
|
width: 75%;
|
|
max-width: 800px;
|
|
}
|
|
|
|
.pwsp__alt-text {
|
|
color: var(--fg);
|
|
margin: 0 auto;
|
|
text-align: center;
|
|
padding: var(--margin);
|
|
border-radius: var(--radius);
|
|
max-height: 8em;
|
|
overflow-y: auto;
|
|
text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px;
|
|
white-space: pre-line;
|
|
}
|
|
</style>
|