f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-09 02:52:38 +00:00
Code Wiki Activity

Merge pull request #2297 from jeddai/fix-query-params

Browse Source 
update WithRoute to handle query params correctly
This commit is contained in:
Trevor Buckner
2022-08-28 15:00:39 -04:00
committed by GitHub
parent e40dbf7935 17c426cc91
commit 0811da79c4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/homebrew/homebrew.jsx
View File

@@ -14,13 +14,17 @@ const PrintPage = require('./pages/printPage/printPage.jsx');
const WithRoute = (props)=>{ const WithRoute = (props)=>{
const params = useParams(); const params = useParams();
const searchParams = useSearchParams(); const [searchParams] = useSearchParams();
const queryParams = {};
for (const [key, value] of searchParams?.entries() || []) {
queryParams[key] = value;
}
const Element = props.el; const Element = props.el;
const allProps = { const allProps = {
...props, ...props,
...params, ...params,
...searchParams, query : queryParams,
el : undefined el : undefined
}; };
return <Element {...allProps} />; return <Element {...allProps} />;
}; };