Skip to content

Commit 4534664

Browse files
committed
fix(stage-tamagotchi): not able to route to /settings for hash router
1 parent 33de7d4 commit 4534664

File tree

1 file changed

+6
-6
lines changed
  • apps/stage-tamagotchi/src/main/libs/electron

1 file changed

+6
-6
lines changed

apps/stage-tamagotchi/src/main/libs/electron/location.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { BrowserWindow } from 'electron'
1+
import type { BrowserWindow, LoadFileOptions, LoadURLOptions } from 'electron'
22

33
import { join } from 'node:path'
44
import { env } from 'node:process'
@@ -24,23 +24,23 @@ export function baseUrl(parentOfIndexHtml: string) {
2424
}
2525
}
2626

27-
export async function load(window: BrowserWindow, url: string | { url: string } | { file: string }) {
27+
export async function load(window: BrowserWindow, url: string | { url: string, options?: LoadURLOptions } | { file: string, options?: LoadFileOptions }) {
2828
if (typeof url === 'object' && 'url' in url) {
29-
return await window.loadURL(url.url)
29+
return await window.loadURL(url.url, url.options)
3030
}
3131
if (typeof url === 'object' && 'file' in url) {
32-
return await window.loadFile(url.file)
32+
return await window.loadFile(url.file, url.options)
3333
}
3434

3535
return await window.loadURL(url)
3636
}
3737

3838
export function withHashRoute(baseUrl: string | { url: string } | { file: string }, hashRoute: string) {
3939
if (typeof baseUrl === 'object' && 'url' in baseUrl) {
40-
return { url: `${baseUrl.url}/#${hashRoute}` }
40+
return { url: `${baseUrl.url}/#${hashRoute}` } satisfies { url: string, options?: LoadURLOptions }
4141
}
4242
if (typeof baseUrl === 'object' && 'file' in baseUrl) {
43-
return { file: `${baseUrl.file}#${hashRoute}` }
43+
return { file: `${baseUrl.file}`, options: { hash: hashRoute } } satisfies { file: string, options?: LoadFileOptions }
4444
}
4545

4646
return `${baseUrl}/#${hashRoute}`

0 commit comments

Comments
 (0)