Skip to content
This repository was archived by the owner on Feb 19, 2025. It is now read-only.

Commit 5210319

Browse files
committed
fix: dropdown focus issues
1 parent 899ccf8 commit 5210319

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

src/components/Dropdown/Dropdown.stories.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
IconLogOut,
77
IconChevronDown,
88
IconChevronRight,
9+
IconHardDrive,
910
} from './../../index'
1011
import Typography from '../Typography'
1112

@@ -104,7 +105,7 @@ export const DefaultFull = (args: any) => {
104105
</Dropdown.Item>,
105106
]}
106107
>
107-
<Dropdown.TriggerItem>
108+
<Dropdown.TriggerItem icon={<IconHardDrive />}>
108109
Open sub menu{' '}
109110
<Dropdown.RightSlot>
110111
<IconChevronRight size={14} />
@@ -117,7 +118,7 @@ export const DefaultFull = (args: any) => {
117118
</Dropdown.Item>,
118119
]}
119120
>
120-
<Button as="span" type="secondary" iconRight={<IconChevronDown />}>
121+
<Button as="span" type="default" iconRight={<IconChevronDown />}>
121122
Click for dropdown
122123
</Button>
123124
</Dropdown>

src/components/Dropdown/Dropdown.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ function Dropdown({
5050
return (
5151
<RadixDropdown.Root onOpenChange={onOpenChange} open={open}>
5252
{isNested ? (
53-
<RadixDropdown.TriggerItem
54-
className={[__styles.item, __styles.item_nested].join(' ')}
55-
>
53+
<RadixDropdown.TriggerItem className={[__styles.item_nested].join(' ')}>
5654
{children}
5755
</RadixDropdown.TriggerItem>
5856
) : (
@@ -118,7 +116,7 @@ export function Item({
118116
export function TriggerItem({ children, icon, disabled }: ItemProps) {
119117
let __styles = styleHandler('dropdown')
120118
return (
121-
<div className={__styles.trigger}>
119+
<div className={__styles.item}>
122120
{icon && icon}
123121
<span>{children}</span>
124122
</div>

src/lib/theme/defaultTheme.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -1166,16 +1166,23 @@ export default {
11661166
dropdown: {
11671167
// root:
11681168
trigger: `
1169+
flex
11691170
border-none
11701171
rounded
11711172
bg-transparent p-0
1172-
data-open:ring-2
1173-
data-open:ring-scale-900
1173+
1174+
outline-none
1175+
outline-offset-1
1176+
transition-all
1177+
focus:outline-4
1178+
focus:outline-brand-700
11741179
`,
11751180
item_nested: `
11761181
border-none
11771182
data-open:bg-scale-300 dark:data-open:bg-scale-500
11781183
data-open:text-scale-1200
1184+
focus:outline-none
1185+
focus:text-scale-1200
11791186
`,
11801187
content: `
11811188
bg-scale-100 dark:bg-scale-300

0 commit comments

Comments
 (0)