Skip to content

Commit 4a0fa67

Browse files
MarfuenMarfuen
authored
Merge pull request #589 from trycompai/mariano/comp-fix-z-index
[dev] [Marfuen] mariano/comp-fix-z-index
2 parents 77b9801 + 9e660d2 commit 4a0fa67

File tree

4 files changed

+164
-169
lines changed

4 files changed

+164
-169
lines changed

‎apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/people/all/components/MultiRoleCombobox.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export function MultiRoleCombobox({
174174
"border border-primary",
175175
)}
176176
onClick={(e) => {
177-
e.stopPropagation(); // Prevent popover trigger
177+
e.stopPropagation(); // Prevent popover
178178
handleSelect(role);
179179
}}
180180
>
@@ -206,7 +206,7 @@ export function MultiRoleCombobox({
206206
<PopoverContent className="w-[--radix-popover-trigger-width] p-0">
207207
<Command>
208208
<CommandInput
209-
placeholder={t("people.filters.search")}
209+
placeholder="Search..."
210210
value={searchTerm}
211211
onValueChange={setSearchTerm}
212212
/>
@@ -245,7 +245,7 @@ export function MultiRoleCombobox({
245245
selectedRoles.includes(role.value)) // Disable any locked roles
246246
}
247247
className={cn(
248-
"flex flex-col items-start py-2", // Adjust padding and alignment
248+
"flex flex-col items-start py-2 cursor-pointer", // Adjust padding and alignment
249249
lockedRoles.includes(role.value) &&
250250
selectedRoles.includes(
251251
role.value,

‎bun.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/ui/package.json‎

Lines changed: 148 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +1,149 @@
11
{
2-
"name": "@comp/ui",
3-
"version": "1.0.0",
4-
"private": true,
5-
"sideEffects": false,
6-
"files": [
7-
"tailwind.config.ts",
8-
"postcss.config.js",
9-
"globals.css"
10-
],
11-
"scripts": {
12-
"clean": "rm -rf .turbo node_modules",
13-
"lint": "biome check .",
14-
"format": "biome --write .",
15-
"typecheck": "tsc --noEmit"
16-
},
17-
"overrides": {
18-
"react-is": "^19.0.0"
19-
},
20-
"devDependencies": {
21-
"autoprefixer": "^10.4.20",
22-
"react": "19.1.0",
23-
"react-dom": "19.1.0",
24-
"typescript": "^5.8.3"
25-
},
26-
"exports": {
27-
"./resizable": "./src/components/resizable.tsx",
28-
"./secondary-menu": "./src/components/secondary-menu.tsx",
29-
"./animated-size-container": "./src/components/animated-size-container.tsx",
30-
"./accordion": "./src/components/accordion.tsx",
31-
"./alert-dialog": "./src/components/alert-dialog.tsx",
32-
"./breadcrumb": "./src/components/breadcrumb.tsx",
33-
"./alert": "./src/components/alert.tsx",
34-
"./chart": "./src/components/chart.tsx",
35-
"./currency-input": "./src/components/currency-input.tsx",
36-
"./submit-button": "./src/components/submit-button.tsx",
37-
"./avatar": "./src/components/avatar.tsx",
38-
"./button": "./src/components/button.tsx",
39-
"./calendar": "./src/components/calendar.tsx",
40-
"./card": "./src/components/card.tsx",
41-
"./slider": "./src/components/slider.tsx",
42-
"./carousel": "./src/components/carousel.tsx",
43-
"./checkbox": "./src/components/checkbox.tsx",
44-
"./collapsible": "./src/components/collapsible.tsx",
45-
"./combobox": "./src/components/combobox.tsx",
46-
"./combobox-dropdown": "./src/components/combobox-dropdown.tsx",
47-
"./command": "./src/components/command.tsx",
48-
"./context-menu": "./src/components/context-menu.tsx",
49-
"./date-range-picker": "./src/components/date-range-picker.tsx",
50-
"./dialog": "./src/components/dialog.tsx",
51-
"./drawer": "./src/components/drawer.tsx",
52-
"./dropdown-menu": "./src/components/dropdown-menu.tsx",
53-
"./form": "./src/components/form.tsx",
54-
"./editor": "./src/components/editor/index.tsx",
55-
"./globals.css": "./src/globals.css",
56-
"./hover-card": "./src/components/hover-card.tsx",
57-
"./icons": "./src/components/icons.tsx",
58-
"./input": "./src/components/input.tsx",
59-
"./input-otp": "./src/components/input-otp.tsx",
60-
"./label": "./src/components/label.tsx",
61-
"./navigation-menu": "./src/components/navigation-menu.tsx",
62-
"./popover": "./src/components/popover.tsx",
63-
"./postcss": "./postcss.config.js",
64-
"./progress": "./src/components/progress.tsx",
65-
"./radio-group": "./src/components/radio-group.tsx",
66-
"./scroll-area": "./src/components/scroll-area.tsx",
67-
"./select": "./src/components/select.tsx",
68-
"./sheet": "./src/components/sheet.tsx",
69-
"./badge": "./src/components/badge.tsx",
70-
"./separator": "./src/components/separator.tsx",
71-
"./skeleton": "./src/components/skeleton.tsx",
72-
"./spinner": "./src/components/spinner.tsx",
73-
"./switch": "./src/components/switch.tsx",
74-
"./multiple-selector": "./src/components/multiple-selector.tsx",
75-
"./table": "./src/components/table.tsx",
76-
"./tabs": "./src/components/tabs.tsx",
77-
"./tailwind.config": "./tailwind.config.ts",
78-
"./textarea": "./src/components/textarea.tsx",
79-
"./toast": "./src/components/toast.tsx",
80-
"./toaster": "./src/components/toaster.tsx",
81-
"./tooltip": "./src/components/tooltip.tsx",
82-
"./time-range-input": "./src/components/time-range-input.tsx",
83-
"./use-toast": "./src/components/use-toast.tsx",
84-
"./cn": "./src/utils/cn.ts",
85-
"./truncate": "./src/utils/truncate.ts",
86-
"./hooks": "./src/hooks/index.ts",
87-
"./quantity-input": "./src/components/quantity-input.tsx",
88-
"./use-media-query": "./src/hooks/use-media-query.tsx",
89-
"./inner-menu": "./src/components/inner-menu.tsx",
90-
"./empty-card": "./src/components/empty-card.tsx",
91-
"./text-editor": "./src/text-editor.css",
92-
"./prosemirror": "./src/prosemirror.css",
93-
"./editor.css": "./src/editor.css",
94-
"./chart-tooltip": "./src/components/chart-tooltip.tsx",
95-
"./date-picker": "./src/components/date-picker.tsx"
96-
},
97-
"dependencies": {
98-
"@mui/icons-material": "^6.1.6",
99-
"@radix-ui/react-accordion": "^1.2.1",
100-
"@radix-ui/react-alert-dialog": "^1.1.2",
101-
"@radix-ui/react-avatar": "^1.1.1",
102-
"@radix-ui/react-checkbox": "^1.1.2",
103-
"@radix-ui/react-collapsible": "^1.1.1",
104-
"@radix-ui/react-context-menu": "^2.2.2",
105-
"@radix-ui/react-dialog": "^1.1.2",
106-
"@radix-ui/react-dropdown-menu": "^2.1.2",
107-
"@radix-ui/react-hover-card": "^1.1.2",
108-
"@radix-ui/react-icons": "^1.3.0",
109-
"@radix-ui/react-label": "^2.1.0",
110-
"@radix-ui/react-navigation-menu": "^1.2.1",
111-
"@radix-ui/react-popover": "^1.1.4",
112-
"@radix-ui/react-progress": "^1.1.0",
113-
"@radix-ui/react-radio-group": "^1.2.1",
114-
"@radix-ui/react-scroll-area": "^1.2.0",
115-
"@radix-ui/react-select": "^2.1.2",
116-
"@radix-ui/react-separator": "^1.1.0",
117-
"@radix-ui/react-slider": "^1.2.1",
118-
"@radix-ui/react-slot": "^1.1.0",
119-
"@radix-ui/react-switch": "^1.1.1",
120-
"@radix-ui/react-tabs": "^1.1.1",
121-
"@radix-ui/react-toast": "^1.2.2",
122-
"@radix-ui/react-tooltip": "^1.1.3",
123-
"@tailwindcss/typography": "^0.5.16",
124-
"@tiptap/extension-bold": "2.11.5",
125-
"@tiptap/extension-link": "^2.9.1",
126-
"@tiptap/extension-placeholder": "^2.9.1",
127-
"@tiptap/extension-underline": "^2.9.1",
128-
"@tiptap/pm": "^2.9.1",
129-
"@tiptap/react": "^2.9.1",
130-
"@tiptap/starter-kit": "^2.9.1",
131-
"@uidotdev/usehooks": "^2.4.1",
132-
"class-variance-authority": "^0.7.0",
133-
"clsx": "^2.1.1",
134-
"cmdk": "0.2.1",
135-
"date-fns": "^4.1.0",
136-
"embla-carousel-react": "^8.3.0",
137-
"input-otp": "^1.2.4",
138-
"jsonfile": "^6.1.0",
139-
"lucide-react": "^0.447.0",
140-
"postcss": "^8.4.47",
141-
"react-day-picker": "8.10.1",
142-
"react-dropzone": "^14.3.5",
143-
"react-icons": "^5.3.0",
144-
"react-number-format": "^5.4.2",
145-
"react-resizable-panels": "^2.1.7",
146-
"recharts": "^2.12.7",
147-
"tailwind-merge": "2.5.3",
148-
"tailwindcss": "^3.4.13",
149-
"tailwindcss-animate": "^1.0.7",
150-
"use-callback-ref": "^1.3.3",
151-
"vaul": "^1.0.0"
152-
}
153-
}
2+
"name": "@comp/ui",
3+
"version": "1.0.0",
4+
"private": true,
5+
"sideEffects": false,
6+
"files": ["tailwind.config.ts", "postcss.config.js", "globals.css"],
7+
"scripts": {
8+
"clean": "rm -rf .turbo node_modules",
9+
"lint": "biome check .",
10+
"format": "biome --write .",
11+
"typecheck": "tsc --noEmit"
12+
},
13+
"overrides": {
14+
"react-is": "^19.0.0"
15+
},
16+
"devDependencies": {
17+
"autoprefixer": "^10.4.20",
18+
"react": "19.1.0",
19+
"react-dom": "19.1.0",
20+
"typescript": "^5.8.3"
21+
},
22+
"exports": {
23+
"./resizable": "./src/components/resizable.tsx",
24+
"./secondary-menu": "./src/components/secondary-menu.tsx",
25+
"./animated-size-container": "./src/components/animated-size-container.tsx",
26+
"./accordion": "./src/components/accordion.tsx",
27+
"./alert-dialog": "./src/components/alert-dialog.tsx",
28+
"./breadcrumb": "./src/components/breadcrumb.tsx",
29+
"./alert": "./src/components/alert.tsx",
30+
"./chart": "./src/components/chart.tsx",
31+
"./currency-input": "./src/components/currency-input.tsx",
32+
"./submit-button": "./src/components/submit-button.tsx",
33+
"./avatar": "./src/components/avatar.tsx",
34+
"./button": "./src/components/button.tsx",
35+
"./calendar": "./src/components/calendar.tsx",
36+
"./card": "./src/components/card.tsx",
37+
"./slider": "./src/components/slider.tsx",
38+
"./carousel": "./src/components/carousel.tsx",
39+
"./checkbox": "./src/components/checkbox.tsx",
40+
"./collapsible": "./src/components/collapsible.tsx",
41+
"./combobox": "./src/components/combobox.tsx",
42+
"./combobox-dropdown": "./src/components/combobox-dropdown.tsx",
43+
"./command": "./src/components/command.tsx",
44+
"./context-menu": "./src/components/context-menu.tsx",
45+
"./date-range-picker": "./src/components/date-range-picker.tsx",
46+
"./dialog": "./src/components/dialog.tsx",
47+
"./drawer": "./src/components/drawer.tsx",
48+
"./dropdown-menu": "./src/components/dropdown-menu.tsx",
49+
"./form": "./src/components/form.tsx",
50+
"./editor": "./src/components/editor/index.tsx",
51+
"./globals.css": "./src/globals.css",
52+
"./hover-card": "./src/components/hover-card.tsx",
53+
"./icons": "./src/components/icons.tsx",
54+
"./input": "./src/components/input.tsx",
55+
"./input-otp": "./src/components/input-otp.tsx",
56+
"./label": "./src/components/label.tsx",
57+
"./navigation-menu": "./src/components/navigation-menu.tsx",
58+
"./popover": "./src/components/popover.tsx",
59+
"./postcss": "./postcss.config.js",
60+
"./progress": "./src/components/progress.tsx",
61+
"./radio-group": "./src/components/radio-group.tsx",
62+
"./scroll-area": "./src/components/scroll-area.tsx",
63+
"./select": "./src/components/select.tsx",
64+
"./sheet": "./src/components/sheet.tsx",
65+
"./badge": "./src/components/badge.tsx",
66+
"./separator": "./src/components/separator.tsx",
67+
"./skeleton": "./src/components/skeleton.tsx",
68+
"./spinner": "./src/components/spinner.tsx",
69+
"./switch": "./src/components/switch.tsx",
70+
"./multiple-selector": "./src/components/multiple-selector.tsx",
71+
"./table": "./src/components/table.tsx",
72+
"./tabs": "./src/components/tabs.tsx",
73+
"./tailwind.config": "./tailwind.config.ts",
74+
"./textarea": "./src/components/textarea.tsx",
75+
"./toast": "./src/components/toast.tsx",
76+
"./toaster": "./src/components/toaster.tsx",
77+
"./tooltip": "./src/components/tooltip.tsx",
78+
"./time-range-input": "./src/components/time-range-input.tsx",
79+
"./use-toast": "./src/components/use-toast.tsx",
80+
"./cn": "./src/utils/cn.ts",
81+
"./truncate": "./src/utils/truncate.ts",
82+
"./hooks": "./src/hooks/index.ts",
83+
"./quantity-input": "./src/components/quantity-input.tsx",
84+
"./use-media-query": "./src/hooks/use-media-query.tsx",
85+
"./inner-menu": "./src/components/inner-menu.tsx",
86+
"./empty-card": "./src/components/empty-card.tsx",
87+
"./text-editor": "./src/text-editor.css",
88+
"./prosemirror": "./src/prosemirror.css",
89+
"./editor.css": "./src/editor.css",
90+
"./chart-tooltip": "./src/components/chart-tooltip.tsx",
91+
"./date-picker": "./src/components/date-picker.tsx"
92+
},
93+
"dependencies": {
94+
"@mui/icons-material": "^6.1.6",
95+
"@radix-ui/react-accordion": "^1.2.1",
96+
"@radix-ui/react-alert-dialog": "^1.1.2",
97+
"@radix-ui/react-avatar": "^1.1.1",
98+
"@radix-ui/react-checkbox": "^1.1.2",
99+
"@radix-ui/react-collapsible": "^1.1.1",
100+
"@radix-ui/react-context-menu": "^2.2.2",
101+
"@radix-ui/react-dialog": "^1.1.2",
102+
"@radix-ui/react-dropdown-menu": "^2.1.2",
103+
"@radix-ui/react-hover-card": "^1.1.2",
104+
"@radix-ui/react-icons": "^1.3.0",
105+
"@radix-ui/react-label": "^2.1.0",
106+
"@radix-ui/react-navigation-menu": "^1.2.1",
107+
"@radix-ui/react-popover": "^1.1.2",
108+
"@radix-ui/react-progress": "^1.1.0",
109+
"@radix-ui/react-radio-group": "^1.2.1",
110+
"@radix-ui/react-scroll-area": "^1.2.0",
111+
"@radix-ui/react-select": "^2.1.2",
112+
"@radix-ui/react-separator": "^1.1.0",
113+
"@radix-ui/react-slider": "^1.2.1",
114+
"@radix-ui/react-slot": "^1.1.0",
115+
"@radix-ui/react-switch": "^1.1.1",
116+
"@radix-ui/react-tabs": "^1.1.1",
117+
"@radix-ui/react-toast": "^1.2.2",
118+
"@radix-ui/react-tooltip": "^1.1.3",
119+
"@tailwindcss/typography": "^0.5.16",
120+
"@tiptap/extension-bold": "2.11.5",
121+
"@tiptap/extension-link": "^2.9.1",
122+
"@tiptap/extension-placeholder": "^2.9.1",
123+
"@tiptap/extension-underline": "^2.9.1",
124+
"@tiptap/pm": "^2.9.1",
125+
"@tiptap/react": "^2.9.1",
126+
"@tiptap/starter-kit": "^2.9.1",
127+
"@uidotdev/usehooks": "^2.4.1",
128+
"class-variance-authority": "^0.7.0",
129+
"clsx": "^2.1.1",
130+
"cmdk": "0.2.1",
131+
"date-fns": "^4.1.0",
132+
"embla-carousel-react": "^8.3.0",
133+
"input-otp": "^1.2.4",
134+
"jsonfile": "^6.1.0",
135+
"lucide-react": "^0.447.0",
136+
"postcss": "^8.4.47",
137+
"react-day-picker": "8.10.1",
138+
"react-dropzone": "^14.3.5",
139+
"react-icons": "^5.3.0",
140+
"react-number-format": "^5.4.2",
141+
"react-resizable-panels": "^2.1.7",
142+
"recharts": "^2.12.7",
143+
"tailwind-merge": "2.5.3",
144+
"tailwindcss": "^3.4.13",
145+
"tailwindcss-animate": "^1.0.7",
146+
"use-callback-ref": "^1.3.3",
147+
"vaul": "^1.0.0"
148+
}
149+
}

‎packages/ui/src/components/popover.tsx‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
"use client"
1+
"use client";
22

3-
import * as React from "react"
4-
import * as PopoverPrimitive from "@radix-ui/react-popover"
3+
import * as React from "react";
4+
import * as PopoverPrimitive from "@radix-ui/react-popover";
5+
import { cn } from "../utils";
56

6-
import { cn } from "@comp/ui/cn"
7+
const Popover = PopoverPrimitive.Root;
78

8-
const Popover = PopoverPrimitive.Root
9+
const PopoverTrigger = PopoverPrimitive.Trigger;
910

10-
const PopoverTrigger = PopoverPrimitive.Trigger
11-
12-
const PopoverAnchor = PopoverPrimitive.Anchor
11+
const PopoverAnchor = PopoverPrimitive.Anchor;
1312

1413
const PopoverContent = React.forwardRef<
1514
React.ElementRef<typeof PopoverPrimitive.Content>,
@@ -21,13 +20,13 @@ const PopoverContent = React.forwardRef<
2120
align={align}
2221
sideOffset={sideOffset}
2322
className={cn(
24-
"z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-popover-content-transform-origin]",
25-
className
23+
"z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-popover-content-transform-origin] pointer-events-auto",
24+
className,
2625
)}
2726
{...props}
2827
/>
2928
</PopoverPrimitive.Portal>
30-
))
31-
PopoverContent.displayName = PopoverPrimitive.Content.displayName
29+
));
30+
PopoverContent.displayName = PopoverPrimitive.Content.displayName;
3231

33-
export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor, PopoverPrimitive }
32+
export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };

0 commit comments

Comments
 (0)