entasis 0.5.0 → 0.7.0

package/dist/utils/cva/merge.d.ts

@@ -16,6 +16,7 @@
  *     earlier edge forms; edge forms combine; `static` is a modifier)
  *   - `shimmer*` (`shimmer` / `shimmer-none` exclude each other; `once` and
  *     `reverse` are modifiers; `shimmer-color|duration|spread|angle-*` are scales)
+ *   - `state-layer` / `state-layer-none` exclude each other
  *   - `rounded-<step>-concentric` / `rounded-t|b-<step>-concentric` (join the core corner groups), the container side
  *     needing nothing here — a `rounded-<step>` publishes its radius to its children by itself
  *   - `duration-*` / `ease-*` motion tokens
@@ -30,4 +31,111 @@
  * falsy values, so no separate clsx pass is needed.
  */
 import type { ClassValue } from './types.js';
+export declare const mergeConfig: {
+    extend: {
+        theme: {
+            spacing: string[];
+        };
+        classGroups: {
+            raised: (string | {
+                raised: string[];
+            })[];
+            lift: (string | {
+                lift: string[];
+            })[];
+            'h-control': {
+                'h-control': string[];
+            }[];
+            'h-row': {
+                'h-row': string[];
+            }[];
+            'min-h-row': {
+                'min-h-row': string[];
+            }[];
+            'size-icon': {
+                'size-icon': string[];
+            }[];
+            'min-size-hit': {
+                'min-size-hit': string[];
+            }[];
+            'ps-indent': {
+                'ps-indent': string[];
+            }[];
+            duration: {
+                duration: string[];
+            }[];
+            ease: {
+                ease: string[];
+            }[];
+            h: {
+                h: string[];
+            }[];
+            w: {
+                w: string[];
+            }[];
+            'scroll-fade': (string | {
+                'scroll-fade': string[];
+            })[];
+            'scroll-fade-t': string[];
+            'scroll-fade-b': string[];
+            'scroll-fade-start': {
+                'scroll-fade': string[];
+            }[];
+            'scroll-fade-end': {
+                'scroll-fade': string[];
+            }[];
+            shimmer: string[];
+            'state-layer': string[];
+            'shimmer-color': {
+                'shimmer-color': {
+                    readonly $v: "isAny";
+                }[];
+            }[];
+            'shimmer-duration': {
+                'shimmer-duration': {
+                    readonly $v: "isAny";
+                }[];
+            }[];
+            'shimmer-spread': {
+                'shimmer-spread': {
+                    readonly $v: "isAny";
+                }[];
+            }[];
+            'shimmer-angle': {
+                'shimmer-angle': {
+                    readonly $v: "isAny";
+                }[];
+            }[];
+            rounded: {
+                rounded: ((value: string) => boolean)[];
+            }[];
+            'rounded-t': {
+                'rounded-t': ((value: string) => boolean)[];
+            }[];
+            'rounded-b': {
+                'rounded-b': ((value: string) => boolean)[];
+            }[];
+        };
+        conflictingClassGroups: {
+            raised: string[];
+            lift: string[];
+            shadow: string[];
+            'h-control': string[];
+            'h-row': string[];
+            h: string[];
+            'size-icon': string[];
+            w: string[];
+            size: string[];
+            'min-size-hit': string[];
+            'min-h-row': string[];
+            'min-w': string[];
+            'min-h': string[];
+            'ps-indent': string[];
+            ps: string[];
+            px: string[];
+            p: string[];
+            'scroll-fade': string[];
+        };
+    };
+};
 export declare const cn: (...inputs: ClassValue[]) => string;

package/dist/utils/cva/merge.js

@@ -16,6 +16,7 @@
  *     earlier edge forms; edge forms combine; `static` is a modifier)
  *   - `shimmer*` (`shimmer` / `shimmer-none` exclude each other; `once` and
  *     `reverse` are modifiers; `shimmer-color|duration|spread|angle-*` are scales)
+ *   - `state-layer` / `state-layer-none` exclude each other
  *   - `rounded-<step>-concentric` / `rounded-t|b-<step>-concentric` (join the core corner groups), the container side
  *     needing nothing here — a `rounded-<step>` publishes its radius to its children by itself
  *   - `duration-*` / `ease-*` motion tokens
@@ -44,7 +45,7 @@ const SEMANTIC_SPACING = [
     'layout-lg',
     'layout-xl'
 ];
-const merge = createCn({
+export const mergeConfig = {
     extend: {
         theme: {
             spacing: SEMANTIC_SPACING
@@ -74,6 +75,8 @@ const merge = createCn({
             'scroll-fade-start': [{ 'scroll-fade': ['s', 'l'] }],
             'scroll-fade-end': [{ 'scroll-fade': ['e', 'r'] }],
             shimmer: ['shimmer', 'shimmer-none'],
+            // The overlay is a ::before, so only its own off switch can remove it.
+            'state-layer': ['state-layer', 'state-layer-none'],
             'shimmer-color': [{ 'shimmer-color': [validators.isAny] }],
             'shimmer-duration': [{ 'shimmer-duration': [validators.isAny] }],
             'shimmer-spread': [{ 'shimmer-spread': [validators.isAny] }],
@@ -110,5 +113,6 @@ const merge = createCn({
             'scroll-fade': ['scroll-fade-t', 'scroll-fade-b', 'scroll-fade-start', 'scroll-fade-end']
         }
     }
-});
+};
+const merge = createCn(mergeConfig);
 export const cn = (...inputs) => merge(...inputs);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "entasis",
-	"version": "0.5.0",
+	"version": "0.7.0",
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite dev",