RageStudio/comty
1
0
Fork 0
mirror of https://github.com/ragestudio/comty.git synced 2025-06-10 02:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix router setLocation

Browse Source
This commit is contained in:
srgooglo 2022-09-07 11:14:36 +02:00
parent 94228561b1
commit adbb5fca95
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/app/src/router.jsx
View File

@ -72,7 +72,16 @@ export const InternalRouter = withRouter((props) => {
window.app.eventBus.emit("transitionDone", event) window.app.eventBus.emit("transitionDone", event)
}) })
props.history.setLocation = (to, state, delay) => { props.history.setLocation = (to, state = {}, delay = 150) => {
// clean double slashes
to = to.replace(/\/{2,}/g, "/")
// if state is a number, it's a delay
if (typeof state !== "object") {
delay = state
state = {}
}
const lastLocation = props.history.lastLocation const lastLocation = props.history.lastLocation
if (typeof lastLocation !== "undefined" && lastLocation?.pathname === to && lastLocation?.state === state) { if (typeof lastLocation !== "undefined" && lastLocation?.pathname === to && lastLocation?.state === state) {
@ -91,7 +100,6 @@ export const InternalRouter = withRouter((props) => {
}, state) }, state)
props.history.lastLocation = window.location props.history.lastLocation = window.location
}, delay ?? defaultTransitionDelay) }, delay ?? defaultTransitionDelay)
} }