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

clean up

Browse Source
This commit is contained in:
syuilo
2025-03-19 15:17:41 +09:00
parent 11378b17c5
commit bdc72e5817
6 changed files with 21 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/frontend/src/components/MkPageWindow.vue
View File

@@ -60,9 +60,8 @@ const windowRouter = routerFactory(props.initialPath);
const pageMetadata = ref<null | PageMetadata>(null);
const windowEl = shallowRef<InstanceType<typeof MkWindow>>();
const history = ref<{ path: string; key: string; }[]>([{
const history = ref<{ path: string; }[]>([{
path: windowRouter.getCurrentPath(),
key: windowRouter.getCurrentKey(),
}]);
const buttonsLeft = computed(() => {
const buttons: Record<string, unknown>[] = [];
@@ -100,12 +99,12 @@ function getSearchMarker(path: string) {
const searchMarkerId = ref<string | null>(getSearchMarker(props.initialPath));
windowRouter.addListener('push', ctx => {
history.value.push({ path: ctx.path, key: ctx.key });
history.value.push({ path: ctx.path });
});
windowRouter.addListener('replace', ctx => {
history.value.pop();
history.value.push({ path: ctx.path, key: ctx.key });
history.value.push({ path: ctx.path });
});
windowRouter.addListener('change', ctx => {
@@ -155,7 +154,7 @@ const contextmenu = computed(() => ([{
function back() {
history.value.pop();
windowRouter.replace(history.value.at(-1)!.path, history.value.at(-1)!.key);
windowRouter.replace(history.value.at(-1)!.path);
}
function reload() {

6
packages/frontend/src/components/global/NestedRouterView.vue
View File

@@ -47,14 +47,14 @@ function resolveNested(current: Resolved, d = 0): Resolved | null {
const current = resolveNested(router.current)!;
const currentPageComponent = shallowRef('component' in current.route ? current.route.component : MkLoadingPage);
const currentPageProps = ref(current.props);
const key = ref(router.getCurrentKey() + JSON.stringify(Object.fromEntries(current.props)));
const key = ref(router.getCurrentPath());
function onChange({ resolved, key: newKey }) {
function onChange({ resolved }) {
const current = resolveNested(resolved);
if (current == null || 'redirect' in current.route) return;
currentPageComponent.value = current.route.component;
currentPageProps.value = current.props;
key.value = newKey + JSON.stringify(Object.fromEntries(current.props));
key.value = router.getCurrentPath();
}
router.addListener('change', onChange);

6
packages/frontend/src/components/global/RouterView.vue
View File

@@ -44,13 +44,13 @@ provide(DI.routerCurrentDepth, currentDepth + 1);
const current = router.current!;
const currentPageComponent = shallowRef('component' in current.route ? current.route.component : MkLoadingPage);
const currentPageProps = ref(current.props);
const key = ref(router.getCurrentKey() + JSON.stringify(Object.fromEntries(current.props)));
const key = ref(router.getCurrentPath());
function onChange({ resolved, key: newKey }) {
function onChange({ resolved }) {
if (resolved == null || 'redirect' in resolved.route) return;
currentPageComponent.value = resolved.route.component;
currentPageProps.value = resolved.props;
key.value = newKey + JSON.stringify(Object.fromEntries(resolved.props));
key.value = router.getCurrentPath();
nextTick(() => {
// ページ遷移完了後に再びキャッシュを有効化

2
packages/frontend/src/components/global/StackingRouterView.vue
View File

@@ -123,7 +123,7 @@ function mount() {
function back() {
const prev = tabs.value[tabs.value.length - 2];
tabs.value = [...tabs.value.slice(0, tabs.value.length - 1)];
router.replace(prev.path, prev.key);
router.replace(prev.path);
}
router.addListener('replace', onReplace);