npm - @json-editor/json-editor - Versions diffs - 2.11.0 → 2.13.0 - Mend

@json-editor/json-editor 2.11.0 → 2.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (89) hide show

package/.env +1 -1
package/CHANGELOG.md +19 -0
package/README.md +90 -6
package/README_ADDON.md +5 -1
package/dist/jsoneditor.js +1 -1
package/dist/jsoneditor.js.LICENSE.txt +1 -1
package/dist/nonmin/jsoneditor.js +417 -227
package/dist/nonmin/jsoneditor.js.map +1 -1
package/docs/cleave.html +1 -1
package/docs/datetime.html +1 -1
package/docs/describedby.html +1 -1
package/docs/index.html +66 -14
package/docs/meta_schema.json +16 -1
package/docs/radio.html +1 -1
package/docs/scripts/ajv-validator.js +8695 -0
package/docs/select2.html +1 -1
package/docs/selectize.html +2 -5
package/docs/signature.html +12 -11
package/docs/wysiwyg.html +1 -1
package/package.json +1 -1
package/src/core.js +10 -1
package/src/defaults.js +3 -1
package/src/editor.js +19 -1
package/src/editors/array/selectize.js +0 -2
package/src/editors/array.js +24 -13
package/src/editors/base64.js +9 -0
package/src/editors/button.js +8 -2
package/src/editors/integer.js +3 -2
package/src/editors/multiple.js +3 -0
package/src/editors/number.js +4 -2
package/src/editors/object.js +71 -3
package/src/editors/signature.js +16 -16
package/src/editors/simplemde.js +2 -1
package/src/editors/string.js +4 -0
package/src/editors/table.js +17 -14
package/src/resolvers.js +13 -6
package/src/schemaloader.js +13 -0
package/src/theme.js +4 -0
package/src/themes/bootstrap3.js +6 -0
package/src/themes/bootstrap4.js +6 -0
package/src/themes/bootstrap5.js +6 -0
package/src/validator.js +28 -0
package/tests/codeceptjs/codecept.json +1 -1
package/tests/codeceptjs/constrains/contains_test.js +3 -2
package/tests/codeceptjs/constrains/dependentRequired_test.js +33 -0
package/tests/codeceptjs/constrains/dependentSchemas_test.js +1 -0
package/tests/codeceptjs/core_test.js +14 -4
package/tests/codeceptjs/editors/advanced_test.js +1 -1
package/tests/codeceptjs/editors/array_test.js +59 -0
package/tests/codeceptjs/editors/autocomplete_test.js +3 -1
package/tests/codeceptjs/editors/object_test.js +20 -0
package/tests/codeceptjs/editors/tabs_test.js +1 -1
package/tests/codeceptjs/issues/issue-gh-1330_test.js +8 -0
package/tests/codeceptjs/issues/issue-gh-1338_test.js +2 -0
package/tests/codeceptjs/issues/issue-gh-1364_test.js +13 -0
package/tests/codeceptjs/issues/issue-gh-1367_test.js +11 -0
package/tests/codeceptjs/issues/issue-gh-1383_test.js +9 -0
package/tests/codeceptjs/issues/issue-gh-1384_test.js +9 -0
package/tests/codeceptjs/issues/issue-gh-1410_test.js +13 -0
package/tests/codeceptjs/issues/issue-gh-1422_test.js +9 -0
package/tests/codeceptjs/issues/issue-gh-1431_test.js +12 -0
package/tests/codeceptjs/issues/issue-gh-1439_test.js +12 -0
package/tests/docker-compose-local.yml +4 -0
package/tests/pages/array-header-template.html +59 -0
package/tests/pages/array-selectize-create.html +62 -0
package/tests/pages/array-table-responsive.html +65 -0
package/tests/pages/button-icons.html +1 -1
package/tests/pages/button_state_mode_1.html +34 -0
package/tests/pages/button_state_mode_2.html +35 -0
package/tests/pages/dependentRequired.html +71 -0
package/tests/pages/issues/issue-gh-1330.html +52 -0
package/tests/pages/issues/issue-gh-1364.html +64 -0
package/tests/pages/issues/issue-gh-1367.html +49 -0
package/tests/pages/issues/issue-gh-1383.html +31 -0
package/tests/pages/issues/issue-gh-1383.json +14 -0
package/tests/pages/issues/issue-gh-1384.html +31 -0
package/tests/pages/issues/issue-gh-1384.json +36 -0
package/tests/pages/issues/issue-gh-1410.html +57 -0
package/tests/pages/issues/issue-gh-1422.html +68 -0
package/tests/pages/issues/issue-gh-1431.html +49 -0
package/tests/pages/issues/issue-gh-1439.html +69 -0
package/tests/pages/keep_only_existing_values.html +1 -1
package/tests/pages/load-events.html +60 -0
package/tests/pages/meta-schema.html +16 -2
package/tests/pages/meta_schema.json +5 -1
package/tests/pages/object-case-sensitive-property-search-false.html +41 -0
package/tests/pages/object-case-sensitive-property-search-true.html +41 -0
package/dist/dev/jsoneditor.js +0 -3687
package/dist/jsoneditor.js.map +0 -1

