heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

chore(client): fix #8858

Browse source
This commit is contained in:
syuilo 2022-06-28 17:59:23 +09:00
parent 30bdfde4cc
commit a50b1d69a1
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/client/src/nirax.ts
View file

@ -66,6 +66,7 @@ export class Router extends EventEmitter<{
private currentKey = Date.now().toString(); private currentKey = Date.now().toString();
public currentRoute: ShallowRef<RouteDef | null> = shallowRef(null); public currentRoute: ShallowRef<RouteDef | null> = shallowRef(null);
public navHook: ((path: string) => boolean) | null = null;
constructor(routes: Router['routes'], currentPath: Router['currentPath']) { constructor(routes: Router['routes'], currentPath: Router['currentPath']) {
super(); super();
@ -192,6 +193,10 @@ export class Router extends EventEmitter<{
} }
public push(path: string) { public push(path: string) {
if (this.navHook) {
const cancel = this.navHook(path);
if (cancel) return;
}
const beforePath = this.currentPath; const beforePath = this.currentPath;
this.navigate(path, null); this.navigate(path, null);
this.emit('push', { this.emit('push', {

7
packages/client/src/ui/deck.vue
View file

@ -65,6 +65,13 @@ import { $i } from '@/account';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';
import { mainRouter } from '@/router'; import { mainRouter } from '@/router';
if (deckStore.state.navWindow) {
mainRouter.navHook = (path) => {
os.pageWindow(path);
return true;
};
}
const isMobile = ref(window.innerWidth <= 500); const isMobile = ref(window.innerWidth <= 500);
window.addEventListener('resize', () => { window.addEventListener('resize', () => {
isMobile.value = window.innerWidth <= 500; isMobile.value = window.innerWidth <= 500;