jedison 0.3.7 → 0.3.9

package/dist/esm/jedison.js

@@ -128,7 +128,7 @@ function combineDeep(target, ...sources) {
 const overwriteExistingProperties = (obj1, obj2) => {
   Object.keys(obj2).forEach((key) => {
     if (key in obj1) {
-      if (isSet(obj1[key]) && isSet(obj2[key]) && (isObject(obj1[key]) && isObject(obj2[key]) || isArray(obj1[key]) && isArray(obj2[key]) || isString(obj1[key]) && isString(obj2[key]) || isNumber(obj1[key]) && isNumber(obj2[key]) || isBoolean(obj1[key]) && isBoolean(obj2[key]))) {
+      if (isSet(obj1[key]) && isSet(obj2[key]) && (isObject(obj1[key]) && isObject(obj2[key]) || isArray(obj1[key]) && isArray(obj2[key]) || isString(obj1[key]) && isString(obj2[key]) || isNumber(obj1[key]) && isNumber(obj2[key]) || isBoolean(obj1[key]) && isBoolean(obj2[key]) || isNull(obj1[key]) && isNull(obj2[key]))) {
         if (isObject(obj1[key]) && isObject(obj2[key])) {
           overwriteExistingProperties(obj1[key], obj2[key]);
         } else {
@@ -1660,6 +1660,7 @@ class Instance extends EventEmitter {
     this.isDirty = false;
     this.watched = {};
     this.key = this.path.split(this.jedison.pathSeparator).pop();
+    this.arrayTemplateData = config.arrayTemplateData || {};
     this.init();
   }
   /**
@@ -1798,6 +1799,16 @@ class Instance extends EventEmitter {
   getValue() {
     return clone(this.value);
   }
+  /**
+   * Returns the data that will replace placeholders in titles, descriptions (e.g. "{{ i1 }} {{ value.title }}")
+   */
+  getTemplateData() {
+    return {
+      ...this.arrayTemplateData,
+      value: this.getValue(),
+      settings: this.jedison.options.settings
+    };
+  }
   /**
    * Sets the instance value
    */
@@ -2063,16 +2074,15 @@ class Editor {
     return content;
   }
   getTitle() {
-    if (this.title) {
-      return this.title;
-    }
+    let titleFromSchema = false;
     this.title = this.instance.getKey();
     const schemaTitle = getSchemaTitle(this.instance.schema);
     if (isSet(schemaTitle)) {
-      this.title = compileTemplate(schemaTitle, {
-        value: this.instance.getValue(),
-        settings: this.instance.jedison.options.settings
-      });
+      this.title = schemaTitle;
+      titleFromSchema = true;
+    }
+    if (titleFromSchema) {
+      this.title = compileTemplate(this.title, this.instance.getTemplateData());
       this.title = this.getHtmlFromMarkdown(this.title);
       const domPurifyOptions = combineDeep({}, this.instance.jedison.options.domPurifyOptions, {
         FORBID_TAGS: ["p"]
@@ -2087,10 +2097,7 @@ class Editor {
     }
     const schemaDescription = getSchemaDescription(this.instance.schema);
     if (isSet(schemaDescription)) {
-      this.description = compileTemplate(schemaDescription, {
-        value: this.instance.getValue(),
-        settings: this.instance.jedison.options.settings
-      });
+      this.description = compileTemplate(schemaDescription, this.instance.getTemplateData());
       this.description = this.getHtmlFromMarkdown(this.description);
       const domPurifyOptions = this.instance.jedison.options.domPurifyOptions;
       this.purifyContent(this.description, domPurifyOptions);
@@ -2249,6 +2256,14 @@ class InstanceIfThenElse extends Instance {
     this.activeInstance.register();
     this.instances.forEach((instance, index2) => {
       instance.off("notifyParent");
+      if (instance.children && isObject(value)) {
+        instance.children.forEach((child) => {
+          const shouldUpdateValue = child.isMultiple && hasOwn(value, child.getKey());
+          if (shouldUpdateValue) {
+            child.setValue(value[child.getKey()], false, "api");
+          }
+        });
+      }
       const startingValue = this.instanceStartingValues[index2];
       const currentValue = instance.getValue();
       let instanceValue = value;
@@ -2348,6 +2363,7 @@ class InstanceMultiple extends Instance {
     this.schemas = [];
     this.switcherOptionValues = [];
     this.switcherOptionsLabels = [];
+    this.isMultiple = true;
     this.on("set-value", () => {
       this.onSetValue();
     });
@@ -2733,7 +2749,7 @@ class InstanceArray extends Instance {
       this.refreshChildren();
     });
   }
-  createItemInstance() {
+  createItemInstance(index2) {
     let schema;
     const itemsCount = this.children.length;
     const schemaItems = getSchemaItems(this.schema);
@@ -2747,7 +2763,11 @@ class InstanceArray extends Instance {
       jedison: this.jedison,
       schema,
       path: this.path + this.jedison.pathSeparator + itemsCount,
-      parent: this
+      parent: this,
+      arrayTemplateData: {
+        i0: index2,
+        i1: index2 + 1
+      }
     });
   }
   setDefaultValue() {
@@ -2798,8 +2818,8 @@ class InstanceArray extends Instance {
     if (!isArray(value)) {
       return;
     }
-    value.forEach((itemValue) => {
-      const child = this.createItemInstance(itemValue);
+    value.forEach((itemValue, index2) => {
+      const child = this.createItemInstance(index2);
       this.children.push(child);
       child.setValue(itemValue, false);
     });
@@ -6058,7 +6078,7 @@ class Theme {
       icon: "add"
     });
     const fieldset = this.getFieldset();
-    const { legend, infoContainer } = this.getLegend({
+    const { legend, infoContainer, legendText } = this.getLegend({
       content: config.title,
       id: config.id,
       titleHidden: config.titleHidden
@@ -6112,6 +6132,7 @@ class Theme {
       ariaLive,
       propertiesActivators,
       legend,
+      legendText,
       infoContainer
     };
   }