forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-13 11:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure props are not passed to Fragment

Browse Source
This commit is contained in:
Alejandro Celaya
2023-08-06 18:09:46 +02:00
parent 5a9640bd57
commit 47dd105cd6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shlink-web-component/src/Main.tsx
View File

@@ -31,7 +31,11 @@ export const Main = (
const location = useLocation(); const location = useLocation();
const routesPrefix = useRoutesPrefix(); const routesPrefix = useRoutesPrefix();
const inRouterContext = useInRouterContext(); const inRouterContext = useInRouterContext();
const Wrapper = useMemo(() => (inRouterContext ? Fragment : BrowserRouter), [inRouterContext]); const [Wrapper, props] = useMemo(() => (
inRouterContext
? [Fragment, {}]
: [BrowserRouter, { basename: routesPrefix }]
), [inRouterContext]);
const [sidebarVisible, toggleSidebar, showSidebar, hideSidebar] = useToggle(); const [sidebarVisible, toggleSidebar, showSidebar, hideSidebar] = useToggle();
useEffect(() => hideSidebar(), [location]); useEffect(() => hideSidebar(), [location]);
@@ -43,7 +47,7 @@ export const Main = (
// FIXME Check if this works when not currently wrapped in a router // FIXME Check if this works when not currently wrapped in a router
return ( return (
<Wrapper basename={routesPrefix}> <Wrapper {...props}>
<FontAwesomeIcon icon={burgerIcon} className={burgerClasses} onClick={toggleSidebar} /> <FontAwesomeIcon icon={burgerIcon} className={burgerClasses} onClick={toggleSidebar} />
<div {...swipeableProps} className="menu-layout__swipeable"> <div {...swipeableProps} className="menu-layout__swipeable">