[react] Only set resolving flag if new schemas has refs in JsonFors c…

…omponent
eclipsesource · Mar 22, 2019 · f2409dc · f2409dc
1 parent eaef688
commit f2409dc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/react/src/JsonForms.tsx b/packages/react/src/JsonForms.tsx
@@ -46,7 +46,7 @@ interface JsonFormsRendererState {
     resolvedSchema: JsonSchema;
 }
 
-const hasRefs = (schema: JsonSchema) => {
+const hasRefs = (schema: JsonSchema): boolean => {
     if (schema !== undefined) {
         return Object.keys(findRefs(schema)).length > 0;
     }
@@ -62,11 +62,12 @@ export class ResolvedJsonFormsDispatchRenderer
     ) {
 
         if (!isEqual(prevState.schema, nextProps.schema)) {
+            const schemaHasRefs: boolean = hasRefs(nextProps.schema);
             const newState: JsonFormsRendererState = {
                 id: prevState.id,
-                resolvedSchema: undefined,
+                resolvedSchema: schemaHasRefs ? undefined : nextProps.schema,
                 schema: nextProps.schema,
-                resolving: true,
+                resolving: schemaHasRefs,
             };
             return newState;
         }