summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/global
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-03-19 15:17:41 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-03-19 15:17:41 +0900
commitbdc72e5817782316bb2c56ab362b4aa237236bef (patch)
tree209e6fca274123ea93dc38bce5e9a96bef15a974 /packages/frontend/src/components/global
parent🎨 (diff)
downloadmisskey-bdc72e5817782316bb2c56ab362b4aa237236bef.tar.gz
misskey-bdc72e5817782316bb2c56ab362b4aa237236bef.tar.bz2
misskey-bdc72e5817782316bb2c56ab362b4aa237236bef.zip
clean up
Diffstat (limited to 'packages/frontend/src/components/global')
-rw-r--r--packages/frontend/src/components/global/NestedRouterView.vue6
-rw-r--r--packages/frontend/src/components/global/RouterView.vue6
-rw-r--r--packages/frontend/src/components/global/StackingRouterView.vue2
3 files changed, 7 insertions, 7 deletions
diff --git a/packages/frontend/src/components/global/NestedRouterView.vue b/packages/frontend/src/components/global/NestedRouterView.vue
index eb7192d8e0..40ee21c674 100644
--- a/packages/frontend/src/components/global/NestedRouterView.vue
+++ b/packages/frontend/src/components/global/NestedRouterView.vue
@@ -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);
diff --git a/packages/frontend/src/components/global/RouterView.vue b/packages/frontend/src/components/global/RouterView.vue
index b01e355c5e..2f1ee6734f 100644
--- a/packages/frontend/src/components/global/RouterView.vue
+++ b/packages/frontend/src/components/global/RouterView.vue
@@ -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(() => {
// ページ遷移完了後に再びキャッシュを有効化
diff --git a/packages/frontend/src/components/global/StackingRouterView.vue b/packages/frontend/src/components/global/StackingRouterView.vue
index d1ca655dee..8f5e6663d8 100644
--- a/packages/frontend/src/components/global/StackingRouterView.vue
+++ b/packages/frontend/src/components/global/StackingRouterView.vue
@@ -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);