refactor(row): cleanup

packages/varlet-ui/src/col/Col.vue

@@ -44,12 +44,15 @@ export default defineComponent({
   setup(props) {
     const span = computed(() => toNumber(props.span))
     const offset = computed(() => toNumber(props.offset))
-    const { row } = useRow()
     const padding = computed<ColPadding>(() => {
-      const [y = 0, x = 0] = row?.average?.value || []
+      const [y = 0, x = 0] = row?.average.value ?? []
       return { left: x, right: x, top: y, bottom: y }
     })
 
+    const { row, bindRow } = useRow()
+
+    call(bindRow, null)
+
     function getSize(mode: string, size: string | number | ColSizeDescriptor | undefined) {
       const classes: string[] = []
 
@@ -59,9 +62,19 @@ export default defineComponent({
 
       if (isPlainObject(size)) {
         const { offset, span } = size
-        if (Number(span) >= 0) classes.push(n(`--span-${mode}-${span}`))
-        if (offset) classes.push(n(`--offset-${mode}-${offset}`))
-      } else if (Number(size) >= 0) {
+
+        if (Number(span) >= 0) {
+          classes.push(n(`--span-${mode}-${span}`))
+        }
+
+        if (offset) {
+          classes.push(n(`--offset-${mode}-${offset}`))
+        }
+
+        return classes
+      }
+
+      if (Number(size) >= 0) {
         classes.push(n(`--span-${mode}-${size}`))
       }
 

packages/varlet-ui/src/col/provide.ts

@@ -13,12 +13,12 @@ export type ColSizeDescriptor = {
   offset?: number | string
 }
 
-export type ColProvider = object
-
 export function useRow() {
-  const { parentProvider } = useParent<RowProvider, ColProvider>(ROW_BIND_COL_KEY)
+  const { index, bindParent, parentProvider } = useParent<RowProvider, null>(ROW_BIND_COL_KEY)
 
   return {
+    index,
     row: parentProvider,
+    bindRow: bindParent,
   }
 }

packages/varlet-ui/src/row/Row.vue

@@ -16,7 +16,7 @@
 import { defineComponent, computed } from 'vue'
 import { props } from './props'
 import { isArray, call } from '@varlet/shared'
-import { useCols, type RowProvider } from './provide'
+import { useCols } from './provide'
 import { toPxNum, padStartFlex } from '../utils/elements'
 import { createNamespace } from '../utils/components'
 
@@ -31,9 +31,7 @@ export default defineComponent({
     )
     const { bindCols } = useCols()
 
-    const rowProvider: RowProvider = { average }
-
-    bindCols(rowProvider)
+    bindCols({ average })
 
     function handleClick(e: Event) {
       call(props.onClick, e)

packages/varlet-ui/src/row/provide.ts

@@ -9,9 +9,11 @@ export interface RowProvider {
 export const ROW_BIND_COL_KEY = Symbol('ROW_BIND_COL_KEY')
 
 export function useCols() {
-  const { bindChildren } = useChildren<RowProvider, ColProvider>(ROW_BIND_COL_KEY)
+  const { length, childProviders: cols, bindChildren } = useChildren<RowProvider, ColProvider>(ROW_BIND_COL_KEY)
 
   return {
+    length,
+    cols,
     bindCols: bindChildren,
   }
 }