mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-25 23:13:10 +02:00
a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
262 lines
6.7 KiB
Vue
262 lines
6.7 KiB
Vue
<!--
|
||
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
||
SPDX-License-Identifier: AGPL-3.0-only
|
||
-->
|
||
|
||
<template>
|
||
<div ref="root" :class="['chromatic-ignore', $style.root, { [$style.cover]: cover }]" :title="title ?? ''">
|
||
<TransitionGroup
|
||
:duration="defaultStore.state.animation && props.transition?.duration || undefined"
|
||
:enterActiveClass="defaultStore.state.animation && props.transition?.enterActiveClass || undefined"
|
||
:leaveActiveClass="defaultStore.state.animation && (props.transition?.leaveActiveClass ?? $style.transition_leaveActive) || undefined"
|
||
:enterFromClass="defaultStore.state.animation && props.transition?.enterFromClass || undefined"
|
||
:leaveToClass="defaultStore.state.animation && props.transition?.leaveToClass || undefined"
|
||
:enterToClass="defaultStore.state.animation && props.transition?.enterToClass || undefined"
|
||
:leaveFromClass="defaultStore.state.animation && props.transition?.leaveFromClass || undefined"
|
||
>
|
||
<canvas v-show="hide" key="canvas" ref="canvas" :class="$style.canvas" :width="canvasWidth" :height="canvasHeight" :title="title ?? undefined"/>
|
||
<img v-show="!hide" key="img" ref="img" :height="imgHeight" :width="imgWidth" :class="$style.img" :src="src ?? undefined" :title="title ?? undefined" :alt="alt ?? undefined" loading="eager" decoding="async"/>
|
||
</TransitionGroup>
|
||
</div>
|
||
</template>
|
||
|
||
<script lang="ts">
|
||
import DrawBlurhash from '@/workers/draw-blurhash?worker';
|
||
import TestWebGL2 from '@/workers/test-webgl2?worker';
|
||
import { WorkerMultiDispatch } from '@/scripts/worker-multi-dispatch.js';
|
||
import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash.js';
|
||
|
||
const canvasPromise = new Promise<WorkerMultiDispatch | HTMLCanvasElement>(resolve => {
|
||
// テスト環境で Web Worker インスタンスは作成できない
|
||
if (import.meta.env.MODE === 'test') {
|
||
const canvas = document.createElement('canvas');
|
||
canvas.width = 64;
|
||
canvas.height = 64;
|
||
resolve(canvas);
|
||
return;
|
||
}
|
||
const testWorker = new TestWebGL2();
|
||
testWorker.addEventListener('message', event => {
|
||
if (event.data.result) {
|
||
const workers = new WorkerMultiDispatch(
|
||
() => new DrawBlurhash(),
|
||
Math.min(navigator.hardwareConcurrency - 1, 4),
|
||
);
|
||
resolve(workers);
|
||
if (_DEV_) console.log('WebGL2 in worker is supported!');
|
||
} else {
|
||
const canvas = document.createElement('canvas');
|
||
canvas.width = 64;
|
||
canvas.height = 64;
|
||
resolve(canvas);
|
||
if (_DEV_) console.log('WebGL2 in worker is not supported...');
|
||
}
|
||
testWorker.terminate();
|
||
});
|
||
});
|
||
</script>
|
||
|
||
<script lang="ts" setup>
|
||
import { computed, nextTick, onMounted, onUnmounted, shallowRef, watch, ref } from 'vue';
|
||
import { v4 as uuid } from 'uuid';
|
||
import { render } from 'buraha';
|
||
import { defaultStore } from '@/store.js';
|
||
|
||
const props = withDefaults(defineProps<{
|
||
transition?: {
|
||
duration?: number | { enter: number; leave: number; };
|
||
enterActiveClass?: string;
|
||
leaveActiveClass?: string;
|
||
enterFromClass?: string;
|
||
leaveToClass?: string;
|
||
enterToClass?: string;
|
||
leaveFromClass?: string;
|
||
} | null;
|
||
src?: string | null;
|
||
hash?: string | null;
|
||
alt?: string | null;
|
||
title?: string | null;
|
||
height?: number;
|
||
width?: number;
|
||
cover?: boolean;
|
||
forceBlurhash?: boolean;
|
||
onlyAvgColor?: boolean; // 軽量化のためにBlurhashを使わずに平均色だけを描画
|
||
}>(), {
|
||
transition: null,
|
||
src: null,
|
||
alt: '',
|
||
title: null,
|
||
height: 64,
|
||
width: 64,
|
||
cover: true,
|
||
forceBlurhash: false,
|
||
onlyAvgColor: false,
|
||
});
|
||
|
||
const viewId = uuid();
|
||
const canvas = shallowRef<HTMLCanvasElement>();
|
||
const root = shallowRef<HTMLDivElement>();
|
||
const img = shallowRef<HTMLImageElement>();
|
||
const loaded = ref(false);
|
||
const canvasWidth = ref(64);
|
||
const canvasHeight = ref(64);
|
||
const imgWidth = ref(props.width);
|
||
const imgHeight = ref(props.height);
|
||
const bitmapTmp = ref<CanvasImageSource | undefined>();
|
||
const hide = computed(() => !loaded.value || props.forceBlurhash);
|
||
|
||
function waitForDecode() {
|
||
if (props.src != null && props.src !== '') {
|
||
nextTick()
|
||
.then(() => img.value?.decode())
|
||
.then(() => {
|
||
loaded.value = true;
|
||
}, error => {
|
||
console.log('Error occurred during decoding image', img.value, error);
|
||
});
|
||
} else {
|
||
loaded.value = false;
|
||
}
|
||
}
|
||
|
||
watch([() => props.width, () => props.height, root], () => {
|
||
const ratio = props.width / props.height;
|
||
if (ratio > 1) {
|
||
canvasWidth.value = Math.round(64 * ratio);
|
||
canvasHeight.value = 64;
|
||
} else {
|
||
canvasWidth.value = 64;
|
||
canvasHeight.value = Math.round(64 / ratio);
|
||
}
|
||
|
||
const clientWidth = root.value?.clientWidth ?? 300;
|
||
imgWidth.value = clientWidth;
|
||
imgHeight.value = Math.round(clientWidth / ratio);
|
||
}, {
|
||
immediate: true,
|
||
});
|
||
|
||
function drawImage(bitmap: CanvasImageSource) {
|
||
// canvasがない(mountedされていない)場合はTmpに保存しておく
|
||
if (!canvas.value) {
|
||
bitmapTmp.value = bitmap;
|
||
return;
|
||
}
|
||
|
||
// canvasがあれば描画する
|
||
bitmapTmp.value = undefined;
|
||
const ctx = canvas.value.getContext('2d');
|
||
if (!ctx) return;
|
||
ctx.drawImage(bitmap, 0, 0, canvasWidth.value, canvasHeight.value);
|
||
}
|
||
|
||
function drawAvg() {
|
||
if (!canvas.value || !props.hash) return;
|
||
|
||
const ctx = canvas.value.getContext('2d');
|
||
if (!ctx) return;
|
||
|
||
// avgColorでお茶をにごす
|
||
ctx.beginPath();
|
||
ctx.fillStyle = extractAvgColorFromBlurhash(props.hash) ?? '#888';
|
||
ctx.fillRect(0, 0, canvasWidth.value, canvasHeight.value);
|
||
}
|
||
|
||
async function draw() {
|
||
if (props.hash == null) return;
|
||
|
||
drawAvg();
|
||
|
||
if (props.onlyAvgColor) return;
|
||
|
||
const work = await canvasPromise;
|
||
if (work instanceof WorkerMultiDispatch) {
|
||
work.postMessage(
|
||
{
|
||
id: viewId,
|
||
hash: props.hash,
|
||
},
|
||
undefined,
|
||
);
|
||
} else {
|
||
try {
|
||
render(props.hash, work);
|
||
drawImage(work);
|
||
} catch (error) {
|
||
console.error('Error occurred during drawing blurhash', error);
|
||
}
|
||
}
|
||
}
|
||
|
||
function workerOnMessage(event: MessageEvent) {
|
||
if (event.data.id !== viewId) return;
|
||
drawImage(event.data.bitmap as ImageBitmap);
|
||
}
|
||
|
||
canvasPromise.then(work => {
|
||
if (work instanceof WorkerMultiDispatch) {
|
||
work.addListener(workerOnMessage);
|
||
}
|
||
|
||
draw();
|
||
});
|
||
|
||
watch(() => props.src, () => {
|
||
waitForDecode();
|
||
});
|
||
|
||
watch(() => props.hash, () => {
|
||
draw();
|
||
});
|
||
|
||
onMounted(() => {
|
||
// drawImageがmountedより先に呼ばれている場合はここで描画する
|
||
if (bitmapTmp.value) {
|
||
drawImage(bitmapTmp.value);
|
||
}
|
||
waitForDecode();
|
||
});
|
||
|
||
onUnmounted(() => {
|
||
canvasPromise.then(work => {
|
||
if (work instanceof WorkerMultiDispatch) {
|
||
work.removeListener(workerOnMessage);
|
||
}
|
||
});
|
||
});
|
||
</script>
|
||
|
||
<style lang="scss" module>
|
||
.transition_leaveActive {
|
||
position: absolute;
|
||
top: 0;
|
||
left: 0;
|
||
}
|
||
.root {
|
||
position: relative;
|
||
width: 100%;
|
||
height: 100%;
|
||
|
||
&.cover {
|
||
> .canvas,
|
||
> .img {
|
||
object-fit: cover;
|
||
}
|
||
}
|
||
}
|
||
|
||
.canvas,
|
||
.img {
|
||
display: block;
|
||
width: 100%;
|
||
height: 100%;
|
||
}
|
||
|
||
.canvas {
|
||
object-fit: contain;
|
||
}
|
||
|
||
.img {
|
||
object-fit: contain;
|
||
}
|
||
</style>
|