diff --git a/src/components/ActivatableLink/ActivatableLink.jsx b/src/components/ActivatableLink/ActivatableLink.jsx index 858376d..d977add 100644 --- a/src/components/ActivatableLink/ActivatableLink.jsx +++ b/src/components/ActivatableLink/ActivatableLink.jsx @@ -1,6 +1,6 @@ import { A } from "@solidjs/router"; import { defaultTo, isNil, pick, pipe, prop } from "ramda"; -import { Show } from "solid-js"; +import { Show, mergeProps } from "solid-js"; import classes from "./ActivatableLink.module.css"; /** @@ -24,17 +24,21 @@ const defaultActivatable = pipe(defaultTo(true), prop("activatable")); * @returns {import("solid-js").Component} */ export default function ActivatableLink(props) { + const mergedProps = mergeProps( + { activatable: true, leftIcon: null, rightIcon: null }, + props + ); return ( - {props.leftIcon} - {props.children} - {props.rightIcon} + {mergedProps.leftIcon} + {mergedProps.children} + {mergedProps.rightIcon} ); }