Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/packages/col/col.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React, {
useContext,
useEffect,
useState,
useMemo,
} from 'react'
import classNames from 'classnames'
import { View } from '@tarojs/components'
Expand All @@ -27,19 +28,16 @@ export const Col: FunctionComponent<Partial<TaroColProps>> = (props) => {
...defaultProps,
...props,
}
const [colName, setColName] = useState('')
const [colStyle, setColStyle] = useState({})
const { gutter } = useContext(DataContext) as any

const classs = () => {
// 定义col的class类
const classs = useMemo(() => {
const prefixCls = 'nut-col'
return `${prefixCls} ${prefixCls}-${span} ${
gutter ? `${prefixCls}-gutter` : ''
} ${prefixCls}-offset-${offset}`
}
const getStyle = () => {
// 定义col的style类
}, [offset, span, gutter])

const getStyle = useMemo(() => {
const style: CSSProperties = {}
if (!isFirst) {
style.paddingLeft = pxTransform((gutter as number) / 2)
Expand All @@ -48,11 +46,15 @@ export const Col: FunctionComponent<Partial<TaroColProps>> = (props) => {
style.paddingRight = pxTransform((gutter as number) / 2)
}
return style
}
}, [isFirst, isLast, gutter])

const [colName, setColName] = useState(classs)
const [colStyle, setColStyle] = useState(getStyle)

useEffect(() => {
setColName(classs)
setColStyle(getStyle)
}, [span, offset, gutter])
}, [classs, getStyle])

return (
<View
Expand Down
20 changes: 11 additions & 9 deletions src/packages/col/col.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React, {
useContext,
useEffect,
useState,
useMemo,
} from 'react'
import classNames from 'classnames'
import { DataContext } from '@/packages/row/context'
Expand All @@ -29,15 +30,14 @@ export const Col: FunctionComponent<
}
const { gutter } = useContext(DataContext) as any

const classs = () => {
// 定义col的class类
const classs = useMemo(() => {
const prefixCls = 'nut-col'
return `${prefixCls} ${prefixCls}-${span} ${
gutter ? `${prefixCls}-gutter` : ''
} ${prefixCls}-offset-${offset}`
}
const getStyle = () => {
// 定义col的style类
}, [offset, span, gutter])

const getStyle = useMemo(() => {
const style: CSSProperties = {}
if (!isFirst) {
style.paddingLeft = `${(gutter as number) / 2}px`
Expand All @@ -46,13 +46,15 @@ export const Col: FunctionComponent<
style.paddingRight = `${(gutter as number) / 2}px`
}
return style
}
const [colName, setColName] = useState(classs())
const [colStyle, setColStyle] = useState(getStyle())
}, [isFirst, isLast, gutter])

const [colName, setColName] = useState(classs)
const [colStyle, setColStyle] = useState(getStyle)

useEffect(() => {
setColName(classs)
setColStyle(getStyle)
}, [span, offset, gutter])
}, [classs, getStyle])

return (
<div
Expand Down
Loading