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
6 changes: 3 additions & 3 deletions apps/member-profile/app/routes/_profile.companies.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function CompanyDescription({
function EmployeeCount({ employees }: Pick<CompanyInView, 'employees'>) {
return (
<Tooltip>
<TooltipTrigger>
<TooltipTrigger cursor="default">
<Text className="flex items-center gap-1" color="gray-500" variant="sm">
<Users size="16" />
<span>{employees}</span>
Expand All @@ -295,7 +295,7 @@ function OpportunitiesCount({
}: Pick<CompanyInView, 'opportunities'>) {
return (
<Tooltip>
<TooltipTrigger>
<TooltipTrigger cursor="default">
<Text className="flex items-center gap-1" color="gray-500" variant="sm">
<Layers size="16" />
<span>{opportunities}</span>
Expand All @@ -315,7 +315,7 @@ function OpportunitiesCount({
function ReviewCount({ reviews }: Pick<CompanyInView, 'reviews'>) {
return (
<Tooltip>
<TooltipTrigger>
<TooltipTrigger cursor="default">
<Text className="flex items-center gap-1" color="gray-500" variant="sm">
<FileText size="16" />
<span>{reviews}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function LogoLink({ href, imageAlt, imageSrc, tooltip }: LogoLinkProps) {
<Tooltip>
<TooltipTrigger asChild>
<a
className="cursor-pointer hover:opacity-90"
className="hover:opacity-90"
href={href}
rel="noopener noreferrer"
target="_blank"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ function ReportButton() {
<IconButton
backgroundColor="gray-100"
backgroundColorOnHover="gray-200"
className="cursor-pointer"
disabled={disabled}
icon={<Flag />}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ function OpportunitiesTable() {
<Tooltip>
<TooltipTrigger asChild>
<Link
className="cursor-pointer"
target="_blank"
to={generatePath(Route['/directory/:id'], {
id: opportunity.posterId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function RejectedPill({ reason }: RejectedPillProps) {

return (
<Tooltip>
<TooltipTrigger>
<TooltipTrigger cursor="default">
<Pill className="flex items-center gap-1" color="red-100">
Rejected
{!!reason && <Info size={16} className="text-error" />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,6 @@ function ResumeBookSponsors() {
<Tooltip>
<TooltipTrigger asChild>
<a
className="cursor-pointer"
href={'https://' + sponsor.domain}
rel="noopener noreferrer"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion apps/member-profile/app/shared/components/offer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export function OfferTitle({ postedAt, role }: OfferTitleProps) {
export function TotalCompensationTooltip() {
return (
<Tooltip>
<TooltipTrigger className="align-text-bottom">
<TooltipTrigger className="align-text-bottom" cursor="default">
<Info size={16} />
</TooltipTrigger>

Expand Down
8 changes: 1 addition & 7 deletions apps/member-profile/app/shared/components/resource.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,7 @@ export const Resource = ({
</Text>

<Tooltip>
<TooltipTrigger
className={getTextCn({
className: 'cursor-auto',
color: 'gray-500',
variant: 'sm',
})}
>
<TooltipTrigger className="text-sm text-gray-500" cursor="default">
{postedAt}
</TooltipTrigger>
<TooltipContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function WorkExperienceItem({

{!!rest.showOptions && (
<Tooltip>
<TooltipTrigger>
<TooltipTrigger cursor="default">
<Check
className="text-gray-300 data-[reviewed=true]:text-success"
data-reviewed={!!rest.hasReviewed}
Expand Down
8 changes: 7 additions & 1 deletion packages/ui/src/components/radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,18 @@ export const Radio = ({
);
};

Radio.Group = function RadioGroup({ children }: PropsWithChildren) {
type RadioGroupProps = PropsWithChildren<{
defaultValue?: string;
}>;

Radio.Group = function RadioGroup({ children, defaultValue }: RadioGroupProps) {
const childrenWithProps = React.Children.map(children, (child, i) => {
if (React.isValidElement(child)) {
const props: Partial<RadioProps> = {
...child.props,
color: child.props.color || ACCENT_COLORS[i % ACCENT_COLORS.length],
defaultChecked:
child.props.value === defaultValue || child.props.defaultChecked,
};

return React.cloneElement(child, props);
Expand Down
10 changes: 6 additions & 4 deletions packages/ui/src/components/textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function TextareaWithMaximum({

function TextareaWithMinimum({
defaultValue,
minLength,
minLength = 0,
...rest
}: TextareaProps) {
const [value, setValue] = useState<string>(defaultValue?.toString() || '');
Expand All @@ -106,9 +106,11 @@ function TextareaWithMinimum({
{...rest}
/>

<Text className="text-right" color="gray-500" variant="sm">
Current: {value.length} &bull; Minimum: {minLength}
</Text>
{value.length < minLength && (
<Text className="text-right" color="gray-500" variant="sm">
{minLength - value.length} more characters required.
</Text>
)}
</>
);
}
19 changes: 17 additions & 2 deletions packages/ui/src/components/tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@ export function TooltipText(props: TextProps) {
return <Text color="white" variant="xs" {...props} />;
}

export function TooltipTrigger({ className, ...props }: TooltipTriggerProps) {
return <Trigger className={cx('cursor-default', className)} {...props} />;
export function TooltipTrigger({
className,
cursor = 'pointer',
...props
}: TooltipTriggerProps & {
cursor?: 'default' | 'pointer';
}) {
return (
<Trigger
className={cx(
cursor === 'default' && 'cursor-default',
cursor === 'pointer' && 'cursor-pointer',
className
)}
{...props}
/>
);
}