Fix path prop usage of DispatchField

eclipsesource · Feb 18, 2019 · 374b6d5 · 374b6d5
1 parent 32c5986
commit 374b6d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/material/src/complex/MaterialTableControl.tsx b/packages/material/src/complex/MaterialTableControl.tsx
@@ -141,9 +141,10 @@ const NonEmptyCell = ({
   scopedSchema,
   errors
 }: NonEmptyCellProps) => {
+  const path = rowPath + (scopedSchema.type === 'object' ? '.' + propName : '');
   const errorsPerEntry: any[] = filter(
     errors,
-    error => error.dataPath === rowPath + '.' + propName
+    error => error.dataPath === path
   ).map(e => e.message);
   const isValid = isEmpty(errorsPerEntry);
   return (
@@ -155,7 +156,7 @@ const NonEmptyCell = ({
             undefined,
             scopedSchema.type === 'object' ? `#/properties/${propName}` : '#'
           )}
-          path={rowPath}
+          path={path}
         />
         <FormHelperText error={!isValid}>
           {!isValid && formatErrorMessage(errorsPerEntry)}

diff --git a/packages/vanilla/src/complex/TableArrayControl.tsx b/packages/vanilla/src/complex/TableArrayControl.tsx
@@ -162,7 +162,7 @@ class TableArrayControl extends React.Component<
                               <DispatchField
                                 schema={schema}
                                 uischema={createControlElement(prop)}
-                                path={childPath}
+                                path={childPath + '.' + prop}
                               />
                             </td>
                           );

diff --git a/packages/vanilla/src/controls/InputControl.tsx b/packages/vanilla/src/controls/InputControl.tsx
@@ -57,7 +57,7 @@ export class InputControl extends Control<
       schema,
       visible,
       required,
-      parentPath,
+      path,
       fields
     } = this.props;
 
@@ -93,7 +93,7 @@ export class InputControl extends Control<
           <DispatchField
             uischema={uischema}
             schema={schema}
-            path={parentPath}
+            path={path}
             id={id + '-input'}
           />
           <div className={divClassNames}>