Merge branch 'master' into master

swagger-api · Apr 1, 2020 · 1d4125a · 1d4125a
2 parents 305e6ee + 4b81aea
commit 1d4125a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/core/json-schema-components.jsx b/src/core/json-schema-components.jsx
@@ -53,10 +53,12 @@ export class JsonSchemaForm extends Component {
     // In the json schema rendering code, we optimistically query our system for a number of components.
     // If the component doesn't exist, we optionally suppress these warnings.
     let getComponentSilently = (name) => getComponent(name, false, { failSilently: true })
+
     let Comp = (format ? 
       getComponentSilently(`JsonSchema_${type}_${format}`) :
       getComponentSilently(`JsonSchema_${type}`)) ||
       getComponentSilently("JsonSchema_string")
+
     return <Comp { ...this.props } errors={errors} fn={fn} getComponent={getComponent} value={value} onChange={onChange} schema={schema} disabled={disabled}/>
   }
 

diff --git a/src/core/plugins/view/root-injects.jsx b/src/core/plugins/view/root-injects.jsx
@@ -100,6 +100,7 @@ const wrapRender = (component) => {
   return target
 }
 
+
 export const getComponent = (getSystem, getStore, getComponents, componentName, container, config = {}) => {
 
   if(typeof componentName !== "string")
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,6 +100,7 @@ const wrapRender = (component) => { @@
       return target
     }
     export const getComponent = (getSystem, getStore, getComponents, componentName, container, config = {}) => {
       if(typeof componentName !== "string")
@@ Expand Down @@