@vuer-ai/vuer-uikit 0.0.109 → 0.0.112

package/src/dial/wrapped-inputs/ControlledInputs.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { PropsWithChildren, ReactElement, ReactNode, useCallback } from "react";
 import { LabelPositionT, useDialSchema } from "../DialProvider";
 import {
   ColorInput,
@@ -6,6 +6,7 @@ import {
   Input,
   InputSlot,
   Label,
+  type LayoutType,
   Select,
   SelectContent,
   SelectItem,
@@ -15,56 +16,62 @@ import {
   Switch,
 } from "../../index"; // Base input component that connects to the dial store
 
-// Base input component that connects to the dial store
-interface DialInputProps {
-  name: string;
-  type?: string;
-  min?: number;
-  max?: number;
-  step?: number;
-  options?: any[];
-  label?: string;
-  labelPosition?: LabelPositionT;
-  size?: "sm" | "md" | "lg";
-}
-
 // Helper component for wrapping inputs with labels
 const DialInputWrapper: React.FC<{
   label?: string;
-  children: React.ReactElement;
-}> = ({ label, children }) => {
+  labelPosition?: LabelPositionT;
+  children: ReactNode;
+}> = ({ label, labelPosition = "top", children }) => {
   if (!label) {
     return <>{children}</>;
   }
 
   return (
-    <FormLayout orientation="label-top">
+    <FormLayout orientation={`label-${labelPosition}` as LayoutType}>
       <Label size="sm">{label}</Label>
-      {children}
+      {children as ReactElement}
     </FormLayout>
   );
 };
 
-export const DialNumberInput: React.FC<DialInputProps> = ({
+export interface DialNumInputProps extends PropsWithChildren {
+  name: string;
+  type?: string;
+  min?: number;
+  max?: number;
+  step?: number;
+  options?: unknown[];
+  label?: string;
+  labelPosition?: LabelPositionT;
+  size?: "sm" | "md" | "lg";
+}
+
+// Base input component that connects to the dial store
+export const DialNumberInput: React.FC<DialNumInputProps> = ({
   name,
   min,
   max,
   step = 1,
   label,
-  labelPosition,
+  labelPosition = "top",
   size = "sm",
+  ...props
 }) => {
   const { getValue, setValue } = useDialSchema();
   const value = (getValue(name) ?? 0) as number;
 
+  const handleChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => setValue(name, parseFloat(e.target.value)),
+    [name],
+  );
+
   const inputProps = {
     type: "number" as const,
     value,
     min,
     max,
     step,
-    onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
-      setValue(name, parseFloat(e.target.value)),
+    onChange: handleChange,
     size,
   };
 
@@ -74,69 +81,82 @@ export const DialNumberInput: React.FC<DialInputProps> = ({
     );
   } else {
     return (
-      <DialInputWrapper label={label}>
+      <DialInputWrapper label={label} labelPosition={labelPosition} {...props}>
         <Input {...inputProps} />
       </DialInputWrapper>
     );
   }
 };
 
-export const DialBooleanInput: React.FC<DialInputProps> = ({ name, label, labelPosition }) => {
+export const DialBooleanInput: React.FC<DialNumInputProps> = ({
+  name,
+  label,
+  labelPosition,
+  ...props
+}) => {
   const { getValue, setValue } = useDialSchema();
   const value = (getValue(name) ?? false) as boolean;
 
+  const handleChange = useCallback((checked: boolean) => setValue(name, checked), [name]);
+
   const switchProps = {
     checked: value,
-    onCheckedChange: (checked: boolean) => setValue(name, checked),
+    onCheckedChange: handleChange,
   };
 
-  if (!label) {
+  if (!label || labelPosition === "inline") {
     return <Switch {...switchProps} />;
   }
 
   return (
-    <div className="flex flex-row items-center gap-2">
-      <Label size="sm">{label}</Label>
+    <DialInputWrapper label={label} labelPosition={labelPosition} {...props}>
       <Switch {...switchProps} />
-    </div>
+    </DialInputWrapper>
   );
 };
 
 // Dial-wrapped ColorInput
-export const DialColorInput: React.FC<DialInputProps> = ({ name, label }) => {
+export const DialColorInput: React.FC<DialNumInputProps> = ({ name, label, ...props }) => {
   const { getValue, setValue } = useDialSchema();
   const value = (getValue(name) ?? "") as string;
 
-  const inputComp = (
-    <ColorInput value={value} onChange={(e) => setValue(name, e.target.value)} prefix={label} />
+  const handleChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => setValue(name, e.target.value),
+    [name],
   );
 
-  if (!label) {
-    return inputComp;
-  }
+  const inputComp = <ColorInput value={value} onChange={handleChange} prefix={label} />;
 
-  return <DialInputWrapper label={label}>{inputComp}</DialInputWrapper>;
+  return (
+    <DialInputWrapper label={label} {...props}>
+      {inputComp}
+    </DialInputWrapper>
+  );
 };
 
-export const DialSelectInput: React.FC<DialInputProps> = ({
+export const DialSelectInput: React.FC<DialNumInputProps> = ({
   name,
   options = [],
   label,
-  labelPosition,
   size = "sm",
+  ...props
 }) => {
   const { getValue, setValue } = useDialSchema();
   const value = getValue(name);
 
+  console.log("dial schema:", name, value);
+
+  const handleValueChange = useCallback(
+    (val: string) => {
+      // Try to parse as number if possible
+      const parsed = !isNaN(Number(val)) ? Number(val) : val;
+      setValue(name, parsed);
+    },
+    [name],
+  );
+
   const selectComponent = (
-    <Select
-      value={String(value)}
-      onValueChange={(val) => {
-        // Try to parse as number if possible
-        const parsed = !isNaN(Number(val)) ? Number(val) : val;
-        setValue(name, parsed);
-      }}
-    >
+    <Select value={String(value)} onValueChange={handleValueChange}>
       <SelectTrigger size={size}>
         <SelectValue placeholder="Select an option" />
       </SelectTrigger>
@@ -150,44 +170,39 @@ export const DialSelectInput: React.FC<DialInputProps> = ({
     </Select>
   );
 
-  if (!label) {
-    return selectComponent;
-  }
-
-  return <DialInputWrapper label={label}>{selectComponent}</DialInputWrapper>;
+  return (
+    <DialInputWrapper label={label} {...props}>
+      {selectComponent}
+    </DialInputWrapper>
+  );
 };
 
-export const DialSliderInput: React.FC<DialInputProps> = ({
+export const DialSliderInput: React.FC<DialNumInputProps> = ({
   name,
   min = 0,
   max = 100,
   step = 1,
   label,
-  labelPosition,
-  size = "sm",
+  ...props
 }) => {
   const { getValue, setValue } = useDialSchema();
   const value = (getValue(name) ?? min) as number;
 
+  const handleValueChange = useCallback(([val]: number[]) => setValue(name, val), [name]);
+
   const sliderProps = {
     value: [value],
-    onValueChange: ([val]: number[]) => setValue(name, val),
+    onValueChange: handleValueChange,
     min,
     max,
     step,
     className: "flex-1",
   };
 
-  const sliderComponent = (
-    <div className="flex flex-1 items-center gap-2">
+  return (
+    <DialInputWrapper label={label} {...props}>
       <Slider {...sliderProps} />
       <span className="text-text-secondary w-12 text-right text-sm">{value}</span>
-    </div>
+    </DialInputWrapper>
   );
-
-  if (!label) {
-    return sliderComponent;
-  }
-
-  return <DialInputWrapper label={label}>{sliderComponent}</DialInputWrapper>;
 };

package/src/dial/wrapped-inputs/DialPresetsInput.tsx

@@ -1,51 +1,42 @@
 import React from "react";
 
+import { FormLayout, Label, type LayoutType } from "../../ui";
 import { PresetsInput } from "../../ui/inputs/presets-input";
-import { FormLayout, Label } from "../../index";
 import { LabelPositionT, useDialSchema } from "../DialProvider";
 
-interface DialPresetsInputProps {
-  name: string;
-  label?: string;
-  size?: "sm" | "md" | "lg";
-  labelPosition?: LabelPositionT;
-  options: Array<string | number | { label: string; value: string | number }>;
-}
-
 const DialInputWrapper: React.FC<{
   label?: string;
+  labelPosition?: LabelPositionT;
   children: React.ReactElement;
-}> = ({ label, children }) => {
+}> = ({ label, labelPosition = "top", children }) => {
   if (!label) {
     return <>{children}</>;
   }
 
   return (
-    <FormLayout orientation="label-top">
+    <FormLayout orientation={`label-${labelPosition}` as LayoutType}>
       <Label size="sm">{label}</Label>
       {children}
     </FormLayout>
   );
 };
 
-export const DialPresetsInput: React.FC<DialPresetsInputProps> = ({
-  name,
-  label,
-  size = "sm",
-  labelPosition,
-  options,
-}) => {
+export const DialPresetsInput: React.FC<{
+  name: string;
+  label?: string;
+  size?: "sm" | "md" | "lg";
+  labelPosition?: LabelPositionT;
+  options: Array<string | number | { label: string; value: string | number }>;
+}> = ({ name, label, size = "sm", labelPosition = "top", options }) => {
   const { getValue, setValue } = useDialSchema();
   const value = (getValue(name) ?? 0) as number;
 
   // Extract preset values from options
-  const presets = options
-    .slice(0, 3)
-    .map((opt) => {
-      if (typeof opt === "number") return opt;
-      if (typeof opt === "string") return parseFloat(opt);
-      return typeof opt.value === "number" ? opt.value : parseFloat(opt.value as string);
-    }) as [number, number, number];
+  const presets = options.slice(0, 3).map((opt) => {
+    if (typeof opt === "number") return opt;
+    if (typeof opt === "string") return parseFloat(opt);
+    return typeof opt.value === "number" ? opt.value : parseFloat(opt.value as string);
+  }) as [number, number, number];
 
   // Pad with zeros if less than 3 presets
   while (presets.length < 3) {
@@ -53,6 +44,7 @@ export const DialPresetsInput: React.FC<DialPresetsInputProps> = ({
   }
 
   if (labelPosition === "inline") {
+    // this is suspicious - Ge
     return (
       <div className="flex items-center gap-2">
         {label && <Label size="sm">{label}</Label>}
@@ -66,7 +58,7 @@ export const DialPresetsInput: React.FC<DialPresetsInputProps> = ({
     );
   } else {
     return (
-      <DialInputWrapper label={label}>
+      <DialInputWrapper label={label} labelPosition={labelPosition}>
         <PresetsInput
           value={value}
           onChange={(val) => setValue(name, val)}
@@ -76,4 +68,4 @@ export const DialPresetsInput: React.FC<DialPresetsInputProps> = ({
       </DialInputWrapper>
     );
   }
-};
+};

package/src/dial/wrapped-inputs/DialVectorInput.tsx

@@ -1,12 +1,14 @@
-import React from "react";
+import React, { useCallback } from "react";
+
+import { FormLayout, Label, type LayoutType, VectorInput } from "../../index";
 import { useDialSchema } from "../DialProvider";
-import { FormLayout, Label, VectorInput } from "../../index";
 
 interface DialVectorInputProps {
   name: string;
   label?: string;
   column?: boolean;
   size?: "sm" | "md" | "lg";
+  labelPosition?: "left" | "top";
 }
 
 /**
@@ -17,8 +19,17 @@ export const DialVectorInput: React.FC<DialVectorInputProps> = ({
   name,
   label,
   size = "sm",
+  labelPosition = "top",
 }) => {
   const { getValue, setValue, schemas } = useDialSchema();
+
+  const handleValuesChange = useCallback(
+    (newValues: number[]) => {
+      setValue(name, newValues);
+    },
+    [name],
+  );
+
   const schema = schemas.find((s) => s.name === name);
   if (!schema) {
     return null;
@@ -61,8 +72,6 @@ export const DialVectorInput: React.FC<DialVectorInputProps> = ({
     gridRows = undefined;
   }
 
-  console.log("the grid-flow is", gridAutoFlow, gridColumns, gridRows);
-
   // Ensure value is an array with correct dimensions
   const vectorValue = Array.isArray(value)
     ? value.concat(Array(Math.max(0, dimensions - value.length)).fill(0))
@@ -85,10 +94,6 @@ export const DialVectorInput: React.FC<DialVectorInputProps> = ({
       ? placeholders.map((p) => <span className="text-xs">{p}</span>)
       : undefined;
 
-  const handleValuesChange = (newValues: number[]) => {
-    setValue(name, newValues);
-  };
-
   const inputComponent = (
     <VectorInput
       value={vectorValue}
@@ -107,7 +112,7 @@ export const DialVectorInput: React.FC<DialVectorInputProps> = ({
   }
 
   return (
-    <FormLayout orientation="label-top">
+    <FormLayout orientation={`label-${labelPosition}` as LayoutType}>
       <Label size="sm">{label}</Label>
       <div className="flex flex-row items-center gap-2">
         {schema.helpText && (

package/src/styles/theme.css

@@ -10,7 +10,7 @@
     rgba(50, 50, 50, 0.6) 0%,
     rgba(70, 70, 70, 0.6) 105.28%
   ) !important;
-  backdrop-filter: blur(20px) !important;
+  backdrop-filter: blur(5px) !important;
 }
 
 @utility liquid-light-bg {
@@ -19,7 +19,7 @@
     rgba(236, 236, 236, 0.6) 0%,
     rgba(202, 202, 202, 0.6) 105.28%
   ) !important;
-  backdrop-filter: blur(20px) !important;
+  backdrop-filter: blur(5px) !important;
 }
 
 @utility liquid-dark-bg-tooltip-arrow {
@@ -165,7 +165,7 @@
   --color-select-secondary: var(--select-secondary);
   /* radius */
   --radius-uk-xs: var(--radius); /* 4px */
-  --radius-uk-sm: calc(var(--radius) + 2px); /* 6px */
+  --radius-uk-sm: calc(var(--radius) + 3px); /* 6px */
   --radius-uk-md: calc(var(--radius) + 4px); /* 8px */
   --radius-uk-lg: calc(var(--radius) + 10px); /* 12px */
   --radius-uk-xl: calc(var(--radius) + 13px); /* 16px */

package/src/ui/button.tsx

@@ -55,11 +55,11 @@ export const buttonVariants = cva(
       },
       size: {
         sm: [
-          "rounded-uk-sm",
+          "rounded-uk-md",
           "text-uk-sm",
           "py-sm",
           "gap-xxs",
-          "px-sm",
+          "px-md",
           "leading-4",
           "[&_svg:not([class*='size-'])]:size-3",
         ],

package/src/ui/card.tsx

@@ -12,9 +12,12 @@ const cardVariants = cva(
     "flex-col",
     "rounded-uk-lg",
     "bg-bg-primary",
-    "liquid:shadow-[0_4px_16px_0_var(--color-shadow-secondary)]",
     "liquid-dark:liquid-dark-bg",
+    "liquid-dark:border-[0.9px]",
+    "liquid-dark:border-[rgba(85,85,85,100)]",
     "liquid-light:liquid-light-bg",
+    "liquid-light:border-[0.8px]",
+    "liquid-light:border-[white]",
   ],
   {
     variants: {
@@ -86,7 +89,6 @@ function CardTitle({ className, ...props }: ComponentProps<"div">) {
         "text-uk-md",
         "leading-uk-md",
         "font-medium",
-        "-mt-2",
         "vertical-align-middle",
         className,
       )}
@@ -102,7 +104,7 @@ function CardDescription({ className, ...props }: ComponentProps<"div">) {
   return (
     <div
       data-slot="card-description"
-      className={cn("text-uk-sm", "-mt-2", "text-text-secondary", "leading-uk-sm", className)}
+      className={cn("text-uk-sm", "text-text-secondary", "leading-uk-sm", className)}
       {...props}
     />
   );
@@ -119,8 +121,6 @@ function CardAction({ className, ...props }: ComponentProps<"div">) {
         "text-text-secondary",
         "text-uk-sm",
         "leading-uk-sm",
-        "-mt-2",
-        "-mr-3",
         "font-medium",
         "vertical-align-middle",
         className,

package/src/ui/index.ts

@@ -20,7 +20,6 @@ export * from "./toggle-group";
 export * from "./badge";
 export * from "./radio-group";
 export * from "./card";
-export * from "./panel";
 export * from "./toolbar";
 export * from "./checkbox";
 export * from "./switch";
@@ -38,6 +37,8 @@ export * from "./UIKitBadge";
 export * from "./DialBadge";
 export * from "./resizable";
 export * from "./inputs";
+export * from "./progress";
+export * from "./spinner";
 
 export * from "./layouts";
 export * from "./theme";

package/src/ui/inputs/input.tsx

@@ -14,9 +14,27 @@ const inputRootVariants = cva(
         error: ["hover:bg-danger-primary/10", "bg-danger-primary/20"],
       },
       size: {
-        sm: ["h-6", "text-uk-sm", "[&_.input-slot>svg:not([class*='size-'])]:size-3", "px-sm"],
-        md: ["h-8", "text-uk-md", "[&_.input-slot>svg:not([class*='size-'])]:size-4", "px-md"],
-        lg: ["h-9", "text-uk-lg", "[&_.input-slot>svg:not([class*='size-'])]:size-5", "px-lg"],
+        sm: [
+          "h-6",
+          "text-uk-sm",
+          "rounded-[10px]",
+          "[&_.input-slot>svg:not([class*='size-'])]:size-3",
+          "px-sm",
+        ],
+        md: [
+          "h-8",
+          "text-uk-md",
+          "rounded-[11px]",
+          "[&_.input-slot>svg:not([class*='size-'])]:size-4",
+          "px-md",
+        ],
+        lg: [
+          "h-9",
+          "text-uk-lg",
+          "rounded-[12px]",
+          "[&_.input-slot>svg:not([class*='size-'])]:size-5",
+          "px-lg",
+        ],
       },
     },
     defaultVariants: {

package/src/ui/label.tsx

@@ -5,7 +5,14 @@ import * as React from "react";
 import { cn } from "../hooks";
 
 const labelVariants = cva(
-  ["font-normal", "leading-none", "peer-disabled:cursor-not-allowed", "peer-disabled:opacity-70"],
+  [
+    "font-normal",
+    "leading-none",
+    "peer-disabled:cursor-not-allowed",
+    "peer-disabled:opacity-70",
+    "text-nowrap",
+    "overflow-ellipsis",
+  ],
   {
     variants: {
       size: {

package/src/ui/layout.tsx

@@ -23,6 +23,7 @@ export function FormLayout({
   children,
 }: FormLayoutProps) {
   const Com = asChild ? Slot : "div";
+  console.log("layout", orientation);
 
   return (
     <Com

package/src/ui/progress.tsx

@@ -0,0 +1,29 @@
+import { type ComponentProps } from "react"
+import * as ProgressPrimitive from "@radix-ui/react-progress"
+
+import { cn } from "../hooks"
+
+function Progress({
+  className,
+  value,
+  ...props
+}: ComponentProps<typeof ProgressPrimitive.Root>) {
+  return (
+    <ProgressPrimitive.Root
+      data-slot="progress"
+      className={cn(
+        "bg-bg-secondary relative h-2 w-full overflow-hidden rounded-uk-xl",
+        className
+      )}
+      {...props}
+    >
+      <ProgressPrimitive.Indicator
+        data-slot="progress-indicator"
+        className="bg-brand-primary h-full w-full flex-1 transition-all"
+        style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
+      />
+    </ProgressPrimitive.Root>
+  )
+}
+
+export { Progress }

package/src/ui/spinner.tsx

@@ -0,0 +1,67 @@
+import { type LucideProps } from 'lucide-react';
+
+const Ring = ({ size = 24, ...props }: LucideProps) => (
+  <svg
+    height={size}
+    stroke="currentColor"
+    viewBox="0 0 44 44"
+    width={size}
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <title>Loading...</title>
+    <g fill="none" fillRule="evenodd" strokeWidth="2">
+      <circle cx="22" cy="22" r="1">
+        <animate
+          attributeName="r"
+          begin="0s"
+          calcMode="spline"
+          dur="1.8s"
+          keySplines="0.165, 0.84, 0.44, 1"
+          keyTimes="0; 1"
+          repeatCount="indefinite"
+          values="1; 20"
+        />
+        <animate
+          attributeName="stroke-opacity"
+          begin="0s"
+          calcMode="spline"
+          dur="1.8s"
+          keySplines="0.3, 0.61, 0.355, 1"
+          keyTimes="0; 1"
+          repeatCount="indefinite"
+          values="1; 0"
+        />
+      </circle>
+      <circle cx="22" cy="22" r="1">
+        <animate
+          attributeName="r"
+          begin="-0.9s"
+          calcMode="spline"
+          dur="1.8s"
+          keySplines="0.165, 0.84, 0.44, 1"
+          keyTimes="0; 1"
+          repeatCount="indefinite"
+          values="1; 20"
+        />
+        <animate
+          attributeName="stroke-opacity"
+          begin="-0.9s"
+          calcMode="spline"
+          dur="1.8s"
+          keySplines="0.3, 0.61, 0.355, 1"
+          keyTimes="0; 1"
+          repeatCount="indefinite"
+          values="1; 0"
+        />
+      </circle>
+    </g>
+  </svg>
+);
+
+export type SpinnerProps = LucideProps;
+
+export const Spinner = (props: SpinnerProps) => {
+  return <Ring {...props} />;
+};
+