@coreui/vue-pro 5.0.0-alpha.0 → 5.0.0-beta.0

package/src/components/progress/CProgress.ts

@@ -1,25 +1,61 @@
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, inject } from 'vue'
 
 import { CProgressBar } from './CProgressBar'
+import { Color } from '../../props'
 
 const CProgress = defineComponent({
   name: 'CProgress',
   props: {
+    /**
+     * Use to animate the stripes right to left via CSS3 animations.
+     */
+    animated: Boolean,
+    /**
+     * Sets the color context of the component to one of CoreUI’s themed colors.
+     *
+     * @values 'primary', 'secondary', 'success', 'danger', 'warning', 'info', 'dark', 'light'
+     */
+    color: Color,
     /**
      * Sets the height of the component. If you set that value the inner `<CProgressBar>` will automatically resize accordingly.
      */
     height: Number,
+    /**
+     * A string of all className you want applied to the <CProgressBar/> component.
+     *
+     * @since 5.0.0-beta.0
+     */
+    progressBarClassName: String,
     /**
      * Makes progress bar thinner.
      */
     thin: Boolean,
+    /**
+     * The percent to progress the ProgressBar.
+     */
+    value: {
+      type: Number,
+      default: 0,
+    },
+    /**
+     * Set the progress bar variant to optional striped.
+     *
+     * @values 'striped'
+     */
+    variant: {
+      type: String,
+      validator: (value: string) => {
+        return value === 'striped'
+      },
+    },
     /**
      * Change the default color to white.
      */
     white: Boolean,
-    ...CProgressBar.props,
   },
   setup(props, { slots }) {
+    const stacked = inject('stacked', false) as boolean
+
     return () =>
       h(
         'div',
@@ -31,20 +67,42 @@ const CProgress = defineComponent({
               'progress-white': props.white,
             },
           ],
-          ...(props.height, { style: `height: ${props.height}px` }),
+          style: {
+            ...(props.height ? { height: `${props.height}px` } : {}),
+            ...(stacked ? { width: `${props.value}%` } : {}),
+          },
+          ...(props.value !== undefined && {
+            role: 'progressbar',
+            'aria-valuenow': props.value,
+            'aria-valuemin': 0,
+            'aria-valuemax': 100,
+          }),
         },
-        props.value
-          ? h(
+        // @ts-expect-error name is defined in component
+        slots.default && slots.default().some((vnode) => vnode.type.name === 'CProgressBar')
+          ? slots.default().map((vnode) => {
+              // @ts-expect-error name is defined in component
+              if (vnode.type.name === 'CProgressBar') {
+                return h(vnode, {
+                  ...(props.animated && { animated: props.animated }),
+                  ...(props.color && { color: props.color }),
+                  ...(props.value && { value: props.value }),
+                  ...(props.variant && { variant: props.variant }),
+                })
+              }
+              return vnode
+            })
+          : h(
               CProgressBar,
               {
-                value: props.value,
+                ...(props.progressBarClassName && { class: props.progressBarClassName }),
                 animated: props.animated,
                 color: props.color,
+                value: props.value,
                 variant: props.variant,
               },
-              slots.default && slots.default(),
-            )
-          : slots.default && slots.default(),
+              () => slots.default && slots.default(),
+            ),
       )
   },
 })

package/src/components/progress/CProgressBar.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h } from 'vue'
+import { defineComponent, h, inject } from 'vue'
 
 import { Color } from '../../props'
 
@@ -35,6 +35,8 @@ const CProgressBar = defineComponent({
     },
   },
   setup(props, { slots }) {
+    const stacked = inject('stacked', false) as boolean
+
     return () =>
       h(
         'div',
@@ -47,11 +49,7 @@ const CProgressBar = defineComponent({
               ['progress-bar-animated']: props.animated,
             },
           ],
-          role: 'progressbar',
-          style: `width: ${props.value}%`,
-          'aria-valuenow': props.value,
-          'aria-valuemin': '0',
-          'aria-valuemax': '100',
+          ...(!stacked && { style: { width: `${props.value}%` } }),
         },
         slots.default && slots.default(),
       )

package/src/components/progress/CProgressStacked.ts

