@otfdashkit/ui 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otfdashkit/ui",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "OTF UI — production-quality React component library. 98 primitives + blocks + layouts + charts on Radix + Tailwind v4. Cross-platform parity API with @otfdashkit/ui-native.",
   "keywords": [
     "otfdashkit",

package/src/index.ts

@@ -167,7 +167,8 @@ export * from './text'
 export * from './backgrounds'
 export * from './headers'
 export * from './motion'
-// export * from './data'      // conflicts with components/data-grid (DataGrid)
+// './data' is not star-exported: its DataGrid name collides with components/data-grid.
+export { DataGrid as AdvancedDataGrid, type DataGridProps as AdvancedDataGridProps } from './data/DataGrid'
 export * from './data/DataList'
 export * from './data/EventCalendar'
 export * from './data/GridList'

package/src/primitives/Button/Button.tsx

@@ -1,131 +1,2 @@
-import React from 'react'
-import { Slot } from '@radix-ui/react-slot'
-import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '../utils/cn'
-
-const buttonVariants = cva(
-  [
-    'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium font-sans',
-    'transition-colors duration-[var(--duration-fast,100ms)]',
-    'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
-    'disabled:pointer-events-none disabled:opacity-50',
-    'select-none',
-  ].join(' '),
-  {
-    variants: {
-      variant: {
-        default:
-          'bg-primary text-primary-foreground hover:bg-primary/90 active:bg-primary/80',
-        secondary:
-          'bg-secondary text-secondary-foreground hover:bg-secondary/80 active:bg-secondary/70',
-        outline:
-          'border border-border bg-transparent hover:bg-accent hover:text-accent-foreground active:bg-accent/70',
-        ghost:
-          'hover:bg-accent hover:text-accent-foreground active:bg-accent/70',
-        destructive:
-          'bg-destructive text-destructive-foreground hover:bg-destructive/90 active:bg-destructive/80',
-        link:
-          'text-primary underline-offset-4 hover:underline',
-        /** Gradient stack — premium variant */
-        gradient: [
-          'bg-gradient-to-b from-primary to-[hsl(var(--primary)/0.8)]',
-          'text-primary-foreground',
-          'shadow-[0_1px_0_0_rgba(255,255,255,0.1)_inset,0_-1px_0_0_rgba(0,0,0,0.25)_inset]',
-          'hover:from-[hsl(var(--primary)/0.9)] hover:to-[hsl(var(--primary)/0.7)]',
-          'active:from-[hsl(var(--primary)/0.8)] active:to-[hsl(var(--primary)/0.6)]',
-        ].join(' '),
-        /** Texture — nested ring surface as a button */
-        texture: [
-          'relative border border-border/40',
-          'bg-gradient-to-b from-card to-[hsl(var(--card)/0.9)]',
-          'text-foreground',
-          'shadow-[0_0_0_1px_hsl(var(--border)/0.2)_inset]',
-          'hover:border-border/60 hover:bg-accent',
-          'active:shadow-none',
-        ].join(' '),
-        /** Shimmer — animated conic gradient sweep with a hover highlight.
-         *  Loud + premium; reserve for primary CTAs and pricing pages, not
-         *  for in-product UI (gets tiring fast). Cross-platform parity with
-         *  @otfdashkit/ui-native via the same `shimmer` variant key. */
-        shimmer: [
-          'relative isolate overflow-hidden',
-          'bg-primary text-primary-foreground',
-          'shadow-[0_1px_0_rgba(255,255,255,0.18)_inset,0_-1px_0_rgba(0,0,0,0.25)_inset]',
-          'hover:bg-primary/95',
-          // Continuous conic-gradient sweep behind the surface.
-          'before:absolute before:inset-[-1px] before:rounded-[inherit] before:-z-10',
-          'before:bg-[conic-gradient(from_0deg,transparent_0deg,transparent_70deg,rgba(255,255,255,0.55)_90deg,transparent_110deg,transparent_360deg)]',
-          'before:animate-[shimmer-rotate_2.6s_linear_infinite]',
-          // Diagonal gloss that sweeps on hover.
-          'after:absolute after:inset-0 after:rounded-[inherit] after:pointer-events-none',
-          'after:bg-[linear-gradient(115deg,transparent_30%,rgba(255,255,255,0.22)_50%,transparent_70%)]',
-          'after:translate-x-[-120%] hover:after:translate-x-[120%] after:transition-transform after:duration-[900ms] after:ease-out',
-        ].join(' '),
-      },
-      size: {
-        sm:      'h-8 px-3 text-xs rounded-md',
-        default: 'h-9 px-4 py-2',
-        lg:      'h-11 px-6 text-base',
-        xl:      'h-12 px-8 text-base',
-        icon:    'h-9 w-9 p-0',
-        'icon-sm': 'h-7 w-7 p-0 text-xs',
-      },
-    },
-    defaultVariants: { variant: 'default', size: 'default' },
-  }
-)
-
-export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
-  asChild?: boolean
-}
-
-export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : 'button'
-    return (
-      <Comp
-        data-slot="button"
-        className={cn(buttonVariants({ variant, size }), className)}
-        ref={ref}
-        {...props}
-      />
-    )
-  }
-)
-Button.displayName = 'Button'
-
-export interface IconButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  icon: React.ReactNode
-  label: string
-  size?: 'sm' | 'default' | 'lg'
-  variant?: VariantProps<typeof buttonVariants>['variant']
-  asChild?: boolean
-}
-
-export const IconButton = React.forwardRef<HTMLButtonElement, IconButtonProps>(
-  ({ icon, label, size = 'default', variant = 'ghost', className, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : 'button'
-    const sizeClass = size === 'sm' ? 'h-7 w-7' : size === 'lg' ? 'h-10 w-10' : 'h-9 w-9'
-    return (
-      <Comp
-        ref={ref}
-        aria-label={label}
-        data-slot="icon-button"
-        className={cn(
-          buttonVariants({ variant }),
-          sizeClass,
-          'p-0 shrink-0',
-          className
-        )}
-        {...props}
-      >
-        {icon}
-      </Comp>
-    )
-  }
-)
-IconButton.displayName = 'IconButton'
-
-export { buttonVariants }
+// Single source of truth lives in ../button; this path stays so existing imports keep working.
+export * from '../button'

package/src/primitives/button.tsx

@@ -14,12 +14,42 @@ const buttonVariants = cva(
         ghost:       'hover:bg-accent hover:text-accent-foreground',
         destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90',
         link:        'text-primary underline-offset-4 hover:underline',
+        gradient: [
+          'bg-gradient-to-b from-primary to-[hsl(var(--primary)/0.8)]',
+          'text-primary-foreground',
+          'shadow-[0_1px_0_0_rgba(255,255,255,0.1)_inset,0_-1px_0_0_rgba(0,0,0,0.25)_inset]',
+          'hover:from-[hsl(var(--primary)/0.9)] hover:to-[hsl(var(--primary)/0.7)]',
+          'active:from-[hsl(var(--primary)/0.8)] active:to-[hsl(var(--primary)/0.6)]',
+        ].join(' '),
+        texture: [
+          'relative border border-border/40',
+          'bg-gradient-to-b from-card to-[hsl(var(--card)/0.9)]',
+          'text-foreground',
+          'shadow-[0_0_0_1px_hsl(var(--border)/0.2)_inset]',
+          'hover:border-border/60 hover:bg-accent',
+          'active:shadow-none',
+        ].join(' '),
+        // Loud by design: keep for primary CTAs. The sweep keyframe ships in themes/base.css.
+        shimmer: [
+          'relative isolate overflow-hidden',
+          'bg-primary text-primary-foreground',
+          'shadow-[0_1px_0_rgba(255,255,255,0.18)_inset,0_-1px_0_rgba(0,0,0,0.25)_inset]',
+          'hover:bg-primary/95',
+          'before:absolute before:inset-[-1px] before:rounded-[inherit] before:-z-10',
+          'before:bg-[conic-gradient(from_0deg,transparent_0deg,transparent_70deg,rgba(255,255,255,0.55)_90deg,transparent_110deg,transparent_360deg)]',
+          'before:animate-[shimmer-rotate_2.6s_linear_infinite] motion-reduce:before:animate-none',
+          'after:absolute after:inset-0 after:rounded-[inherit] after:pointer-events-none',
+          'after:bg-[linear-gradient(115deg,transparent_30%,rgba(255,255,255,0.22)_50%,transparent_70%)]',
+          'after:translate-x-[-120%] hover:after:translate-x-[120%] after:transition-transform after:duration-[900ms] after:ease-out',
+        ].join(' '),
       },
       size: {
         sm:      'h-8 px-3 text-xs',
         default: 'h-9 px-4 py-2',
         lg:      'h-11 px-6 text-base',
+        xl:      'h-12 px-8 text-base',
         icon:    'h-9 w-9',
+        'icon-sm': 'h-7 w-7 p-0 text-xs',
       },
     },
     defaultVariants: { variant: 'default', size: 'default' },
@@ -40,4 +70,26 @@ export const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 )
 Button.displayName = 'Button'
 
+export interface IconButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  icon: React.ReactNode
+  /** Accessible name; an icon-only button has no visible text. */
+  label: string
+  size?: 'sm' | 'default' | 'lg'
+  variant?: VariantProps<typeof buttonVariants>['variant']
+  asChild?: boolean
+}
+
+export const IconButton = React.forwardRef<HTMLButtonElement, IconButtonProps>(
+  ({ icon, label, size = 'default', variant = 'ghost', className, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : 'button'
+    const sizeClass = size === 'sm' ? 'h-7 w-7' : size === 'lg' ? 'h-10 w-10' : 'h-9 w-9'
+    return (
+      <Comp ref={ref} aria-label={label} className={cn(buttonVariants({ variant }), sizeClass, 'p-0 shrink-0', className)} {...props}>
+        {icon}
+      </Comp>
+    )
+  }
+)
+IconButton.displayName = 'IconButton'
+
 export { buttonVariants }