jedison 1.10.0 → 1.11.0

package/dist/esm/jedison.js

@@ -1821,8 +1821,6 @@ class Instance extends EventEmitter {
     this.children = [];
     this.ui = null;
     this.isDirty = false;
-    this.cachedErrors = null;
-    this.cachedErrorsValue = void 0;
     this.watched = {};
     this.key = this.path.split(this.jedison.pathSeparator).pop();
     this.arrayTemplateData = config.arrayTemplateData || {};
@@ -2034,7 +2032,6 @@ class Instance extends EventEmitter {
     }
     this.value = newValue;
     this.isDirty = true;
-    this.cachedErrors = null;
     this.emit("set-value", newValue, initiator);
     this.emit("change", initiator);
     this.jedison.emit("instance-change", this, initiator);
@@ -2055,15 +2052,9 @@ class Instance extends EventEmitter {
     if (!this.isActive) {
       return [];
     }
-    if (this.cachedErrorsValue === this.value && this.cachedErrors !== null) {
-      return this.cachedErrors;
-    }
-    const errors = removeDuplicatesFromArray(
+    return removeDuplicatesFromArray(
       this.jedison.validator.getErrors(this.getValueRaw(), this.originalSchema, this.getKey(), this.path)
     );
-    this.cachedErrorsValue = this.value;
-    this.cachedErrors = errors;
-    return errors;
   }
   /**
    * Returns true if any leaf descendant is showing validation errors.
@@ -2800,8 +2791,8 @@ class InstanceMultiple extends Instance {
       instance.off("notifyParent");
       instance.on("notifyParent", (initiator) => {
         this.value = this.activeInstance.getValueRaw();
-        this.emit("notifyParent", initiator);
         this.emit("change", initiator);
+        this.emit("notifyParent", initiator);
       });
       this.instances.push(instance);
       this.register();
@@ -2937,7 +2928,6 @@ class InstanceObject extends Instance {
       Object.keys(value).forEach((propertyName) => {
         const matchesPattern = compiledPatterns.some((re) => re.test(propertyName));
         if (!hasOwn(this.properties, propertyName) && !matchesPattern) {
-          console.warn("deleting", propertyName);
           delete value[propertyName];
         }
       });
@@ -3266,7 +3256,8 @@ const glyphicons = {
   info: "glyphicon glyphicon-question-sign",
   close: "glyphicon glyphicon-remove",
   edit: "glyphicon glyphicon-pencil",
-  save: "glyphicon glyphicon-floppy-disk"
+  save: "glyphicon glyphicon-floppy-disk",
+  copy: "glyphicon glyphicon-copy"
 };
 const bootstrapIcons = {
   properties: "bi bi-card-list",
@@ -3280,7 +3271,8 @@ const bootstrapIcons = {
   info: "bi bi-question-circle",
   close: "bi bi-x",
   edit: "bi bi-pencil",
-  save: "bi bi-floppy"
+  save: "bi bi-floppy",
+  copy: "bi bi-clipboard"
 };
 const fontAwesome3 = {
   properties: "icon-list",
@@ -3294,7 +3286,8 @@ const fontAwesome3 = {
   info: "icon-question-sign",
   close: "icon-remove",
   edit: "icon-pencil",
-  save: "icon-save"
+  save: "icon-save",
+  copy: "icon-copy"
 };
 const fontAwesome4 = {
   properties: "fa fa-list",
@@ -3308,7 +3301,8 @@ const fontAwesome4 = {
   info: "fa fa-question-circle",
   close: "fa fa-times",
   edit: "fa fa-pencil",
-  save: "fa fa-floppy-o"
+  save: "fa fa-floppy-o",
+  copy: "fa fa-clipboard"
 };
 const fontAwesome5 = {
   properties: "fas fa-list",
@@ -3322,7 +3316,8 @@ const fontAwesome5 = {
   info: "fas fa-question-circle",
   close: "fas fa-times",
   edit: "fas fa-pencil-alt",
-  save: "fas fa-save"
+  save: "fas fa-save",
+  copy: "fas fa-clipboard"
 };
 const fontAwesome6 = {
   properties: "fa-solid fa-list",
@@ -3336,7 +3331,8 @@ const fontAwesome6 = {
   info: "fa-solid fa-circle-question",
   close: "fa-solid fa-xmark",
   edit: "fa-solid fa-pencil",
-  save: "fa-solid fa-floppy-disk"
+  save: "fa-solid fa-floppy-disk",
+  copy: "fa-solid fa-clipboard"
 };
 class EditorBoolean extends Editor {
   sanitize(value) {
@@ -4114,6 +4110,9 @@ class EditorObject extends Editor {
         alert("Invalid JSON");
       }
     });
+    this.control.jsonData.copyBtn.addEventListener("click", () => {
+      navigator.clipboard.writeText(this.control.jsonData.input.value);
+    });
     this.control.jsonData.toggle.addEventListener("click", () => {
       this.refreshJsonDataInputSize();
     });
@@ -4586,6 +4585,9 @@ class EditorArray extends Editor {
     this.addJsonDataEventListeners();
   }
   addJsonDataEventListeners() {
+    this.control.jsonData.copyBtn.addEventListener("click", () => {
+      navigator.clipboard.writeText(this.control.jsonData.input.value);
+    });
     this.control.jsonData.saveBtn.addEventListener("click", () => {
       try {
         const inputValue = JSON.parse(this.control.jsonData.input.value);
@@ -5313,7 +5315,7 @@ class EditorArrayNav extends EditorArray {
     tabListCol.appendChild(tabList);
     tabContentCol.appendChild(tabContent);
     this.instance.children.forEach((child, index2) => {
-      const { deleteBtn, moveUpBtn, moveDownBtn, btnGroup, addAfterBtn } = this.getButtons(index2);
+      const { deleteBtn, moveUpBtn, moveDownBtn, dragBtn, btnGroup, addAfterBtn } = this.getButtons(index2);
       if (isSet(arrayDelete) && arrayDelete === true) {
         btnGroup.appendChild(deleteBtn);
       }
@@ -5324,6 +5326,9 @@ class EditorArrayNav extends EditorArray {
       if (isSet(arrayAddAfter) && arrayAddAfter === true) {
         btnGroup.appendChild(addAfterBtn);
       }
+      if (this.isSortable()) {
+        btnGroup.appendChild(dragBtn);
+      }
       this.control.childrenSlot.appendChild(child.ui.control.container);
       const schemaTitle = getSchemaTitle(child.schema);
       const childTitle = isSet(schemaTitle) ? schemaTitle + " " + (index2 + 1) : child.getKey();
@@ -5370,11 +5375,32 @@ class EditorArrayNav extends EditorArray {
         moveDownBtn.setAttribute("disabled", "");
       }
     });
+    this.refreshSortable(tabList);
     this.refreshDisabledState();
     this.refreshAddBtn();
     this.refreshDeleteAllBtn();
     this.refreshJsonData();
   }
+  showValidationErrors(errors, force = false) {
+    super.showValidationErrors(errors, force);
+    this.refreshUI();
+  }
+  refreshSortable(container) {
+    if (this.isSortable()) {
+      if (this.sortable) {
+        this.sortable.destroy();
+      }
+      this.sortable = window.Sortable.create(container, {
+        animation: 150,
+        handle: ".jedi-array-drag",
+        disabled: this.disabled || this.readOnly,
+        onEnd: (evt) => {
+          this.activeItemIndex = evt.newIndex;
+          this.instance.move(evt.oldIndex, evt.newIndex);
+        }
+      });
+    }
+  }
 }
 class EditorMultiple extends Editor {
   static resolves(schema) {
@@ -5397,6 +5423,20 @@ class EditorMultiple extends Editor {
     if (this.embedSwitcher) {
       this.control.header.style.display = "none";
     }
+    this.instance.on("change", () => {
+      const jedison = this.instance.jedison;
+      const errors = jedison.getErrors(["error", "warning"]);
+      const prefix = this.instance.path + "/";
+      const matching = [];
+      for (const inst of jedison.instances.values()) {
+        if (inst.ui && inst.path.startsWith(prefix)) {
+          matching.push(inst);
+        }
+      }
+      for (const inst of matching.reverse()) {
+        inst.ui.showValidationErrors(errors);
+      }
+    });
   }
   adaptForTable(td) {
     this.theme.adaptForTableMultipleControl(this.control, td);
@@ -5842,16 +5882,20 @@ class EditorNumberRaty extends EditorNumber {
     });
     try {
       const ratyOptions = getSchemaXOption(this.instance.schema, "raty") ?? {};
-      this.raty = new Raty(this.control.placeholder, Object.assign({}, ratyOptions), {
+      this.raty = new Raty(this.control.placeholder, Object.assign({}, ratyOptions, {
         click: (score) => {
           this.instance.setValue(score, true, "user");
         }
-      });
+      }));
       this.raty.init();
     } catch (e) {
       console.error("Raty is not available or not loaded correctly.", e);
     }
   }
+  adaptForTable() {
+    this.theme.visuallyHidden(this.control.label);
+    this.theme.visuallyHidden(this.control.description);
+  }
   refreshDisabledState() {
     if (this.disabled || this.readOnly) {
       this.raty.readOnly(true);
@@ -7594,6 +7638,11 @@ class Theme {
     input.style.overflowX = "auto";
     input.style.resize = "both";
     input.style.maxHeight = "60vh";
+    const copyBtn = this.getButton({
+      id: "jedi-json-data-copy-" + config.id,
+      icon: "copy"
+    });
+    copyBtn.classList.add("jedi-json-data-copy");
     const saveBtn = this.getButton({
       // content: config.propertiesToggleContent, // todo: use text config or something
       id: "jedi-json-data-save-" + config.id,
@@ -7602,12 +7651,14 @@ class Theme {
     dialog.appendChild(control);
     control.appendChild(label);
     control.appendChild(input);
+    dialog.appendChild(copyBtn);
     dialog.appendChild(saveBtn);
     return {
       dialog,
       toggle,
       control,
       input,
+      copyBtn,
       saveBtn
     };
   }
@@ -8874,6 +8925,8 @@ class ThemeBootstrap3 extends Theme {
     const jsonData = super.getJsonData(config);
     jsonData.control.classList.add("form-group");
     jsonData.input.classList.add("form-control");
+    jsonData.copyBtn.classList.add("btn-default");
+    jsonData.copyBtn.classList.add("btn-block");
     jsonData.saveBtn.classList.add("btn-primary");
     jsonData.saveBtn.classList.add("btn-block");
     return jsonData;
@@ -9239,6 +9292,8 @@ class ThemeBootstrap4 extends Theme {
     const jsonData = super.getJsonData(config);
     jsonData.control.classList.add("form-group");
     jsonData.input.classList.add("form-control");
+    jsonData.copyBtn.classList.add("btn-secondary");
+    jsonData.copyBtn.classList.add("btn-block");
     jsonData.saveBtn.classList.add("btn-primary");
     jsonData.saveBtn.classList.add("btn-block");
     return jsonData;
@@ -9623,6 +9678,8 @@ class ThemeBootstrap5 extends Theme {
     const jsonData = super.getJsonData(config);
     jsonData.control.classList.add("mb-3");
     jsonData.input.classList.add("form-control");
+    jsonData.copyBtn.classList.add("btn-secondary");
+    jsonData.copyBtn.classList.add("w-100");
     jsonData.saveBtn.classList.add("btn-primary");
     jsonData.saveBtn.classList.add("w-100");
     return jsonData;