Skip to content

Commit f015ccd

Browse files
Merge pull request #141 from linked-planet/dev
Update package dependencies and enhance component styles. Bump versio…
2 parents 84208ef + 76122e0 commit f015ccd

File tree

6 files changed

+352
-308
lines changed

6 files changed

+352
-308
lines changed

library/src/components/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export type ButtonAppearance =
2323

2424
type ButtonVariantProps = VariantProps<typeof buttonVariants>
2525
const buttonVariants = cva(
26-
"focus-visible:outline-selected-bold relative box-border flex shrink-0 cursor-pointer items-center justify-center gap-1 rounded-sm border-2 border-transparent px-3 py-1 outline-none outline-2 outline-offset-4 focus-visible:outline-solid",
26+
"focus-visible:outline-selected-bold relative box-border flex shrink-0 cursor-pointer items-center justify-center gap-1 rounded-sm border-2 border-transparent px-2 py-1 outline-none outline-2 outline-offset-4 focus-visible:outline-solid",
2727
{
2828
variants: {
2929
appearance: {

library/src/components/DropdownMenu.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -479,24 +479,24 @@ const Trigger = forwardRef<HTMLButtonElement, DropdownTriggerProps>(
479479
{...rest}
480480
>
481481
{children}
482-
<IconSizeHelper
483-
className={`hidden h-4 w-4 items-center justify-center ${
482+
<ChevronUpIcon
483+
size="16"
484+
strokeWidth="3"
485+
className={`hidden text-text-subtlest hover:text-text disabled:text-text-disabled ${
484486
hideChevron
485487
? ""
486488
: "group-data-[state=open]:flex group-data-[state=open]:visible"
487489
}`}
488-
>
489-
<ChevronUpIcon size="12" strokeWidth="4" />
490-
</IconSizeHelper>
491-
<IconSizeHelper
492-
className={`hidden h-4 w-4 items-center justify-center ${
490+
/>
491+
<ChevronDownIcon
492+
size="16"
493+
strokeWidth="3"
494+
className={`hidden text-text-subtlest hover:text-text disabled:text-text-disabled ${
493495
hideChevron
494496
? ""
495497
: "group-data-[state=closed]:flex group-data-[state=closed]:visible"
496498
}`}
497-
>
498-
<ChevronDownIcon size="12" strokeWidth="4" />
499-
</IconSizeHelper>
499+
/>
500500
</Button>
501501
)
502502
},

library/src/components/Popover.tsx

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { twMerge } from "tailwind-merge"
44
import { getPortal } from "../utils"
55
import { Button, type ButtonProps } from "./Button"
66
import { overlayBaseStyle } from "./styleHelper"
7-
import { IconSizeHelper } from "./IconSizeHelper"
87
import { ChevronDownIcon, ChevronUpIcon } from "lucide-react"
98

109
const portalDivId = "uikts-popover" as const
@@ -13,6 +12,8 @@ type TriggerProps = RPo.PopoverTriggerProps &
1312
ButtonProps & {
1413
"data-state"?: "open" | "closed" // coming from RDd, do not use, only for typechecking
1514
hideChevron?: boolean
15+
chevronClassName?: string
16+
chevronStyle?: React.CSSProperties
1617
}
1718

1819
// this is basically a copy of the dropdown trigger
@@ -22,7 +23,10 @@ const Trigger = forwardRef<HTMLButtonElement, TriggerProps>(
2223
children,
2324
style,
2425
className,
26+
chevronClassName,
27+
chevronStyle,
2528
hideChevron = false,
29+
disabled,
2630
...rest
2731
} = props
2832
return (
@@ -36,22 +40,30 @@ const Trigger = forwardRef<HTMLButtonElement, TriggerProps>(
3640
...style,
3741
}}
3842
{...rest}
43+
disabled={disabled}
3944
>
4045
{children}
41-
<IconSizeHelper
42-
className={`hidden h-full w-6 items-center justify-center ${
43-
hideChevron ? "" : "group-data-[state=open]:flex"
44-
}`}
45-
>
46-
<ChevronUpIcon size="12" />
47-
</IconSizeHelper>
48-
<IconSizeHelper
49-
className={`hidden h-full w-6 items-center justify-center ${
50-
hideChevron ? "" : "group-data-[state=closed]:flex"
51-
}`}
52-
>
53-
<ChevronDownIcon size="12" />
54-
</IconSizeHelper>
46+
<ChevronUpIcon
47+
size="16"
48+
strokeWidth={3}
49+
className={twMerge(
50+
"hidden text-text-subtlest hover:text-text disabled:text-text-disabled",
51+
hideChevron ? "" : "group-data-[state=open]:flex",
52+
chevronClassName,
53+
)}
54+
style={chevronStyle}
55+
/>
56+
57+
<ChevronDownIcon
58+
size="16"
59+
strokeWidth={3}
60+
className={twMerge(
61+
"hidden text-text-subtlest hover:text-text disabled:text-text-disabled",
62+
hideChevron ? "" : "group-data-[state=closed]:flex",
63+
chevronClassName,
64+
)}
65+
style={chevronStyle}
66+
/>
5567
</Button>
5668
)
5769
},

library/src/components/inputs/Select.tsx

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@ import {
2525
} from "react-select"
2626
import ReactSelectAsync from "react-select/async"
2727

28+
import { getPortal } from "../../utils/getPortal"
29+
30+
import ReactSelectCreatable, {
31+
type CreatableProps,
32+
} from "react-select/creatable"
33+
import { twJoin, twMerge } from "tailwind-merge"
34+
import { SlidingErrorMessage } from "./ErrorHelpWrapper"
35+
import { IconSizeHelper } from "../IconSizeHelper"
36+
import { inputBaseStyles } from "../styleHelper"
37+
import { ChevronDownIcon, ChevronUpIcon, XIcon } from "lucide-react"
38+
2839
// usage aria stuff:
2940
// https://react-select.com/advanced
3041

@@ -40,17 +51,6 @@ export type SelectAriaOnChange<V, isMulti extends boolean> = AriaOnChange<
4051
export type SelectAriaOnFilter = AriaOnFilter
4152
export type SelectAriaOnFocus<V> = AriaOnFocus<OptionType<V>>
4253

43-
import { getPortal } from "../../utils/getPortal"
44-
45-
import ReactSelectCreatable, {
46-
type CreatableProps,
47-
} from "react-select/creatable"
48-
import { twJoin, twMerge } from "tailwind-merge"
49-
import { SlidingErrorMessage } from "./ErrorHelpWrapper"
50-
import { IconSizeHelper } from "../IconSizeHelper"
51-
import { inputBaseStyles } from "../styleHelper"
52-
import { ChevronDownIcon, ChevronUpIcon, XIcon } from "lucide-react"
53-
5454
const menuStyles =
5555
"bg-surface min-w-min shadow-overlay rounded-xs overflow-hidden" // some styles like zIndex are overwritten by react-select, use the custom-styles below for those
5656

@@ -508,9 +508,9 @@ const SelectInner = <ValueType, IsMulti extends boolean = boolean>({
508508
>
509509
<IconSizeHelper>
510510
{_props.selectProps.menuIsOpen ? (
511-
<ChevronUpIcon size="12" />
511+
<ChevronUpIcon size="16" strokeWidth={3} />
512512
) : (
513-
<ChevronDownIcon size="12" />
513+
<ChevronDownIcon size="16" strokeWidth={3} />
514514
)}
515515
</IconSizeHelper>
516516
</div>

0 commit comments

Comments
 (0)