jedison 1.4.4 → 1.5.1

package/dist/esm/jedison.js

@@ -2672,6 +2672,7 @@ class InstanceObject extends Instance {
     this.schemaAdditionalProperties = getSchemaAdditionalProperties(this.schema);
     const schemaProperties = getSchemaProperties(this.schema);
     const schemaRequired = getSchemaRequired(this.schema);
+    const initialValue = clone(this.value);
     if (isSet(schemaProperties)) {
       Object.keys(schemaProperties).forEach((key) => {
         const schema = schemaProperties[key];
@@ -2695,7 +2696,7 @@ class InstanceObject extends Instance {
           musstCreateChild = false;
         }
         if (musstCreateChild) {
-          this.createChild(schema, key, hasOwn(this.value, key) ? this.value[key] : void 0);
+          this.createChild(schema, key, hasOwn(initialValue, key) ? initialValue[key] : void 0);
         }
       });
     }
@@ -2704,7 +2705,7 @@ class InstanceObject extends Instance {
         this.requiredProperties.add(requiredProperty);
         if (!hasOwn(this.properties, requiredProperty)) {
           this.properties[requiredProperty] = {};
-          this.createChild({}, requiredProperty, hasOwn(this.value, requiredProperty) ? this.value[requiredProperty] : void 0);
+          this.createChild({}, requiredProperty, hasOwn(initialValue, requiredProperty) ? initialValue[requiredProperty] : void 0);
         }
       });
     }
@@ -3866,16 +3867,15 @@ class EditorObjectGrid extends EditorObject {
     });
   }
 }
