@luxfi/ui 7.4.10 → 7.4.11

package/dist/drawer.d.ts

@@ -1,5 +1,8 @@
+import * as _hanzogui_core from '@hanzogui/core';
+import * as _hanzo_gui from '@hanzo/gui';
+import { Dialog, YStack, XStack } from '@hanzo/gui';
+import * as _hanzogui_web from '@hanzogui/web';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import * as RadixDialog from '@radix-ui/react-dialog';
 import * as React from 'react';
 
 interface DrawerRootProps {
@@ -9,13 +12,15 @@ interface DrawerRootProps {
     onOpenChange?: (details: {
         open: boolean;
     }) => void;
-    placement?: 'left' | 'right' | 'top' | 'bottom';
+    placement?: Placement;
     initialFocusEl?: (() => HTMLElement | null) | React.RefObject<HTMLElement>;
     lazyMount?: boolean;
     unmountOnExit?: boolean;
     modal?: boolean;
-    size?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
+    size?: Size;
 }
+type Placement = 'left' | 'right' | 'top' | 'bottom';
+type Size = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
 declare const DrawerRoot: (props: DrawerRootProps) => react_jsx_runtime.JSX.Element;
 interface DrawerContentProps extends React.ComponentPropsWithoutRef<'div'> {
     portalled?: boolean;
@@ -25,12 +30,40 @@ interface DrawerContentProps extends React.ComponentPropsWithoutRef<'div'> {
 }
 declare const DrawerContent: React.ForwardRefExoticComponent<DrawerContentProps & React.RefAttributes<HTMLDivElement>>;
 declare const DrawerCloseTrigger: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
-declare const DrawerTrigger: (props: React.ComponentPropsWithoutRef<typeof RadixDialog.Trigger>) => react_jsx_runtime.JSX.Element;
-declare const DrawerHeader: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
-declare const DrawerBody: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
-declare const DrawerFooter: React.ForwardRefExoticComponent<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & React.RefAttributes<HTMLDivElement>>;
-declare const DrawerTitle: React.ForwardRefExoticComponent<RadixDialog.DialogTitleProps & React.RefAttributes<HTMLHeadingElement>>;
-declare const DrawerDescription: React.ForwardRefExoticComponent<RadixDialog.DialogDescriptionProps & React.RefAttributes<HTMLParagraphElement>>;
-declare const DrawerActionTrigger: React.ForwardRefExoticComponent<RadixDialog.DialogCloseProps & React.RefAttributes<HTMLButtonElement>>;
+declare const DrawerTrigger: ({ asChild, children, ...rest }: React.ComponentProps<typeof Dialog.Trigger>) => react_jsx_runtime.JSX.Element;
+declare const DrawerHeader: ({ children, ...props }: React.ComponentProps<typeof YStack>) => react_jsx_runtime.JSX.Element;
+declare const DrawerBody: ({ children, ...props }: React.ComponentProps<typeof YStack>) => react_jsx_runtime.JSX.Element;
+declare const DrawerFooter: ({ children, ...props }: React.ComponentProps<typeof XStack>) => react_jsx_runtime.JSX.Element;
+declare const DrawerTitle: _hanzogui_web.GuiComponent<Omit<_hanzogui_web.GetFinalProps<_hanzogui_web.TextNonStyleProps, _hanzogui_web.TextStylePropsBase, {
+    unstyled?: boolean | undefined;
+    size?: _hanzogui_web.FontSizeTokens | undefined;
+}>, "scope"> & {
+    scope?: _hanzo_gui.DialogScopes;
+}, _hanzogui_web.GuiTextElement, _hanzogui_web.TextNonStyleProps & {
+    scope?: _hanzo_gui.DialogScopes;
+}, _hanzogui_web.TextStylePropsBase, {
+    unstyled?: boolean | undefined;
+    size?: _hanzogui_web.FontSizeTokens | undefined;
+}, _hanzogui_web.StaticConfigPublic>;
+declare const DrawerDescription: _hanzogui_web.GuiComponent<Omit<_hanzogui_web.GetFinalProps<_hanzogui_web.TextNonStyleProps, _hanzogui_web.TextStylePropsBase, {
+    unstyled?: boolean | undefined;
+    size?: _hanzogui_web.FontSizeTokens | undefined;
+}>, "scope"> & {
+    scope?: _hanzo_gui.DialogScopes;
+}, _hanzogui_web.GuiTextElement, _hanzogui_web.TextNonStyleProps & {
+    scope?: _hanzo_gui.DialogScopes;
+}, _hanzogui_web.TextStylePropsBase, {
+    unstyled?: boolean | undefined;
+    size?: _hanzogui_web.FontSizeTokens | undefined;
+}, _hanzogui_web.StaticConfigPublic>;
+declare const DrawerActionTrigger: _hanzogui_web.GuiComponent<Omit<_hanzogui_web.GetFinalProps<_hanzogui_core.RNViewNonStyleProps, _hanzogui_web.StackStyleBase, {}>, "scope" | "displayWhenAdapted"> & {
+    displayWhenAdapted?: boolean;
+} & {
+    scope?: _hanzo_gui.DialogScopes;
+}, _hanzogui_web.GuiElement, _hanzogui_core.RNViewNonStyleProps & {
+    displayWhenAdapted?: boolean;
+} & {
+    scope?: _hanzo_gui.DialogScopes;
+}, _hanzogui_web.StackStyleBase, {}, _hanzogui_web.StaticConfigPublic>;
 
 export { DrawerActionTrigger, DrawerBody, DrawerCloseTrigger, DrawerContent, type DrawerContentProps, DrawerDescription, DrawerFooter, DrawerHeader, DrawerRoot, type DrawerRootProps, DrawerTitle, DrawerTrigger };

package/dist/drawer.js

@@ -1,28 +1,10 @@
 "use client";
-import { styled, View, Sheet } from '@hanzo/gui';
-import * as RadixDialog from '@radix-ui/react-dialog';
+import { styled, View, Sheet, Dialog, YStack, Text, XStack } from '@hanzo/gui';
 import * as React3 from 'react';
-import { clsx } from 'clsx';
-import { twMerge } from 'tailwind-merge';
+import { Children, createElement } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
 // src/drawer.tsx
-var NARROW_PX = 640;
-function useBelow(px) {
-  const [below, setBelow] = React3.useState(false);
-  React3.useEffect(() => {
-    const mql = window.matchMedia(`(max-width: ${px - 1}px)`);
-    const apply = () => setBelow(mql.matches);
-    apply();
-    mql.addEventListener("change", apply);
-    return () => mql.removeEventListener("change", apply);
-  }, [px]);
-  return below;
-}
-var useIsNarrow = () => useBelow(NARROW_PX);
-function cn(...inputs) {
-  return twMerge(clsx(inputs));
-}
 var CLOSE_ICON_PATH = "M9.44 8.035a.791.791 0 0 0 1.12 0l3.802-3.803a.791.791 0 0 1 1.119 0l.287.287a.79.79 0 0 1 0 1.119L11.965 9.44a.79.79 0 0 0 0 1.118l3.803 3.803a.791.791 0 0 1 0 1.119l-.287.287a.791.791 0 0 1-1.119 0l-3.803-3.803a.79.79 0 0 0-1.118 0l-3.803 3.803a.79.79 0 0 1-1.119 0l-.287-.287a.791.791 0 0 1 0-1.119l3.803-3.803a.791.791 0 0 0 0-1.118L4.232 5.638a.791.791 0 0 1 0-1.119l.287-.287a.791.791 0 0 1 1.119 0L9.44 8.035Z";
 var CloseButtonFrame = styled(View, {
   name: "LuxCloseButton",
@@ -85,13 +67,35 @@ var CloseButton = React3.forwardRef(function CloseButton2(props, ref) {
     }
   );
 });
+var ink = (children, Wrap = Text, props = {}) => {
+  let hasText = false;
+  Children.forEach(children, (child) => {
+    if (typeof child === "string" || typeof child === "number") hasText = true;
+  });
+  if (!hasText) return children;
+  return Children.map(children, (child) => typeof child === "string" || typeof child === "number" ? createElement(Wrap, props, child) : child);
+};
+var NARROW_PX = 640;
+function useBelow(px) {
+  const [below, setBelow] = React3.useState(false);
+  React3.useEffect(() => {
+    const mql = window.matchMedia(`(max-width: ${px - 1}px)`);
+    const apply = () => setBelow(mql.matches);
+    apply();
+    mql.addEventListener("change", apply);
+    return () => mql.removeEventListener("change", apply);
+  }, [px]);
+  return below;
+}
+var useIsNarrow = () => useBelow(NARROW_PX);
 var DrawerPlacementContext = React3.createContext("right");
 var DrawerSizeContext = React3.createContext("md");
 var DrawerStateContext = React3.createContext({
   open: false,
   setOpen: () => {
   },
-  modal: true
+  modal: true,
+  narrow: false
 });
 var DrawerRoot = (props) => {
   const {
@@ -106,60 +110,40 @@ var DrawerRoot = (props) => {
   const [uncontrolled, setUncontrolled] = React3.useState(defaultOpen ?? false);
   const isControlled = open !== void 0;
   const isOpen = isControlled ? open : uncontrolled;
+  const narrow = useIsNarrow();
   const setOpen = React3.useCallback((nextOpen) => {
     if (!isControlled) setUncontrolled(nextOpen);
     onOpenChange?.({ open: nextOpen });
   }, [isControlled, onOpenChange]);
   const state = React3.useMemo(
-    () => ({ open: isOpen, setOpen, modal }),
-    [isOpen, setOpen, modal]
+    () => ({ open: isOpen, setOpen, modal, narrow }),
+    [isOpen, setOpen, modal, narrow]
   );
-  return /* @__PURE__ */ jsx(DrawerPlacementContext.Provider, { value: placement, children: /* @__PURE__ */ jsx(DrawerSizeContext.Provider, { value: size, children: /* @__PURE__ */ jsx(DrawerStateContext.Provider, { value: state, children: /* @__PURE__ */ jsx(
-    RadixDialog.Root,
-    {
-      open: isOpen,
-      onOpenChange: setOpen,
-      modal,
-      children
-    }
-  ) }) }) });
+  return /* @__PURE__ */ jsx(DrawerPlacementContext.Provider, { value: placement, children: /* @__PURE__ */ jsx(DrawerSizeContext.Provider, { value: size, children: /* @__PURE__ */ jsx(DrawerStateContext.Provider, { value: state, children: narrow ? children : /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: setOpen, modal, children }) }) }) });
 };
-var PLACEMENT_CLASSES = {
-  right: [
-    "inset-y-0 right-0",
-    "data-[state=open]:animate-in data-[state=open]:slide-in-from-right",
-    "data-[state=closed]:animate-out data-[state=closed]:slide-out-to-right"
-  ].join(" "),
-  left: [
-    "inset-y-0 left-0",
-    "data-[state=open]:animate-in data-[state=open]:slide-in-from-left",
-    "data-[state=closed]:animate-out data-[state=closed]:slide-out-to-left"
-  ].join(" "),
-  top: [
-    "inset-x-0 top-0",
-    "data-[state=open]:animate-in data-[state=open]:slide-in-from-top",
-    "data-[state=closed]:animate-out data-[state=closed]:slide-out-to-top"
-  ].join(" "),
-  bottom: [
-    "inset-x-0 bottom-0",
-    "data-[state=open]:animate-in data-[state=open]:slide-in-from-bottom",
-    "data-[state=closed]:animate-out data-[state=closed]:slide-out-to-bottom"
-  ].join(" ")
+var ANCHOR = {
+  right: { top: 0, bottom: 0, right: 0, enterStyle: { x: 24, opacity: 0 }, exitStyle: { x: 24, opacity: 0 } },
+  left: { top: 0, bottom: 0, left: 0, enterStyle: { x: -24, opacity: 0 }, exitStyle: { x: -24, opacity: 0 } },
+  top: { left: 0, right: 0, top: 0, enterStyle: { y: -24, opacity: 0 }, exitStyle: { y: -24, opacity: 0 } },
+  bottom: { left: 0, right: 0, bottom: 0, enterStyle: { y: 24, opacity: 0 }, exitStyle: { y: 24, opacity: 0 } }
 };
-var SIZE_CLASSES = {
-  right: { xs: "w-60", sm: "w-80", md: "w-96", lg: "w-[480px]", xl: "w-[640px]", full: "w-screen" },
-  left: { xs: "w-60", sm: "w-80", md: "w-96", lg: "w-[480px]", xl: "w-[640px]", full: "w-screen" },
-  top: { xs: "h-40", sm: "h-60", md: "h-80", lg: "h-96", xl: "h-[480px]", full: "h-screen" },
-  bottom: { xs: "h-40", sm: "h-60", md: "h-80", lg: "h-96", xl: "h-[480px]", full: "h-screen" }
+var ACROSS = {
+  xs: 240,
+  sm: 320,
+  md: 384,
+  lg: 480,
+  xl: 640,
+  full: "100%"
 };
+var extent = (placement, size) => placement === "left" || placement === "right" ? { width: ACROSS[size], maxWidth: "100%" } : { height: ACROSS[size], maxHeight: "100%" };
+var SCRIM = "rgba(0,0,0,0.5)";
 var DrawerContent = React3.forwardRef(
   function DrawerContent2(props, ref) {
-    const { children, portalled = true, portalRef, offset: _offset, backdrop = true, className, ...rest } = props;
+    const { children, portalled = true, portalRef: _portalRef, offset: _offset, backdrop = true, ...rest } = props;
     const placement = React3.useContext(DrawerPlacementContext);
     const size = React3.useContext(DrawerSizeContext);
-    const { open, setOpen, modal } = React3.useContext(DrawerStateContext);
-    const isNarrow = useIsNarrow();
-    if (isNarrow) {
+    const { open, setOpen, modal, narrow } = React3.useContext(DrawerStateContext);
+    if (narrow) {
       return /* @__PURE__ */ jsxs(
         Sheet,
         {
@@ -177,7 +161,7 @@ var DrawerContent = React3.forwardRef(
                 transition: "lazy",
                 enterStyle: { opacity: 0 },
                 exitStyle: { opacity: 0 },
-                className: "bg-black/50"
+                backgroundColor: SCRIM
               }
             ),
             /* @__PURE__ */ jsx(Sheet.Handle, {}),
@@ -185,10 +169,11 @@ var DrawerContent = React3.forwardRef(
               Sheet.Frame,
               {
                 unstyled: true,
-                className: cn(
-                  "flex flex-col rounded-t-2xl bg-[var(--color-drawer-bg)] shadow-[var(--shadow-drawer)]",
-                  className
-                ),
+                flexDirection: "column",
+                borderTopLeftRadius: 16,
+                borderTopRightRadius: 16,
+                backgroundColor: "var(--color-drawer-bg)",
+                shadowColor: "var(--shadow-drawer)",
                 ...rest,
                 children
               }
@@ -199,67 +184,61 @@ var DrawerContent = React3.forwardRef(
     }
     const content = /* @__PURE__ */ jsxs(Fragment, { children: [
       backdrop && /* @__PURE__ */ jsx(
-        RadixDialog.Overlay,
+        Dialog.Overlay,
         {
-          className: cn(
-            "fixed inset-0 z-50 bg-black/50",
-            "data-[state=open]:animate-in data-[state=open]:fade-in-0",
-            "data-[state=closed]:animate-out data-[state=closed]:fade-out-0"
-          )
-        }
+          position: "fixed",
+          top: 0,
+          right: 0,
+          bottom: 0,
+          left: 0,
+          zIndex: 50,
+          backgroundColor: SCRIM,
+          transition: "lazy",
+          enterStyle: { opacity: 0 },
+          exitStyle: { opacity: 0 }
+        },
+        "overlay"
       ),
       /* @__PURE__ */ jsx(
-        RadixDialog.Content,
+        Dialog.Content,
         {
           ref,
-          className: cn(
-            "fixed z-50 flex flex-col bg-[var(--color-drawer-bg)] shadow-[var(--shadow-drawer)] duration-300",
-            PLACEMENT_CLASSES[placement] ?? PLACEMENT_CLASSES.right,
-            SIZE_CLASSES[placement]?.[size] ?? SIZE_CLASSES.right?.md,
-            className
-          ),
+          unstyled: true,
+          position: "fixed",
+          zIndex: 50,
+          flexDirection: "column",
+          backgroundColor: "var(--color-drawer-bg)",
+          transition: "medium",
+          ...ANCHOR[placement],
+          ...extent(placement, size),
           ...rest,
           children
-        }
+        },
+        "content"
       )
     ] });
-    if (portalled) {
-      return /* @__PURE__ */ jsx(RadixDialog.Portal, { container: portalRef?.current ?? void 0, children: content });
-    }
-    return content;
+    return portalled ? /* @__PURE__ */ jsx(Dialog.Portal, { children: content }) : content;
   }
 );
 var DrawerCloseTrigger = React3.forwardRef(function DrawerCloseTrigger2(props, ref) {
-  return /* @__PURE__ */ jsx(RadixDialog.Close, { asChild: true, children: /* @__PURE__ */ jsx(
-    CloseButton,
-    {
-      ref,
-      className: cn("absolute top-7 right-5", props.className),
-      ...props
-    }
-  ) });
+  return (
+    // Placement belongs to the surrounding box, not to the button: CloseButton
+    // is a fixed 20px control and has no opinion about where it sits.
+    /* @__PURE__ */ jsx(View, { position: "absolute", top: 28, right: 20, zIndex: 1, children: /* @__PURE__ */ jsx(Dialog.Close, { asChild: true, children: /* @__PURE__ */ jsx(CloseButton, { ref, ...props }) }) })
+  );
 });
-var DrawerTrigger = (props) => {
-  const { asChild = true, ...rest } = props;
-  return /* @__PURE__ */ jsx(RadixDialog.Trigger, { asChild, ...rest });
-};
-var DrawerHeader = React3.forwardRef(
-  function DrawerHeader2({ className, ...props }, ref) {
-    return /* @__PURE__ */ jsx("div", { ref, className: cn("flex flex-col gap-1.5 p-6 pb-0", className), ...props });
+var DrawerTrigger = ({ asChild = true, children, ...rest }) => {
+  const { setOpen, narrow } = React3.useContext(DrawerStateContext);
+  if (narrow) {
+    return React3.isValidElement(children) ? React3.cloneElement(children, { onClick: () => setOpen(true) }) : /* @__PURE__ */ jsx(Fragment, { children });
   }
-);
-var DrawerBody = React3.forwardRef(
-  function DrawerBody2({ className, ...props }, ref) {
-    return /* @__PURE__ */ jsx("div", { ref, className: cn("flex-1 overflow-auto p-6", className), ...props });
-  }
-);
-var DrawerFooter = React3.forwardRef(
-  function DrawerFooter2({ className, ...props }, ref) {
-    return /* @__PURE__ */ jsx("div", { ref, className: cn("flex items-center justify-end gap-2 p-6 pt-0", className), ...props });
-  }
-);
-var DrawerTitle = RadixDialog.Title;
-var DrawerDescription = RadixDialog.Description;
-var DrawerActionTrigger = RadixDialog.Close;
+  return /* @__PURE__ */ jsx(Dialog.Trigger, { asChild, ...rest, children });
+};
+var DrawerHeader = ({ children, ...props }) => /* @__PURE__ */ jsx(YStack, { gap: 6, padding: 24, paddingBottom: 0, ...props, children: ink(children) });
+var DrawerBody = ({ children, ...props }) => /* @__PURE__ */ jsx(YStack, { flex: 1, overflow: "scroll", padding: 24, ...props, children: ink(children) });
+var DrawerFooter = ({ children, ...props }) => /* @__PURE__ */ jsx(XStack, { alignItems: "center", justifyContent: "flex-end", gap: 8, padding: 24, paddingTop: 0, ...props, children: ink(children) });
+var DrawerTitle = Dialog.Title;
+var DrawerDescription = Dialog.Description;
+var DrawerActionTrigger = Dialog.Close;
 
 export { DrawerActionTrigger, DrawerBody, DrawerCloseTrigger, DrawerContent, DrawerDescription, DrawerFooter, DrawerHeader, DrawerRoot, DrawerTitle, DrawerTrigger };

package/dist/field.cjs

@@ -1,10 +1,8 @@
 "use client";
 'use strict';
 
-var LabelPrimitive = require('@radix-ui/react-label');
+var gui = require('@hanzo/gui');
 var React = require('react');
-var clsx = require('clsx');
-var tailwindMerge = require('tailwind-merge');
 var jsxRuntime = require('react/jsx-runtime');
 
 function _interopNamespace(e) {
@@ -25,19 +23,26 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var LabelPrimitive__namespace = /*#__PURE__*/_interopNamespace(LabelPrimitive);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 // src/field.tsx
-function cn(...inputs) {
-  return tailwindMerge.twMerge(clsx.clsx(inputs));
-}
 var space = String.fromCharCode(32);
 function getComponentDisplayName(type) {
   if (typeof type === "string") return void 0;
   if ("displayName" in type) return type.displayName;
   return void 0;
 }
+var ERROR = "var(--color-text-error)";
+var MUTED = "var(--color-text-secondary)";
+var Marks = ({ required, optionalText, errorText }) => /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+  required && /* @__PURE__ */ jsxRuntime.jsx(gui.Text, { color: ERROR, "aria-hidden": true, children: "*" }),
+  !required && optionalText && /* @__PURE__ */ jsxRuntime.jsx(gui.Text, { fontSize: 14, color: MUTED, children: optionalText }),
+  errorText && /* @__PURE__ */ jsxRuntime.jsxs(gui.Text, { fontSize: 14, color: ERROR, children: [
+    "-",
+    space,
+    errorText
+  ] })
+] });
 var Field = React__namespace.forwardRef(
   function Field2(props, ref) {
     const {
@@ -56,127 +61,73 @@ var Field = React__namespace.forwardRef(
       className,
       style
     } = props;
+    const flags = {
+      "data-disabled": disabled || void 0,
+      "data-readonly": readOnly || void 0,
+      "data-invalid": invalid || void 0
+    };
     if (floating && label) {
-      const injectedProps2 = {
-        className: "peer",
-        placeholder: " ",
-        size,
-        floating,
-        disabled,
-        readOnly
-      };
+      const injectedProps = { className: "lux-field-control", placeholder: " ", size, floating, disabled, readOnly };
       const labelElement = /* @__PURE__ */ jsxRuntime.jsxs(
-        LabelPrimitive__namespace.Root,
+        gui.Label,
         {
-          className: cn(
-            "absolute left-3 top-1/2 -translate-y-1/2",
-            "text-[var(--color-input-placeholder,theme(colors.gray.400))]",
-            "pointer-events-none select-none",
-            "origin-top-left transition-all duration-150",
-            "peer-focus:top-1 peer-focus:translate-y-0 peer-focus:scale-75",
-            "peer-[:not(:placeholder-shown)]:top-1 peer-[:not(:placeholder-shown)]:translate-y-0 peer-[:not(:placeholder-shown)]:scale-75"
-          ),
           htmlFor: id,
+          position: "absolute",
+          left: 12,
+          top: "50%",
+          pointerEvents: "none",
+          userSelect: "none",
+          flexDirection: "row",
+          gap: 4,
+          color: "var(--color-input-placeholder)",
+          className: "lux-field-float",
           children: [
             label,
-            required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "ml-0.5 text-[var(--color-fg-error,theme(colors.red.500))]", "aria-hidden": "true", children: "*" }),
-            !required && optionalText && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "ml-1 text-[var(--color-text-secondary,theme(colors.gray.400))] text-sm", children: optionalText }),
-            errorText && /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "ml-0.5 text-[var(--color-fg-error,theme(colors.red.500))] text-sm", children: [
-              "-",
-              space,
-              errorText
-            ] })
+            /* @__PURE__ */ jsxRuntime.jsx(Marks, { required, optionalText, errorText })
           ]
         }
       );
-      const helperTextElement = helperText ? /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mt-1.5 text-xs text-[var(--color-text-secondary,theme(colors.gray.400))]", children: helperText }) : null;
+      const helperTextElement = helperText ? /* @__PURE__ */ jsxRuntime.jsx(gui.Text, { marginTop: 6, fontSize: 12, color: MUTED, children: helperText }) : null;
       const child2 = React__namespace.Children.only(children);
       const isInputGroup = getComponentDisplayName(child2.type) === "InputGroup";
       if (isInputGroup) {
-        const inputElement2 = React__namespace.cloneElement(
+        const inputElement = React__namespace.cloneElement(
           React__namespace.Children.only(child2.props.children),
-          injectedProps2
-        );
-        const groupInputElement = React__namespace.cloneElement(
-          child2,
-          {},
-          inputElement2,
-          labelElement
-        );
-        return /* @__PURE__ */ jsxRuntime.jsxs(
-          "div",
-          {
-            ref,
-            id,
-            className: cn("relative w-full", className),
-            style,
-            "data-disabled": disabled || void 0,
-            "data-readonly": readOnly || void 0,
-            "data-invalid": invalid || void 0,
-            children: [
-              groupInputElement,
-              helperTextElement
-            ]
-          }
+          injectedProps
         );
+        return /* @__PURE__ */ jsxRuntime.jsxs(gui.YStack, { ref, id, position: "relative", width: "100%", className, style, ...flags, children: [
+          React__namespace.cloneElement(child2, {}, inputElement, labelElement),
+          helperTextElement
+        ] });
       }
-      const inputElement = React__namespace.cloneElement(child2, injectedProps2);
-      return /* @__PURE__ */ jsxRuntime.jsxs(
-        "div",
+      return /* @__PURE__ */ jsxRuntime.jsxs(gui.YStack, { ref, id, position: "relative", width: "100%", className, style, ...flags, children: [
+        React__namespace.cloneElement(child2, injectedProps),
+        labelElement,
+        helperTextElement
+      ] });
+    }
+    const child = React__namespace.Children.only(children);
+    return /* @__PURE__ */ jsxRuntime.jsxs(gui.YStack, { ref, id, gap: 4, className, style, ...flags, children: [
+      label && /* @__PURE__ */ jsxRuntime.jsxs(
+        gui.Label,
         {
-          ref,
-          id,
-          className: cn("relative w-full", className),
-          style,
-          "data-disabled": disabled || void 0,
-          "data-readonly": readOnly || void 0,
-          "data-invalid": invalid || void 0,
+          htmlFor: id,
+          flexDirection: "row",
+          gap: 4,
+          fontSize: 14,
+          fontWeight: "500",
+          color: "var(--color-text-primary)",
+          opacity: disabled ? 0.4 : 1,
           children: [
-            inputElement,
-            labelElement,
-            helperTextElement
+            label,
+            /* @__PURE__ */ jsxRuntime.jsx(Marks, { required, optionalText })
           ]
         }
-      );
-    }
-    const injectedProps = {
-      size
-    };
-    const child = React__namespace.Children.only(children);
-    const clonedChild = React__namespace.cloneElement(child, injectedProps);
-    return /* @__PURE__ */ jsxRuntime.jsxs(
-      "div",
-      {
-        ref,
-        id,
-        className: cn("flex flex-col gap-1", className),
-        style,
-        "data-disabled": disabled || void 0,
-        "data-readonly": readOnly || void 0,
-        "data-invalid": invalid || void 0,
-        children: [
-          label && /* @__PURE__ */ jsxRuntime.jsxs(
-            LabelPrimitive__namespace.Root,
-            {
-              className: cn(
-                "text-sm font-medium text-[var(--color-field-label,theme(colors.gray.700))]",
-                "dark:text-[var(--color-field-label,theme(colors.gray.300))]",
-                disabled && "opacity-40"
-              ),
-              htmlFor: id,
-              children: [
-                label,
-                required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "ml-0.5 text-[var(--color-fg-error,theme(colors.red.500))]", "aria-hidden": "true", children: "*" }),
-                !required && optionalText && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "ml-1 text-[var(--color-text-secondary,theme(colors.gray.400))] text-sm font-normal", children: optionalText })
-              ]
-            }
-          ),
-          clonedChild,
-          helperText && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-[var(--color-text-secondary,theme(colors.gray.400))]", children: helperText }),
-          errorText && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-[var(--color-fg-error,theme(colors.red.500))]", children: errorText })
-        ]
-      }
-    );
+      ),
+      React__namespace.cloneElement(child, { size }),
+      helperText && /* @__PURE__ */ jsxRuntime.jsx(gui.Text, { fontSize: 12, color: MUTED, children: helperText }),
+      errorText && /* @__PURE__ */ jsxRuntime.jsx(gui.Text, { fontSize: 12, color: ERROR, children: errorText })
+    ] });
   }
 );
 

package/dist/field.d.cts

@@ -14,7 +14,6 @@ interface FieldProps {
     readonly readOnly?: boolean;
     readonly invalid?: boolean;
     readonly floating?: boolean;
-    readonly bgColor?: string | Record<string, string>;
     readonly id?: string;
     readonly className?: string;
     readonly style?: React.CSSProperties;

package/dist/field.d.ts

@@ -14,7 +14,6 @@ interface FieldProps {
     readonly readOnly?: boolean;
     readonly invalid?: boolean;
     readonly floating?: boolean;
-    readonly bgColor?: string | Record<string, string>;
     readonly id?: string;
     readonly className?: string;
     readonly style?: React.CSSProperties;