jupiter-dynamic-forms 1.18.7 → 1.18.8

package/dist/index.mjs

@@ -12681,7 +12681,8 @@ let JupiterDynamicForm = class extends LitElement {
     })) == null ? void 0 : _a.id;
   }
   async scrollToConcept(conceptName, dimensions, match) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    console.log(`[scrollToConcept] ▶ START conceptName=${conceptName} value=${match == null ? void 0 : match.value} dims=${JSON.stringify(dimensions)}`);
     let targetSection = null;
     let targetConcept = null;
     const sectionsToSearch = [
@@ -12691,18 +12692,35 @@ let JupiterDynamicForm = class extends LitElement {
         return !((_a2 = this._currentSchema) == null ? void 0 : _a2.sections.find((cs) => cs.id === s2.id));
       })
     ];
+    console.log(`[scrollToConcept] Searching ${sectionsToSearch.length} sections`);
     for (const section2 of sectionsToSearch) {
       const found = this._findConceptByName(section2.concepts, conceptName);
       if (found) {
-        targetSection = section2;
-        targetConcept = found;
-        break;
+        if (dimensions == null ? void 0 : dimensions.length) {
+          const cols = section2.columns ?? this._columns;
+          const colId = this._findColumnByDimensions(cols, dimensions);
+          console.log(`[scrollToConcept] Section "${section2.id}" has concept "${found.id}" | colMatch=${colId ?? "null"} | cols=${cols.map((c2) => c2.id).join(",")}`);
+          if (colId) {
+            targetSection = section2;
+            targetConcept = found;
+            break;
+          } else if (!targetSection) {
+            targetSection = section2;
+            targetConcept = found;
+          }
+        } else {
+          console.log(`[scrollToConcept] Section "${section2.id}" has concept "${found.id}" (no dims, taking first)`);
+          targetSection = section2;
+          targetConcept = found;
+          break;
+        }
       }
     }
     if (!targetSection || !targetConcept) {
       console.warn(`[scrollToConcept] Concept not found: ${conceptName}`);
       return;
     }
