natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mkv13 media list" 

This reverts commit c2ac53c66b.
This commit is contained in:
ThatOneCalculator 2023-04-04 23:58:55 -07:00
parent 679187c779
commit 2d7f227de7
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
1 changed files with 123 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
packages/client/src/components/MkMediaList.vue
View File

@ -1,11 +1,11 @@
<template> <template>
<div> <div class="hoawjimk">
<XBanner v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :media="media"/> <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, { dmWidth: inDm }"> <div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container" :class="{ dmWidth: inDm }">
<div ref="gallery" :class="[$style.medias, count <= 4 ? $style['n' + count] : $style.nMany]"> <div ref="gallery" :data-count="mediaList.filter(media => previewable(media)).length" @click.stop>
<template v-for="media in mediaList.filter(media => previewable(media))"> <template v-for="media in mediaList.filter(media => previewable(media))">
<XVideo v-if="media.type.startsWith('video')" :key="media.id" :class="$style.media" :video="media"/> <XVideo v-if="media.type.startsWith('video')" :key="media.id" :video="media"/>
<XImage v-else-if="media.type.startsWith('image')" :key="media.id" :class="$style.media" class="image" :data-id="media.id" :image="media" :raw="raw"/> <XImage v-else-if="media.type.startsWith('image')" :key="media.id" class="image" :data-id="media.id" :image="media" :raw="raw"/>
</template> </template>
</div> </div>
</div> </div>
@ -13,7 +13,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted, ref, useCssModule } from 'vue'; import { onMounted, ref } from 'vue';
import * as misskey from 'calckey-js'; import * as misskey from 'calckey-js';
import PhotoSwipeLightbox from 'photoswipe/lightbox'; import PhotoSwipeLightbox from 'photoswipe/lightbox';
import PhotoSwipe from 'photoswipe'; import PhotoSwipe from 'photoswipe';
@ -23,6 +23,7 @@ import XImage from '@/components/MkMediaImage.vue';
import XVideo from '@/components/MkMediaVideo.vue'; import XVideo from '@/components/MkMediaVideo.vue';
import * as os from '@/os'; import * as os from '@/os';
import { FILE_TYPE_BROWSERSAFE } from '@/const'; import { FILE_TYPE_BROWSERSAFE } from '@/const';
import { defaultStore } from '@/store';
const props = defineProps<{ const props = defineProps<{
mediaList: misskey.entities.DriveFile[]; mediaList: misskey.entities.DriveFile[];
@ -30,12 +31,8 @@ const props = defineProps<{
inDm?: boolean; inDm?: boolean;
}>(); }>();
const $style = useCssModule();
const gallery = ref(null); const gallery = ref(null);
const pswpZIndex = os.claimZIndex('middle'); 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);
onMounted(() => { onMounted(() => {
const lightbox = new PhotoSwipeLightbox({ const lightbox = new PhotoSwipeLightbox({
@ -49,8 +46,7 @@ onMounted(() => {
src: media.url, src: media.url,
w: media.properties.width, w: media.properties.width,
h: media.properties.height, h: media.properties.height,
alt: media.comment ?? media.name, alt: media.comment,
comment: media.comment ?? media.name,
}; };
if (media.properties.orientation != null && media.properties.orientation >= 5) { if (media.properties.orientation != null && media.properties.orientation >= 5) {
[item.w, item.h] = [item.h, item.w]; [item.w, item.h] = [item.h, item.w];
@ -58,24 +54,22 @@ onMounted(() => {
return item; return item;
}), }),
gallery: gallery.value, gallery: gallery.value,
mainClass: $style.pswp,
children: '.image', children: '.image',
thumbSelector: '.image', thumbSelector: '.image',
loop: false, loop: false,
padding: window.innerWidth > 500 ? { padding: window.innerWidth > 500 ? {
top: 32, top: 32,
bottom: 90, bottom: 32,
left: 32, left: 32,
right: 32, right: 32,
} : { } : {
top: 0, top: 0,
bottom: 78, bottom: 0,
left: 0, left: 0,
right: 0, right: 0,
}, },
imageClickAction: 'close', imageClickAction: 'close',
tapAction: 'toggle-controls', tapAction: 'toggle-controls',
bgOpacity: 1,
pswpModule: PhotoSwipe, pswpModule: PhotoSwipe,
}); });
@ -87,7 +81,6 @@ onMounted(() => {
const id = element.dataset.id; const id = element.dataset.id;
const file = props.mediaList.find(media => media.id === id); const file = props.mediaList.find(media => media.id === id);
if (!file) return;
itemData.src = file.url; itemData.src = file.url;
itemData.w = Number(file.properties.width); itemData.w = Number(file.properties.width);
@ -96,8 +89,7 @@ onMounted(() => {
[itemData.w, itemData.h] = [itemData.h, itemData.w]; [itemData.w, itemData.h] = [itemData.h, itemData.w];
} }
itemData.msrc = file.thumbnailUrl; itemData.msrc = file.thumbnailUrl;
itemData.alt = file.comment ?? file.name; itemData.alt = file.comment;
itemData.comment = file.comment ?? file.name;
itemData.thumbCropped = true; itemData.thumbCropped = true;
}); });
@ -108,24 +100,28 @@ onMounted(() => {
appendTo: 'wrapper', appendTo: 'wrapper',
onInit: (el, pwsp) => { onInit: (el, pwsp) => {
let textBox = document.createElement('p'); let textBox = document.createElement('p');
textBox.className = 'pwsp__alt-text _acrylic'; textBox.className = 'pwsp__alt-text';
el.appendChild(textBox); el.appendChild(textBox);
pwsp.on('change', (a) => { let preventProp = function(ev: Event): void {
textBox.textContent = pwsp.currSlide.data.comment; ev.stopPropagation();
};
// Allow scrolling/text selection
el.onwheel = preventProp;
el.onclick = preventProp;
el.onpointerdown = preventProp;
el.onpointercancel = preventProp;
el.onpointermove = preventProp;
pwsp.on('change', () => {
textBox.textContent = pwsp.currSlide.data.alt?.trim();
}); });
}, },
}); });
}); });
lightbox.init(); lightbox.init();
window.addEventListener('popstate', () => {
if (lightbox.pswp && lightbox.pswp.isOpen === true) {
lightbox.pswp.close();
return;
}
});
}); });
const previewable = (file: misskey.entities.DriveFile): boolean => { const previewable = (file: misskey.entities.DriveFile): boolean => {
@ -135,106 +131,128 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
}; };
</script> </script>
<style lang="scss" module> <style lang="scss" scoped>
.dmWidth { .hoawjimk {
> .dmWidth {
min-width: 20rem; min-width: 20rem;
max-width: 40rem; max-width: 40rem;
} }
.container { > .gird-container {
position: relative; position: relative;
width: 100%; width: 100%;
margin-top: 4px; margin-top: 4px;
border-radius: var(--radius);
overflow: hidden;
&:before {
content: '';
display: block;
padding-top: 56.25% // 16:9;
} }
.medias { > div {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
display: grid; display: grid;
grid-gap: 8px; grid-gap: 8px;
// for webkit > * {
height: 100%; overflow: hidden;
border-radius: 6px;
}
&.n1 { &[data-count="1"] {
aspect-ratio: 16/9;
grid-template-rows: 1fr; grid-template-rows: 1fr;
} }
&.n2 { &[data-count="2"] {
aspect-ratio: 16/9;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr; grid-template-rows: 1fr;
} }
&.n3 { &[data-count="3"] {
aspect-ratio: 16/9;
grid-template-columns: 1fr 0.5fr; grid-template-columns: 1fr 0.5fr;
grid-template-rows: 1fr 1fr; grid-template-rows: 1fr 1fr;
> .media:nth-child(1) { > *:nth-child(1) {
grid-row: 1 / 3; grid-row: 1 / 3;
} }
> .media:nth-child(3) { > *:nth-child(3) {
grid-column: 2 / 3; grid-column: 2 / 3;
grid-row: 2 / 3; grid-row: 2 / 3;
} }
} }
&.n4 { &[data-count="4"] {
aspect-ratio: 16/9;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
grid-template-rows: 1fr 1fr; grid-template-rows: 1fr 1fr;
} }
&.nMany { > *:nth-child(1) {
grid-template-columns: 1fr 1fr; grid-column: 1 / 2;
grid-row: 1 / 2;
> .media {
aspect-ratio: 16/9;
}
}
} }
.media { > *:nth-child(2) {
overflow: hidden; // clipにするとバグる grid-column: 2 / 3;
border-radius: 8px; grid-row: 1 / 2;
} }
.pswp { > *:nth-child(3) {
--pswp-root-z-index: var(--mk-pswp-root-z-index, 2000700) !important; grid-column: 1 / 2;
--pswp-bg: var(--modalBg) !important; grid-row: 2 / 3;
}
> *:nth-child(4) {
grid-column: 2 / 3;
grid-row: 2 / 3;
}
}
}
} }
</style> </style>
<style lang="scss"> <style lang="scss">
.pswp__bg { .pswp {
background: var(--modalBg); // なぜか機能しない
backdrop-filter: var(--modalBgFilter); //z-index: v-bind(pswpZIndex);
z-index: 2000000;
} }
.pwsp__alt-text-container { .pwsp__alt-text-container {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
position: absolute; position: absolute;
bottom: 20px; bottom: 30px;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 75%; width: 75%;
max-width: 800px;
} }
.pwsp__alt-text { .pwsp__alt-text {
color: var(--fg); color: white;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
padding: var(--margin); padding: 10px;
border-radius: var(--radius); background: rgba(0, 0, 0, 0.5);
max-height: 8em; border-radius: 5px;
max-height: 10vh;
overflow-x: clip;
overflow-y: auto; overflow-y: auto;
text-shadow: var(--bg) 0 0 10px, var(--bg) 0 0 3px, var(--bg) 0 0 3px; overscroll-behavior: contain;
white-space: pre-line;
} }
.pwsp__alt-text:empty {
display: none;
}
</style> </style>