From ab17a05df3ddd079c072bb3cc09506572df3a265 Mon Sep 17 00:00:00 2001 From: forehalo Date: Wed, 17 Apr 2024 03:56:24 +0000 Subject: [PATCH] fix(core): give page reference correct link (#6587) --- .../modules/workbench/view/workbench-link.tsx | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx b/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx index 534567172..3cf9adaf2 100644 --- a/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx +++ b/packages/frontend/core/src/modules/workbench/view/workbench-link.tsx @@ -8,7 +8,6 @@ import { Workbench } from '../entities/workbench'; export const WorkbenchLink = ({ to, - children, onClick, ...other }: React.PropsWithChildren< @@ -17,6 +16,9 @@ export const WorkbenchLink = ({ const workbench = useService(Workbench); const { appSettings } = useAppSettingHelper(); const basename = useLiveData(workbench.basename$); + const link = + basename + + (typeof to === 'string' ? to : `${to.pathname}${to.search}${to.hash}`); const handleClick = useCallback( (event: React.MouseEvent) => { event.preventDefault(); @@ -29,21 +31,16 @@ export const WorkbenchLink = ({ if (appSettings.enableMultiView && environment.isDesktop) { workbench.open(to, { at: 'beside' }); } else if (!environment.isDesktop) { - const href = - typeof to === 'string' - ? to - : `${to.pathname}${to.search}${to.hash}`; - popupWindow(basename + href); + popupWindow(link); } } else { workbench.open(to); } }, - [appSettings.enableMultiView, basename, onClick, to, workbench] - ); - return ( - - {children} - + [appSettings.enableMultiView, link, onClick, to, workbench] ); + + // eslint suspicious runtime error + // eslint-disable-next-line react/no-danger-with-children + return ; };