+    console.log(`[scrollToConcept] → targetSection="${targetSection.id}" targetConceptId="${targetConcept.id}"`);
     targetSection.expanded = true;
     if (this.display === "sidePanel" && this._activeSidePanelRoleId !== targetSection.id) {
       this._activeSidePanelRoleId = targetSection.id;
@@ -12716,10 +12734,12 @@ let JupiterDynamicForm = class extends LitElement {
     } else if (!hasValueMatch) {
       targetColumnId = ((_b = columns[0]) == null ? void 0 : _b.id) ?? null;
     }
+    console.log(`[scrollToConcept] targetColumnId=${targetColumnId} hasValueMatch=${hasValueMatch} targetValue=${targetValue}`);
     this.requestUpdate();
     await this.updateComplete;
     await new Promise((resolve) => setTimeout(resolve, 300));
     const sectionElements = (_c = this.shadowRoot) == null ? void 0 : _c.querySelectorAll("jupiter-form-section");
+    console.log(`[scrollToConcept] DOM: found ${(sectionElements == null ? void 0 : sectionElements.length) ?? 0} jupiter-form-section elements`);
     let targetSectionEl = null;
     sectionElements == null ? void 0 : sectionElements.forEach((el) => {
       var _a2;
@@ -12732,8 +12752,13 @@ let JupiterDynamicForm = class extends LitElement {
     }
     await targetSectionEl.updateComplete;
     const conceptTrees = (_d = targetSectionEl.shadowRoot) == null ? void 0 : _d.querySelectorAll("jupiter-concept-tree");
+    console.log(`[scrollToConcept] conceptTrees in targetSection: ${(conceptTrees == null ? void 0 : conceptTrees.length) ?? 0}`);
     let targetFieldEl = null;
     const conceptId = targetConcept.id;
+    const conceptIdBase = conceptId.includes("__") ? conceptId.split("__")[0] : conceptId;
+    console.log(`[scrollToConcept] conceptId="${conceptId}" conceptIdBase="${conceptIdBase}"`);
+    const sameBaseConcept = (fieldConceptId) => fieldConceptId === conceptId || fieldConceptId.includes("__") && fieldConceptId.split("__")[0] === conceptIdBase;
+    let phase1FieldCount = 0;
     conceptTrees == null ? void 0 : conceptTrees.forEach((ct) => {
       var _a2;
       if (targetFieldEl)
@@ -12744,31 +12769,72 @@ let JupiterDynamicForm = class extends LitElement {
           return;
         const columnMatch = targetColumnId ? fieldEl.conceptId === conceptId && fieldEl.columnId === targetColumnId : fieldEl.conceptId === conceptId;
         const valueMatch = !hasValueMatch || String(fieldEl.value ?? "") === targetValue;
+        if (columnMatch) {
+          phase1FieldCount++;
+          console.log(`[scrollToConcept] Phase1 candidate: conceptId=${fieldEl.conceptId} columnId=${fieldEl.columnId} value=${fieldEl.value} valueMatch=${valueMatch}`);
+        }
         if (columnMatch && valueMatch)
           targetFieldEl = fieldEl;
       });
     });
-    if (!targetFieldEl && hasValueMatch && !targetColumnId) {
-      for (const ct of Array.from(conceptTrees ?? [])) {
+    console.log(`[scrollToConcept] Phase1: scanned ${phase1FieldCount} candidates, found=${!!targetFieldEl}`);
+    if (!targetFieldEl && hasValueMatch) {
+      console.log(`[scrollToConcept] Phase2: searching ALL sections by base concept name + value`);
+      const allSectionEls = ((_e = this.shadowRoot) == null ? void 0 : _e.querySelectorAll("jupiter-form-section")) ?? [];
+      for (const secEl of Array.from(allSectionEls)) {
         if (targetFieldEl)
           break;
-        const fields = (_e = ct.shadowRoot) == null ? void 0 : _e.querySelectorAll("jupiter-form-field");
-        fields == null ? void 0 : fields.forEach((fieldEl) => {
+        const cts = ((_f = secEl.shadowRoot) == null ? void 0 : _f.querySelectorAll("jupiter-concept-tree")) ?? [];
+        for (const ct of Array.from(cts)) {
           if (targetFieldEl)
-            return;
-          const columnMatch = targetColumnId ? fieldEl.conceptId === conceptId && fieldEl.columnId === targetColumnId : fieldEl.conceptId === conceptId;
-          if (columnMatch)
-            targetFieldEl = fieldEl;
-        });
+            break;
+          const fields = ((_g = ct.shadowRoot) == null ? void 0 : _g.querySelectorAll("jupiter-form-field")) ?? [];
+          fields.forEach((fieldEl) => {
+            if (targetFieldEl)
+              return;
+            const baseMatch = sameBaseConcept(fieldEl.conceptId);
+            const valMatch = String(fieldEl.value ?? "") === targetValue;
+            if (baseMatch) {
+              console.log(`[scrollToConcept] Phase2 candidate: conceptId=${fieldEl.conceptId} value=${fieldEl.value} valMatch=${valMatch}`);
+            }
+            if (baseMatch && valMatch) {
+              console.log(`[scrollToConcept] Phase2 ✅ MATCH: conceptId=${fieldEl.conceptId} columnId=${fieldEl.columnId} value=${fieldEl.value}`);
+              targetFieldEl = fieldEl;
+            }
+          });
+        }
+      }
+    }
+    if (!targetFieldEl) {
+      const allSectionEls = ((_h = this.shadowRoot) == null ? void 0 : _h.querySelectorAll("jupiter-form-section")) ?? [];
+      for (const secEl of Array.from(allSectionEls)) {
+        if (targetFieldEl)
+          break;
+        const cts = ((_i = secEl.shadowRoot) == null ? void 0 : _i.querySelectorAll("jupiter-concept-tree")) ?? [];
+        for (const ct of Array.from(cts)) {
+          if (targetFieldEl)
+            break;
+          const fields = ((_j = ct.shadowRoot) == null ? void 0 : _j.querySelectorAll("jupiter-form-field")) ?? [];
+          fields.forEach((fieldEl) => {
+            if (targetFieldEl)
+              return;
+            const columnMatch = targetColumnId ? sameBaseConcept(fieldEl.conceptId) && fieldEl.columnId === targetColumnId : sameBaseConcept(fieldEl.conceptId);
+            if (columnMatch) {
+              console.log(`[scrollToConcept] Phase3 ✅ fallback: conceptId=${fieldEl.conceptId} columnId=${fieldEl.columnId} value=${fieldEl.value}`);
+              targetFieldEl = fieldEl;
+            }
+          });
+        }
       }
     }
     if (!targetFieldEl) {
       console.warn(`[scrollToConcept] Field element not found for concept: ${conceptName}`);
       return;
     }
+    console.log(`[scrollToConcept] ✅ HIGHLIGHTING conceptId=${targetFieldEl.conceptId} columnId=${targetFieldEl.columnId} value=${targetFieldEl.value}`);
     targetFieldEl.scrollIntoView({ behavior: "smooth", block: "center" });
     targetFieldEl.classList.add("concept-highlight");
-    const focusTarget = (_f = targetFieldEl.shadowRoot) == null ? void 0 : _f.querySelector(
+    const focusTarget = (_k = targetFieldEl.shadowRoot) == null ? void 0 : _k.querySelector(
       'input:not([type="hidden"]), select, textarea, button, [tabindex]:not([tabindex="-1"])'
     );
     focusTarget == null ? void 0 : focusTarget.focus({ preventScroll: true });