From 0e1276a3114d4be3b82ef46bbcd47c0096da6efa Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins <matiss@mja.lv> Date: Fri, 6 Jan 2023 03:25:11 +0000 Subject: [PATCH] fix: some react warnings (#418) --- .../budget/rollover/rollover-components.js | 1 - packages/loot-design/src/components/common.js | 29 ++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/loot-design/src/components/budget/rollover/rollover-components.js b/packages/loot-design/src/components/budget/rollover/rollover-components.js index ecd82108b..62f37e3bb 100644 --- a/packages/loot-design/src/components/budget/rollover/rollover-components.js +++ b/packages/loot-design/src/components/budget/rollover/rollover-components.js @@ -426,7 +426,6 @@ export function IncomeCategoryMonth({ name="received" width="flex" borderColor={colors.border} - textAlign="right" style={[ { paddingRight: MONTH_RIGHT_PADDING, textAlign: 'right' }, isLast && { borderBottomWidth: 0 } diff --git a/packages/loot-design/src/components/common.js b/packages/loot-design/src/components/common.js index 7403dcf98..3c69be92d 100644 --- a/packages/loot-design/src/components/common.js +++ b/packages/loot-design/src/components/common.js @@ -111,18 +111,27 @@ export function AnchorLink({ ); } -export const ExternalLink = React.forwardRef((props, ref) => { - function onClick(e) { - e.preventDefault(); - window.Actual.openURLInBrowser(props.href); - } +export const ExternalLink = React.forwardRef( + ({ asAnchor, children, ...props }, ref) => { + function onClick(e) { + e.preventDefault(); + window.Actual.openURLInBrowser(props.href); + } - if (props.asAnchor) { - // eslint-disable-next-line - return <a ref={ref} {...props} onClick={onClick} />; + if (asAnchor) { + return ( + <a ref={ref} {...props} onClick={onClick}> + {children} + </a> + ); + } + return ( + <Button ref={ref} bare {...props} onClick={onClick}> + {children} + </Button> + ); } - return <Button ref={ref} bare {...props} onClick={onClick} />; -}); +); function ButtonLink_({ history, -- GitLab