Skip to content

Commit 00fb497

Browse files
authored
fix(table): fixed toRefs() warning (#79)
1 parent f3c7768 commit 00fb497

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

packages/anu-vue/src/components/table/ATable.tsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const ATable = defineComponent({
120120
return null
121121
}).filter(i => i) as [keyof typeof props, typeof props[keyof typeof props]][]
122122

123-
return toRefs(Object.fromEntries(cardPropsEntries))
123+
return toRefs(reactive(Object.fromEntries(cardPropsEntries)))
124124
})
125125

126126
// 👉 isSST
@@ -136,6 +136,8 @@ export const ATable = defineComponent({
136136

137137
const fetchRows = () => {
138138
// _search.value, currentPage.value, currentPageSize.value, sortedCols.value
139+
if (typeof props.rows !== 'function')
140+
return
139141

140142
(props.rows as ItemsFunction)({
141143
/* eslint-disable @typescript-eslint/no-use-before-define */
@@ -163,6 +165,12 @@ export const ATable = defineComponent({
163165
shallSortByAsc: null,
164166
}
165167

168+
// 👉 Paginated Rows
169+
const paginatedRows = ref<any[]>([])
170+
171+
// 👉 rowsToRender
172+
const rowsToRender = computed(() => isSST.value ? _serverRows.value : paginatedRows.value)
173+
166174
// 👉 _columns
167175
// TODO: Improve _columns computation
168176
// If columns are provided via prop
@@ -173,10 +181,9 @@ export const ATable = defineComponent({
173181

174182
// Else generate columns from first row
175183
: isSST.value
176-
/* eslint-disable @typescript-eslint/no-use-before-define */
184+
177185
? (rowsToRender.value.length
178186
? Object.keys(rowsToRender.value[0])
179-
/* eslint-enable @typescript-eslint/no-use-before-define */
180187
.map(k => ({
181188
...columnDefaults,
182189
name: k,
@@ -230,9 +237,6 @@ export const ATable = defineComponent({
230237
}),
231238
)
232239

233-
// 👉 Paginated Rows
234-
const paginatedRows = ref<any[]>([])
235-
236240
// TODO: Check passing toRef(props, 'pageSize') to useOffsetPagination and use returned `currentPageSize` for reactive pgeSize prop
237241
const currentPageSize = ref(props.pageSize)
238242
const paginateRows = ({ currentPage, currentPageSize }: { currentPage: number; currentPageSize: number }) => {
@@ -275,9 +279,6 @@ export const ATable = defineComponent({
275279

276280
watch([_search, sortedCols, sortedRows], recalculateCurrentPageData, { deep: true, immediate: true })
277281

278-
// 👉 rowsToRender
279-
const rowsToRender = computed(() => isSST.value ? _serverRows.value : paginatedRows.value)
280-
281282
// 👉 onRequest
282283
// watch([_search, currentPage, sortedCols], fetchRows, { deep: true, immediate: true })
283284

0 commit comments

Comments
 (0)