dima/supabase
1
0 Fork 0
mirror of https://github.com/supabase/supabase.git synced 2026-10-05 09:25:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: update radix (#45111)

Browse Source 
## Problem

In order to update to react 19, we need to update several dependencies

## Solution

- migrate to the `radix` umbrella package to ease upgrade
- update some dependencies


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Chores**
* Consolidated Radix UI usage to a single unified package across apps
and packages, updated package manifests and workspace catalog entries.
No user-facing behavior, visuals, or public APIs changed.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com>
This commit is contained in:
Gildas GarciaandIvan Vasilov authored and GitHub committed 2026-04-27 11:03:28 +02:00
1 parent 80bc5b2463
commit 7f4b02f2a7
78 files changed
+423 -2293
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/docs/components/Navigation/NavigationMenu/NavigationMenuGuideList.tsx
+4 -4
View File
@@ -1,13 +1,13 @@
'use client'
import * as Accordion from '@radix-ui/react-accordion'
import { usePathname } from 'next/navigation'
import { Accordion } from 'radix-ui'
import { PropsWithChildren } from 'react'
import { type NavMenuSection } from '../Navigation.types'
import { MenuId } from './NavigationMenu'
import * as NavItems from './NavigationMenu.constants'
import NavigationMenuGuideListItems from './NavigationMenuGuideListItems'
import { usePathname } from 'next/navigation'
import { PropsWithChildren } from 'react'
import { MenuId } from './NavigationMenu'
const NavigationMenuGuideList = ({
id,
apps/docs/components/Navigation/NavigationMenu/NavigationMenuGuideListItems.tsx
+3 -3
View File
@@ -1,9 +1,9 @@
import * as Accordion from '@radix-ui/react-accordion'
import { usePathname } from 'next/navigation'
import { useTheme } from 'next-themes'
import { ChevronDown } from 'lucide-react'
import { useTheme } from 'next-themes'
import Image from 'next/legacy/image'
import Link from 'next/link'
import { usePathname } from 'next/navigation'
import { Accordion } from 'radix-ui'
import React, { useEffect, useRef } from 'react'
import MenuIconPicker from './MenuIconPicker'
apps/docs/components/Navigation/NavigationMenu/NavigationMenuRefListItems.tsx
+7 -6
View File
@@ -1,14 +1,15 @@
'use client'
import * as Accordion from '@radix-ui/react-accordion'
import { ChevronUp } from 'lucide-react'
import Image from 'next/legacy/image'
import { Fragment, memo } from 'react'
import { cn } from 'ui'
import RevVersionDropdown from '~/components/RefVersionDropdown'
import type { ICommonItem, ICommonSection } from '~/components/reference/Reference.types'
import RevVersionDropdown from '~/components/RefVersionDropdown'
import { menuState, useMenuActiveRefId } from '~/hooks/useMenuState'
import { BASE_PATH } from '~/lib/constants'
import { ChevronUp } from 'lucide-react'
import Image from 'next/legacy/image'
import { Accordion } from 'radix-ui'
import { Fragment, memo } from 'react'
import { cn } from 'ui'
import MenuIconPicker from './MenuIconPicker'
import * as NavItems from './NavigationMenu.constants'
import { deepFilterSections } from './NavigationMenu.utils'
apps/docs/components/Navigation/SideBar.tsx
+3 -3
View File
@@ -1,10 +1,10 @@
import { REFERENCES } from '~/content/navigation.references'
import { ArrowLeft, ChevronRight } from 'lucide-react'
import Image from 'next/legacy/image'
import Link from 'next/link'
import { usePathname } from 'next/navigation'
import { REFERENCES } from '~/content/navigation.references'
import { Accordion } from 'radix-ui'
import * as Accordion from '@radix-ui/react-accordion'
import { ArrowLeft, ChevronRight } from 'lucide-react'
import { NavMenuGroup, NavMenuSection } from './Navigation.types'
const SideBar = ({ menuItems = [] }: { menuItems: any }) => {
apps/docs/features/docs/Reference.navigation.client.tsx
+4 -7
View File
@@ -1,11 +1,13 @@
'use client'
import * as Collapsible from '@radix-ui/react-collapsible'
import type { AbbrevApiReferenceSection } from '~/features/docs/Reference.utils'
import { isElementInViewport } from '~/features/ui/helpers.dom'
import { BASE_PATH } from '~/lib/constants'
import { debounce } from 'lodash-es'
import { ChevronUp } from 'lucide-react'
import Link from 'next/link'
import { usePathname } from 'next/navigation'
import { Collapsible } from 'radix-ui'
import type { HTMLAttributes, MouseEvent, PropsWithChildren } from 'react'
import {
createContext,
@@ -17,13 +19,8 @@ import {
useState,
useSyncExternalStore,
} from 'react'
import { cn } from 'ui'
import type { AbbrevApiReferenceSection } from '~/features/docs/Reference.utils'
import { isElementInViewport } from '~/features/ui/helpers.dom'
import { BASE_PATH } from '~/lib/constants'
export const ReferenceContentInitiallyScrolledContext = createContext<boolean>(false)
let patchCount = 0
apps/docs/package.json
+1 -2
View File
@@ -54,8 +54,6 @@
"@octokit/graphql": "^8.0.0",
"@octokit/plugin-paginate-graphql": "^4.0.0",
"@octokit/plugin-retry": "^8.1.0",
"@radix-ui/react-accordion": "^1.2.12",
"@radix-ui/react-collapsible": "^1.0.3",
"@sentry/nextjs": "catalog:",
"@supabase/supabase-js": "catalog:",
"@tailwindcss/container-queries": "^0.1.1",
@@ -100,6 +98,7 @@
"nuqs": "^1.19.1",
"openai": "^4.75.1",
"openapi-fetch": "0.12.4",
"radix-ui": "catalog:",
"react": "catalog:",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "catalog:",
apps/studio/components/ui/DataTable/DataTableFilters/DataTableFilterControlsDrawer.tsx
+3 -3
View File
@@ -1,5 +1,5 @@
import { VisuallyHidden } from '@radix-ui/react-visually-hidden'
import { FilterIcon } from 'lucide-react'
import { VisuallyHidden } from 'radix-ui'
import { useRef } from 'react'
import {
Button,
@@ -51,12 +51,12 @@ export function DataTableFilterControlsDrawer() {
</TooltipContent>
</Tooltip>
<DrawerContent className="max-h-[calc(100dvh-4rem)]">
<VisuallyHidden>
<VisuallyHidden.VisuallyHidden>
<DrawerHeader>
<DrawerTitle>Filters</DrawerTitle>
<DrawerDescription>Adjust your table filters</DrawerDescription>
</DrawerHeader>
</VisuallyHidden>
</VisuallyHidden.VisuallyHidden>
<div className="px-4 flex-1 overflow-y-auto">
<DataTableFilterControls />
</div>
apps/studio/components/ui/DataTable/primitives/Slider.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
// Props to https://github.com/shadcn-ui/ui/issues/885#issuecomment-2059600641
// @mildtomato - consider using this as the main Slider component in packages/ui
import * as SliderPrimitive from '@radix-ui/react-slider'
import { Slider as SliderPrimitive } from 'radix-ui'
import { ComponentPropsWithoutRef, ElementRef, forwardRef, Fragment } from 'react'
import { cn } from 'ui'
apps/studio/components/ui/DataTable/primitives/Sortable.tsx
+3 -3
View File
@@ -29,7 +29,7 @@ import {
type SortableContextProps,
} from '@dnd-kit/sortable'
import { CSS } from '@dnd-kit/utilities'
import { Slot, type SlotProps } from '@radix-ui/react-slot'
import { Slot } from 'radix-ui'
import { createContext, forwardRef, useContext, useMemo, useState } from 'react'
import { createPortal } from 'react-dom'
import { Button, cn, type ButtonProps } from 'ui'
@@ -239,7 +239,7 @@ function useSortableItem() {
return context
}
interface SortableItemProps extends SlotProps {
interface SortableItemProps extends Slot.SlotProps {
/**
* The unique identifier of the item.
* @example "item-1"
@@ -282,7 +282,7 @@ export const SortableItem = forwardRef<HTMLDivElement, SortableItemProps>(
transition,
}
const Comp = asChild ? Slot : 'div'
const Comp = asChild ? Slot.Slot : 'div'
return (
<SortableItemContext.Provider value={context}>
apps/studio/package.json
+2 -4
View File
@@ -53,9 +53,6 @@
"@monaco-editor/react": "^4.6.0",
"@next/bundle-analyzer": "16.2.3",
"@number-flow/react": "^0.3.2",
"@radix-ui/react-slider": "^1.1.2",
"@radix-ui/react-slot": "^1.2.0",
"@radix-ui/react-visually-hidden": "^1.1.3",
"@sentry/nextjs": "catalog:",
"@std/path": "npm:@jsr/std__path@^1.0.8",
"@stripe/react-stripe-js": "^3.7.0",
@@ -114,6 +111,7 @@
"papaparse": "^5.3.1",
"path-to-regexp": "^8.0.0",
"pg-minify": "^1.6.3",
"radix-ui": "catalog:",
"randombytes": "^2.1.0",
"react": "catalog:",
"react-data-grid": "7.0.0-beta.47",
@@ -150,7 +148,7 @@
"@faker-js/faker": "^9.9.0",
"@graphql-codegen/cli": "5.0.5",
"@graphql-typed-document-node/core": "^3.2.0",
"@radix-ui/react-use-escape-keydown": "^1.0.3",
"@radix-ui/react-use-escape-keydown": "^1.1.1",
"@smithy/property-provider": "^4.0.4",
"@supabase/postgres-meta": "^0.64.4",
"@tailwindcss/container-queries": "^0.1.1",
apps/ui-library/package.json
+2 -28
View File
@@ -19,33 +19,6 @@
"dependencies": {
"@hookform/resolvers": "^3.1.1",
"@monaco-editor/react": "^4.6.0",
"@radix-ui/react-accordion": "*",
"@radix-ui/react-alert-dialog": "*",
"@radix-ui/react-aspect-ratio": "*",
"@radix-ui/react-avatar": "*",
"@radix-ui/react-checkbox": "*",
"@radix-ui/react-collapsible": "*",
"@radix-ui/react-context-menu": "*",
"@radix-ui/react-dialog": "*",
"@radix-ui/react-dropdown-menu": "*",
"@radix-ui/react-hover-card": "*",
"@radix-ui/react-label": "*",
"@radix-ui/react-menubar": "*",
"@radix-ui/react-navigation-menu": "*",
"@radix-ui/react-popover": "*",
"@radix-ui/react-progress": "*",
"@radix-ui/react-radio-group": "*",
"@radix-ui/react-scroll-area": "*",
"@radix-ui/react-select": "*",
"@radix-ui/react-separator": "*",
"@radix-ui/react-slider": "*",
"@radix-ui/react-slot": "*",
"@radix-ui/react-switch": "*",
"@radix-ui/react-tabs": "*",
"@radix-ui/react-toast": "*",
"@radix-ui/react-toggle": "*",
"@radix-ui/react-toggle-group": "*",
"@radix-ui/react-tooltip": "*",
"@react-router/fs-routes": "^7.4.0",
"@supabase-labs/y-supabase": "0.1.0",
"@supabase/postgrest-js": "catalog:",
@@ -55,7 +28,7 @@
"api-types": "workspace:*",
"axios": "^1.12.0",
"class-variance-authority": "*",
"cmdk": "^1.0.0",
"cmdk": "^1.1.1",
"common": "workspace:*",
"common-tags": "^1.8.2",
"contentlayer2": "0.4.6",
@@ -70,6 +43,7 @@
"next-themes": "^0.3.0",
"openai": "^5.9.0",
"openapi-fetch": "0.12.4",
"radix-ui": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
"react-hook-form": "^7.71.2",
apps/ui-library/registry/default/components/ui/avatar.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as AvatarPrimitive from '@radix-ui/react-avatar'
import { Avatar as AvatarPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '@/lib/utils'
apps/ui-library/registry/default/components/ui/button.tsx
+2 -2
View File
@@ -1,4 +1,4 @@
import { Slot } from '@radix-ui/react-slot'
import { Slot as SlotPrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
@@ -38,7 +38,7 @@ export interface ButtonProps
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : 'button'
const Comp = asChild ? SlotPrimitive.Slot : 'button'
return (
<Comp className={cn(buttonVariants({ variant, size, className }))} ref={ref} {...props} />
)
apps/ui-library/registry/default/components/ui/checkbox.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as CheckboxPrimitive from '@radix-ui/react-checkbox'
import { Checkbox as CheckboxPrimitive } from 'radix-ui'
import { Check } from 'lucide-react'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/dialog.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as DialogPrimitive from '@radix-ui/react-dialog'
import { Dialog as DialogPrimitive } from 'radix-ui'
import { XIcon } from 'lucide-react'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/form.tsx
+5 -5
View File
@@ -1,7 +1,7 @@
'use client'
import * as LabelPrimitive from '@radix-ui/react-label'
import { Slot } from '@radix-ui/react-slot'
import { Label as LabelPrimitive, Slot as SlotPrimitive } from 'radix-ui'
import * as React from 'react'
import {
Controller,
@@ -99,13 +99,13 @@ const FormLabel = React.forwardRef<
FormLabel.displayName = 'FormLabel'
const FormControl = React.forwardRef<
React.ElementRef<typeof Slot>,
React.ComponentPropsWithoutRef<typeof Slot>
React.ElementRef<typeof SlotPrimitive.Slot>,
React.ComponentPropsWithoutRef<typeof SlotPrimitive.Slot>
>(({ ...props }, ref) => {
const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
return (
<Slot
<SlotPrimitive.Slot
ref={ref}
id={formItemId}
aria-describedby={!error ? `${formDescriptionId}` : `${formDescriptionId} ${formMessageId}`}
apps/ui-library/registry/default/components/ui/hover-card.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as HoverCardPrimitive from '@radix-ui/react-hover-card'
import { HoverCard as HoverCardPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '@/lib/utils'
apps/ui-library/registry/default/components/ui/label.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as LabelPrimitive from '@radix-ui/react-label'
import { Label as LabelPrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/popover.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as PopoverPrimitive from '@radix-ui/react-popover'
import { Popover as PopoverPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '@/lib/utils'
apps/ui-library/registry/default/components/ui/progress.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as ProgressPrimitive from '@radix-ui/react-progress'
import { Progress as ProgressPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '@/lib/utils'
apps/ui-library/registry/default/components/ui/select.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SelectPrimitive from '@radix-ui/react-select'
import { Select as SelectPrimitive } from 'radix-ui'
import { Check, ChevronDown, ChevronUp } from 'lucide-react'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/switch.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SwitchPrimitives from '@radix-ui/react-switch'
import { Switch as SwitchPrimitives } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/toggle-group.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group'
import { ToggleGroup as ToggleGroupPrimitive } from 'radix-ui'
import { type VariantProps } from 'class-variance-authority'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/toggle.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as TogglePrimitive from '@radix-ui/react-toggle'
import { Toggle as TogglePrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
apps/ui-library/registry/default/components/ui/tooltip.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as TooltipPrimitive from '@radix-ui/react-tooltip'
import { Tooltip as TooltipPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '@/lib/utils'
apps/www/components/ImageModal.tsx
+1 -3
View File
@@ -1,7 +1,5 @@
import { Dialog } from 'radix-ui'
import { useEffect, useState } from 'react'
import * as Dialog from '@radix-ui/react-dialog'
import styleHandler from 'ui/src/lib/theme/styleHandler'
export type ImageModalProps = RadixProps & Props
apps/www/package.json
+1 -1
View File
@@ -32,7 +32,6 @@
"@octokit/graphql": "^8.0.0",
"@octokit/plugin-paginate-graphql": "^4.0.0",
"@octokit/rest": "^21.0.0",
"@radix-ui/react-dialog": "^1.0.5",
"@sentry/nextjs": "catalog:",
"@supabase/ssr": "catalog:",
"@supabase/supabase-js": "catalog:",
@@ -71,6 +70,7 @@
"nuqs": "^2.8.1",
"openai": "^4.75.1",
"parse-numeric-range": "^1.3.0",
"radix-ui": "catalog:",
"react": "catalog:",
"react-copy-to-clipboard": "^5.1.0",
"react-countdown": "^2.3.5",
packages/ui-patterns/package.json
+2 -3
View File
@@ -782,8 +782,6 @@
"dependencies": {
"@hookform/resolvers": "^3.1.1",
"@monaco-editor/react": "^4.6.0",
"@radix-ui/react-slot": "^1.2.4",
"@radix-ui/react-visually-hidden": "^1.1.3",
"@std/toml": "jsr:^1.0.11",
"@tanstack/react-table": "^8.21.3",
"@supabase/sql-to-rest": "^0.1.6",
@@ -807,6 +805,7 @@
"next-themes": "*",
"openai": "^4.75.1",
"prism-react-renderer": "^2.3.1",
"radix-ui": "catalog:",
"react": "catalog:",
"react-countdown": "^2.3.5",
"react-dom": "catalog:",
@@ -814,7 +813,7 @@
"react-hook-form": "^7.71.2",
"react-intersection-observer": "^9.8.2",
"react-markdown": "^10.1.0",
"react-medium-image-zoom": "^5.2.4",
"react-medium-image-zoom": "^5.4.3",
"react-syntax-highlighter": "^15.6.6",
"react-use": "^17.5.0",
"recharts": "catalog:",
packages/ui-patterns/src/AssistantChat/AssistantCommandsPopover.tsx
+3
View File
@@ -1,5 +1,8 @@
'use client'
// Required to avoid issue:
// The inferred type of AssistantCommandsPopover cannot be named without a reference to PopoverProps
import { Popover as _RadixPopover } from 'radix-ui'
import {
ComponentPropsWithoutRef,
createRef,
packages/ui-patterns/src/Chart/index.tsx
+2 -2
View File
@@ -1,9 +1,9 @@
'use client'
import { Slot } from '@radix-ui/react-slot'
import dayjs from 'dayjs'
import { HelpCircle, Loader2 } from 'lucide-react'
import Link from 'next/link'
import { Slot } from 'radix-ui'
import * as React from 'react'
import { useContext, useMemo, useRef, useState } from 'react'
import {
@@ -86,7 +86,7 @@ interface ChartCardProps extends React.HTMLAttributes<HTMLDivElement> {
const ChartCard = React.forwardRef<HTMLDivElement, ChartCardProps>(
({ children, className, asChild, ...props }, ref) => {
const Comp = asChild ? Slot : Card
const Comp = asChild ? Slot.Slot : Card
return (
<Comp ref={ref} className={cn('relative w-full', className)} {...props}>
{children}
packages/ui-patterns/src/CommandMenu/api/CommandMenu.tsx
+4 -4
View File
@@ -1,9 +1,9 @@
'use client'
import { VisuallyHidden } from '@radix-ui/react-visually-hidden'
import { useBreakpoint } from 'common'
import useDragToClose from 'common/hooks/useDragToClose'
import { AlertTriangle, ArrowLeft, Search } from 'lucide-react'
import { VisuallyHidden } from 'radix-ui'
import type { HTMLAttributes, MouseEvent, PropsWithChildren, ReactElement, ReactNode } from 'react'
import { Children, cloneElement, forwardRef, isValidElement, useEffect, useMemo } from 'react'
import { ErrorBoundary } from 'react-error-boundary'
@@ -264,7 +264,7 @@ function CommandMenu({ children, trigger }: CommandMenuProps) {
}}
size={size}
className={cn(
'relative flex flex-col my-0 mx-auto rounded-t-lg overflow-hidden',
'relative flex flex-col my-0 mx-auto rounded-t-lg',
'h-[85dvh] mt-[15vh] md:max-h-[500px] md:mt-0 left-0 bottom-0 md:bottom-auto',
'!animate-in !slide-in-from-bottom-[85%] !duration-300',
'data-[state=closed]:!animate-out data-[state=closed]:!slide-out-to-bottom',
@@ -279,10 +279,10 @@ function CommandMenu({ children, trigger }: CommandMenuProps) {
className: cn('overflow-hidden flex data-closed:delay-100'),
}}
>
<VisuallyHidden>
<VisuallyHidden.VisuallyHidden>
<DialogTitle>Command menu</DialogTitle>
<DialogDescription>Type a command or search</DialogDescription>
</VisuallyHidden>
</VisuallyHidden.VisuallyHidden>
<ErrorBoundary FallbackComponent={CommandError}>
<PageSwitch>{children}</PageSwitch>
</ErrorBoundary>
packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx
+3
View File
@@ -1,5 +1,8 @@
'use client'
// Required to avoid issue:
// The inferred type of ConfirmationModal cannot be named without a reference to DialogProps
import { Dialog as _RadixDialog } from 'radix-ui'
import { forwardRef, MouseEventHandler, useEffect, useState } from 'react'
import {
Alert_Shadcn_,
packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx
+3
View File
@@ -2,6 +2,9 @@
import { zodResolver } from '@hookform/resolvers/zod'
import { Check, Copy } from 'lucide-react'
// Required to avoid issue:
// The inferred type of ConfirmationModal cannot be named without a reference to DialogProps
import { Dialog as _RadixDialog } from 'radix-ui'
import { forwardRef, ReactNode, useEffect, useState } from 'react'
import { useForm } from 'react-hook-form'
import {
packages/ui-patterns/src/InnerSideMenu/index.tsx
+4
View File
@@ -1,5 +1,9 @@
import { ChevronRight, ChevronsDown, Loader2, Search } from 'lucide-react'
import Link from 'next/link'
// Required to avoid issues:
// The inferred type of InnerSideMenuCollapsible cannot be named without a reference to CollapsibleProps
// The inferred type of InnerSideBarFilterSortDropdown cannot be named without a reference to DropdownMenuProps
import { Collapsible as _RadixCollapsible, DropdownMenu as _RadixDropdownMenu } from 'radix-ui'
import { ElementRef, forwardRef } from 'react'
import {
cn,
packages/ui-patterns/src/info-tooltip.tsx
+3
View File
@@ -1,3 +1,6 @@
// Required to avoid issue:
// The inferred type of InfoTooltip cannot be named without a reference to TooltipContentProps
import { Tooltip as _RadixToolpip } from 'radix-ui'
import { ElementRef, forwardRef } from 'react'
import { Tooltip, TooltipContent, TooltipTrigger } from 'ui'
packages/ui/package.json
+2 -28
View File
@@ -15,33 +15,6 @@
"test:report": "open coverage/lcov-report/index.html"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.2.12",
"@radix-ui/react-alert-dialog": "^1.1.15",
"@radix-ui/react-aspect-ratio": "^1.0.3",
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-context": "^1.0.1",
"@radix-ui/react-context-menu": "^2.1.5",
"@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16",
"@radix-ui/react-hover-card": "^1.1.15",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-menubar": "^1.1.16",
"@radix-ui/react-navigation-menu": "^1.2.14",
"@radix-ui/react-popover": "^1.1.15",
"@radix-ui/react-progress": "^1.0.3",
"@radix-ui/react-radio-group": "^1.3.8",
"@radix-ui/react-scroll-area": "^1.2.10",
"@radix-ui/react-select": "^2.2.6",
"@radix-ui/react-separator": "^1.1.2",
"@radix-ui/react-slider": "^1.3.6",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-tabs": "^1.1.0",
"@radix-ui/react-toggle": "^1.1.10",
"@radix-ui/react-toggle-group": "^1.1.11",
"@radix-ui/react-tooltip": "^1.2.8",
"@tailwindcss/forms": "^0.5.0",
"@tailwindcss/typography": "^0.5.9",
"class-variance-authority": "^0.6.1",
@@ -50,10 +23,11 @@
"color": "^4.2.3",
"date-fns": "^2.30.0",
"framer-motion": "^11.18.2",
"input-otp": "^1.2.3",
"input-otp": "^1.4.2",
"lodash": "catalog:",
"lucide-react": "^0.436.0",
"prop-types": "^15.7.2",
"radix-ui": "catalog:",
"react": "catalog:",
"react-accessible-treeview": "^2.11.2",
"react-copy-to-clipboard": "^5.1.0",
packages/ui/src/components/Accordion/Accordion.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
'use client'
import * as RadixAccordion from '@radix-ui/react-accordion'
import { ChevronDown } from 'lucide-react'
import { Accordion as RadixAccordion } from 'radix-ui'
import React, { createContext, useContext, useState } from 'react'
import styleHandler from '../../lib/theme/styleHandler'
packages/ui/src/components/Button/Button.tsx
+2 -2
View File
@@ -1,8 +1,8 @@
'use client'
import { Slot } from '@radix-ui/react-slot'
import { cva, VariantProps } from 'class-variance-authority'
import { Loader2 } from 'lucide-react'
import { Slot } from 'radix-ui'
import { cloneElement, forwardRef, isValidElement } from 'react'
import { SIZE_VARIANTS, SIZE_VARIANTS_DEFAULT } from '../../lib/constants'
@@ -240,7 +240,7 @@ const Button = forwardRef<HTMLButtonElement, ButtonProps>(
},
ref
) => {
const Comp = asChild ? Slot : 'button'
const Comp = asChild ? Slot.Slot : 'button'
const { className, tabIndex } = props
const showIcon = loading || icon
// decrecating 'showIcon' for rightIcon
packages/ui/src/components/Collapsible/Collapsible.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as RadixCollapsible from '@radix-ui/react-collapsible'
import { Collapsible as RadixCollapsible } from 'radix-ui'
import React from 'react'
import styleHandler from '../../lib/theme/styleHandler'
packages/ui/src/components/Listbox/Listbox2.tsx
+1 -1
View File
@@ -1,8 +1,8 @@
'use client'
import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu'
import { flatten } from 'lodash'
import { Check } from 'lucide-react'
import { DropdownMenu as DropdownMenuPrimitive } from 'radix-ui'
import React, { useEffect, useRef, useState } from 'react'
import { FormLayout } from '../../lib/Layout/FormLayout/FormLayout'
packages/ui/src/components/Popover/Popover.tsx
+5 -6
View File
@@ -1,14 +1,13 @@
'use client'
import type * as RadixPopoverTypes from '@radix-ui/react-popover'
import * as RadixPopover from '@radix-ui/react-popover'
import { X } from 'lucide-react'
import { Popover as RadixPopover } from 'radix-ui'
import * as React from 'react'
import styleHandler from '../../lib/theme/styleHandler'
interface RootProps {
align?: RadixPopoverTypes.PopoverContentProps['align']
align?: RadixPopover.PopoverContentProps['align']
ariaLabel?: string
arrow?: boolean
children?: React.ReactNode
@@ -16,12 +15,12 @@ interface RootProps {
defaultOpen?: boolean
disabled?: boolean
modal?: boolean
onOpenChange?: RadixPopoverTypes.PopoverProps['onOpenChange']
onOpenChange?: RadixPopover.PopoverProps['onOpenChange']
open?: boolean
overlay?: React.ReactNode
showClose?: boolean
side?: RadixPopoverTypes.PopoverContentProps['side']
sideOffset?: RadixPopoverTypes.PopoverContentProps['sideOffset']
side?: RadixPopover.PopoverContentProps['side']
sideOffset?: RadixPopover.PopoverContentProps['sideOffset']
style?: React.CSSProperties
header?: React.ReactNode
footer?: React.ReactNode
packages/ui/src/components/SidePanel/SidePanel.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as Dialog from '@radix-ui/react-dialog'
import { Dialog } from 'radix-ui'
import React from 'react'
import { Button } from '../../components/Button/Button'
packages/ui/src/components/Tabs/Tabs.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as TabsPrimitive from '@radix-ui/react-tabs'
import { Tabs as TabsPrimitive } from 'radix-ui'
import {
Children,
isValidElement,
packages/ui/src/components/radio-group-card.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
'use client'
import * as RadioGroupPrimitive from '@radix-ui/react-radio-group'
import { Circle } from 'lucide-react'
import { RadioGroup as RadioGroupPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../lib/utils/cn'
packages/ui/src/components/radio-group-stacked.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
'use client'
import * as RadioGroupPrimitive from '@radix-ui/react-radio-group'
import { Circle } from 'lucide-react'
import { RadioGroup as RadioGroupPrimitive } from 'radix-ui'
import * as React from 'react'
import { Label } from '../components/shadcn/ui/label'
packages/ui/src/components/shadcn/ui/accordion.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as AccordionPrimitive from '@radix-ui/react-accordion'
import { Accordion as AccordionPrimitive } from 'radix-ui'
import { ChevronDown } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/alert-dialog.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
import { AlertDialog as AlertDialogPrimitive } from 'radix-ui'
import { cva, VariantProps } from 'class-variance-authority'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/aspect-ratio.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as AspectRatioPrimitive from '@radix-ui/react-aspect-ratio'
import { AspectRatio as AspectRatioPrimitive } from 'radix-ui'
const AspectRatio = AspectRatioPrimitive.Root
packages/ui/src/components/shadcn/ui/avatar.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as AvatarPrimitive from '@radix-ui/react-avatar'
import { Avatar as AvatarPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/breadcrumb.tsx
+2 -2
View File
@@ -1,4 +1,4 @@
import { Slot } from '@radix-ui/react-slot'
import { Slot as SlotPrimitive } from 'radix-ui'
import { ChevronRightIcon } from 'lucide-react'
import * as React from 'react'
@@ -46,7 +46,7 @@ const BreadcrumbLink = React.forwardRef<
asChild?: boolean
}
>(({ asChild, className, ...props }, ref) => {
const Comp = asChild ? Slot : 'a'
const Comp = asChild ? SlotPrimitive.Slot : 'a'
return (
<Comp
packages/ui/src/components/shadcn/ui/button.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
'use client'
import { Slot } from '@radix-ui/react-slot'
import { Slot as SlotPrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
@@ -39,7 +39,7 @@ export interface ButtonProps
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : 'button'
const Comp = asChild ? SlotPrimitive.Slot : 'button'
return (
<Comp className={cn(buttonVariants({ variant, size, className }))} ref={ref} {...props} />
)
packages/ui/src/components/shadcn/ui/checkbox.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as CheckboxPrimitive from '@radix-ui/react-checkbox'
import { Checkbox as CheckboxPrimitive } from 'radix-ui'
import { Check } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/collapsible.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as CollapsiblePrimitive from '@radix-ui/react-collapsible'
import { Collapsible as CollapsiblePrimitive } from 'radix-ui'
const Collapsible = CollapsiblePrimitive.Root
packages/ui/src/components/shadcn/ui/command.tsx
+2 -2
View File
@@ -1,8 +1,8 @@
'use client'
import { DialogProps } from '@radix-ui/react-dialog'
import { Command as CommandPrimitive } from 'cmdk'
import { X as RemoveIcon, Search } from 'lucide-react'
import { Dialog as DialogPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
@@ -23,7 +23,7 @@ const Command = React.forwardRef<
))
Command.displayName = CommandPrimitive.displayName
interface CommandDialogProps extends DialogProps {}
interface CommandDialogProps extends DialogPrimitive.DialogProps {}
const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
return (
packages/ui/src/components/shadcn/ui/context-menu.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as ContextMenuPrimitive from '@radix-ui/react-context-menu'
import { ContextMenu as ContextMenuPrimitive } from 'radix-ui'
import { Check, ChevronRight, Circle } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/dialog.tsx
+2 -2
View File
@@ -1,9 +1,8 @@
'use client'
import * as DialogPrimitive from '@radix-ui/react-dialog'
import { DialogProps } from '@radix-ui/react-dialog'
import { cva, VariantProps } from 'class-variance-authority'
import { X } from 'lucide-react'
import { Dialog as DialogPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
@@ -219,6 +218,7 @@ const DialogSectionSeparator = React.forwardRef<
))
DialogSectionSeparator.displayName = 'DialogSectionSeparator'
type DialogProps = DialogPrimitive.DialogProps
export {
Dialog,
DialogClose,
packages/ui/src/components/shadcn/ui/dropdown-menu.tsx
+3 -5
View File
@@ -1,11 +1,7 @@
'use client'
import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu'
import {
DropdownMenuCheckboxItemProps,
DropdownMenuTriggerProps,
} from '@radix-ui/react-dropdown-menu'
import { Check, ChevronRight, Circle } from 'lucide-react'
import { DropdownMenu as DropdownMenuPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
@@ -175,6 +171,8 @@ const DropdownMenuShortcut = ({ className, ...props }: React.HTMLAttributes<HTML
}
DropdownMenuShortcut.displayName = 'DropdownMenuShortcut'
type DropdownMenuCheckboxItemProps = DropdownMenuPrimitive.DropdownMenuCheckboxItemProps
type DropdownMenuTriggerProps = DropdownMenuPrimitive.DropdownMenuTriggerProps
export {
DropdownMenu,
DropdownMenuCheckboxItem,
packages/ui/src/components/shadcn/ui/form.tsx
+6 -6
View File
@@ -1,7 +1,7 @@
'use client'
import * as LabelPrimitive from '@radix-ui/react-label'
import { Slot } from '@radix-ui/react-slot'
import { Label as LabelPrimitive, Slot as SlotPrimitive } from 'radix-ui'
import { AnimatePresence, motion } from 'framer-motion'
import * as React from 'react'
import {
@@ -79,7 +79,7 @@ const FormItem = React.forwardRef<
>(({ asChild, ...props }, ref) => {
const id = React.useId()
const Comp = asChild ? Slot : 'div'
const Comp = asChild ? SlotPrimitive.Slot : 'div'
return (
<FormItemContext.Provider value={{ id }}>
@@ -115,13 +115,13 @@ const FormLabel = React.forwardRef<
FormLabel.displayName = 'FormLabel'
const FormControl = React.forwardRef<
React.ElementRef<typeof Slot>,
React.ComponentPropsWithoutRef<typeof Slot>
React.ElementRef<typeof SlotPrimitive.Slot>,
React.ComponentPropsWithoutRef<typeof SlotPrimitive.Slot>
>(({ ...props }, ref) => {
const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
return (
<Slot
<SlotPrimitive.Slot
ref={ref}
id={formItemId}
aria-describedby={!error ? `${formDescriptionId}` : `${formDescriptionId} ${formMessageId}`}
packages/ui/src/components/shadcn/ui/hover-card.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as HoverCardPrimitive from '@radix-ui/react-hover-card'
import { HoverCard as HoverCardPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/label.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as LabelPrimitive from '@radix-ui/react-label'
import { Label as LabelPrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/menubar.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as MenubarPrimitive from '@radix-ui/react-menubar'
import { Menubar as MenubarPrimitive } from 'radix-ui'
import { Check, ChevronRight, Circle } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/navigation-menu.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu'
import { NavigationMenu as NavigationMenuPrimitive } from 'radix-ui'
import { cva } from 'class-variance-authority'
import { ChevronDown } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/popover.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as PopoverPrimitive from '@radix-ui/react-popover'
import { Popover as PopoverPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/progress.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as ProgressPrimitive from '@radix-ui/react-progress'
import { Progress as ProgressPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/radio-group.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as RadioGroupPrimitive from '@radix-ui/react-radio-group'
import { RadioGroup as RadioGroupPrimitive } from 'radix-ui'
import { Circle } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/scroll-area.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area'
import { ScrollArea as ScrollAreaPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/select.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SelectPrimitive from '@radix-ui/react-select'
import { Select as SelectPrimitive } from 'radix-ui'
import { cva, VariantProps } from 'class-variance-authority'
import { Check, ChevronDown, ChevronUp } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/separator.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SeparatorPrimitive from '@radix-ui/react-separator'
import { Separator as SeparatorPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/sheet.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SheetPrimitive from '@radix-ui/react-dialog'
import { Dialog as SheetPrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import { X } from 'lucide-react'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/sidebar.tsx
+7 -6
View File
@@ -1,8 +1,9 @@
'use client'
import { Slot } from '@radix-ui/react-slot'
import { cva, VariantProps } from 'class-variance-authority'
import { PanelLeft } from 'lucide-react'
// Separator import to please TypeScript
import { Separator as _SeparatorPrimitive, Slot as SlotPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from './../../../lib/utils'
@@ -425,7 +426,7 @@ const SidebarGroupLabel = React.forwardRef<
HTMLDivElement,
React.ComponentProps<'div'> & { asChild?: boolean }
>(({ className, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : 'div'
const Comp = asChild ? SlotPrimitive.Slot : 'div'
return (
<Comp
@@ -446,7 +447,7 @@ const SidebarGroupAction = React.forwardRef<
HTMLButtonElement,
React.ComponentProps<'button'> & { asChild?: boolean }
>(({ className, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : 'button'
const Comp = asChild ? SlotPrimitive.Slot : 'button'
return (
<Comp
@@ -552,7 +553,7 @@ const SidebarMenuButton = React.forwardRef<
},
ref
) => {
const Comp = asChild ? Slot : 'button'
const Comp = asChild ? SlotPrimitive.Slot : 'button'
const { isMobile, state } = useSidebar()
const { disabled, tabIndex } = props
@@ -607,7 +608,7 @@ const SidebarMenuAction = React.forwardRef<
showOnHover?: boolean
}
>(({ className, asChild = false, showOnHover = false, ...props }, ref) => {
const Comp = asChild ? Slot : 'button'
const Comp = asChild ? SlotPrimitive.Slot : 'button'
return (
<Comp
@@ -713,7 +714,7 @@ const SidebarMenuSubButton = React.forwardRef<
isActive?: boolean
}
>(({ asChild = false, size = 'md', isActive, className, ...props }, ref) => {
const Comp = asChild ? Slot : 'a'
const Comp = asChild ? SlotPrimitive.Slot : 'a'
return (
<Comp
packages/ui/src/components/shadcn/ui/slider.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SliderPrimitive from '@radix-ui/react-slider'
import { Slider as SliderPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/switch.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as SwitchPrimitives from '@radix-ui/react-switch'
import { Switch as SwitchPrimitives } from 'radix-ui'
import { cva, VariantProps } from 'class-variance-authority'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/tabs.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as TabsPrimitive from '@radix-ui/react-tabs'
import { Tabs as TabsPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
packages/ui/src/components/shadcn/ui/toggle-group.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group'
import { ToggleGroup as ToggleGroupPrimitive } from 'radix-ui'
import { VariantProps } from 'class-variance-authority'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/toggle.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as TogglePrimitive from '@radix-ui/react-toggle'
import { Toggle as TogglePrimitive } from 'radix-ui'
import { cva, type VariantProps } from 'class-variance-authority'
import * as React from 'react'
packages/ui/src/components/shadcn/ui/tooltip.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
'use client'
import * as TooltipPrimitive from '@radix-ui/react-tooltip'
import { Tooltip as TooltipPrimitive } from 'radix-ui'
import * as React from 'react'
import { cn } from '../../../lib/utils/cn'
pnpm-lock.yaml
Generated
+279 -2104
View File
File diff suppressed because it is too large. Load diff
pnpm-workspace.yaml
+2 -1
View File
@@ -17,6 +17,7 @@ catalog:
lodash: ^4.18.1
lodash-es: ^4.18.1
next: 16.2.3
radix-ui: ^1.4.3
react: ^18.3.0
react-dom: ^18.3.0
recharts: ^2.15.4
@@ -50,7 +51,7 @@ minimumReleaseAgeExclude:
- '@ai-sdk/*'
- '@supabase/*'
- '@supabase-labs/*'
- braintrust # Included for bugfix in v3.9.0
- braintrust # Included for bugfix in v3.9.0
# The following packages are excluded from the minimum release age check because they had a vulneralibity
# Delete them the next time you update this list
- follow-redirects