Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Migrate Progress to Base UI (#2564)
Luke Vella7c0259c9eb6e
diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex 1be2d4b3c..4fe4ab2b0 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -26,7 +26,6 @@"@radix-ui/react-dropdown-menu": "^2.0.4","@radix-ui/react-popover": "^1.0.5","@radix-ui/react-portal": "^1.1.6",- "@radix-ui/react-progress": "^1.1.2","@radix-ui/react-radio-group": "^1.2.3","@radix-ui/react-select": "^2.2.2","@radix-ui/react-slot": "^1.1.2",diff --git a/packages/ui/src/progress.tsx b/packages/ui/src/progress.tsxindex ee1ebfec9..7151f6b6f 100644--- a/packages/ui/src/progress.tsx+++ b/packages/ui/src/progress.tsx@@ -1,28 +1,35 @@"use client";-import * as ProgressPrimitive from "@radix-ui/react-progress";-import * as React from "react";+import { Progress as ProgressPrimitive } from "@base-ui/react/progress";import { cn } from "./lib/utils";-const Progress = React.forwardRef<- React.ElementRef<typeof ProgressPrimitive.Root>,- React.ComponentPropsWithoutRef<typeof ProgressPrimitive.Root>->(({ className, value, ...props }, ref) => (- <ProgressPrimitive.Root- ref={ref}- className={cn(- "relative h-1 w-full overflow-hidden rounded-full bg-secondary",- className,- )}- {...props}- >- <ProgressPrimitive.Indicator- className="h-full w-full flex-1 bg-linear-to-r from-primary/50 to-primary transition-all"- style={{ transform: `translateX(-${100 - (value || 0)}%)` }}- />- </ProgressPrimitive.Root>-));-Progress.displayName = ProgressPrimitive.Root.displayName;+function Progress({+ className,+ value,+ ...props+}: ProgressPrimitive.Root.Props) {+ return (+ <ProgressPrimitive.Root+ data-slot="progress"+ value={value}+ className={cn(+ "relative h-1 w-full overflow-hidden rounded-full bg-secondary",+ className,+ )}+ {...props}+ >+ <ProgressPrimitive.Track+ data-slot="progress-track"+ className="h-full w-full"+ >+ <ProgressPrimitive.Indicator+ data-slot="progress-indicator"+ className="h-full bg-linear-to-r from-primary/50 to-primary transition-all"+ />+ </ProgressPrimitive.Track>+ </ProgressPrimitive.Root>+ );+}export { Progress };diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex c19ca501b..be0c177a2 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -788,9 +788,6 @@ importers:'@radix-ui/react-portal':specifier: ^1.1.6version: 1.1.10(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@radix-ui/react-progress':- specifier: ^1.1.2- version: 1.1.8(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-radio-group':specifier: ^1.2.3version: 1.3.8(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])@@ -3804,19 +3801,6 @@ packages:'@types/react-dom':optional: true- '@radix-ui/[email protected]':- resolution: {integrity: sha512-+gISHcSPUJ7ktBy9RnTqbdKW78bcGke3t6taawyZ71pio1JewwGSJizycs7rLhGTvMJYCQB1DBK4KQsxs7U8dA==}- peerDependencies:- '@types/react': '*'- '@types/react-dom': '*'- react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc- react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc- peerDependenciesMeta:- '@types/react':- optional: true- '@types/react-dom':- optional: true-'@radix-ui/[email protected]':resolution: {integrity: sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==}peerDependencies:@@ -15193,16 +15177,6 @@ snapshots:'@types/react': 19.2.13'@types/react-dom': 19.2.3(@types/[email protected])- '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':- dependencies:- '@radix-ui/react-context': 1.1.3(@types/[email protected])([email protected])- '@radix-ui/react-primitive': 2.1.4(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- react: 19.2.6- react-dom: 19.2.6([email protected])- optionalDependencies:- '@types/react': 19.2.13- '@types/react-dom': 19.2.3(@types/[email protected])-'@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@radix-ui/primitive': 1.1.3