diff --git a/example/package-lock.json b/example/package-lock.json index 2386c61c8..87e275e12 100644 --- a/example/package-lock.json +++ b/example/package-lock.json @@ -10,10 +10,13 @@ "hasInstallScript": true, "dependencies": { "@radix-ui/react-checkbox": "^1.3.3", + "@radix-ui/react-collapsible": "^1.1.12", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-popover": "^1.1.15", "@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-tabs": "^1.1.13", "@remoteoss/remote-flows": "file://..", "axios": "^1.8.3", "class-variance-authority": "^0.7.1", @@ -52,13 +55,10 @@ "dependencies": { "@hookform/resolvers": "^4.1.3", "@radix-ui/react-checkbox": "^1.3.3", - "@radix-ui/react-collapsible": "^1.1.12", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-popover": "^1.1.15", "@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-tabs": "^1.1.13", "@remoteoss/remote-json-schema-form-kit": "github:remoteoss/remote-json-schema-form-kit#v0.0.5", "@tailwindcss/cli": "^4.1.17", "@tailwindcss/postcss": "^4.1.17", @@ -870,6 +870,36 @@ } } }, + "node_modules/@radix-ui/react-collapsible": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz", + "integrity": "sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.5", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "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 + } + } + }, "node_modules/@radix-ui/react-collection": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz", @@ -1265,6 +1295,37 @@ } } }, + "node_modules/@radix-ui/react-scroll-area": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz", + "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==", + "license": "MIT", + "dependencies": { + "@radix-ui/number": "1.1.1", + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-presence": "1.1.5", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "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 + } + } + }, "node_modules/@radix-ui/react-select": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz", @@ -1326,6 +1387,36 @@ } } }, + "node_modules/@radix-ui/react-tabs": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz", + "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.5", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-roving-focus": "1.1.11", + "@radix-ui/react-use-controllable-state": "1.2.2" + }, + "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 + } + } + }, "node_modules/@radix-ui/react-use-callback-ref": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", diff --git a/example/package.json b/example/package.json index dad63e7cb..98a6e76a4 100644 --- a/example/package.json +++ b/example/package.json @@ -14,6 +14,9 @@ }, "dependencies": { "@radix-ui/react-checkbox": "^1.3.3", + "@radix-ui/react-collapsible": "^1.1.12", + "@radix-ui/react-scroll-area": "^1.2.10", + "@radix-ui/react-tabs": "^1.1.13", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-popover": "^1.1.15", "@radix-ui/react-radio-group": "^1.3.8", diff --git a/example/src/App.tsx b/example/src/App.tsx index 770ad5048..13bec4f87 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -4,17 +4,15 @@ import { CardDescription, CardHeader, CardTitle, - Tabs, - TabsContent, - TabsList, - TabsTrigger, + cn, +} from '@remoteoss/remote-flows/internals'; +import { Tabs, TabsContent, TabsList, TabsTrigger } from './components/ui/tabs'; +import { Collapsible, CollapsibleContent, CollapsibleTrigger, - Button, - cn, -} from '@remoteoss/remote-flows/internals'; - +} from './components/ui/collapsible'; +import { Button } from './components/ui/button'; import { Check, Copy, ChevronRight, ChevronDown } from 'lucide-react'; import { useState } from 'react'; diff --git a/example/src/ContractorOnboarding.tsx b/example/src/ContractorOnboarding.tsx index f16a1bdd2..da05aab17 100644 --- a/example/src/ContractorOnboarding.tsx +++ b/example/src/ContractorOnboarding.tsx @@ -19,12 +19,8 @@ import { eorProductIdentifier, $TSFixMe, } from '@remoteoss/remote-flows'; -import { - Card, - Tabs, - TabsTrigger, - TabsList, -} from '@remoteoss/remote-flows/internals'; +import { Card } from '@remoteoss/remote-flows/internals'; +import { Tabs, TabsTrigger, TabsList } from './components/ui/tabs'; import Flag from 'react-flagpack'; import React, { useState } from 'react'; import { RemoteFlows } from './RemoteFlows'; diff --git a/example/src/CostCalculatorWithPremiumBenefits.tsx b/example/src/CostCalculatorWithPremiumBenefits.tsx index 9f4d205b0..e97611815 100644 --- a/example/src/CostCalculatorWithPremiumBenefits.tsx +++ b/example/src/CostCalculatorWithPremiumBenefits.tsx @@ -20,15 +20,14 @@ import { convertFromCents, ZendeskTriggerButton, } from '@remoteoss/remote-flows'; +import { Card, cn } from '@remoteoss/remote-flows/internals'; import { Drawer, DrawerContent, DrawerHeader, DrawerTitle, DrawerTrigger, - Card, - cn, -} from '@remoteoss/remote-flows/internals'; +} from './components/ui/drawer'; import { ButtonHTMLAttributes, useState, isValidElement } from 'react'; import { RemoteFlows } from './RemoteFlows'; import { components } from './CostCalculatorComponents'; diff --git a/example/src/OffboardingRequestModal.tsx b/example/src/OffboardingRequestModal.tsx index 114fcbfb6..92c2ee4ac 100644 --- a/example/src/OffboardingRequestModal.tsx +++ b/example/src/OffboardingRequestModal.tsx @@ -1,13 +1,13 @@ import { TerminationDialogInfoContent } from '@remoteoss/remote-flows'; +import { Button } from './components/ui/button'; import { Dialog, DialogTrigger, DialogContent, DialogHeader, DialogTitle, - Button, - ScrollArea, -} from '@remoteoss/remote-flows/internals'; +} from './components/ui/dialog'; +import { ScrollArea } from './components/ui/scroll-area'; export function OffboardingRequestModal({ employee, diff --git a/example/src/ReviewContractorOnboardingStep.tsx b/example/src/ReviewContractorOnboardingStep.tsx index 0bc73a01f..2852514b3 100644 --- a/example/src/ReviewContractorOnboardingStep.tsx +++ b/example/src/ReviewContractorOnboardingStep.tsx @@ -4,7 +4,7 @@ import { NormalizedFieldError, useMagicLink, } from '@remoteoss/remote-flows'; -import { Button } from '@remoteoss/remote-flows/internals'; +import { Button } from './components/ui/button'; import { InfoIcon } from 'lucide-react'; import { InviteSection, ReviewMeta } from './ReviewOnboardingStep'; import { AlertError } from './AlertError'; diff --git a/example/src/TerminationReasonsDialog.tsx b/example/src/TerminationReasonsDialog.tsx index db1903c49..256a6fdb2 100644 --- a/example/src/TerminationReasonsDialog.tsx +++ b/example/src/TerminationReasonsDialog.tsx @@ -3,9 +3,9 @@ import { DialogContent, DialogHeader, DialogTrigger, - ScrollArea, DialogTitle, -} from '@remoteoss/remote-flows/internals'; +} from './components/ui/dialog'; +import { ScrollArea } from './components/ui/scroll-area'; import { TerminationReasonsDetailContent } from '@remoteoss/remote-flows'; export function TerminationReasonsDialog() { diff --git a/example/src/ZendeskDialog.tsx b/example/src/ZendeskDialog.tsx index b9bbde914..1bd9847a0 100644 --- a/example/src/ZendeskDialog.tsx +++ b/example/src/ZendeskDialog.tsx @@ -5,9 +5,9 @@ import { DialogDescription, DialogHeader, DialogTitle, - ScrollArea, DialogTrigger, -} from '@remoteoss/remote-flows/internals'; +} from './components/ui/dialog'; +import { ScrollArea } from './components/ui/scroll-area'; import type { ZendeskDrawerComponentProps } from '@remoteoss/remote-flows'; export function ZendeskDialog({ diff --git a/example/src/components/PricingPlanModals.tsx b/example/src/components/PricingPlanModals.tsx index c3a3f3441..699e1a0f8 100644 --- a/example/src/components/PricingPlanModals.tsx +++ b/example/src/components/PricingPlanModals.tsx @@ -1,3 +1,4 @@ +import { Button } from './ui/button'; import { Dialog, DialogTrigger, @@ -6,8 +7,7 @@ import { DialogTitle, DialogDescription, DialogFooter, - Button, -} from '@remoteoss/remote-flows/internals'; +} from './ui/dialog'; import { onboardingWorkflows, corProductIdentifier, diff --git a/src/components/ui/collapsible.tsx b/example/src/components/ui/collapsible.tsx similarity index 100% rename from src/components/ui/collapsible.tsx rename to example/src/components/ui/collapsible.tsx diff --git a/src/components/ui/scroll-area.tsx b/example/src/components/ui/scroll-area.tsx similarity index 96% rename from src/components/ui/scroll-area.tsx rename to example/src/components/ui/scroll-area.tsx index d61f325a4..d165bc393 100644 --- a/src/components/ui/scroll-area.tsx +++ b/example/src/components/ui/scroll-area.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area'; -import { cn } from '@/src/lib/utils'; +import { cn } from '@remoteoss/remote-flows/internals'; const ScrollArea = React.forwardRef< HTMLDivElement, diff --git a/src/components/ui/tabs.tsx b/example/src/components/ui/tabs.tsx similarity index 96% rename from src/components/ui/tabs.tsx rename to example/src/components/ui/tabs.tsx index 89ce4dd10..17b13bfce 100644 --- a/src/components/ui/tabs.tsx +++ b/example/src/components/ui/tabs.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import * as TabsPrimitive from '@radix-ui/react-tabs'; -import { cn } from '@/src/lib/utils'; +import { cn } from '@remoteoss/remote-flows/internals'; function Tabs({ className, diff --git a/package-lock.json b/package-lock.json index 2ac64f5e4..1ea4d6211 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,13 +10,10 @@ "dependencies": { "@hookform/resolvers": "^4.1.3", "@radix-ui/react-checkbox": "^1.3.3", - "@radix-ui/react-collapsible": "^1.1.12", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-popover": "^1.1.15", "@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-tabs": "^1.1.13", "@remoteoss/remote-json-schema-form-kit": "github:remoteoss/remote-json-schema-form-kit#v0.0.5", "@tailwindcss/cli": "^4.1.17", "@tailwindcss/postcss": "^4.1.17", @@ -2061,36 +2058,6 @@ } } }, - "node_modules/@radix-ui/react-collapsible": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz", - "integrity": "sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-controllable-state": "1.2.2", - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "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 - } - } - }, "node_modules/@radix-ui/react-collection": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz", @@ -2558,37 +2525,6 @@ } } }, - "node_modules/@radix-ui/react-scroll-area": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz", - "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==", - "license": "MIT", - "dependencies": { - "@radix-ui/number": "1.1.1", - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "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 - } - } - }, "node_modules/@radix-ui/react-select": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz", @@ -2650,36 +2586,6 @@ } } }, - "node_modules/@radix-ui/react-tabs": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz", - "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-roving-focus": "1.1.11", - "@radix-ui/react-use-controllable-state": "1.2.2" - }, - "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 - } - } - }, "node_modules/@radix-ui/react-use-callback-ref": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", diff --git a/package.json b/package.json index a74cecbe1..32b2821f8 100644 --- a/package.json +++ b/package.json @@ -88,13 +88,10 @@ "dependencies": { "@hookform/resolvers": "^4.1.3", "@radix-ui/react-checkbox": "^1.3.3", - "@radix-ui/react-collapsible": "^1.1.12", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-popover": "^1.1.15", "@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-tabs": "^1.1.13", "@remoteoss/remote-json-schema-form-kit": "github:remoteoss/remote-json-schema-form-kit#v0.0.5", "@tailwindcss/cli": "^4.1.17", "@tailwindcss/postcss": "^4.1.17", diff --git a/src/internals.ts b/src/internals.ts index 4172b31bb..41c4fe8cb 100644 --- a/src/internals.ts +++ b/src/internals.ts @@ -8,11 +8,9 @@ */ // Internal utilities -export { cn, sanitizeHtml } from './lib/utils'; +export { cn } from './lib/utils'; // UI Components for internal use -export { Button, buttonVariants } from './components/ui/button'; - export { Card, CardHeader, @@ -22,48 +20,6 @@ export { CardFooter, } from './components/ui/card'; -export { - Collapsible, - CollapsibleContent, - CollapsibleTrigger, -} from './components/ui/collapsible'; - -export { - Drawer, - DrawerContent, - DrawerHeader, - DrawerTitle, - DrawerTrigger, -} from './components/ui/drawer'; - -export { - Dialog, - DialogTrigger, - DialogContent, - DialogHeader, - DialogTitle, - DialogDescription, - DialogFooter, -} from './components/ui/dialog'; - -export { Tabs, TabsList, TabsTrigger, TabsContent } from './components/ui/tabs'; - export { Alert, AlertDescription, AlertTitle } from './components/ui/alert'; -export { Badge, badgeVariants } from './components/ui/badge'; - export { FileUploader } from './components/ui/file-uploader'; - -// Add any other UI components you want to share -export { Input } from './components/ui/input'; -export { Label } from './components/ui/label'; -export { Checkbox } from './components/ui/checkbox'; -export { RadioGroup, RadioGroupItem } from './components/ui/radio-group'; -export { - Select, - SelectContent, - SelectItem, - SelectTrigger, - SelectValue, -} from './components/ui/select'; -export { ScrollArea } from './components/ui/scroll-area';