@actuate-media/cms-admin 0.63.2 → 0.65.0

package/src/views/Users.tsx

@@ -28,6 +28,7 @@ import { useApiData } from '../lib/useApiData.js'
 import { cmsApi } from '../lib/api.js'
 import { Button } from '../components/ui/Button.js'
 import { EmptyState } from '../components/ui/EmptyState.js'
+import { FilterPill } from '../components/ui/FilterPill.js'
 import { Skeleton } from '../components/ui/Skeleton.js'
 import { ConfirmDialog } from '../components/ui/ConfirmDialog.js'
 import { UserDetailDrawer } from './users/UserDetailDrawer.js'
@@ -964,24 +965,11 @@ export function Users({ embedded = false }: UsersProps = {}) {
           role="group"
           aria-label="Filter by role"
         >
-          {ROLE_PILLS.map((pill) => {
-            const active = roleFilter === pill
-            return (
-              <button
-                key={pill}
-                type="button"
-                onClick={() => setRoleFilter(pill)}
-                aria-pressed={active}
-                className={`rounded-full px-3 py-1 text-xs font-medium transition-colors ${
-                  active
-                    ? 'bg-brand text-brand-foreground'
-                    : 'bg-muted text-muted-foreground hover:bg-accent'
-                }`}
-              >
-                {pill}
-              </button>
-            )
-          })}
+          {ROLE_PILLS.map((pill) => (
+            <FilterPill key={pill} active={roleFilter === pill} onClick={() => setRoleFilter(pill)}>
+              {pill}
+            </FilterPill>
+          ))}
         </div>
 
         {/* Table / states */}

package/src/views/page-builder/BlockEditor.tsx

@@ -2,13 +2,13 @@
 
 import { useState, useMemo, useCallback } from 'react'
 import { Star, Copy, Trash2 } from 'lucide-react'
-import * as SwitchPrimitive from '@radix-ui/react-switch'
 import type { BlockNode, BlockTypeDefinition, FieldDefinition } from '@actuate-media/cms-core'
 import { BlockCatalog } from '@actuate-media/cms-core/page-builder'
 import { AIBlockAssist } from './AIBlockAssist.js'
 import { RelationshipField } from './RelationshipField.js'
 import { TipTapEditor } from '../../components/TipTapEditor.js'
 import { MediaPickerModal } from '../../components/MediaPickerModal.js'
+import { Toggle } from '../../components/ui/Toggle.js'
 
 export interface BlockEditorProps {
   node: BlockNode
@@ -224,14 +224,11 @@ function FieldRenderer({ name, definition, value, onChange }: FieldRendererProps
       return (
         <div className="flex items-center justify-between">
           <label className="text-foreground text-sm font-medium">{label}</label>
-          <SwitchPrimitive.Root
+          <Toggle
             checked={!!value}
             onCheckedChange={(checked) => onChange(checked)}
-            className="bg-input data-[state=checked]:bg-primary relative h-5 w-9 rounded-full transition-colors"
             aria-label={label}
-          >
-            <SwitchPrimitive.Thumb className="bg-background block h-3.5 w-3.5 translate-x-0.5 rounded-full shadow-sm transition-transform data-[state=checked]:translate-x-[18px]" />
-          </SwitchPrimitive.Root>
+          />
         </div>
       )
 

package/src/views/page-builder/BottomBar.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { Plus, Grid3X3 } from 'lucide-react'
-import * as Switch from '@radix-ui/react-switch'
+import { Toggle } from '../../components/ui/Toggle.js'
 import type { DeviceMode } from '../../hooks/useBuilderState.js'
 
 export interface BottomBarProps {
@@ -45,14 +45,11 @@ export function BottomBar({
       {/* Grid overlay toggle */}
       <label className="flex cursor-pointer items-center gap-2">
         <Grid3X3 size={14} className="text-muted-foreground" />
-        <Switch.Root
+        <Toggle
           checked={showGridOverlay}
           onCheckedChange={onToggleGrid}
-          className="bg-input-background data-[state=checked]:bg-primary relative h-[18px] w-8 rounded-full transition-colors"
           aria-label="Toggle grid overlay"
-        >
-          <Switch.Thumb className="bg-background block h-3.5 w-3.5 translate-x-0.5 rounded-full shadow-sm transition-transform data-[state=checked]:translate-x-[14px]" />
-        </Switch.Root>
+        />
         <span className="text-muted-foreground text-xs">Grid</span>
       </label>
 

package/src/views/page-builder/NodeSettings.tsx

@@ -14,7 +14,7 @@ import {
   ArrowDownToLine,
   Minus,
 } from 'lucide-react'
-import * as SwitchPrimitive from '@radix-ui/react-switch'
+import { Toggle } from '../../components/ui/Toggle.js'
 import type {
   BuilderNode,
   SectionNode,
@@ -231,14 +231,11 @@ function SectionFields({
       <p className={SECTION_HEADING_CLASS}>Attributes</p>
       <div className="flex items-center justify-between">
         <label className="text-foreground text-sm font-medium">Visibility</label>
-        <SwitchPrimitive.Root
+        <Toggle
           checked={s.visibility !== 'hidden'}
           onCheckedChange={(checked) => updateSetting('visibility', checked ? 'visible' : 'hidden')}
-          className="bg-input data-[state=checked]:bg-primary relative h-5 w-9 rounded-full transition-colors"
           aria-label="Section visibility"
-        >
-          <SwitchPrimitive.Thumb className="bg-background block h-3.5 w-3.5 translate-x-0.5 rounded-full shadow-sm transition-transform data-[state=checked]:translate-x-[18px]" />
-        </SwitchPrimitive.Root>
+        />
       </div>
       <div>
         <label className={LABEL_CLASS}>HTML ID</label>
@@ -389,25 +386,19 @@ function RowFields({
       <p className={SECTION_HEADING_CLASS}>Mobile</p>
       <div className="flex items-center justify-between">
         <label className="text-foreground text-sm font-medium">Reverse on Mobile</label>
-        <SwitchPrimitive.Root
+        <Toggle
           checked={!!s.reverseOnMobile}
           onCheckedChange={(checked) => updateSetting('reverseOnMobile', checked)}
-          className="bg-input data-[state=checked]:bg-primary relative h-5 w-9 rounded-full transition-colors"
           aria-label="Reverse column order on mobile"
-        >
-          <SwitchPrimitive.Thumb className="bg-background block h-3.5 w-3.5 translate-x-0.5 rounded-full shadow-sm transition-transform data-[state=checked]:translate-x-[18px]" />
-        </SwitchPrimitive.Root>
+        />
       </div>
       <div className="flex items-center justify-between">
         <label className="text-foreground text-sm font-medium">Wrap on Mobile</label>
-        <SwitchPrimitive.Root
+        <Toggle
           checked={!!s.wrapOnMobile}
           onCheckedChange={(checked) => updateSetting('wrapOnMobile', checked)}
-          className="bg-input data-[state=checked]:bg-primary relative h-5 w-9 rounded-full transition-colors"
           aria-label="Wrap columns on mobile"
-        >
-          <SwitchPrimitive.Thumb className="bg-background block h-3.5 w-3.5 translate-x-0.5 rounded-full shadow-sm transition-transform data-[state=checked]:translate-x-[18px]" />
-        </SwitchPrimitive.Root>
+        />
       </div>
 
       <p className={SECTION_HEADING_CLASS}>Column Presets</p>

package/src/views/page-builder/PageTemplates.tsx

@@ -47,7 +47,7 @@ export function PageTemplates({ onNavigate }: PageTemplatesProps) {
 
       <div className="mb-4 flex items-center justify-between">
         <div>
-          <h1 className="text-foreground mb-1 text-2xl font-medium">Page Templates</h1>
+          <h1 className="text-foreground mb-1">Page Templates</h1>
           <p className="text-muted-foreground text-sm">
             {templates.length} saved template{templates.length === 1 ? '' : 's'}
           </p>

package/src/views/page-builder/SavedSections.tsx

@@ -169,7 +169,7 @@ export function SavedSections({ onNavigate, config }: SavedSectionsProps) {
     <div className="p-4 pr-8">
       <div className="mb-6 flex items-center justify-between">
         <div>
-          <h1 className="text-foreground text-2xl font-medium">Saved Sections</h1>
+          <h1 className="text-foreground">Saved Sections</h1>
           <p className="text-muted-foreground mt-1 text-sm">
             Reusable sections for the page builder
           </p>
@@ -393,7 +393,7 @@ function SectionForm({ initial, saving, onSave, onCancel }: SectionFormProps) {
           <ArrowLeft size={16} />
           Back
         </button>
-        <h1 className="text-foreground text-2xl font-medium">
+        <h1 className="text-foreground">
           {initial ? `Edit: ${initial.name}` : 'Create Saved Section'}
         </h1>
       </div>

package/src/views/page-builder/Widgets.tsx

@@ -18,7 +18,7 @@ export function Widgets({ onNavigate }: WidgetsProps) {
   return (
     <div className="p-4 pr-8">
       <div className="mb-4">
-        <h1 className="text-foreground mb-1 text-2xl font-medium">Widgets</h1>
+        <h1 className="text-foreground mb-1">Widgets</h1>
         <p className="text-muted-foreground text-sm">
           Reusable, embeddable components for pages and saved sections.
         </p>

package/src/views/page-editor/SectionInspector.tsx

@@ -19,6 +19,7 @@ import {
 } from '@dnd-kit/sortable'
 import { CSS } from '@dnd-kit/utilities'
 import { MediaPickerModal } from '../../components/MediaPickerModal.js'
+import { Toggle } from '../../components/ui/Toggle.js'
 import type { PageSection } from '../../lib/page-editor-service.js'
 import type { ResolvedRepeater, SectionSettings } from './section-types.js'
 import {
@@ -497,28 +498,15 @@ function BooleanField({
 }) {
   return (
     <div>
-      <button
-        type="button"
-        id={id}
-        role="switch"
-        aria-checked={value}
-        onClick={() => onChange(!value)}
-        className="border-border text-foreground hover:bg-accent flex w-full items-center justify-between rounded-md border px-2.5 py-1.5 text-sm"
-      >
+      <div className="border-border text-foreground flex w-full items-center justify-between rounded-md border px-2.5 py-1.5 text-sm">
         <span>{field.label}</span>
-        <span
-          aria-hidden
-          className={`relative inline-flex h-5 w-9 shrink-0 items-center rounded-full transition-colors ${
-            value ? 'bg-primary' : 'bg-muted'
-          }`}
-        >
-          <span
-            className={`bg-card inline-block h-4 w-4 transform rounded-full transition-transform ${
-              value ? 'translate-x-4' : 'translate-x-0.5'
-            }`}
-          />
-        </span>
-      </button>
+        <Toggle
+          id={id}
+          checked={value}
+          onCheckedChange={(v) => onChange(v)}
+          aria-label={field.label}
+        />
+      </div>
       {field.help && <p className="text-muted-foreground mt-1 text-xs">{field.help}</p>}
     </div>
   )

package/src/views/post-editor/PostHeaderPanel.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { X } from 'lucide-react'
+import { Toggle } from '../../components/ui/Toggle.js'
 import type { PostHeaderConfig } from '../../lib/post-editor-service.js'
 
 interface PostHeaderPanelProps {
@@ -75,29 +76,18 @@ export function PostHeaderPanel({ header, canEdit, onClose, onChange }: PostHead
           {TOGGLES.map((t) => {
             const value = header[t.key] === true
             return (
-              <button
+              <div
                 key={t.key}
-                type="button"
-                role="switch"
-                aria-checked={value}
-                disabled={!canEdit}
-                onClick={() => onChange({ [t.key]: !value } as Partial<PostHeaderConfig>)}
-                className="border-border text-foreground hover:bg-accent flex w-full items-center justify-between rounded-md border px-2.5 py-1.5 text-sm disabled:opacity-50"
+                className="border-border text-foreground flex w-full items-center justify-between rounded-md border px-2.5 py-1.5 text-sm"
               >
                 <span>{t.label}</span>
-                <span
-                  aria-hidden
-                  className={`relative inline-flex h-5 w-9 shrink-0 items-center rounded-full transition-colors ${
-                    value ? 'bg-primary' : 'bg-muted'
-                  }`}
-                >
-                  <span
-                    className={`bg-card inline-block h-4 w-4 transform rounded-full transition-transform ${
-                      value ? 'translate-x-4' : 'translate-x-0.5'
-                    }`}
-                  />
-                </span>
-              </button>
+                <Toggle
+                  checked={value}
+                  disabled={!canEdit}
+                  onCheckedChange={(v) => onChange({ [t.key]: v } as Partial<PostHeaderConfig>)}
+                  aria-label={t.label}
+                />
+              </div>
             )
           })}
         </fieldset>

package/src/views/seo/TechnicalTab.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useId, useState } from 'react'
 import { RefreshCw, Map, AlertTriangle, CheckCircle2, ExternalLink, Bot } from 'lucide-react'
-import * as Switch from '@radix-ui/react-switch'
+import { Toggle as UiToggle } from '../../components/ui/Toggle.js'
 import { toast } from 'sonner'
 import {
   fetchSitemapStatus,
@@ -67,16 +67,13 @@ function Toggle({
           {help}
         </span>
       </span>
-      <Switch.Root
+      <UiToggle
         checked={checked}
         onCheckedChange={onChange}
         disabled={disabled}
         aria-labelledby={labelId}
         aria-describedby={helpId}
-        className="bg-input-background data-[state=checked]:bg-primary focus-visible:ring-ring relative h-[18px] w-8 shrink-0 rounded-full transition-colors focus-visible:ring-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
-      >
-        <Switch.Thumb className="bg-background block h-3.5 w-3.5 translate-x-0.5 rounded-full shadow-sm transition-transform data-[state=checked]:translate-x-[14px]" />
-      </Switch.Root>
+      />
     </div>
   )
 }

package/src/views/settings/components.tsx

@@ -3,6 +3,8 @@
 import * as Dialog from '@radix-ui/react-dialog'
 import { AlertTriangle, Check, Loader2, Lock } from 'lucide-react'
 import { useId, type ReactNode } from 'react'
+import { Card, CardContent, CardDescription, CardHeader } from '../../components/ui/Card.js'
+import { Toggle } from '../../components/ui/Toggle.js'
 import { adminPortalContainer } from '../../lib/portal-container.js'
 import type { SettingsSourceMetadata, ValidationIssue } from './useGeneralSettings.js'
 
@@ -34,21 +36,21 @@ export function SettingsCard({
 }) {
   const headingId = useId()
   return (
-    <section
-      aria-labelledby={headingId}
-      className={`border-border bg-card rounded-lg border p-6 ${className ?? ''}`}
-    >
-      <header className="mb-4 flex items-start justify-between gap-3">
+    <Card padding="none" aria-labelledby={headingId} role="region" className={className}>
+      <CardHeader className="flex items-start justify-between gap-3">
         <div className="min-w-0">
-          <Heading id={headingId} className="text-foreground text-lg font-medium">
+          <Heading
+            id={headingId}
+            className="text-[length:var(--fs-card)] font-semibold text-[var(--txt)]"
+          >
             {title}
           </Heading>
-          {description && <p className="text-muted-foreground mt-0.5 text-sm">{description}</p>}
+          {description && <CardDescription>{description}</CardDescription>}
         </div>
         {actions && <div className="flex shrink-0 items-center gap-2">{actions}</div>}
-      </header>
-      {children}
-    </section>
+      </CardHeader>
+      <CardContent className="pt-0 text-[var(--txt)]">{children}</CardContent>
+    </Card>
   )
 }
 
@@ -176,23 +178,14 @@ export function SettingsToggleRow({
         </div>
         <p className="text-muted-foreground mt-0.5 text-sm">{description}</p>
       </div>
-      <button
-        type="button"
-        role="switch"
-        aria-checked={checked}
-        aria-label={label}
-        disabled={disabled}
-        onClick={() => onChange(!checked)}
-        className={`focus-visible:ring-ring relative mt-0.5 h-6 w-11 shrink-0 rounded-full transition-colors focus-visible:ring-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50 ${
-          checked ? 'bg-brand' : 'bg-switch-background'
-        }`}
-      >
-        <span
-          className={`bg-card absolute top-0.5 block h-5 w-5 rounded-full shadow-sm transition-transform ${
-            checked ? 'translate-x-[22px]' : 'translate-x-0.5'
-          }`}
+      <div className="mt-0.5 shrink-0">
+        <Toggle
+          checked={checked}
+          onCheckedChange={onChange}
+          disabled={disabled}
+          aria-label={label}
         />
-      </button>
+      </div>
     </div>
   )
 }