Skip to content

fix(solid): make tooltip trigger work as expected #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pedrodesu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(solid): make tooltip trigger work as expected #573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions components/solid/src/components/ui/tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { PolymorphicProps } from '@ark-ui/solid'
import { Tooltip as ArkTooltip } from '@ark-ui/solid/tooltip'
import { type ComponentProps, type JSX, Show, splitProps } from 'solid-js'
import { Portal } from 'solid-js/web'
Expand All @@ -19,11 +20,13 @@ const Trigger = withContext(ArkTooltip.Trigger, 'trigger')

export { TooltipContext as Context } from '@ark-ui/solid/tooltip'

export interface TooltipProps extends Omit<RootProps, 'content'> {
type TriggerRenderProp = PolymorphicProps<'button'>['asChild']

export interface TooltipProps extends Omit<RootProps, 'content' | 'children'> {
showArrow?: boolean
portalled?: boolean
portalRef?: HTMLElement | undefined
children: JSX.Element | undefined
children: TriggerRenderProp | JSX.Element | undefined
content: JSX.Element | string
contentProps?: ContentProps
disabled?: boolean
Expand All @@ -42,10 +45,15 @@ export const Tooltip = (props: TooltipProps) => {

const portalled = () => local.portalled ?? true

const asRenderProp = () => (typeof local.children === 'function' ? local.children : false)

return (
<Show when={!local.disabled} fallback={local.children}>
<Show when={!local.disabled} fallback={local.children as JSX.Element}>
<Root {...rootProps}>
<Trigger>{local.children}</Trigger>
<Show when={asRenderProp()} fallback={<Trigger>{local.children as JSX.Element}</Trigger>}>
{(renderFn) => <Trigger asChild={renderFn()} />}
</Show>

<Show
when={portalled()}
fallback={
Expand Down