singularity-components 0.1.81 → 0.1.82

package/dist/main.d.cts

@@ -39,17 +39,19 @@ type Props$2 = React$1.ComponentProps<"button"> & VariantProps<typeof buttonVari
 };
 declare function Button({ className, variant, size, asChild, iconStart, iconStartAnimate, iconEnd, iconEndAnimate, children, ...props }: Props$2): react_jsx_runtime.JSX.Element;
 
-type ValidBreakpoint = "" | "sm:" | "md:" | "lg:" | "xl:" | "2xl:";
-type ValidMarginDirection = "m-" | "mx-" | "my-" | "mt-" | "mr-" | "mb-" | "ml-";
-type ValidSize = "0" | "0.5" | "1" | "1.5" | "2" | "2.5" | "3" | "3.5" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "14" | "16" | "20" | "24" | "28" | "32" | "36" | "40" | "44" | "48" | "52" | "56" | "60" | "64" | "72" | "80" | "96" | "px" | "auto";
-type TailwindMarginClass = "" | `${ValidBreakpoint}${ValidMarginDirection}${ValidSize}`;
+type Breakpoint = "" | "sm:" | "md:" | "lg:" | "xl:" | "2xl:";
+type MarginDirection = "m-" | "mx-" | "my-" | "mt-" | "mr-" | "mb-" | "ml-";
+type Size = "0" | "0.5" | "1" | "1.5" | "2" | "2.5" | "3" | "3.5" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "14" | "16" | "20" | "24" | "28" | "32" | "36" | "40" | "44" | "48" | "52" | "56" | "60" | "64" | "72" | "80" | "96" | "px" | "auto";
+type TailwindMarginClassValue = `${Breakpoint}${MarginDirection}${Size}`;
+type TailwindMarginClass = TailwindMarginClassValue[];
 type OmitClassProperty<T1, T2 extends string> = Omit<T1, T2>;
