fix: update app.config and BaseButton.vue

shuriken-ui · Dec 17, 2023 · 1d7467d · 1d7467d
1 parent 3ccd337
commit 1d7467d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.playground/app.config.ts b/.playground/app.config.ts
@@ -1,6 +1,12 @@
 export default defineAppConfig({
   nuxtIcon: {},
   nui: {
+    BaseButton: {
+      variant: 'solid',
+      rounded: 'sm',
+      color: 'default',
+      size: 'md',
+    },
     defaultShapes: {
       //     accordion: 'straight',
       //     autocompleteItem: 'straight',

diff --git a/components/base/BaseButton.vue b/components/base/BaseButton.vue
@@ -165,6 +165,9 @@ const { attributes, is } = useNinjaButton(props)
   <component :is="is" v-bind="attributes" :class="classes">
     <slot v-if="!props.loading" />
     <BasePlaceload v-else class="h-4 w-12 rounded" />
+    <!-- <pre>
+      {{ classes }}
+    </pre> -->
     <span v-if="props.badge" :class="badges">
       <span v-if="props.badgePulse" class="nui-button-badge-pulse"></span>
       <span class="nui-button-badge-inner"></span>

diff --git a/composables/default-property.ts b/composables/default-property.ts
@@ -3,8 +3,8 @@ export const useNuiDefaultProperty = (
   component: string,
   property: string,
 ): Ref<string> => {
-  const config = (useAppConfig()?.appConfig as any)?.nui
-  return computed(
-    () => properties?.[property] ?? config?.[component]?.[property],
-  )
+  const config = useAppConfig().nui as any
+  return computed(() => {
+    return properties?.[property] ?? config?.[component]?.[property]
+  })
 }