diff --git a/src/components/dialogs/MainDialogContainer.vue b/src/components/dialogs/MainDialogContainer.vue index 6329408e..81a872a4 100644 --- a/src/components/dialogs/MainDialogContainer.vue +++ b/src/components/dialogs/MainDialogContainer.vue @@ -34,8 +34,7 @@ const worldStore = useWorldStore(); const { - previousInstancesInfoDialogVisible, - previousInstancesInfoDialogInstanceId, + previousInstancesInfoDialog, previousInstancesUserDialog, previousInstancesWorldDialog, previousInstancesGroupDialog @@ -47,7 +46,7 @@ worldStore.worldDialog.visible || avatarStore.avatarDialog.visible || groupStore.groupDialog.visible || - previousInstancesInfoDialogVisible.value || + previousInstancesInfoDialog.value.visible || previousInstancesUserDialog.value.visible || previousInstancesWorldDialog.value.visible || previousInstancesGroupDialog.value.visible, @@ -67,7 +66,7 @@ const activeCrumb = computed(() => dialogCrumbs.value[dialogCrumbs.value.length - 1] || null); const activeType = computed(() => { const type = (() => { - if (previousInstancesInfoDialogVisible.value) { + if (previousInstancesInfoDialog.value.visible) { return 'previous-instances-info'; } if (previousInstancesUserDialog.value.visible) { diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue index d5f2b21a..2ccf92a1 100644 --- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue +++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue @@ -43,8 +43,7 @@ import { useVrcxVueTable } from '../../../lib/table/useVrcxVueTable'; const { lookupUser } = useUserStore(); - const { previousInstancesInfoDialogVisible, previousInstancesInfoDialogInstanceId } = - storeToRefs(useInstanceStore()); + const { previousInstancesInfoDialog } = storeToRefs(useInstanceStore()); const { gameLogIsFriend, gameLogIsFavorite } = useGameLogStore(); const { t } = useI18n(); @@ -134,7 +133,7 @@ }; watch( - () => previousInstancesInfoDialogVisible.value, + () => previousInstancesInfoDialog.value.visible, (value) => { if (value) { nextTick(() => { @@ -148,7 +147,7 @@ function init() { loading.value = true; - location.value = parseLocation(previousInstancesInfoDialogInstanceId.value); + location.value = parseLocation(previousInstancesInfoDialog.value.instanceId); } function refreshPreviousInstancesInfoTable() { diff --git a/src/stores/instance.js b/src/stores/instance.js index 8edb9644..a07ebc6c 100644 --- a/src/stores/instance.js +++ b/src/stores/instance.js @@ -24,8 +24,11 @@ import { userRequest, worldRequest } from '../api'; +import { + accessTypeLocaleKeyMap, + instanceContentSettings +} from '../shared/constants'; import { database } from '../service/database'; -import { accessTypeLocaleKeyMap, instanceContentSettings } from '../shared/constants'; import { useAppearanceSettingsStore } from './settings/appearance'; import { useFriendStore } from './friend'; import { useGroupStore } from './group'; @@ -107,9 +110,10 @@ export const useInstanceStore = defineStore('Instance', () => { const queuedInstances = reactive(new Map()); - const previousInstancesInfoDialogVisible = ref(false); - - const previousInstancesInfoDialogInstanceId = ref(''); + const previousInstancesInfoDialog = ref({ + instanceId: '', + visible: false + }); const previousInstancesUserDialog = ref({ visible: false, @@ -153,7 +157,7 @@ export const useInstanceStore = defineStore('Instance', () => { (isLoggedIn) => { currentInstanceUsersData.value = []; instanceJoinHistory.clear(); - previousInstancesInfoDialogVisible.value = false; + previousInstancesInfoDialog.value.visible = false; previousInstancesUserDialog.value.visible = false; previousInstancesWorldDialog.value.visible = false; previousInstancesGroupDialog.value.visible = false; @@ -192,7 +196,7 @@ export const useInstanceStore = defineStore('Instance', () => { } function hidePreviousInstancesDialogs() { - previousInstancesInfoDialogVisible.value = false; + previousInstancesInfoDialog.value.visible = false; previousInstancesUserDialog.value.visible = false; previousInstancesUserDialog.value.openFlg = false; previousInstancesWorldDialog.value.visible = false; @@ -301,8 +305,8 @@ export const useInstanceStore = defineStore('Instance', () => { function showPreviousInstancesInfoDialog(instanceId, options = {}) { hidePreviousInstancesDialogs(); - previousInstancesInfoDialogVisible.value = true; - previousInstancesInfoDialogInstanceId.value = instanceId; + previousInstancesInfoDialog.value.visible = true; + previousInstancesInfoDialog.value.instanceId = instanceId; if (!options.skipBreadcrumb && instanceId) { uiStore.pushDialogCrumb( 'previous-instances-info', @@ -1460,8 +1464,7 @@ export const useInstanceStore = defineStore('Instance', () => { currentInstanceWorld, currentInstanceLocation, queuedInstances, - previousInstancesInfoDialogVisible, - previousInstancesInfoDialogInstanceId, + previousInstancesInfoDialog, previousInstancesUserDialog, previousInstancesWorldDialog, previousInstancesGroupDialog,