fix(BaseList): render ul/ol and li tags

shuriken-ui · Sep 15, 2023 · 44c3876 · 44c3876
1 parent 712da3c
commit 44c3876
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/components/base/BaseList.vue b/components/base/BaseList.vue
@@ -1,12 +1,4 @@
 <script lang="ts">
-// const slots = useSlots()
-// const hasMedia = computed(() => {
-//   return slots.default?.().some((vnode) => {
-//     console.log(vnode)
-//     return typeof vnode.type !== 'string'
-//   })
-// })
-
 export default defineComponent({
   props: {
     /**
@@ -16,17 +8,26 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    /**
+     * Force the list to be media.
+     */
+    media: {
+      type: Boolean,
+      default: undefined,
+    },
   },
   setup(props, { slots }) {
     return () => {
       const ordered = props.ordered ? 'nui-list-ol' : 'nui-list-ul'
       const children = slots.default?.()
-      const hasMedia = children?.some((vnode) => {
-        return typeof vnode.type !== 'string'
-      })
+      const hasMedia =
+        props.media ??
+        children?.some((vnode) => {
+          return typeof vnode.type !== 'string'
+        })
 
       return h(
-        'div',
+        props.ordered ? 'ol' : 'ul',
         {
           class: [
             'nui-list',

diff --git a/components/base/BaseListItem.vue b/components/base/BaseListItem.vue
@@ -20,7 +20,7 @@ const hasSubtitle = computed(() => {
 </script>
 
 <template>
-  <div class="nui-list-item">
+  <li class="nui-list-item">
     <slot />
 
     <div v-if="hasTitle || hasSubtitle">
@@ -45,5 +45,5 @@ const hasSubtitle = computed(() => {
     <div class="ms-auto">
       <slot name="end" />
     </div>
-  </div>
+  </li>
 </template>