@@ -3,7 +3,7 @@ import { defaultForm, createDefaults } from './schema-defaults';
3
3
import canonicalTitleMap from './canonical-title-map' ;
4
4
5
5
// export function merge(schema, form, schemaDefaultTypes, ignore, options, readonly, asyncTemplates) {
6
- export function merge ( lookup , form , ignore , options , readonly , asyncTemplates ) {
6
+ export function merge ( lookup , form , typeDefaults = createDefaults ( ) , ignore , options , readonly , asyncTemplates ) {
7
7
let formItems = [ ] ;
8
8
let formItemRest = [ ] ;
9
9
form = form || [ ] ;
@@ -14,7 +14,7 @@ export function merge(lookup, form, ignore, options, readonly, asyncTemplates) {
14
14
let idxRest = form . indexOf ( '...' ) ;
15
15
if ( typeof lookup === 'object' && lookup . hasOwnProperty ( 'properties' ) ) {
16
16
readonly = readonly || lookup . readonly || lookup . readOnly ;
17
- stdForm = defaultForm ( lookup , createDefaults ( ) , ignore , options ) ;
17
+ stdForm = defaultForm ( lookup , typeDefaults , ignore , options ) ;
18
18
19
19
let defaultFormLookup = stdForm . lookup ;
20
20
@@ -97,14 +97,14 @@ export function merge(lookup, form, ignore, options, readonly, asyncTemplates) {
97
97
98
98
// if it's a type with items, merge 'em!
99
99
if ( obj . items ) {
100
- obj . items = merge ( lookup , obj . items , ignore , options , obj . readonly , asyncTemplates ) ;
100
+ obj . items = merge ( lookup , obj . items , typeDefaults , ignore , options , obj . readonly , asyncTemplates ) ;
101
101
}
102
102
103
103
// if its has tabs, merge them also!
104
104
if ( obj . tabs ) {
105
105
obj . tabs . forEach ( ( tab ) => {
106
106
if ( tab . items ) {
107
- tab . items = merge ( lookup , tab . items , ignore , options , obj . readonly , asyncTemplates ) ;
107
+ tab . items = merge ( lookup , tab . items , typeDefaults , ignore , options , obj . readonly , asyncTemplates ) ;
108
108
}
109
109
} ) ;
110
110
}
0 commit comments