Skip to content

Commit

Permalink
fix: merge conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
surajahmed committed Dec 5, 2022
2 parents 751641e + 6b4e0ab commit 96e9818
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/components/composites/Popper/Popper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ const PopperArrow = React.forwardRef(
);

const arrowStyles = React.useMemo(
() => [arrowProps.style, triangleStyle, additionalStyles, style],
[triangleStyle, additionalStyles, arrowProps.style, style]
() => [arrowProps?.style, triangleStyle, additionalStyles, style],
[triangleStyle, additionalStyles, arrowProps?.style, style]
);

return (
Expand Down

0 comments on commit 96e9818

Please sign in to comment.