@jinntec/fore 2.8.0 → 3.0.1

package/src/ui/fx-repeatitem.js

@@ -50,6 +50,8 @@ export class FxRepeatitem extends withDraggability(UIElement, true) {
         `;
     this.getOwnerForm().registerLazyElement(this);
 
+    // Keep ref as a *property only* so repeatitem does not become the nearest [ref] for its children.
+    // Its children already get their context from the repeatitem via getInScopeContext().
     this.ref = `${this.parentNode.ref}`;
 
     this.tabindex = 0;
@@ -58,7 +60,7 @@ export class FxRepeatitem extends withDraggability(UIElement, true) {
   disconnectedCallback() {
     super.disconnectedCallback();
     this.removeEventListener('click', this._dispatchIndexChange);
-    this.removeEventListener('focusin', this._handleFocus);
+    this.removeEventListener('focusin', this._dispatchIndexChange);
   }
 
   init() {
@@ -96,6 +98,19 @@ export class FxRepeatitem extends withDraggability(UIElement, true) {
     this.getOwnerForm().refresh();
   }
 
+  update(_modelItem) {
+    // Repeatitems must refresh when their ModelItem facets (e.g. relevant) change,
+    // but they should NOT have a `ref` attribute (that would change inscope context resolution).
+    const fore = this.getOwnerForm();
+    if (!fore) return;
+
+    if (fore.isRefreshPhase) {
+      fore.addToBatchedNotifications(this);
+    } else {
+      this.refresh();
+    }
+  }
+
   async refresh(force = false) {
     // this.modelItem = this.getModelItem();
     this.attachObserver();

package/src/ui/repeat-base.js

@@ -199,12 +199,15 @@ export class RepeatBase extends withDraggability(UIElement, false) {
 
     // Generate the parent `modelItem` for the new repeat item
     this.opNum++;
-    const parentModelItem = FxBind.createModelItem(this.ref, node, this, this.opNum);
+    let parentModelItem = FxBind.createModelItem(this.ref, node, this, this.opNum);
+    // IMPORTANT: registerModelItem may return an existing canonical ModelItem for the same path.
+    // Always keep using the returned instance to avoid "ghost" ModelItems that still notify.
+    parentModelItem = this.getModel().registerModelItem(parentModelItem);
     newRepeatItem.modelItem = parentModelItem;
 
     this.setIndex(insertionIndex);
 
-    this.getModel().registerModelItem(parentModelItem);
+    // parentModelItem already registered above
 
     // Step 5: Create modelItems recursively for child elements
     this._createModelItemsRecursively(newRepeatItem, parentModelItem);
@@ -214,7 +217,6 @@ export class RepeatBase extends withDraggability(UIElement, false) {
 
     this.getOwnerForm().addToBatchedNotifications(newRepeatItem);
   }
-
   /**
    * @abstract
    *
@@ -475,7 +477,9 @@ export class RepeatBase extends withDraggability(UIElement, false) {
               // Create a ModelItem only for the final node; children never get their own opNum
               modelItem = FxBind.createModelItem(ref, node, child, null);
               modelItem.parentModelItem = parentModelItem;
-              this.getModel().registerModelItem(modelItem);
+            // IMPORTANT: keep using the canonical instance returned by registerModelItem.
+            // Otherwise a throwaway ModelItem can leak into observer graphs and be notified.
+            modelItem = this.getModel().registerModelItem(modelItem);
             }
 
             // Always apply Dewey rewrite (handles both $inst and instance('inst') forms)

package/src/withDraggability.js

@@ -217,7 +217,6 @@ export const withDraggability = (superclass, isAlsoDraggable) =>
       }
 
       // Note: full refresh needed since multiple model items may be affected.
-      // TODO: Leverage the changedPaths trick
       this.getOwnerForm().getModel().updateModel();
       this.getOwnerForm().refresh(true);
     }