-class EditorObjectNav extends EditorObject {
+class EditorObjectCategories extends EditorObject {
   static resolves(schema) {
     const format2 = getSchemaXOption(schema, "format");
-    const regex = /^nav-(horizontal|vertical(?:-\d+)?)$/;
-    const hasNavFormat = regex.test(format2);
-    return getSchemaType(schema) === "object" && hasNavFormat;
+    const regex = /^categories-(horizontal|vertical(?:-\d+)?)$/;
+    return getSchemaType(schema) === "object" && regex.test(format2);
   }
   init() {
     super.init();
-    this.activeTabIndex = 0;
+    this.activeCategoryName = null;
   }
   refreshEditors() {
     while (this.control.childrenSlot.firstChild) {
@@ -3898,31 +3898,136 @@ class EditorObjectNav extends EditorObject {
     row.appendChild(tabContentCol);
     tabListCol.appendChild(tabList);
     tabContentCol.appendChild(tabContent);
-    this.instance.children.forEach((child, index2) => {
-      if (child.isActive) {
-        const active = index2 === this.activeTabIndex;
-        const id = pathToAttribute(child.path);
+    const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
+    const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
+    const defaultLabel = getSchemaXOption(this.instance.schema, "categoriesDefaultLabel") ?? "Basic";
+    const categoriesMap = /* @__PURE__ */ new Map();
+    this.instance.children.forEach((child) => {
+      if (!child.isActive) return;
+      const hidden = getSchemaXOption(child.schema, "hidden");
+      if (isSet(hidden) && hidden === true) return;
+      const childSchemaType = getSchemaType(child.schema);
+      const xCategory = getSchemaXOption(child.schema, "category");
+      let categoryName;
+      if (isSet(xCategory)) {
+        categoryName = xCategory;
+      } else if (childSchemaType === "object" || childSchemaType === "array") {
         const schemaTitle = getSchemaTitle(child.schema);
-        const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
-        const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
-        const tab = this.theme.getTab({
-          hasErrors: navWarning && child.hasNestedValidationErrors(),
-          navWarningMessage,
-          title: isSet(schemaTitle) ? schemaTitle : child.getKey(),
-          id,
-          active
-        });
-        tab.list.addEventListener("click", () => {
-          this.activeTabIndex = index2;
-        });
-        this.theme.setTabPaneAttributes(child.ui.control.container, active, id);
-        tabList.appendChild(tab.list);
-        tabContent.appendChild(child.ui.control.container);
+        categoryName = isSet(schemaTitle) ? schemaTitle : child.getKey();
+      } else {
+        categoryName = defaultLabel;
+      }
+      if (!categoriesMap.has(categoryName)) {
+        categoriesMap.set(categoryName, { children: [], id: pathToAttribute(child.path) });
+      }
+      categoriesMap.get(categoryName).children.push(child);
+    });
+    if (!categoriesMap.has(this.activeCategoryName)) {
+      this.activeCategoryName = categoriesMap.keys().next().value;
+    }
+    categoriesMap.forEach((category, categoryName) => {
+      const active = categoryName === this.activeCategoryName;
+      const { children, id } = category;
+      const hasErrors = navWarning && children.some((child) => child.hasNestedValidationErrors());
+      const tab = this.theme.getTab({
+        hasErrors,
+        navWarningMessage,
+        title: categoryName,
+        id,
+        active
+      });
+      tab.list.addEventListener("click", () => {
+        this.activeCategoryName = categoryName;
+      });
+      const pane = document.createElement("div");
+      this.theme.setTabPaneAttributes(pane, active, id);
+      children.forEach((child) => {
+        pane.appendChild(child.ui.control.container);
         if (this.disabled || this.instance.isReadOnly()) {
           child.ui.disable();
         } else {
           child.ui.enable();
         }
+      });
+      tabList.appendChild(tab.list);
+      tabContent.appendChild(pane);
+    });
+  }
+}
+class EditorObjectNav extends EditorObject {
+  static resolves(schema) {
+    const format2 = getSchemaXOption(schema, "format");
+    const regex = /^nav-(horizontal|vertical(?:-\d+)?)$/;
+    const hasNavFormat = regex.test(format2);
+    return getSchemaType(schema) === "object" && hasNavFormat;
+  }
+  init() {
+    super.init();
+    this.activeTabIndex = 0;
+  }
+  isChildVisible(child) {
+    if (!child.isActive) return false;
+    const hidden = getSchemaXOption(child.schema, "hidden");
+    return !(isSet(hidden) && hidden === true);
+  }
+  getVisibleChildIndices() {
+    return this.instance.children.reduce((indices, child, index2) => {
+      if (this.isChildVisible(child)) indices.push(index2);
+      return indices;
+    }, []);
+  }
+  ensureActiveTabIsVisible(visibleIndices) {
+    if (!visibleIndices.includes(this.activeTabIndex)) {
+      this.activeTabIndex = visibleIndices[0] ?? 0;
+    }
+  }
+  refreshEditors() {
+    while (this.control.childrenSlot.firstChild) {
+      this.control.childrenSlot.removeChild(this.control.childrenSlot.lastChild);
+    }
+    const format2 = getSchemaXOption(this.instance.schema, "format");
+    const formatParts = format2.split("-");
+    const variant = formatParts[1];
+    const columns = formatParts[2];
+    const navColumns = variant === "horizontal" ? 12 : columns ?? 4;
+    const row = this.theme.getRow();
+    const tabListCol = this.theme.getCol(12, 12, navColumns, navColumns);
+    const tabContentCol = this.theme.getCol(12, 12, 12 - navColumns, 12 - navColumns);
+    const tabContent = this.theme.getTabContent();
+    const tabList = this.theme.getTabList({
+      variant
+    });
+    this.control.childrenSlot.appendChild(row);
+    row.appendChild(tabListCol);
+    row.appendChild(tabContentCol);
+    tabListCol.appendChild(tabList);
+    tabContentCol.appendChild(tabContent);
+    const visibleIndices = this.getVisibleChildIndices();
+    this.ensureActiveTabIsVisible(visibleIndices);
+    this.instance.children.forEach((child, index2) => {
+      if (!this.isChildVisible(child)) return;
+      const active = index2 === this.activeTabIndex;
+      const id = pathToAttribute(child.path);
+      const schemaTitle = getSchemaTitle(child.schema);
+      const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
+      const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
+      const tab = this.theme.getTab({
+        hasErrors: navWarning && child.hasNestedValidationErrors(),
+        navWarningMessage,
+        title: isSet(schemaTitle) ? schemaTitle : child.getKey(),
+        id,
+        active
+      });
+      tab.list.addEventListener("click", () => {
+        this.activeTabIndex = index2;
+      });
+      this.theme.setTabPaneAttributes(child.ui.control.container, active, id);
+      tabList.appendChild(tab.list);
+      tabContent.appendChild(child.ui.control.container);
+      if (this.disabled || this.instance.isReadOnly()) {
+        child.ui.disable();
+      } else {
+        child.ui.enable();
       }
     });
   }
@@ -5227,6 +5332,7 @@ class UiResolver {
       EditorNumberSelect,
       EditorNumberInput,
       EditorObjectGrid,
+      EditorObjectCategories,
       EditorObjectNav,
       EditorObject,
       EditorArrayChoices,
@@ -8804,6 +8910,7 @@ const index = {
   EditorNumberSelect,
   EditorNumberInput,
   EditorObjectGrid,
+  EditorObjectCategories,
   EditorObjectNav,
   EditorObject,
   EditorArrayChoices,