feat(react): adjust component recognition priority (#3180)

alibaba · Jun 12, 2022 · bf4e035 · bf4e035
1 parent d705f56
commit bf4e035
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/packages/react/src/components/ReactiveField.tsx b/packages/react/src/components/ReactiveField.tsx
@@ -24,6 +24,9 @@ const mergeChildren = (
   )
 }
 
+const isValidComponent = (target: any) =>
+  target && (typeof target === 'object' || typeof target === 'function')
+
 const renderChildren = (
   children: RenderPropsChildren<GeneralField>,
   field?: GeneralField,
@@ -42,15 +45,19 @@ const ReactiveInternal: React.FC<IReactiveFieldProps> = (props) => {
   )
   if (field.display !== 'visible') return null
 
+  const getComponent = (target: any) => {
+    return isValidComponent(target)
+      ? target
+      : FormPath.getIn(components, target) ?? target
+  }
+
   const renderDecorator = (children: React.ReactNode) => {
     if (!field.decoratorType) {
       return <Fragment>{children}</Fragment>
     }
-    const finalComponent =
-      FormPath.getIn(components, field.decoratorType) ?? field.decoratorType
 
     return React.createElement(
-      finalComponent,
+      getComponent(field.decoratorType),
       toJS(field.decoratorProps),
       children
     )
@@ -83,10 +90,8 @@ const ReactiveInternal: React.FC<IReactiveFieldProps> = (props) => {
     const readOnly = !isVoidField(field)
       ? field.pattern === 'readOnly'
       : undefined
-    const finalComponent =
-      FormPath.getIn(components, field.componentType) ?? field.componentType
     return React.createElement(
-      finalComponent,
+      getComponent(field.componentType),
       {
         disabled,
         readOnly,