option for not using default value & fix select default value

Author: Riccardo Di Benedetto

src/core.js

@@ -15,13 +15,7 @@ export class JSONEditor {
     if (!(element instanceof Element)) throw new Error('element should be an instance of Element')
 
     this.element = element
-    console.log('Before first extend')
-    try {
-      this.options = extend({}, JSONEditor.defaults.options, options)
-    } catch (err) {
-      console.log('Error first extend ', err)
-    }
-    console.log('After first extend - aligned')
+    this.options = extend({}, JSONEditor.defaults.options, options)
     this.ready = false
     this.copyClipboard = null
     this.schema = this.options.schema
@@ -32,13 +26,15 @@ export class JSONEditor {
     const themeName = this.options.theme || JSONEditor.defaults.theme
     const themeClass = JSONEditor.defaults.themes[themeName]
 
+    this.MAX_RECURSIONS = this.options.maxRecurions
+
+    console.log('Current options ', this.options)
     /* Load editors and selected theme style rules */
     if (!themeClass) throw new Error(`Unknown theme ${themeName}`)
     this.element.setAttribute('data-theme', themeName)
     // eslint-disable-next-line new-cap
     this.theme = new themeClass(this)
     const rules = extend(themeClass.rules, this.getEditorsRules())
-    console.log('After rules extend')
     if (!this.theme.options.disable_theme_rules) {
       /* Attempt to locate a shadowRoot parent (i.e. in Web Components) */
       const shadowRoot = getShadowParent(this.element)
@@ -77,9 +73,7 @@ export class JSONEditor {
         required: true,
         container: this.root_container
       })
-      console.log('After create editor')
       this.root.preBuild()
-      console.log('After root postBuild')
       this.root.build()
       this.root.postBuild()
       /* Starting data */
@@ -98,7 +92,6 @@ export class JSONEditor {
         this.trigger('change')
       })
     }, fetchUrl, location)
-    console.log('End of constructor')
   }
 
   getValue () {

src/defaults.js

@@ -283,7 +283,9 @@ function translate (key, variables) {
 /* Default options when initializing JSON Editor */
 const options = {
   upload,
-  prompt_before_delete: true
+  prompt_before_delete: true,
+  useDefault: true,
+  maxRecurions: 99999
 }
 
 /* This assignment was previously in index.js but makes more sense here */

src/editor.js

@@ -524,6 +524,10 @@ export class AbstractEditor {
       return this.schema.default
     }
 
+    if (!this.jsoneditor.options.useDefault) {
+      return null
+    }
+
     if (typeof this.schema.enum !== 'undefined') {
       return this.schema.enum[0]
     }

src/editors/object.js

@@ -1,15 +1,14 @@
 import { AbstractEditor } from '../editor.js'
 import { extend, trigger, hasOwnProperty } from '../utilities.js'
 
-const MAX_RECURSION = 0
-
 export class ObjectEditor extends AbstractEditor {
   constructor (a, b, recursion, stopRecursionCallback = () => {}) {
     super(a, b)
     this._recursion = recursion
     this._stopRecursionCallback = stopRecursionCallback
     this.collapsed = null
     this.collapseOnStopRecursion = this.collapseOnStopRecursion.bind(this)
+    console.log('jsoneditor MAX_RECURSIONS', this.jsoneditor.MAX_RECURSIONS)
   }
 
   getDefault () {
@@ -1003,7 +1002,7 @@ export class ObjectEditor extends AbstractEditor {
 
       this.editors[name] = this.jsoneditor.createEditor(editor, {
         jsoneditor: this.jsoneditor,
-        schema: this._recursion >= MAX_RECURSION ? { type: schema.type || null } : schema,
+        schema: this._recursion >= this.jsoneditor.MAX_RECURSIONS ? { type: schema.type || null } : schema,
         path: `${this.path}.${name}`,
         parent: this
       }, this._recursion + 1, this.collapseOnStopRecursion)
@@ -1021,7 +1020,7 @@ export class ObjectEditor extends AbstractEditor {
 
       this.cached_editors[name] = this.editors[name]
 
-      if (this._recursion >= MAX_RECURSION) {
+      if (this._recursion >= this.jsoneditor.MAX_RECURSIONS) {
         console.info('Stop recursion')
         this._stopRecursionCallback()
       }

src/editors/select.js

@@ -3,8 +3,10 @@ import { extend } from '../utilities.js'
 
 export class SelectEditor extends AbstractEditor {
   setValue (value, initial) {
+    const correctValue = initial && value === null && this.value === undefined ? 'undefined' : value
     /* Sanitize value before setting it */
-    let sanitized = this.typecast(value || '')
+    let sanitized = this.typecast(correctValue || '')
+    console.log('SETVALUE ', 'CURRENT ', this.value, 'SET ', value, 'INITIAL ', initial, 'SANITIZED', sanitized)
 
     if (!this.enum_values.includes(sanitized)) sanitized = this.enum_values[0]
 
@@ -52,7 +54,9 @@ export class SelectEditor extends AbstractEditor {
     if (!this.dependenciesFulfilled) {
       return undefined
     }
-    return this.typecast(this.value)
+    const value = this.typecast(this.value)
+    console.log('GET VALUE ', value, this.value)
+    return value
   }
 
   preBuild () {
@@ -170,6 +174,7 @@ export class SelectEditor extends AbstractEditor {
     this.setInputAttributes([])
 
     this.input.addEventListener('change', (e) => {
+      console.log('SELECT CHANGE ')
       e.preventDefault()
       e.stopPropagation()
       this.onInputChange()
@@ -178,8 +183,9 @@ export class SelectEditor extends AbstractEditor {
     this.control = this.theme.getFormControl(this.label, this.input, this.description, this.infoButton)
     this.container.appendChild(this.control)
 
+    console.log('ENUM VALUES ', this.enum_values)
     this.value = this.enum_values[0]
-
+    console.log('SET ', this.value)
     /* Any special formatting that needs to happen after the input is added to the dom */
     window.requestAnimationFrame(() => {
       if (this.input.parentNode) this.afterInputReady()