daisy-ui-kit 5.0.11 → 5.0.12

package/app/components/Badge.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -53,7 +53,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { ...attrs, class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/Button.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -108,8 +108,7 @@ export default defineComponent({
 
       return h(
         tag as any,
-        {
-          ...attrs,
+        mergeProps(attrs, {
           type: isBtnEl ? props.type : undefined,
           disabled: isBtnEl && props.disabled ? true : undefined,
           'aria-disabled': !isBtnEl && props.disabled ? true : undefined,
@@ -117,7 +116,7 @@ export default defineComponent({
           role: !isBtnEl ? 'button' : undefined,
           class: classes.value,
           onKeydown: !isBtnEl ? onKeydown : undefined,
-        },
+        }),
         slots.default?.(),
       )
     }

package/app/components/Card.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -32,7 +32,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { ...attrs, class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/Countdown.vue

@@ -1,12 +1,13 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'span' },
   },
-  setup(props, { slots }) {
-    return () => h(props.is as any, { class: 'countdown' }, slots.default?.())
+  setup(props, { slots, attrs }) {
+    return () => h(props.is as any, mergeProps(attrs, { class: 'countdown' }), slots.default?.())
   },
 })
 </script>

package/app/components/DaisyLink.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -33,7 +33,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { ...attrs, class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/Fieldset.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -9,7 +9,7 @@ export default defineComponent({
   },
   setup(props, { slots, attrs }) {
     return () =>
-      h(props.is as any, { ...attrs, class: 'fieldset bg-base-200 border-base-300 rounded-box border p-4' }, [
+      h(props.is as any, mergeProps(attrs, { class: 'fieldset bg-base-200 border-base-300 rounded-box border p-4' }), [
         props.legend ? h('legend', { class: 'fieldset-legend' }, props.legend) : slots.legend?.(),
         slots.default?.(),
       ])

package/app/components/Flex.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -81,7 +81,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { ...attrs, class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/FlexItem.vue

@@ -1,7 +1,8 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'div' },
     join: Boolean,
@@ -26,7 +27,7 @@ export default defineComponent({
     nowrap: Boolean,
     wrapReverse: Boolean,
   },
-  setup(props, { slots }) {
+  setup(props, { slots, attrs }) {
     const classes = computed(() => [
       'flex',
       {
@@ -50,7 +51,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/Indicator.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -7,7 +7,7 @@ export default defineComponent({
     is: { type: [String, Object], default: 'div' },
   },
   setup(props, { slots, attrs }) {
-    return () => h(props.is as any, { ...attrs, class: 'indicator' }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: 'indicator' }), slots.default?.())
   },
 })
 </script>

package/app/components/IndicatorItem.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -30,7 +30,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { ...attrs, class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/Navbar.vue

@@ -1,13 +1,14 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'div' },
     glass: { type: Boolean, default: false },
   },
-  setup(props, { slots }) {
-    return () => h(props.is as any, { class: ['navbar', { glass: props.glass }] }, slots.default?.())
+  setup(props, { slots, attrs }) {
+    return () => h(props.is as any, mergeProps(attrs, { class: ['navbar', { glass: props.glass }] }), slots.default?.())
   },
 })
 </script>

package/app/components/NavbarCenter.vue

@@ -1,12 +1,13 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'div' },
   },
-  setup(props, { slots }) {
-    return () => h(props.is as any, { class: 'navbar-center' }, slots.default?.())
+  setup(props, { slots, attrs }) {
+    return () => h(props.is as any, mergeProps(attrs, { class: 'navbar-center' }), slots.default?.())
   },
 })
 </script>

package/app/components/NavbarEnd.vue

@@ -1,12 +1,13 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'div' },
   },
-  setup(props, { slots }) {
-    return () => h(props.is as any, { class: 'navbar-end' }, slots.default?.())
+  setup(props, { slots, attrs }) {
+    return () => h(props.is as any, mergeProps(attrs, { class: 'navbar-end' }), slots.default?.())
   },
 })
 </script>

package/app/components/NavbarStart.vue

@@ -1,12 +1,13 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'div' },
   },
-  setup(props, { slots }) {
-    return () => h(props.is as any, { class: 'navbar-start' }, slots.default?.())
+  setup(props, { slots, attrs }) {
+    return () => h(props.is as any, mergeProps(attrs, { class: 'navbar-start' }), slots.default?.())
   },
 })
 </script>

package/app/components/SkeletonText.vue

@@ -1,12 +1,13 @@
 <script lang="ts">
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
+  inheritAttrs: false,
   props: {
     is: { type: [String, Object], default: 'span' },
   },
-  setup(props, { slots }) {
-    return () => h(props.is as any, { class: 'skeleton skeleton-text' }, slots.default?.())
+  setup(props, { slots, attrs }) {
+    return () => h(props.is as any, mergeProps(attrs, { class: 'skeleton skeleton-text' }), slots.default?.())
   },
 })
 </script>

package/app/components/Stack.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -22,7 +22,7 @@ export default defineComponent({
       },
     ])
 
-    return () => h(props.is as any, { ...attrs, class: classes.value }, slots.default?.())
+    return () => h(props.is as any, mergeProps(attrs, { class: classes.value }), slots.default?.())
   },
 })
 </script>

package/app/components/Tab.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h, inject } from 'vue'
+import { computed, defineComponent, h, inject, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -26,15 +26,14 @@ export default defineComponent({
     return () =>
       h(
         props.is as any,
-        {
-          ...attrs,
+        mergeProps(attrs, {
           class: classes.value,
           onKeypress: (e: KeyboardEvent) => {
             if (e.key === 'Enter') {
               tabManager.currentTab.value = props.name
             }
           },
-        },
+        }),
         [
           h('input', {
             type: 'radio',

package/app/components/Text.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { computed, defineComponent, h } from 'vue'
+import { computed, defineComponent, h, mergeProps } from 'vue'
 
 export default defineComponent({
   inheritAttrs: false,
@@ -171,7 +171,7 @@ export default defineComponent({
     return () =>
       h(
         props.is as any,
-        { ...attrs, ...(props.label ? { 'data-role': 'label' } : {}), class: classes.value },
+        mergeProps(attrs, { ...(props.label ? { 'data-role': 'label' } : {}), class: classes.value }),
         slots.default?.(),
       )
   },

package/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "5.0.11",
+  "version": "5.0.12",
   "packageManager": "pnpm@10.10.0",
   "author": "feathers.dev",
   "exports": {