@json-editor/json-editor 2.10.0 → 2.11.0

package/dist/jsoneditor.js.LICENSE.txt

@@ -3,7 +3,7 @@
  * * @name JSON Editor
  * * @description JSON Schema Based Editor
  * * This library is the continuation of jdorn's great work (see also https://github.com/jdorn/json-editor/issues/800)
- * * @version "2.10.0"
+ * * @version "2.11.0"
  * * @author Jeremy Dorn
  * * @see https://github.com/jdorn/json-editor/
  * * @see https://github.com/json-editor/json-editor

package/dist/nonmin/jsoneditor.js

@@ -3,7 +3,7 @@
  * * @name JSON Editor
  * * @description JSON Schema Based Editor
  * * This library is the continuation of jdorn's great work (see also https://github.com/jdorn/json-editor/issues/800)
- * * @version "2.10.0"
+ * * @version "2.11.0"
  * * @author Jeremy Dorn
  * * @see https://github.com/jdorn/json-editor/
  * * @see https://github.com/json-editor/json-editor
@@ -6234,6 +6234,9 @@ var MultipleEditor = /*#__PURE__*/function (_AbstractEditor) {
       this.editors.forEach(function (editor, type) {
         if (!editor) return;
         if (_this.type === type) {
+          if (_this.keep_only_existing_values) {
+            currentValue = (0,_utilities_js__WEBPACK_IMPORTED_MODULE_32__.overwriteExistingProperties)(editor.getValue(), currentValue);
+          }
           if (_this.keep_values || _this["if"]) editor.setValue(currentValue, true);
           editor.container.style.display = '';
         } else {
@@ -6292,6 +6295,9 @@ var MultipleEditor = /*#__PURE__*/function (_AbstractEditor) {
       this.keep_values = true;
       if (typeof this.jsoneditor.options.keep_oneof_values !== 'undefined') this.keep_values = this.jsoneditor.options.keep_oneof_values;
       if (typeof this.options.keep_oneof_values !== 'undefined') this.keep_values = this.options.keep_oneof_values;
+      this.keep_only_existing_values = false;
+      if (typeof this.jsoneditor.options.keep_only_existing_values !== 'undefined') this.keep_only_existing_values = this.jsoneditor.options.keep_only_existing_values;
+      if (typeof this.options.keep_only_existing_values !== 'undefined') this.keep_only_existing_values = this.options.keep_only_existing_values;
       if (this.schema.oneOf) {
         this.oneOf = true;
         this.types = this.schema.oneOf;
@@ -6389,6 +6395,9 @@ var MultipleEditor = /*#__PURE__*/function (_AbstractEditor) {
         }
         _this3.validators[i] = new _validator_js__WEBPACK_IMPORTED_MODULE_31__.Validator(_this3.jsoneditor, schema, validatorOptions, _this3.defaults);
       });
+      this.jsoneditor.on('change', function () {
+        _this3.switchIf();
+      });
       this.switchEditor(0);
     }
   }, {
@@ -6398,7 +6407,6 @@ var MultipleEditor = /*#__PURE__*/function (_AbstractEditor) {
         this.refreshValue();
         this.refreshHeaderText();
       }
-      this.switchIf();
       _get(_getPrototypeOf(MultipleEditor.prototype), "onChildEditorChange", this).call(this);
     }
   }, {
@@ -19716,6 +19724,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "isObject": () => (/* binding */ isObject),
 /* harmony export */   "isPlainObject": () => (/* binding */ isPlainObject),
 /* harmony export */   "mergeDeep": () => (/* binding */ mergeDeep),
+/* harmony export */   "overwriteExistingProperties": () => (/* binding */ overwriteExistingProperties),
 /* harmony export */   "trigger": () => (/* binding */ trigger)
 /* harmony export */ });
 /* harmony import */ var core_js_modules_es_array_is_array_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.array.is-array.js */ "./node_modules/core-js/modules/es.array.is-array.js");
@@ -19917,6 +19926,14 @@ function mergeDeep(target) {
   }
   return mergeDeep.apply(void 0, [target].concat(sources));
 }
+function overwriteExistingProperties(obj1, obj2) {
+  Object.keys(obj2).forEach(function (key) {
+    if (key in obj1) {
+      obj1[key] = obj2[key];
+    }
+  });
+  return obj1;
+}
 
 /***/ }),