feat(antd/next): support inherit mode to FormItem

alibaba · Jun 21, 2021 · da7423d · da7423d
1 parent 45e9e7f
commit da7423d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/packages/antd/src/form-item/index.tsx b/packages/antd/src/form-item/index.tsx
@@ -55,27 +55,27 @@ const useFormItemLayout = (props: IFormItemProps) => {
   const layout = useFormLayout()
   return {
     ...props,
-    layout: props.layout ?? layout.layout ?? 'horizontal',
-    colon: props.colon ?? layout.colon,
+    layout: props.layout || layout.layout || 'horizontal',
+    colon: props.colon || layout.colon,
     labelAlign:
       layout.layout === 'vertical'
-        ? props.labelAlign ?? layout.labelAlign ?? 'left'
-        : props.labelAlign ?? layout.labelAlign ?? 'right',
-    labelWrap: props.labelWrap ?? layout.labelWrap,
-    labelWidth: props.labelWidth ?? layout.labelWidth,
-    wrapperWidth: props.wrapperWidth ?? layout.wrapperWidth,
-    labelCol: props.labelCol ?? layout.labelCol,
-    wrapperCol: props.wrapperCol ?? layout.wrapperCol,
-    wrapperAlign: props.wrapperAlign ?? layout.wrapperAlign,
-    wrapperWrap: props.wrapperWrap ?? layout.wrapperWrap,
-    fullness: props.fullness ?? layout.fullness,
-    size: props.size ?? layout.size,
-    inset: props.inset ?? layout.inset,
+        ? props.labelAlign || layout.labelAlign || 'left'
+        : props.labelAlign || layout.labelAlign || 'right',
+    labelWrap: props.labelWrap || layout.labelWrap,
+    labelWidth: props.labelWidth || layout.labelWidth,
+    wrapperWidth: props.wrapperWidth || layout.wrapperWidth,
+    labelCol: props.labelCol || layout.labelCol,
+    wrapperCol: props.wrapperCol || layout.wrapperCol,
+    wrapperAlign: props.wrapperAlign || layout.wrapperAlign,
+    wrapperWrap: props.wrapperWrap || layout.wrapperWrap,
+    fullness: props.fullness || layout.fullness,
+    size: props.size || layout.size,
+    inset: props.inset || layout.inset,
     asterisk: props.asterisk,
-    bordered: props.bordered ?? layout.bordered,
+    bordered: props.bordered || layout.bordered,
     feedbackIcon: props.feedbackIcon,
-    feedbackLayout: props.feedbackLayout ?? layout.feedbackLayout ?? 'loose',
-    tooltipLayout: props.tooltipLayout ?? layout.tooltipLayout ?? 'icon',
+    feedbackLayout: props.feedbackLayout || layout.feedbackLayout || 'loose',
+    tooltipLayout: props.tooltipLayout || layout.tooltipLayout || 'icon',
   }
 }
 

diff --git a/packages/next/src/form-item/index.tsx b/packages/next/src/form-item/index.tsx
@@ -55,27 +55,27 @@ const useFormItemLayout = (props: IFormItemProps) => {
   const layout = useFormLayout()
   return {
     ...props,
-    layout: props.layout ?? layout.layout ?? 'horizontal',
-    colon: props.colon ?? layout.colon,
+    layout: props.layout || layout.layout || 'horizontal',
+    colon: props.colon || layout.colon,
     labelAlign:
       layout.layout === 'vertical'
-        ? props.labelAlign ?? layout.labelAlign ?? 'left'
-        : props.labelAlign ?? layout.labelAlign ?? 'right',
-    labelWrap: props.labelWrap ?? layout.labelWrap,
-    labelWidth: props.labelWidth ?? layout.labelWidth,
-    wrapperWidth: props.wrapperWidth ?? layout.wrapperWidth,
-    labelCol: props.labelCol ?? layout.labelCol,
-    wrapperCol: props.wrapperCol ?? layout.wrapperCol,
-    wrapperAlign: props.wrapperAlign ?? layout.wrapperAlign,
-    wrapperWrap: props.wrapperWrap ?? layout.wrapperWrap,
-    fullness: props.fullness ?? layout.fullness,
-    size: props.size ?? layout.size,
-    inset: props.inset ?? layout.inset,
+        ? props.labelAlign || layout.labelAlign || 'left'
+        : props.labelAlign || layout.labelAlign || 'right',
+    labelWrap: props.labelWrap || layout.labelWrap,
+    labelWidth: props.labelWidth || layout.labelWidth,
+    wrapperWidth: props.wrapperWidth || layout.wrapperWidth,
+    labelCol: props.labelCol || layout.labelCol,
+    wrapperCol: props.wrapperCol || layout.wrapperCol,
+    wrapperAlign: props.wrapperAlign || layout.wrapperAlign,
+    wrapperWrap: props.wrapperWrap || layout.wrapperWrap,
+    fullness: props.fullness || layout.fullness,
+    size: props.size || layout.size,
+    inset: props.inset || layout.inset,
     asterisk: props.asterisk,
-    bordered: props.bordered ?? layout.bordered,
+    bordered: props.bordered || layout.bordered,
     feedbackIcon: props.feedbackIcon,
-    feedbackLayout: props.feedbackLayout ?? layout.feedbackLayout ?? 'loose',
-    tooltipLayout: props.tooltipLayout ?? layout.tooltipLayout ?? 'icon',
+    feedbackLayout: props.feedbackLayout || layout.feedbackLayout || 'loose',
+    tooltipLayout: props.tooltipLayout || layout.tooltipLayout || 'icon',
   }
 }