Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(frontend): デッキUI・PageWindowでmatchAllに入ったら新しいタブで開くように #13768

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/frontend/src/components/MkPageWindow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@ windowRouter.addListener('replace', ctx => {
history.value.push({ path: ctx.path, key: ctx.key });
});

windowRouter.navHook = (path) => {
const res = windowRouter.resolve(path);
if (res?.route.path === '/:(*)') {
window.open(path, '_blank', 'noopener');
return true;
}
return res ?? false;
};

windowRouter.init();

provide('router', windowRouter);
Expand Down
25 changes: 20 additions & 5 deletions packages/frontend/src/nirax.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@ export interface IRouter extends EventEmitter<RouterEvent> {
current: Resolved;
currentRef: ShallowRef<Resolved>;
currentRoute: ShallowRef<RouteDef>;
navHook: ((path: string, flag?: RouterFlag) => boolean) | null;

/**
* ナビゲーションフック
*
* `true`でナビゲーションをキャンセル、`false`またはResolvedオブジェクトでナビゲーションを続行
*/
navHook: ((path: string, flag?: RouterFlag) => boolean | Resolved) | null;

/**
* ルートの初期化(eventListenerの定義後に必ず呼び出すこと)
Expand Down Expand Up @@ -199,7 +205,7 @@ export class Router extends EventEmitter<RouterEvent> implements IRouter {
private currentKey = Date.now().toString();
private redirectCount = 0;

public navHook: ((path: string, flag?: RouterFlag) => boolean) | null = null;
public navHook: ((path: string, flag?: RouterFlag) => boolean | Resolved) | null = null;

constructor(routes: Router['routes'], currentPath: Router['currentPath'], isLoggedIn: boolean, notFoundPageComponent: Component) {
super();
Expand Down Expand Up @@ -412,11 +418,20 @@ export class Router extends EventEmitter<RouterEvent> implements IRouter {
this.emit('same');
return;
}

let res: Resolved | null = null;
if (this.navHook) {
const cancel = this.navHook(path, flag);
if (cancel) return;
const hookRes = this.navHook(path, flag);
if (hookRes === true) return;
if (hookRes !== false) {
res = hookRes;
}
}
const res = this.navigate(path, null);

if (res == null) {
res = this.navigate(path, null);
}

if (res.route.path === '/:(*)') {
location.href = path;
} else {
Expand Down
9 changes: 7 additions & 2 deletions packages/frontend/src/ui/deck.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,16 @@ const columnComponents = {
roleTimeline: XRoleTimelineColumn,
};

mainRouter.navHook = (path, flag): boolean => {
mainRouter.navHook = (path, flag) => {
if (flag === 'forcePage') return false;
const noMainColumn = !deckStore.state.columns.some(x => x.type === 'main');
if (deckStore.state.navWindow || noMainColumn) {
os.pageWindow(path);
const res = mainRouter.resolve(path);
if (res?.route.path === '/:(*)') {
window.open(path, '_blank', 'noopener');
} else {
os.pageWindow(path);
}
return true;
}
return false;
Expand Down
Loading