Revert "Unify workspace dropdowns; Update layouts (#458)"

This reverts commit 4bc8448a1d.

packages/ui/src/shadcn/radio-group.tsx

@@ -1,66 +1,67 @@
 'use client';
 
-import { cn } from '#lib/utils';
-import { Radio as RadioPrimitive } from '@base-ui/react/radio';
-import { RadioGroup as RadioGroupPrimitive } from '@base-ui/react/radio-group';
+import * as React from 'react';
 
-function RadioGroup({ className, ...props }: RadioGroupPrimitive.Props) {
+import { CheckIcon } from '@radix-ui/react-icons';
+import { RadioGroup as RadioGroupPrimitive } from 'radix-ui';
+
+import { cn } from '../lib/utils';
+
+const RadioGroup: React.FC<
+  React.ComponentPropsWithRef<typeof RadioGroupPrimitive.Root>
+> = ({ className, ...props }) => {
   return (
-    <RadioGroupPrimitive
-      data-slot="radio-group"
-      className={cn('grid w-full gap-2', className)}
+    <RadioGroupPrimitive.Root
+      className={cn('grid gap-2', className)}
       {...props}
     />
   );
-}
+};
+RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;
 
-function RadioGroupItem({ className, ...props }: RadioPrimitive.Root.Props) {
+const RadioGroupItem: React.FC<
+  React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Item>
+> = ({ className, ...props }) => {
   return (
-    <RadioPrimitive.Root
-      data-slot="radio-group-item"
+    <RadioGroupPrimitive.Item
       className={cn(
-        'group/radio-group-item peer border-input focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-invalid:aria-checked:border-primary dark:bg-input/30 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40 data-checked:border-primary data-checked:bg-primary data-checked:text-primary-foreground dark:data-checked:bg-primary relative flex aspect-square size-4 shrink-0 rounded-full border outline-none after:absolute after:-inset-x-3 after:-inset-y-2 focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:ring-3',
+        'border-primary text-primary focus-visible:ring-ring aspect-square h-4 w-4 rounded-full border focus:outline-hidden focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50',
         className,
       )}
       {...props}
     >
-      <RadioPrimitive.Indicator
-        data-slot="radio-group-indicator"
-        className="flex size-4 items-center justify-center"
-      >
-        <span className="bg-primary-foreground absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2 rounded-full" />
-      </RadioPrimitive.Indicator>
-    </RadioPrimitive.Root>
+      <RadioGroupPrimitive.Indicator className="flex items-center justify-center">
+        <CheckIcon className="fill-primary animate-in fade-in slide-in-from-left-4 h-3.5 w-3.5" />
+      </RadioGroupPrimitive.Indicator>
+    </RadioGroupPrimitive.Item>
   );
-}
+};
+RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;
 
-function RadioGroupItemLabel({
-  selected,
-  className,
-  children,
-  ...props
-}: React.PropsWithChildren<{
-  selected?: boolean;
-}> &
-  React.LabelHTMLAttributes<unknown>) {
+const RadioGroupItemLabel = (
+  props: React.PropsWithChildren<{
+    className?: string;
+    selected?: boolean;
+  }>,
+) => {
   return (
     <label
-      data-selected={selected}
+      data-selected={props.selected}
       className={cn(
-        className,
+        props.className,
         'flex cursor-pointer rounded-md' +
           ' border-input items-center space-x-4 border' +
-          ' focus-within:border-primary active:bg-muted p-2.5 text-sm transition-all',
+          'focus-within:border-primary active:bg-muted p-2.5 text-sm transition-all',
         {
-          [`bg-muted/70`]: selected,
-          [`hover:bg-muted/50`]: !selected,
+          [`bg-muted/70`]: props.selected,
+          [`hover:bg-muted/50`]: !props.selected,
         },
       )}
-      {...props}
     >
-      {children}
+      {props.children}
     </label>
   );
-}
+};
+RadioGroupItemLabel.displayName = 'RadioGroupItemLabel';
 
 export { RadioGroup, RadioGroupItem, RadioGroupItemLabel };