@@ -0,0 +1,19 @@
+import { defineComponent, h, provide } from 'vue'
+
+const CProgressStacked = defineComponent({
+  name: 'CProgressStacked',
+  props: {},
+  setup(_, { slots }) {
+    provide('stacked', true)
+    return () =>
+      h(
+        'div',
+        {
+          class: 'progress-stacked',
+        },
+        slots.default && slots.default(),
+      )
+  },
+})
+
+export { CProgressStacked }

package/src/components/progress/index.ts

@@ -1,12 +1,14 @@
 import { App } from 'vue'
 import { CProgress } from './CProgress'
 import { CProgressBar } from './CProgressBar'
+import { CProgressStacked } from './CProgressStacked'
 
 const CProgressPlugin = {
   install: (app: App): void => {
     app.component(CProgress.name, CProgress)
     app.component(CProgressBar.name, CProgressBar)
+    app.component(CProgressStacked.name, CProgressStacked)
   },
 }
 
-export { CProgressPlugin, CProgress, CProgressBar }
+export { CProgressPlugin, CProgress, CProgressBar, CProgressStacked }

package/src/components/sidebar/CSidebar.ts

@@ -187,7 +187,7 @@ const CSidebar = defineComponent({
       ),
       mobile.value &&
         h(CBackdrop, {
-          class: 'sidebar-backdrop d-none',
+          class: 'sidebar-backdrop',
           visible: props.visible,
           onClick: () => handleHide(),
         }),

package/src/components/smart-pagination/CSmartPagination.ts

@@ -140,11 +140,26 @@ const CSmartPagination = defineComponent({
     const limit = ref(props.limit)
     const pages = ref(props.pages)
 
-    watch(props, () => {
-      activePage.value = props.activePage
-      limit.value = props.limit
-      pages.value = props.pages
-    })
+    watch(
+      () => props.activePage,
+      () => {
+        activePage.value = props.activePage
+      },
+    )
+
+    watch(
+      () => props.limit,
+      () => {
+        limit.value = props.limit
+      },
+    )
+
+    watch(
+      () => props.pages,
+      () => {
+        pages.value = props.pages
+      },
+    )
 
     const showDots = computed(() => {
       return props.dots && limit.value > 4 && limit.value < pages.value

package/src/components/smart-table/CSmartTable.ts

@@ -35,6 +35,8 @@ import type {
   TableFilter,
 } from './types'
 
+export const ITEM_INTERNAL_KEYS = ['_cellProps', '_props', '_selectable', '_selected']
+
 const CSmartTable = defineComponent({
   name: 'CSmartTable',
   props: {
@@ -156,8 +158,6 @@ const CSmartTable = defineComponent({
     },
     /**
      * Adds select element over table, which is used for control items per page in pagination. If you want to customize this element, pass object with optional values:
-     * - label (String) - replaces default label text
-     * - values (Array) - custom array of pagination values
      * - external (Boolean) - disables automatic 'itemsPerPage' change (use to change pages externaly by 'pagination-change' event).
      */
     itemsPerPageSelect: {
@@ -330,7 +330,6 @@ const CSmartTable = defineComponent({
       }),
     )
     const itemsNumber = ref(props.itemsNumber)
-    // eslint-disable-next-line unicorn/explicit-length-check
     const itemsPerPage = ref<number>(props.itemsPerPage || items.value.length)
     const selected = ref<Item[]>([])
     const selectedAll = ref<boolean | string>()
@@ -366,17 +365,18 @@ const CSmartTable = defineComponent({
         props.items.forEach((item: Item) => {
           if (item._selected) {
             const _item = { ...item }
-            delete _item['_cellProps']
-            delete _item['_props']
-            delete _item['_selected']
+            for (const key of ITEM_INTERNAL_KEYS) {
+              delete _item[key]
+            }
 
             selected.value = [...selected.value, _item]
           }
         })
 
         if (Array.isArray(props.items)) {
-          items.value = props.items
-          // eslint-disable-next-line unicorn/explicit-length-check
+          items.value = props.items.map((item: Item, index: number) => {
+            return { ...item, _id: index }
+          })
           itemsNumber.value = props.itemsNumber || props.items.length
         }
       },
@@ -458,7 +458,7 @@ const CSmartTable = defineComponent({
       }
     })
 
-    const handleSorterChange = (column: string, index: number) => {
+    const handleSorterChange = (column: string, index: number, order?: 'asc' | 'desc') => {
       if (
         !isSortable(
           index,
@@ -474,8 +474,14 @@ const CSmartTable = defineComponent({
       //if column changed or sort was descending change asc to true
       const state = sorterState.value
 
+      if (order) {
+        state.state = order
+      }
+
       if (state.column === column) {
-        if (state.state === 0) {
+        if (order) {
+          state.state = order
+        } else if (state.state === 0) {
           state.state = 'asc'
         } else if (state.state === 'asc') {
           state.state = 'desc'
@@ -488,7 +494,7 @@ const CSmartTable = defineComponent({
         }
       } else {
         state.column = column
-        state.state = 'asc'
+        state.state = order || 'asc'
       }
 
       sorterState.value.column = state.column
@@ -512,19 +518,19 @@ const CSmartTable = defineComponent({
     }
 
     const handleRowChecked = (item: Item, value: boolean) => {
-      if (value && !isObjectInArray(selected.value, item, ['_cellProps', '_props', '_selected'])) {
+      if (value && !isObjectInArray(selected.value, item, ITEM_INTERNAL_KEYS)) {
         selected.value = [...selected.value, item]
         return
       }
 
       selected.value = selected.value.filter(
-        (_item: Item) => !isObjectInArray([_item], item, ['_cellProps', '_props', '_selected']),
+        (_item: Item) => !isObjectInArray([_item], item, ITEM_INTERNAL_KEYS),
       )
     }
 
     const handleSelectAllChecked = () => {
       if (selectedAll.value === true) {
-        selected.value = []
+        selected.value = items.value.filter((item) => item._selectable === false)
         return
       }
 
@@ -534,10 +540,27 @@ const CSmartTable = defineComponent({
         return
       }
 
-      selected.value = items.value.map((item) => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { _cellProps, _props, _selected, ...rest } = item
-        return rest
+      const selectable = items.value.filter(
+        (item) => item._selectable !== false || item._selected === true,
+      )
+
+      if (selectable.length === selected.value.length) {
+        selected.value = items.value.filter(
+          (item) => item._selectable === false && item._selected === true,
+        )
+        return
+      }
+
+      const _selected = selectable.map((item) => {
+        return { ...item }
+      })
+
+      selected.value = _selected.map((item) => {
+        for (const key of ITEM_INTERNAL_KEYS) {
+          delete item[key]
+        }
+
+        return item
       })
     }
 
@@ -605,6 +628,10 @@ const CSmartTable = defineComponent({
       sortItems(props.columnSorter, filteredTable.value, itemsDataColumns.value, sorterState.value),
     )
 
+    watch(sortedItems, () => {
+      emit('filteredItemsChange', sortedItems.value)
+    })
+
     const numberOfPages = computed(() =>
       itemsPerPage.value ? Math.ceil(sortedItems.value.length / itemsPerPage.value) : 1,
     )
@@ -744,8 +771,8 @@ const CSmartTable = defineComponent({
                           onFilterChange: (key: string, value: string) =>
                             handleColumnFilterChange(key, value, 'change'),
                           onSelectAllChecked: () => handleSelectAllChecked(),
-                          onSortClick: (key: string, index: number) =>
-                            handleSorterChange(key, index),
+                          onSortClick: (key: string, index: number, order: 'asc' | 'desc') =>
+                            handleSorterChange(key, index, order),
                         },
                         {
                           // @slot Sorter icon when items are unsorted.
@@ -768,7 +795,7 @@ const CSmartTable = defineComponent({
                                   class: 'icon',
                                   viewBox: '0 0 512 512',
                                   role: 'img',
-                                  innerHTML: cilArrowBottom[1],
+                                  innerHTML: cilArrowTop[1],
                                 }),
                           // @slot  Sorter icon when items are sorted descending.
                           sortingIconDescending: () =>
@@ -779,13 +806,14 @@ const CSmartTable = defineComponent({
                                   class: 'icon',
                                   viewBox: '0 0 512 512',
                                   role: 'img',
-                                  innerHTML: cilArrowTop[1],
+                                  innerHTML: cilArrowBottom[1],
                                 }),
                         },
                       ),
                     h(CSmartTableBody, {
                       clickableRows: props.clickableRows,
                       columnNames: columnNames.value,
+                      columns: props.columns ?? columnNames.value,
                       currentItems: currentItems.value,
                       firstItemOnActivePageIndex: firstItemOnActivePageIndex.value,
                       noItemsLabel: props.noItemsLabel,
@@ -881,7 +909,8 @@ const CSmartTable = defineComponent({
                 {
                   class: 'col',
                 },
-                (props.pagination && numberOfPages.value > 1) || props.paginationProps
+                (props.pagination && numberOfPages.value > 1) ||
+                  (props.paginationProps && props.paginationProps.pages > 1)
                   ? h(CSmartPagination, {
                       pages: numberOfPages.value,
                       activePage: activePage.value,

package/src/components/smart-table/CSmartTableBody.ts

@@ -5,8 +5,14 @@ import { CTableBody, CTableDataCell, CTableRow } from '../table/'
 
 import { isObjectInArray } from '../../utils'
 
-import { getClickedColumnName, getTableDataCellProps } from './utils'
-import type { Item } from './types'
+import { ITEM_INTERNAL_KEYS } from './CSmartTable'
+import {
+  getClickedColumnName,
+  getColumnName,
+  getTableDataCellProps,
+  getTableDataCellStyles,
+} from './utils'
+import type { Column, Item } from './types'
 
 const CSmartTableBody = defineComponent({
   name: 'CSmartTableBody',
@@ -17,6 +23,11 @@ const CSmartTableBody = defineComponent({
       default: () => [],
       require: true,
     },
+    columns: {
+      type: Array as PropType<(Column | string)[]>,
+      default: () => [],
+      require: true,
+    },
     currentItems: {
       type: Array as PropType<Item[]>,
       default: () => [],
@@ -33,9 +44,7 @@ const CSmartTableBody = defineComponent({
   },
   emits: ['rowChecked', 'rowClick'],
   setup(props, { emit }) {
-    const colspan: number = props.selectable
-      ? props.columnNames.length + 1
-      : props.columnNames.length
+    const colspan: number = props.selectable ? props.columns.length + 1 : props.columns.length
     return () =>
       h(
         CTableBody,
@@ -59,6 +68,7 @@ const CSmartTableBody = defineComponent({
                           getClickedColumnName(
                             event.target as HTMLTextAreaElement,
                             props.columnNames,
+                            props.selectable,
                           ),
                           event,
                         )
@@ -71,32 +81,31 @@ const CSmartTableBody = defineComponent({
                             h(CFormCheck, {
                               checked:
                                 props.selected &&
-                                isObjectInArray(props.selected, item, [
-                                  '_cellProps',
-                                  '_props',
-                                  '_selected',
-                                ]),
+                                isObjectInArray(props.selected, item, ITEM_INTERNAL_KEYS),
+                              disabled: item._selectable === false,
                               onChange: (event: Event) => {
                                 emit('rowChecked', item, (event.target as HTMLInputElement).checked)
                               },
                             }),
                           ),
-                        props.columnNames.map((colName) =>
-                          props.scopedSlots &&
-                          props.scopedSlots[colName] &&
-                          typeof props.scopedSlots[colName] === 'function'
+                        props.columns.map((column) => {
+                          const colName = getColumnName(column)
+                          return props.scopedSlots &&
+                            props.scopedSlots[colName] &&
+                            typeof props.scopedSlots[colName] === 'function'
                             ? h(props.scopedSlots[colName], { item: item })
                             : typeof item[colName] !== 'undefined' &&
-                              h(
-                                CTableDataCell,
-                                {
-                                  ...getTableDataCellProps(item, colName),
-                                },
-                                {
-                                  default: () => String(item[colName]),
-                                },
-                              ),
-                        ),
+                                h(
+                                  CTableDataCell,
+                                  {
+                                    ...getTableDataCellProps(column, item, colName),
+                                    style: getTableDataCellStyles(column, item, colName),
+                                  },
+                                  {
+                                    default: () => String(item[colName]),
+                                  },
+                                )
+                        }),
                       ],
                     },
                   ),
@@ -115,18 +124,6 @@ const CSmartTableBody = defineComponent({
                         {
                           class: 'p-0',
                           key: `details${trIndex}`,
-                          onClick: (event: MouseEvent) => {
-                            emit(
-                              'rowClick',
-                              item,
-                              trIndex + props.firstItemOnActivePageIndex,
-                              getClickedColumnName(
-                                event.target as HTMLTextAreaElement,
-                                props.columnNames,
-                              ),
-                              true,
-                            )
-                          },
                         },
                         {
                           default: () =>