vueless 0.0.554 → 0.0.556

package/ui.text-money/useAttrs.ts

@@ -6,13 +6,7 @@ import type { UseAttrs } from "../types.ts";
 import type { UMoneyProps, Config } from "./types.ts";
 
 export function useAttrs(props: UMoneyProps): UseAttrs<Config> {
-  const { config, getKeysAttrs, hasSlotContent } = useUI<Config>(defaultConfig, () => props.config);
+  const { config, getKeysAttrs } = useUI<Config>(defaultConfig, () => props.config);
 
-  const keysAttrs = getKeysAttrs();
-
-  return {
-    config,
-    ...keysAttrs,
-    hasSlotContent,
-  };
+  return { config, ...getKeysAttrs() };
 }

package/ui.text-notify/useAttrs.ts

@@ -6,13 +6,7 @@ import type { UseAttrs } from "../types.ts";
 import type { UNotifyProps, Config } from "./types.ts";
 
 export default function useAttrs(props: UNotifyProps): UseAttrs<Config> {
-  const { config, getKeysAttrs, hasSlotContent } = useUI<Config>(defaultConfig, () => props.config);
+  const { config, getKeysAttrs } = useUI<Config>(defaultConfig, () => props.config);
 
-  const keysAttrs = getKeysAttrs();
-
-  return {
-    config,
-    ...keysAttrs,
-    hasSlotContent,
-  };
+  return { config, ...getKeysAttrs() };
 }

package/utils/helper.ts

@@ -1,3 +1,7 @@
+import { Comment, Text, Fragment } from "vue";
+
+import type { Slot, VNode } from "vue";
+
 /**
  * Deeply clone given object (same as lodash.cloneDeep).
  */
@@ -48,6 +52,31 @@ export function createDebounce(func: () => void, ms: number) {
   };
 }
 
+/**
+ * Check if Vue slot defined, and have a content.
+ */
+export function hasSlotContent(slot: Slot | undefined | null, props = {}): boolean {
+  type Args = VNode | VNode[] | undefined | null;
+
+  const asArray = (arg: Args) => {
+    return Array.isArray(arg) ? arg : arg != null ? [arg] : [];
+  };
+
+  const isVNodeEmpty = (vnode: Args) => {
+    return (
+      !vnode ||
+      asArray(vnode).every(
+        (vnode) =>
+          vnode.type === Comment ||
+          (vnode.type === Text && !vnode.children?.length) ||
+          (vnode.type === Fragment && !vnode.children?.length),
+      )
+    );
+  };
+
+  return !isVNodeEmpty(slot?.(props));
+}
+
 /**
  * Change page title in runtime by provided config.
  */

package/utils/node/tailwindSafelist.js

@@ -17,7 +17,7 @@ import {
   DYNAMIC_COLOR_PATTERN,
   TAILWIND_VARIANT_DELIMITER,
   TAILWIND_MERGE_EXTENSION,
-  NESTED_COMPONENT_REG_EXP,
+  NESTED_COMPONENT_PATTERN_REG_EXP,
   TAILWIND_COLOR_OPACITY_DELIMITER,
   TAILWIND_VARIANT_DELIMITER_REG_EXP,
   STRATEGY_TYPE,
@@ -28,7 +28,7 @@ const twMerge = extendTailwindMerge(merge(TAILWIND_MERGE_EXTENSION, vuelessConfi
 
 export const { cx } = defineConfig({
   hooks: {
-    onComplete: (classNames) => twMerge(classNames).replace(NESTED_COMPONENT_REG_EXP, ""),
+    onComplete: (classNames) => twMerge(classNames).replace(NESTED_COMPONENT_PATTERN_REG_EXP, ""),
   },
 });
 

package/utils/ui.ts

@@ -7,8 +7,8 @@ import {
   BRAND_COLOR,
   GRAYSCALE_COLOR,
   DEFAULT_BRAND_COLOR,
-  NESTED_COMPONENT_REG_EXP,
   TAILWIND_MERGE_EXTENSION,
+  NESTED_COMPONENT_PATTERN_REG_EXP,
 } from "../constants.js";
 
 import type {
@@ -62,8 +62,6 @@ if (isCSR) {
 
 /**
  * Extend twMerge (tailwind merge) by vueless and user config:
- * All list of rules available here:
- * https://github.com/dcastil/tailwind-merge/blob/v2.3.0/src/lib/default-config.ts
  */
 const twMerge = extendTailwindMerge(merge(TAILWIND_MERGE_EXTENSION, vuelessConfig.tailwindMerge));
 
@@ -79,7 +77,8 @@ export const {
   cva: classVarianceAuthority,
 } = defineConfig({
   hooks: {
-    onComplete: (classNames) => twMerge(classNames).replace(NESTED_COMPONENT_REG_EXP, ""),
+    onComplete: (classNames) =>
+      twMerge(classNames).replaceAll(NESTED_COMPONENT_PATTERN_REG_EXP, ""),
   },
 });
 

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "vueless",
-  "version": "0.0.554",
+  "version": "0.0.556",
   "contributions": {
     "html": {
       "description-markup": "markdown",
@@ -7720,6 +7720,22 @@
                 "type": "union"
               }
             },
+            {
+              "name": "size",
+              "required": false,
+              "description": "Progress size.",
+              "enum": [
+                "xs",
+                "sm",
+                "md",
+                "lg"
+              ],
+              "value": {
+                "kind": "expression",
+                "type": "union"
+              },
+              "default": "md"
+            },
             {
               "name": "loading",
               "required": false,

package/ui.button/useAttrs.ts

@@ -1,26 +0,0 @@
-import { useSlots, computed } from "vue";
-import useUI from "../composables/useUI.ts";
-
-import defaultConfig from "./config.ts";
-
-import type { UseAttrs } from "../types.ts";
-import type { UButtonProps, Config } from "./types.ts";
-
-export default function useAttrs(props: UButtonProps): UseAttrs<Config> {
-  const { config, getKeysAttrs, hasSlotContent } = useUI<Config>(defaultConfig, () => props.config);
-  const slots = useSlots();
-
-  const mutatedProps = computed(() => ({
-    leftIcon: Boolean(props.leftIcon) || hasSlotContent(slots["left"]),
-    rightIcon: Boolean(props.rightIcon) || hasSlotContent(slots["right"]),
-    label: Boolean(props.label),
-  }));
-
-  const keysAttrs = getKeysAttrs(mutatedProps);
-
-  return {
-    config,
-    ...keysAttrs,
-    hasSlotContent,
-  };
-}