From f2409dc23f41142c5b400d0622737309b2ebe3d5 Mon Sep 17 00:00:00 2001
From: Edgar Mueller <emueller@eclipsesource.com>
Date: Fri, 22 Mar 2019 16:09:54 +0100
Subject: [PATCH] [react] Only set resolving flag if new schemas has refs in
 JsonFors component

---
 packages/react/src/JsonForms.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/react/src/JsonForms.tsx b/packages/react/src/JsonForms.tsx
index 8e6f8ae85..952a5df3d 100644
--- 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;
         }