package/docs/select2.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>JSON Editor Select2 Integration Example</title>
     <!-- jQuery -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>

package/docs/selectize.html CHANGED Viewed

@@ -3,12 +3,9 @@
   <head>
     <meta charset="utf-8" />
     <title>JSON Editor Selectize Integration Example</title>
-    <!-- jQuery -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/selectize@0.12.6/dist/js/standalone/selectize.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/selectize@0.12.6/dist/css/selectize.default.css">
   </head>
   <body>

package/docs/signature.html CHANGED Viewed

@@ -10,24 +10,25 @@
     <h1>JSON Editor: signature editor</h1>
     <div>Using this editor a signature (or any other simple drawing) can be made using the mouse or touchpad. The result is saved in base64 format. The editor will span the full width of the container, so no columns/grids are possible. With big thank you to <a href='https://github.com/szimek'>Szimek</a> for creating SignaturePad. <a href='https://github.com/szimek/signature_pad'>SignaturePad</a> must be included before the json-editor to load the signature editor properly. Set the type of the property to 'string' and the format to 'signature' to use the editor. The canvas is set to a default height of 300px, but this can be easily overriden by adding for example 'canvas_height': 500 in the properties.</div>
     <div id='editor_holder'></div>
     <button id='submit'>Submit (console.log)</button>
     <script>
       // Initialize the editor with a JSON schema
       var editor = new JSONEditor(document.getElementById('editor_holder'),{
         "schema": {
-          "type": "object",
-          "title": "Document",
-          "properties": {
-              "signature": {
-                  "type": "signature",
-                  "title": "Signature",
-                  "options": {
-                      "canvas_height": 500
-                  }
+          'type': 'object',
+          'title': 'Document',
+          'properties': {
+            'signature': {
+              'type': 'string',
+              'format': 'signature',
+              'title': 'Signature',
+              'options': {
+                'canvas_height': 500
               }
+            }
           }
         }
       });

package/docs/wysiwyg.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>JSON Editor WYSIWYG Example</title>
     <!-- jQuery -->
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/@json-editor/json-editor@latest/dist/jsoneditor.min.js"></script>

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "@json-editor/json-editor",
   "title": "JSONEditor",
   "description": "JSON Schema based editor",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "main": "dist/jsoneditor.js",
   "author": {
     "name": "Jeremy Dorn",

package/src/core.js CHANGED Viewed

@@ -64,6 +64,15 @@ export class JSONEditor {
   async load () {
     const fetchUrl = document.location.origin + document.location.pathname.toString()
     const loader = new SchemaLoader(this.options)
+    loader.onSchemaLoaded = (payload) => {
+      this.trigger('schemaLoaded', payload)
+    }
+    loader.onAllSchemasLoaded = () => {
+      this.trigger('allSchemasLoaded')
+    }
     this.expandSchema = (schema) => loader.expandSchema(schema)
     this.expandRefs = (schema, fileBase) => loader.expandRefs(schema, fileBase)
     const location = document.location.toString()
@@ -211,7 +220,7 @@ export class JSONEditor {
     schema = this.expandSchema(schema)
     JSONEditor.defaults.resolvers.find(resolver => {
-      classname = resolver(schema)
+      classname = resolver(schema, this)
       return classname && JSONEditor.defaults.editors[classname]
     })
     if (!classname) throw new Error(`Unknown editor for schema ${JSON.stringify(schema)}`)

package/src/defaults.js CHANGED Viewed

@@ -406,7 +406,9 @@ const options = {
   use_name_attributes: true,
   prompt_before_delete: true,
   use_default_values: true,
-  max_depth: 0
+  max_depth: 0,
+  button_state_mode: 1,
+  case_sensitive_property_search: true
 }
 /* This assignment was previously in index.js but makes more sense here */

package/src/editor.js CHANGED Viewed

@@ -248,9 +248,9 @@ export class AbstractEditor {
   postBuild () {
     this.setupWatchListeners()
     this.addLinks()
+    this.register()
     this.setValue(this.getDefault(), true)
     this.updateHeaderText()
-    this.register()
     this.onWatchedFieldChange()
   }
@@ -510,6 +510,7 @@ export class AbstractEditor {
   onWatchedFieldChange () {
     let vars
     if (this.header_template) {
       vars = extend(this.getWatchedFieldValues(), {
         key: this.key,
@@ -518,6 +519,23 @@ export class AbstractEditor {
         i1: (this.key * 1 + 1),
         title: this.getTitle()
       })
+      // object properties
+      if (Object.keys(this.editors).length) {
+        Object.keys(this.editors).forEach((key) => {
+          const editor = this.editors[key]
+          if (editor.schema && editor.schema.enum && editor.schema.options && editor.schema.options.enum_titles) {
+            const enumIndex = editor.schema.enum.indexOf(editor.value)
+            const enumTitle = editor.options.enum_titles[enumIndex]
+            vars.properties = {}
+            vars.properties[key] = {
+              enumTitle: enumTitle
+            }
+          }
+        })
+      }
       const headerText = this.header_template(vars)
       if (headerText !== this.header_text) {

package/src/editors/array/selectize.js CHANGED Viewed

@@ -75,8 +75,6 @@ export class ArraySelectizeEditor extends MultiSelectEditor {
     this.option_keys.push(`${value}`)
     this.option_titles.push(`${value}`)
     this.select_values[`${value}`] = value
-    /* Update Schema enum to prevent triggering "Value must be one of the enumerated values" */
-    this.schema.items.enum.push(value)
     /* Add new value and label to selectize */
     this.selectize_instance.addOption({ text: value, value })

package/src/editors/array.js CHANGED Viewed

@@ -383,36 +383,47 @@ export class ArrayEditor extends AbstractEditor {
     /* TODO: sortable */
   }
-  setVisibility (element, display) {
-    element.style.display = display ? '' : 'none'
+  setButtonState (element, display) {
+    const buttonStateMode = this.options.button_state_mode || this.jsoneditor.options.button_state_mode
+    switch (buttonStateMode) {
+      case 1:
+        element.style.display = display ? '' : 'none'
+        break
+      case 2:
+        element.disabled = !display
+        break
+      default:
+        element.style.display = display ? '' : 'none'
+    }
   }
   setupButtons (minItems) {
     const controlsNeeded = []
     if (!this.value.length) {
-      this.delete_last_row_button.style.display = 'none'
-      this.remove_all_rows_button.style.display = 'none'
+      this.setButtonState(this.delete_last_row_button, false)
+      this.setButtonState(this.remove_all_rows_button, false)
     } else if (this.value.length === 1) {
-      this.remove_all_rows_button.style.display = 'none'
+      this.setButtonState(this.remove_all_rows_button, false)
       /* If there are minItems items in the array, or configured to hide the delete_last_row button, hide the delete button beneath the rows */
       const display = !(minItems || this.hide_delete_last_row_buttons)
-      this.setVisibility(this.delete_last_row_button, display)
+      this.setButtonState(this.delete_last_row_button, display)
       controlsNeeded.push(display)
     } else {
       const display1 = !(minItems || this.hide_delete_last_row_buttons)
-      this.setVisibility(this.delete_last_row_button, display1)
+      this.setButtonState(this.delete_last_row_button, display1)
       controlsNeeded.push(display1)
       const display2 = !(minItems || this.hide_delete_all_rows_buttons)
-      this.setVisibility(this.remove_all_rows_button, display2)
+      this.setButtonState(this.remove_all_rows_button, display2)
       controlsNeeded.push(display2)
     }
     /* If there are maxItems in the array, hide the add button beneath the rows */
     const display = !((this.getMax() && this.getMax() <= this.rows.length) || this.hide_add_button)
-    this.setVisibility(this.add_row_button, display)
+    this.setButtonState(this.add_row_button, display)
     controlsNeeded.push(display)
     return controlsNeeded.some(e => e)
@@ -431,12 +442,12 @@ export class ArrayEditor extends AbstractEditor {
         /* Hide the move down button for the last row */
         if (editor.movedown_button) {
           const display = (i !== this.rows.length - 1)
-          this.setVisibility(editor.movedown_button, display)
+          this.setButtonState(editor.movedown_button, display)
         }
         /* Hide the delete button if we have minItems items */
         if (editor.delete_button) {
-          this.setVisibility(editor.delete_button, !minItems)
+          this.setButtonState(editor.delete_button, !minItems)
         }
         /* Get the value for this editor */
@@ -677,8 +688,8 @@ export class ArrayEditor extends AbstractEditor {
     button.addEventListener('click', e => {
       e.preventDefault()
       e.stopPropagation()
-      if (this.panel) this.setVisibility(this.panel, this.collapsed)
-      if (this.tabs_holder) this.setVisibility(this.tabs_holder, this.collapsed)
+      if (this.panel) this.setButtonState(this.panel, this.collapsed)
+      if (this.tabs_holder) this.setButtonState(this.tabs_holder, this.collapsed)
       if (this.collapsed) {
         this.collapsed = false
         this.row_holder.style.display = rowHolderDisplay

package/src/editors/base64.js CHANGED Viewed

@@ -44,6 +44,7 @@ export class Base64Editor extends AbstractEditor {
       /* File uploader */
       this.uploader = this.theme.getFormInputField('file')
+      this.uploader.style.display = 'none'
       /* Set attribute of file input field to 'multiple' if: */
       /* 'multiple' key has been set to 'true' in the schema */
@@ -95,6 +96,14 @@ export class Base64Editor extends AbstractEditor {
     this.control = this.theme.getFormControl(this.label, this.uploader || this.input, this.preview, this.infoButton)
     this.container.appendChild(this.control)
+    const uploadButton = this.getButton('button_upload', 'upload', 'button_upload')
+    uploadButton.addEventListener('click', () => {
+      this.uploader.click()
+    })
+    this.control.appendChild(uploadButton)
   }
   refreshPreview () {

package/src/editors/button.js CHANGED Viewed

@@ -24,7 +24,6 @@ export class ButtonEditor extends AbstractEditor {
     /* Get options, either global options from "this.defaults.options.button" or */
     /* single property options from schema "options.button" */
-    const title = this.translateProperty(this.schema.title) || this.key
     const options = this.expandCallbacks('button', extend({}, {
       icon: '',
       validated: false,
@@ -34,8 +33,15 @@ export class ButtonEditor extends AbstractEditor {
       }
     }, this.defaults.options.button || {}, this.options.button || {}))
+    const title = this.translateProperty(options.text || this.schema.title) || this.key
     this.input = this.getButton(title, options.icon, title)
-    this.input.addEventListener('click', options.action, false)
+    if (typeof options.action !== 'function') {
+      window.alert(`No button action defined for "${this.path}"`)
+    } else {
+      this.input.addEventListener('click', options.action, false)
+    }
     if (this.schema.readOnly || this.schema.readonly || this.schema.template) {
       this.disable(true)

package/src/editors/integer.js CHANGED Viewed

@@ -12,8 +12,9 @@ export class IntegerEditor extends NumberEditor {
     }
     if (!this.schema.default && !this.jsoneditor.options.use_default_values && this.value === '') {
-      this.input.value = ''
-      return undefined
+      if (this.shouldBeUnset()) {
+        return undefined
+      }
     } else {
       return isInteger(this.value) ? parseInt(this.value) : this.value
     }

package/src/editors/multiple.js CHANGED Viewed

@@ -276,6 +276,9 @@ export class MultipleEditor extends AbstractEditor {
   }
   refreshValue () {
+    if (!this.editors[this.type]) {
+      return
+    }
     this.value = this.editors[this.type].getValue()
   }

package/src/editors/number.js CHANGED Viewed

@@ -44,8 +44,10 @@ export class NumberEditor extends StringEditor {
     }
     if (!this.schema.default && !this.jsoneditor.options.use_default_values && this.value === '') {
-      this.input.value = ''
-      return undefined
+      if (this.shouldBeUnset()) {
+        this.input.value = ''
+        return undefined
+      }
     } else {
       return isNumber(this.value) ? parseFloat(this.value) : this.value
     }

package/src/editors/object.js CHANGED Viewed

@@ -624,7 +624,17 @@ export class ObjectEditor extends AbstractEditor {
       })
       this.addproperty_input.addEventListener('input', (e) => {
         e.target.previousSibling.childNodes.forEach((value) => {
-          if (value.innerText.includes(e.target.value)) {
+          let searchTerm = value.innerText
+          let propertyTitle = e.target.value
+          const caseSensitivePropertySearch = this.options.case_sensitive_property_search || this.jsoneditor.options.case_sensitive_property_search
+          if (!caseSensitivePropertySearch) {
+            searchTerm = searchTerm.toLowerCase()
+            propertyTitle = propertyTitle.toLowerCase()
+          }
+          if (searchTerm.includes(propertyTitle)) {
             value.style.display = ''
           } else {
             value.style.display = 'none'
@@ -1058,10 +1068,31 @@ export class ObjectEditor extends AbstractEditor {
   }
   canHaveAdditionalProperties () {
+    // schemas have priority over options
+    // local options have priority over global options
+    // lastly global options are evaluated
+    // If the schema additionalProperties keyword is a boolean let the keyword decide
     if (typeof this.schema.additionalProperties === 'boolean') {
       return this.schema.additionalProperties
     }
-    return !this.jsoneditor.options.no_additional_properties
+    // If the schema additionalProperties keyword is a schema then additional properties are allowed and limited by such schema
+    if (typeof this.schema.additionalProperties === 'object' && this.schema.additionalProperties !== null) {
+      return true
+    }
+    // If the schema options no_additional_properties is a boolean let the option decide
+    if (typeof this.options.no_additional_properties === 'boolean') {
+      return !this.options.no_additional_properties
+    }
+    // If the global options no_additional_properties is a boolean let the option decide
+    if (typeof this.jsoneditor.options.no_additional_properties === 'boolean') {
+      return !this.jsoneditor.options.no_additional_properties
+    }
+    return true
   }
   destroy () {
@@ -1109,11 +1140,47 @@ export class ObjectEditor extends AbstractEditor {
     Object.keys(this.editors).forEach(i => {
       if (this.editors[i].isActive()) {
+        this.editors[i].refreshValue()
         this.value[i] = this.editors[i].getValue()
       }
     })
-    if (this.adding_property) this.refreshAddProperties()
+    Object.keys(this.editors).forEach(i => {
+      if (this.editors[i].isActive()) {
+        this.activateDependentRequired(this.editors[i].key)
+      }
+    })
+    if (this.adding_property) {
+      this.refreshAddProperties()
+    }
+  }
+  activateDependentRequired (key) {
+    const dependentRequired = this.getDependentRequired(key)
+    dependentRequired.forEach((requiredProperty) => {
+      let dependentRequiredEditor
+      Object.entries(this.cached_editors).forEach(([i, cachedEditor]) => {
+        if (cachedEditor.key === requiredProperty) {
+          dependentRequiredEditor = cachedEditor
+        }
+      })
+      if (dependentRequiredEditor && !dependentRequiredEditor.isActive()) {
+        dependentRequiredEditor.activate()
+      }
+    })
+  }
+  getDependentRequired (property) {
+    if (this.schema.dependentRequired) {
+      if (hasOwnProperty(this.schema.dependentRequired, property)) {
+        return this.schema.dependentRequired[property]
+      }
+    }
+    return []
   }
   refreshAddProperties () {
@@ -1190,6 +1257,7 @@ export class ObjectEditor extends AbstractEditor {
     if (!editor) {
       return
     }
     if (typeof editor.schema.required === 'boolean') return editor.schema.required
     else if (Array.isArray(this.schema.required)) return this.schema.required.includes(editor.key)
     else if (this.jsoneditor.options.required_by_default) return true

package/src/editors/signature.js CHANGED Viewed

@@ -26,23 +26,23 @@ export class SignatureEditor extends StringEditor {
       canvas.classList.add('signature')
       signatureContainer.appendChild(canvas)
-      this.signaturePad = new window.SignaturePad(canvas, {
-        onEnd () {
-          /* check if the signature is not empty before setting a value */
-          if (!this.signaturePad.isEmpty()) {
-            this.input.value = this.signaturePad.toDataURL()
-          } else {
-            this.input.value = ''
-          }
-          this.is_dirty = true
-          this.refreshValue()
-          this.watch_listener()
-          this.jsoneditor.notifyWatchers(this.path)
-          if (this.parent) this.parent.onChildEditorChange(this)
-          else this.jsoneditor.onChange()
+      this.signaturePad = new window.SignaturePad(canvas)
+      this.signaturePad.onEnd = () => {
+        /* check if the signature is not empty before setting a value */
+        if (!this.signaturePad.isEmpty()) {
+          this.input.value = this.signaturePad.toDataURL()
+        } else {
+          this.input.value = ''
         }
-      })
+        this.is_dirty = true
+        this.refreshValue()
+        this.watch_listener()
+        this.jsoneditor.notifyWatchers(this.path)
+        if (this.parent) this.parent.onChildEditorChange(this)
+        else this.jsoneditor.onChange()
+      }
       /* create button containers and add clear signature button */
       const buttons = document.createElement('div')

package/src/editors/simplemde.js CHANGED Viewed

@@ -23,7 +23,8 @@ export class SimplemdeEditor extends StringEditor {
       options = this.expandCallbacks('simplemde', extend({}, {
         height: 300
       }, this.defaults.options.simplemde || {}, this.options.simplemde || {}, {
-        element: this.input
+        element: this.input,
+        forceSync: true
       }))
       this.simplemde_instance = new window.SimpleMDE(options)

package/src/editors/string.js CHANGED Viewed

@@ -291,6 +291,7 @@ export class StringEditor extends AbstractEditor {
   getValue () {
     const hasValueSet = !!(this.input && this.input.value)
     if (this.shouldBeUnset() && !hasValueSet) {
       return undefined
     }
@@ -319,6 +320,9 @@ export class StringEditor extends AbstractEditor {
   }
   refreshValue () {
+    if (!this.input) {
+      return
+    }
     this.value = this.input.value
     if (typeof this.value !== 'string' && !this.shouldBeUnset()) this.value = ''
     this.serialized = this.value

package/src/editors/table.js CHANGED Viewed

@@ -36,8 +36,11 @@ export class TableEditor extends ArrayEditor {
   }
   build () {
+    this.tableContainer = this.theme.getTableContainer()
     this.table = this.theme.getTable()
-    this.container.appendChild(this.table)
+    this.tableContainer.appendChild(this.table)
+    this.container.appendChild(this.tableContainer)
     this.thead = this.theme.getTableHead()
     this.table.appendChild(this.thead)
     this.header_row = this.theme.getTableRow()
@@ -74,7 +77,7 @@ export class TableEditor extends ArrayEditor {
       this.container.appendChild(this.panel)
     }
-    this.panel.appendChild(this.table)
+    this.panel.appendChild(this.tableContainer)
     this.controls = this.theme.getButtonHolder()
     if (this.array_controls_top) {
       this.title.appendChild(this.controls)
@@ -232,28 +235,28 @@ export class TableEditor extends ArrayEditor {
       if (editor.delete_button) {
         /* Hide the delete button if we have minItems items */
         const display = !minItems
-        this.setVisibility(editor.delete_button, display)
+        this.setButtonState(editor.delete_button, display)
         needRowButtons.push(display)
       }
       if (editor.copy_button) {
         /* Hide the copy button if we have maxItems items */
         const display = !maxItems
-        this.setVisibility(editor.copy_button, display)
+        this.setButtonState(editor.copy_button, display)
         needRowButtons.push(display)
       }
       if (editor.moveup_button) {
         /* Hide the moveup button for the first row */
         const display = i !== 0
-        this.setVisibility(editor.moveup_button, display)
+        this.setButtonState(editor.moveup_button, display)
         needRowButtons.push(display)
       }
       if (editor.movedown_button) {
         /* Hide the movedown button for the last row */
         const display = i !== this.rows.length - 1
-        this.setVisibility(editor.movedown_button, display)
+        this.setButtonState(editor.movedown_button, display)
         needRowButtons.push(display)
       }
     })
@@ -261,26 +264,26 @@ export class TableEditor extends ArrayEditor {
     const need = needRowButtons.some(e => e)
     /* Show/hide controls column in table */
     this.rows.forEach((editor) =>
-      this.setVisibility(editor.controls_cell, need)
+      this.setButtonState(editor.controls_cell, need)
     )
-    this.setVisibility(this.controls_header_cell, need)
+    this.setButtonState(this.controls_header_cell, need)
-    this.setVisibility(this.table, this.value.length)
+    this.setButtonState(this.table, this.value.length)
     /* If there are maxItems items in the array, or configured to hide the add_row_button button, hide the button beneath the rows */
     const display1 = !(maxItems || this.hide_add_button)
-    this.setVisibility(this.add_row_button, display1)
+    this.setButtonState(this.add_row_button, display1)
     /* If there are minItems items in the array, or configured to hide the delete_last_row button, hide the button beneath the rows */
     const display2 = !(!this.value.length || minItems || this.hide_delete_last_row_buttons)
-    this.setVisibility(this.delete_last_row_button, display2)
+    this.setButtonState(this.delete_last_row_button, display2)
     /* If there are minItems items in the array, or configured to hide the remove_all_rows_button button, hide the button beneath the rows */
     const display3 = !(this.value.length <= 1 || minItems || this.hide_delete_all_rows_buttons)
-    this.setVisibility(this.remove_all_rows_button, display3)
+    this.setButtonState(this.remove_all_rows_button, display3)
     const controlsNeeded = display1 || display2 || display3
-    this.setVisibility(this.controls, controlsNeeded)
+    this.setButtonState(this.controls, controlsNeeded)
   }
   refreshValue () {
@@ -439,7 +442,7 @@ export class TableEditor extends ArrayEditor {
         e.preventDefault()
         e.stopPropagation()
-        this.setVisibility(this.panel, this.collapsed)
+        this.setButtonState(this.panel, this.collapsed)
         if (this.collapsed) {
           this.collapsed = false
           this.setButtonText(e.currentTarget, '', 'collapse', 'button_collapse')