fix(antd/next): fix props.prefix is not work for FormGrid/FormLayout (#…

…2151)
alibaba · Sep 14, 2021 · bcdac58 · bcdac58
1 parent e684bb7
commit bcdac58
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/packages/antd/src/form-grid/index.tsx b/packages/antd/src/form-grid/index.tsx
@@ -39,6 +39,7 @@ interface ILayoutProps {
 export interface IFormGridProps {
   className?: string
   style?: React.CSSProperties
+  prefixCls?: string
   minWidth?: number | number[]
   maxWidth?: number | number[]
   minColumns?: number | number[]
@@ -123,7 +124,7 @@ const normalizeProps = (props: IFormGridProps): ILayoutProps => {
 const useGridLayout = (outerProps: IFormGridProps): ILayout => {
   const ref = useRef<HTMLDivElement>(null)
   const props = useRef<ILayoutProps>()
-  const formGridPrefixCls = usePrefixCls('formily-grid')
+  const formGridPrefixCls = usePrefixCls('formily-grid', outerProps)
   const [layoutParams, setLayout] = useState({})
   const [styles, setStyles] = useState({})
   const normalizedProps = normalizeProps(outerProps)

diff --git a/packages/antd/src/form-layout/index.tsx b/packages/antd/src/form-layout/index.tsx
@@ -46,7 +46,7 @@ export const FormLayout: React.FC<IFormLayoutProps> & {
   useFormShallowLayout: () => IFormLayoutProps
 } = ({ shallow, children, prefixCls, className, style, ...props }) => {
   const deepLayout = useFormDeepLayout()
-  const formPrefixCls = usePrefixCls('form')
+  const formPrefixCls = usePrefixCls('form', { prefixCls })
   const layoutPrefixCls = usePrefixCls('formily-layout', { prefixCls })
   const layoutClassName = cls(
     layoutPrefixCls,

diff --git a/packages/next/src/form-grid/index.tsx b/packages/next/src/form-grid/index.tsx
@@ -37,6 +37,7 @@ interface ILayoutProps {
 }
 
 export interface IFormGridProps {
+  prefix?: string
   style?: React.CSSProperties
   className?: string
   minWidth?: number | number[]
@@ -123,7 +124,7 @@ const normalizeProps = (props: IFormGridProps): ILayoutProps => {
 const useGridLayout = (outerProps: IFormGridProps): ILayout => {
   const ref = useRef<HTMLDivElement>(null)
   const props = useRef<ILayoutProps>()
-  const formGridPrefixCls = usePrefixCls('formily-grid')
+  const formGridPrefixCls = usePrefixCls('formily-grid', outerProps)
   const [layoutParams, setLayout] = useState({})
   const [styles, setStyles] = useState({})
   const normalizedProps = normalizeProps(outerProps)

diff --git a/packages/next/src/form-layout/index.tsx b/packages/next/src/form-layout/index.tsx
@@ -46,7 +46,7 @@ export const FormLayout: React.FC<IFormLayoutProps> & {
   useFormShallowLayout: () => IFormLayoutProps
 } = ({ shallow, children, prefix, className, style, ...props }) => {
   const deepLayout = useFormDeepLayout()
-  const formPrefixCls = usePrefixCls('form')
+  const formPrefixCls = usePrefixCls('form', { prefix })
   const layoutPrefixCls = usePrefixCls('formily-layout', { prefix })
   const layoutClassName = cls(
     layoutPrefixCls,