+type OmitClassName<T> = OmitClassProperty<T, "className">;
 
 declare const headingVariants: (props?: ({
     variant?: "h1" | "h2" | "h3" | "h4" | null | undefined;
     foreground?: "default" | "muted" | "primary" | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
-interface HeadingProps extends OmitClassProperty<React__default.HTMLAttributes<HTMLHeadingElement>, "className">, VariantProps<typeof headingVariants> {
+interface HeadingProps extends OmitClassName<React__default.HTMLAttributes<HTMLHeadingElement>>, VariantProps<typeof headingVariants> {
     as?: "h1" | "h2" | "h3" | "h4";
     className?: TailwindMarginClass;
 }
@@ -107,10 +109,10 @@ declare function TableCaption({ className, ...props }: React$1.ComponentProps<"c
 
 declare const textVariants: (props?: ({
     size?: "base" | "sm" | "lg" | "xs" | "xl" | null | undefined;
-    foreground?: "accent" | "default" | "destructive" | "secondary" | "muted" | "primary" | null | undefined;
+    foreground?: "default" | "destructive" | "secondary" | "muted" | "primary" | "accent" | null | undefined;
     weight?: "bold" | "normal" | "medium" | "semibold" | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
-interface TextProps extends OmitClassProperty<React__default.HTMLAttributes<HTMLDivElement>, "className">, VariantProps<typeof textVariants> {
+interface TextProps extends OmitClassName<React__default.HTMLAttributes<HTMLDivElement>>, VariantProps<typeof textVariants> {
     className?: TailwindMarginClass;
 }
 declare const Text: React__default.FC<TextProps>;

package/dist/main.d.ts

@@ -39,17 +39,19 @@ type Props$2 = React$1.ComponentProps<"button"> & VariantProps<typeof buttonVari
 };
 declare function Button({ className, variant, size, asChild, iconStart, iconStartAnimate, iconEnd, iconEndAnimate, children, ...props }: Props$2): react_jsx_runtime.JSX.Element;
 
-type ValidBreakpoint = "" | "sm:" | "md:" | "lg:" | "xl:" | "2xl:";
-type ValidMarginDirection = "m-" | "mx-" | "my-" | "mt-" | "mr-" | "mb-" | "ml-";
-type ValidSize = "0" | "0.5" | "1" | "1.5" | "2" | "2.5" | "3" | "3.5" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "14" | "16" | "20" | "24" | "28" | "32" | "36" | "40" | "44" | "48" | "52" | "56" | "60" | "64" | "72" | "80" | "96" | "px" | "auto";
-type TailwindMarginClass = "" | `${ValidBreakpoint}${ValidMarginDirection}${ValidSize}`;
+type Breakpoint = "" | "sm:" | "md:" | "lg:" | "xl:" | "2xl:";
+type MarginDirection = "m-" | "mx-" | "my-" | "mt-" | "mr-" | "mb-" | "ml-";
+type Size = "0" | "0.5" | "1" | "1.5" | "2" | "2.5" | "3" | "3.5" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "14" | "16" | "20" | "24" | "28" | "32" | "36" | "40" | "44" | "48" | "52" | "56" | "60" | "64" | "72" | "80" | "96" | "px" | "auto";
+type TailwindMarginClassValue = `${Breakpoint}${MarginDirection}${Size}`;
+type TailwindMarginClass = TailwindMarginClassValue[];
 type OmitClassProperty<T1, T2 extends string> = Omit<T1, T2>;
+type OmitClassName<T> = OmitClassProperty<T, "className">;
 
 declare const headingVariants: (props?: ({
     variant?: "h1" | "h2" | "h3" | "h4" | null | undefined;
     foreground?: "default" | "muted" | "primary" | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
-interface HeadingProps extends OmitClassProperty<React__default.HTMLAttributes<HTMLHeadingElement>, "className">, VariantProps<typeof headingVariants> {
+interface HeadingProps extends OmitClassName<React__default.HTMLAttributes<HTMLHeadingElement>>, VariantProps<typeof headingVariants> {
     as?: "h1" | "h2" | "h3" | "h4";
     className?: TailwindMarginClass;
 }
@@ -107,10 +109,10 @@ declare function TableCaption({ className, ...props }: React$1.ComponentProps<"c
 
 declare const textVariants: (props?: ({
     size?: "base" | "sm" | "lg" | "xs" | "xl" | null | undefined;
-    foreground?: "accent" | "default" | "destructive" | "secondary" | "muted" | "primary" | null | undefined;
+    foreground?: "default" | "destructive" | "secondary" | "muted" | "primary" | "accent" | null | undefined;
     weight?: "bold" | "normal" | "medium" | "semibold" | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
-interface TextProps extends OmitClassProperty<React__default.HTMLAttributes<HTMLDivElement>, "className">, VariantProps<typeof textVariants> {
+interface TextProps extends OmitClassName<React__default.HTMLAttributes<HTMLDivElement>>, VariantProps<typeof textVariants> {
     className?: TailwindMarginClass;
 }
 declare const Text: React__default.FC<TextProps>;

package/dist/main.js

@@ -2,7 +2,7 @@ import * as AccordionPrimitive from '@radix-ui/react-accordion';
 import * as React from 'react';
 import { forwardRef, createElement } from 'react';
 import clsx2, { clsx } from 'clsx';
-import { extendTailwindMerge, twMerge } from 'tailwind-merge';
+import { twMerge } from 'tailwind-merge';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { cva } from 'class-variance-authority';
 import { Slot } from '@radix-ui/react-slot';
@@ -20006,10 +20006,22 @@ var __iconNode1609 = [
 ];
 var ZoomOut = createLucideIcon("zoom-out", __iconNode1609);
 function cn(...inputs) {
-  const twMergeWithPrefix = extendTailwindMerge({
-    prefix: "sg:"
-  });
-  return twMergeWithPrefix(twMerge(clsx(inputs)));
+  const classString = clsx(inputs);
+  const allOriginalClasses = classString.split(/\s+/).filter(Boolean);
+  const prefixedClasses = allOriginalClasses.filter((c) => c.startsWith("sg:"));
+  const unprefixedClasses = allOriginalClasses.filter(
+    (c) => !c.startsWith("sg:")
+  );
+  const allClassesWithRemovedPrefix = allOriginalClasses.map(
+    (c) => c.replace("sg:", "")
+  );
+  const mergedClasses = twMerge(allClassesWithRemovedPrefix).split(/\s+/).filter(Boolean);
+  return mergedClasses.map((c) => {
+    if (prefixedClasses.includes("sg:" + c) && !unprefixedClasses.includes(c)) {
+      return "sg:" + c;
+    }
+    return c;
+  }).join(" ");
 }
 function Accordion({
   ...props