mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-03 00:56:00 +02:00
* wip
* wip
* wip
* test
* wip rollup pluginでsearchIndexの情報生成
* wip
* SPDX
* wip: markerIdを自動付与
* rollupでビルド時・devモード時に毎回uuidを生成するように
* 開発サーバーでだけ必要な挙動は開発サーバーのみで
* 条件が逆
* wip: childrenの生成
* update comment
* update comment
* rename auto generated file
* hashをパスと行数から決定
* Update privacy.vue
* Update privacy.vue
* wip
* Update general.vue
* Update general.vue
* wip
* wip
* Update SearchMarker.vue
* wip
* Update profile.vue
* Update mute-block.vue
* Update mute-block.vue
* Update general.vue
* Update general.vue
* childrenがduplicate key errorを吐く問題をいったん解決
* マーカーの形を成形
* loggerを置きかえ
* とりあえず省略記法に対応
* Refactor and Format codes
* wip
* Update settings-search-index.ts
* wip
* wip
* とりあえず不確定要因の仮置きidを削除
* hashの生成を正規化(絶対パスになっていたのを緩和)
* pathの入力を省略可能に
* adminでもパス生成できるように
* Update settings-search-index.ts
* Update privacy.vue
* wip
* build searchIndex
* wip
* build
* Update general.vue
* build
* Update sounds.vue
* build
* build
* Update sounds.vue
* 🎨
* 🎨
* Update privacy.vue
* Update privacy.vue
* Update security.vue
* create-search-indexを多少改善
* build
* Update 2fa.vue
* wip
* 必ずtransformCodeCacheを利用するように, キャッシュの明確な受け渡しを定義
* キャッシュはdevServerでなくても更新
* Revert "wip"
This reverts commit 41bffd3a13.
* inlining
* wip
* Update theme.vue
* 🎨
* wip normalize
* Update theme.vue
* キャッシュのパス変換
* build
* wip
* wip
* Update SearchMarker.vue
* i18n.ts['key'] の形式が取り出せない問題のFix
* build
* 仮でpath入れ
* 必ず絶対パスが使われるように
* wip
* 🎨
* storybookビルド時はcreateSearchIndexをしない
* inliningの構造化
* format code
* Update index.vue
* wip
* wip
* 🎨
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* clean up
* wip
* wip
* wip
* Update rollup-plugin-unwind-css-module-class-name.test.ts
* Update navbar.vue
* clean up
* wip
* wip
* wip
* wip
* wip
* Update preferences-backups.vue
* Update common.ts
* Update preferences.ts
* wip
* wip
* wip
* wip
* Update MkPreferenceContainer.vue
* Update MkPreferenceContainer.vue
* Update MkPreferenceContainer.vue
* enhance: 検索で上下矢印を使用することで検索結果を移動できるように
* Update main-boot.ts
* refactor
* wip
* Update sounds.vue
* fix(frontend): PageWindowでSearchMarkerが動作するように
* enhance(frontend): SearchMarkerの点滅を一定時間で止める
* wip
* lint fix
* fix: 子要素監視が抜けていたのを修正
* アニメーションの回数はCSSで制御するように
* refactor
* enhance(frontend): 検索インデックス作成時のログを削減
* revert
* fix
* fix
* Update preferences.ts
* Update preferences.ts
* wip
* Update preferences.ts
* wip
* 🎨
* wip
* Update MkPreferenceContainer.vue
* wip
* Update preferences.ts
* wip
* Update preferences.ts
* Update preferences.ts
* wip
* wip
* Update preferences.ts
* wip
* wip
* Update preferences.ts
* Update CHANGELOG.md
* Update preferences.ts
* Update deck-store.ts
* deckStoreをdefaultStoreに統合
* wip
* defaultStore -> store
* Update profile.ts
* wip
* refactor
* wip: plugin
* plugin
* plugin
* plugin
* Update plugin.ts
* wip
* Update plugin.vue
* Update preferences.ts
* Update main-boot.ts
* wip
* fix test
* Update plugin.vue
* Update plugin.vue
* Update utility.ts
* wip
* wip
* Update utility.ts
* wip
* wip
* clean up
* Update utility.ts
---------
Co-authored-by: tai-cha <dev@taichan.site>
Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
194 lines
4.8 KiB
Vue
194 lines
4.8 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and misskey-project
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<MkModalWindow
|
|
ref="dialogEl"
|
|
:width="800"
|
|
:height="500"
|
|
:scroll="false"
|
|
:withOkButton="true"
|
|
@close="cancel()"
|
|
@ok="ok()"
|
|
@closed="emit('closed')"
|
|
>
|
|
<template #header>{{ i18n.ts.cropImage }}</template>
|
|
<template #default="{ width, height }">
|
|
<div class="mk-cropper-dialog" :style="`--vw: ${width}px; --vh: ${height}px;`">
|
|
<Transition name="fade">
|
|
<div v-if="loading" class="loading">
|
|
<MkLoading/>
|
|
</div>
|
|
</Transition>
|
|
<div class="container">
|
|
<img ref="imgEl" :src="imgUrl" style="display: none;" @load="onImageLoad">
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</MkModalWindow>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { onMounted, shallowRef, ref } from 'vue';
|
|
import * as Misskey from 'misskey-js';
|
|
import Cropper from 'cropperjs';
|
|
import tinycolor from 'tinycolor2';
|
|
import { apiUrl } from '@@/js/config.js';
|
|
import MkModalWindow from '@/components/MkModalWindow.vue';
|
|
import * as os from '@/os.js';
|
|
import { $i } from '@/account.js';
|
|
import { i18n } from '@/i18n.js';
|
|
import { getProxiedImageUrl } from '@/scripts/media-proxy.js';
|
|
import { prefer } from '@/preferences.js';
|
|
|
|
const emit = defineEmits<{
|
|
(ev: 'ok', cropped: Misskey.entities.DriveFile): void;
|
|
(ev: 'cancel'): void;
|
|
(ev: 'closed'): void;
|
|
}>();
|
|
|
|
const props = defineProps<{
|
|
file: Misskey.entities.DriveFile;
|
|
aspectRatio: number;
|
|
uploadFolder?: string | null;
|
|
}>();
|
|
|
|
const imgUrl = getProxiedImageUrl(props.file.url, undefined, true);
|
|
const dialogEl = shallowRef<InstanceType<typeof MkModalWindow>>();
|
|
const imgEl = shallowRef<HTMLImageElement>();
|
|
let cropper: Cropper | null = null;
|
|
const loading = ref(true);
|
|
|
|
const ok = async () => {
|
|
const promise = new Promise<Misskey.entities.DriveFile>(async (res) => {
|
|
const croppedImage = await cropper?.getCropperImage();
|
|
const croppedSection = await cropper?.getCropperSelection();
|
|
|
|
// 拡大率を計算し、(ほぼ)元の大きさに戻す
|
|
const zoomedRate = croppedImage.getBoundingClientRect().width / croppedImage.clientWidth;
|
|
const widthToRender = croppedSection.getBoundingClientRect().width / zoomedRate;
|
|
|
|
const croppedCanvas = await croppedSection?.$toCanvas({ width: widthToRender });
|
|
croppedCanvas?.toBlob(blob => {
|
|
if (!blob) return;
|
|
const formData = new FormData();
|
|
formData.append('file', blob);
|
|
formData.append('name', `cropped_${props.file.name}`);
|
|
formData.append('isSensitive', props.file.isSensitive ? 'true' : 'false');
|
|
if (props.file.comment) { formData.append('comment', props.file.comment);}
|
|
formData.append('i', $i!.token);
|
|
if (props.uploadFolder) {
|
|
formData.append('folderId', props.uploadFolder);
|
|
} else if (props.uploadFolder !== null && prefer.s.uploadFolder) {
|
|
formData.append('folderId', prefer.s.uploadFolder);
|
|
}
|
|
|
|
window.fetch(apiUrl + '/drive/files/create', {
|
|
method: 'POST',
|
|
body: formData,
|
|
})
|
|
.then(response => response.json())
|
|
.then(f => {
|
|
res(f);
|
|
});
|
|
});
|
|
});
|
|
|
|
os.promiseDialog(promise);
|
|
|
|
const f = await promise;
|
|
|
|
emit('ok', f);
|
|
dialogEl.value!.close();
|
|
};
|
|
|
|
const cancel = () => {
|
|
emit('cancel');
|
|
dialogEl.value!.close();
|
|
};
|
|
|
|
const onImageLoad = () => {
|
|
loading.value = false;
|
|
|
|
if (cropper) {
|
|
cropper.getCropperImage()!.$center('contain');
|
|
cropper.getCropperSelection()!.$center();
|
|
}
|
|
};
|
|
|
|
onMounted(() => {
|
|
cropper = new Cropper(imgEl.value!, {
|
|
});
|
|
|
|
const computedStyle = getComputedStyle(document.documentElement);
|
|
|
|
const selection = cropper.getCropperSelection()!;
|
|
selection.themeColor = tinycolor(computedStyle.getPropertyValue('--MI_THEME-accent')).toHexString();
|
|
selection.aspectRatio = props.aspectRatio;
|
|
selection.initialAspectRatio = props.aspectRatio;
|
|
selection.outlined = true;
|
|
|
|
window.setTimeout(() => {
|
|
cropper!.getCropperImage()!.$center('contain');
|
|
selection.$center();
|
|
}, 100);
|
|
|
|
// モーダルオープンアニメーションが終わったあとで再度調整
|
|
window.setTimeout(() => {
|
|
cropper!.getCropperImage()!.$center('contain');
|
|
selection.$center();
|
|
}, 500);
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" scoped>
|
|
.fade-enter-active,
|
|
.fade-leave-active {
|
|
transition: opacity 0.5s ease 0.5s;
|
|
}
|
|
.fade-enter-from,
|
|
.fade-leave-to {
|
|
opacity: 0;
|
|
}
|
|
|
|
.mk-cropper-dialog {
|
|
display: flex;
|
|
flex-direction: column;
|
|
width: var(--vw);
|
|
height: var(--vh);
|
|
position: relative;
|
|
|
|
> .loading {
|
|
position: absolute;
|
|
z-index: 10;
|
|
top: 0;
|
|
left: 0;
|
|
width: 100%;
|
|
height: 100%;
|
|
display: flex;
|
|
align-items: center;
|
|
justify-content: center;
|
|
-webkit-backdrop-filter: var(--MI-blur, blur(10px));
|
|
backdrop-filter: var(--MI-blur, blur(10px));
|
|
background: rgba(0, 0, 0, 0.5);
|
|
}
|
|
|
|
> .container {
|
|
flex: 1;
|
|
width: 100%;
|
|
height: 100%;
|
|
|
|
> ::v-deep(cropper-canvas) {
|
|
width: 100%;
|
|
height: 100%;
|
|
|
|
> cropper-selection > cropper-handle[action="move"] {
|
|
background: transparent;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</style>
|