sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
syuilo
2025-03-14 20:29:39 +09:00
parent 1c9d9923f4
commit 76dc7affe0
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/frontend/src/components/MkNote.vue
View File

@@ -177,7 +177,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, inject, onMounted, ref, shallowRef, watch, provide } from 'vue'; import { computed, inject, onMounted, ref, shallowRef, watch, provide, reactive, nextTick } from 'vue';
import * as mfm from 'mfm-js'; import * as mfm from 'mfm-js';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import { isLink } from '@@/js/is-link.js'; import { isLink } from '@@/js/is-link.js';
@@ -235,9 +235,18 @@ const props = withDefaults(defineProps<{
mock: false, mock: false,
}); });
provide(DI.mock, props.mock); const transitionNames = reactive({
avatar: '',
});
const transitionName = prepareViewTransition('note-noteDetailed', props.note.id).avatar; provide(DI.mock, props.mock);
provide(DI.navHook, (path, flag) => {
const names = prepareViewTransition(path);
transitionNames.avatar = names.avatar;
nextTick(() => {
router.push(path, flag);
});
});
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'reaction', emoji: string): void; (ev: 'reaction', emoji: string): void;

8
packages/frontend/src/components/global/MkA.vue
View File

@@ -20,6 +20,7 @@ import * as os from '@/os.js';
import { copyToClipboard } from '@/utility/copy-to-clipboard.js'; import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { useRouter } from '@/router/supplier.js'; import { useRouter } from '@/router/supplier.js';
import { DI } from '@/di.js';
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
to: string; to: string;
@@ -37,6 +38,7 @@ const el = shallowRef<HTMLElement>();
defineExpose({ $el: el }); defineExpose({ $el: el });
const router = useRouter(); const router = useRouter();
const navHook = inject(DI.navHook, null);
const active = computed(() => { const active = computed(() => {
if (props.activeClass == null) return false; if (props.activeClass == null) return false;
@@ -99,6 +101,10 @@ function nav(ev: MouseEvent) {
return openWindow(); return openWindow();
} }
router.push(props.to, ev.ctrlKey ? 'forcePage' : null); if (navHook != null) {
navHook(props.to, ev.ctrlKey ? 'forcePage' : null);
} else {
router.push(props.to, ev.ctrlKey ? 'forcePage' : null);
}
} }
</script> </script>

3
packages/frontend/src/di.ts
View File

@@ -4,7 +4,7 @@
*/ */
import type { InjectionKey, Ref } from 'vue'; import type { InjectionKey, Ref } from 'vue';
import type { IRouter } from '@/nirax.js'; import type { IRouter, RouterFlag } from '@/nirax.js';
export const DI = { export const DI = {
routerCurrentDepth: Symbol() as InjectionKey<number>, routerCurrentDepth: Symbol() as InjectionKey<number>,
@@ -12,4 +12,5 @@ export const DI = {
viewId: Symbol() as InjectionKey<string>, viewId: Symbol() as InjectionKey<string>,
viewTransitionId: Symbol() as InjectionKey<Ref<string>>, viewTransitionId: Symbol() as InjectionKey<Ref<string>>,
mock: Symbol() as InjectionKey<boolean>, mock: Symbol() as InjectionKey<boolean>,
navHook: Symbol() as InjectionKey<(path: string, flag?: RouterFlag) => void>,
}; };

2
packages/frontend/src/nirax.ts
View File

@@ -37,7 +37,7 @@ interface RouteDefWithRedirect extends RouteDefBase {
export type RouteDef = RouteDefWithComponent | RouteDefWithRedirect; export type RouteDef = RouteDefWithComponent | RouteDefWithRedirect;
export type RouterFlag = 'forcePage'; export type RouterFlag = 'forcePage' | null;
type ParsedPath = (string | { type ParsedPath = (string | {
name: string; name: string;