Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 20 additions & 17 deletions packages/raystack/components/calendar/calendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,23 +149,26 @@ export const Calendar = function ({
const hasDateInfo = Boolean(dateComponent);

return (
<Tooltip
side='top'
disabled={loadingData || !showTooltip || !message}
message={message}
>
<button
{...buttonProps}
className={cx(
buttonProps.className,
hasDateInfo && styles.dayButtonWithInfo
)}
>
{hasDateInfo && (
<div className={styles.dayInfo}>{dateComponent}</div>
)}
<span className={styles.dayNumber}>{buttonProps.children}</span>
</button>
<Tooltip disabled={loadingData || !showTooltip || !message}>
<Tooltip.Trigger
render={
<button
{...buttonProps}
className={cx(
buttonProps.className,
hasDateInfo && styles.dayButtonWithInfo
)}
>
{hasDateInfo && (
<div className={styles.dayInfo}>{dateComponent}</div>
)}
<span className={styles.dayNumber}>
{buttonProps.children}
</span>
</button>
}
/>
<Tooltip.Content side='top'>{message}</Tooltip.Content>
</Tooltip>
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
width: 100%;
position: relative;
border-radius: var(--rs-radius-2);
border: 1px solid var(--rs-color-border-base-tertiary);
border: 0.5px solid var(--rs-color-border-base-tertiary);
background: var(--rs-color-background-base-primary);
transition: all 0.2s ease;
box-sizing: border-box;
Expand Down Expand Up @@ -310,4 +310,4 @@
.input-error-wrapper.variant-borderless:hover,
.input-error-wrapper.variant-borderless:focus-within {
border-color: transparent;
}
}
3 changes: 1 addition & 2 deletions packages/raystack/components/select/select.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@
user-select: none;
-webkit-user-select: none;
transition: all 0.2s ease;
box-shadow: var(--rs-shadow-feather);
}

.trigger-outline {
border: 0.5px solid var(--rs-color-border-base-secondary);
border: 0.5px solid var(--rs-color-border-base-tertiary);
}

.trigger-text {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
width: 100%;
min-height: 64px;
background-color: var(--rs-color-background-base-primary);
border: 1px solid var(--rs-color-border-base-tertiary);
border: 0.5px solid var(--rs-color-border-base-tertiary);
border-radius: var(--rs-radius-2);
font-size: var(--rs-font-size-small);
line-height: var(--rs-line-height-small);
Expand Down
13 changes: 9 additions & 4 deletions packages/raystack/components/text-area/text-area.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ function TextArea({
{!required && <span className={styles.optional}>(optional)</span>}
</label>
{infoTooltip && (
<Tooltip message={infoTooltip} side='right'>
<span className={styles.helpIcon}>
<InfoCircledIcon />
</span>
<Tooltip>
<Tooltip.Trigger
render={
<span className={styles.helpIcon}>
<InfoCircledIcon />
</span>
}
/>
<Tooltip.Content side='right'>{infoTooltip}</Tooltip.Content>
</Tooltip>
)}
</div>
Expand Down
7 changes: 6 additions & 1 deletion packages/raystack/figma/tooltip.figma.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,10 @@ figma.connect(Tooltip, '<FIGMA_LINK>?node-id=3598-25261', {
props: {
message: figma.textContent('Tooltip text')
},
example: props => <Tooltip {...props}>TOOLTIP_TRIGGER</Tooltip>
example: props => (
<Tooltip>
<Tooltip.Trigger render={<button />}>TOOLTIP_TRIGGER</Tooltip.Trigger>
<Tooltip.Content>{props.message}</Tooltip.Content>
</Tooltip>
)
});
Loading