reorganize utilities

Author: piotrkulpinski

src/forms/controls/Checkbox/Checkbox.tsx

@@ -4,8 +4,8 @@ import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
 import { Check } from "lucide-react"
 import type { ComponentProps } from "react"
 
-import type { VariantProps } from "../../../shared"
-import { cx } from "../../../shared"
+import type { VariantProps } from "~/shared/cva"
+import { cx } from "~/shared/cva"
 
 import { checkboxVariants } from "./Checkbox.variants"
 

src/forms/controls/Checkbox/Checkbox.variants.ts

@@ -1,4 +1,5 @@
-import { cva, focusClasses } from "../../../shared"
+import { focusClasses } from "~/shared/classes"
+import { cva } from "~/shared/cva"
 
 export const checkboxVariants = cva({
   base: [

src/forms/controls/ColorPicker/ColorPicker.tsx

@@ -4,8 +4,8 @@ import Sketch, { type SketchProps } from "@uiw/react-color-sketch"
 import { Grid, X } from "lucide-react"
 import type { HTMLAttributes } from "react"
 
-import type { VariantProps } from "../../../shared"
-import { cx } from "../../../shared"
+import type { VariantProps } from "~/shared/cva"
+import { cx } from "~/shared/cva"
 import { Popover } from "../../../ui/Popover"
 import { inputVariants } from "../Input/Input.variants"
 import {

src/forms/controls/ColorPicker/ColorPicker.variants.ts

@@ -1,4 +1,4 @@
-import { cva } from "../../../shared"
+import { cva } from "~/shared/cva"
 
 export const colorPickerVariants = cva({
   base: "group/picker relative",

src/forms/controls/Editor/Editor.tsx

@@ -2,28 +2,25 @@
 
 import { EditorContent } from "@tiptap/react"
 import type { ComponentProps } from "react"
-
-import type { VariantProps } from "../../../shared"
-import { cx } from "../../../shared"
-import { proseVariants } from "../../../typography/Prose/Prose.variants"
-import type { SeriesProps } from "../../../ui/Stack"
-import { Series } from "../../../ui/Stack"
+import { type VariantProps, cx } from "~/shared/cva"
+import { proseVariants } from "~/typography/Prose/Prose.variants"
+import { Stack } from "~/ui/Stack"
 
 import { editorContentVariants, editorMenuVariants, editorVariants } from "./Editor.variants"
 
-export type EditorProps = ComponentProps<typeof EditorContent> & VariantProps<typeof editorVariants>
+type EditorProps = ComponentProps<typeof EditorContent> & VariantProps<typeof editorVariants>
 
 const EditorRoot = ({ className, error, plain, ...rest }: EditorProps) => {
   return <EditorContent className={cx(editorVariants({ error, plain, className }))} {...rest} />
 }
 
-type EditorMenuProps = SeriesProps & VariantProps<typeof editorMenuVariants>
+type EditorMenuProps = ComponentProps<typeof Stack> & VariantProps<typeof editorMenuVariants>
 
-export const EditorMenu = ({ className, plain, ...rest }: EditorMenuProps) => {
-  return <Series size="sm" className={cx(editorMenuVariants({ plain, className }))} {...rest} />
+const EditorMenu = ({ className, plain, ...rest }: EditorMenuProps) => {
+  return <Stack size="sm" className={cx(editorMenuVariants({ plain, className }))} {...rest} />
 }
 
-export const Editor = Object.assign(EditorRoot, {
+const Editor = Object.assign(EditorRoot, {
   Menu: EditorMenu,
   ContentClass: ({ compact, plain }: VariantProps<typeof editorContentVariants>) =>
     cx(
@@ -34,3 +31,5 @@ export const Editor = Object.assign(EditorRoot, {
       }),
     ),
 })
+
+export { Editor, EditorMenu }

src/forms/controls/Editor/Editor.variants.ts

@@ -1,4 +1,5 @@
-import { cva, focusWithinClasses } from "../../../shared"
+import { focusWithinClasses } from "~/shared/classes"
+import { cva } from "~/shared/cva"
 
 export const editorVariants = cva({
   base: ["relative w-full border rounded-md overflow-hidden transition", focusWithinClasses],

src/forms/controls/Input/Input.tsx

@@ -2,8 +2,8 @@
 
 import type { InputHTMLAttributes } from "react"
 
-import type { VariantProps } from "../../../shared"
-import { cx } from "../../../shared"
+import type { VariantProps } from "~/shared/cva"
+import { cx } from "~/shared/cva"
 import { useAffix } from "../../ui/Affix/Affix"
 
 import { inputVariants } from "./Input.variants"

src/forms/controls/Input/Input.variants.ts

@@ -1,4 +1,5 @@
-import { cva, focusClasses } from "../../../shared"
+import { focusClasses } from "~/shared/classes"
+import { cva } from "~/shared/cva"
 
 export const inputVariants = cva({
   base: [

src/forms/controls/RadioGroup/RadioGroup.tsx

@@ -3,8 +3,8 @@
 import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"
 import type { ComponentProps } from "react"
 
-import type { VariantProps } from "../../../shared"
-import { cx } from "../../../shared"
+import type { VariantProps } from "~/shared/cva"
+import { cx } from "~/shared/cva"
 
 import { Dot } from "../../../ui/Dot"
 import { radioGroupItemVariants } from "./RadioGroup.variants"

src/forms/controls/RadioGroup/RadioGroup.variants.ts

@@ -1,4 +1,5 @@
-import { cva, focusClasses } from "../../../shared"
+import { focusClasses } from "~/shared/classes"
+import { cva } from "~/shared/cva"
 
 export const radioGroupItemVariants = cva({
   base: [