Fix logic of how the "N more" is calculated in relation editor

MerginMaps · Apr 12, 2024 · 6e607aa · 6e607aa
1 parent fabbc5f
commit 6e607aa
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/app/qml/form/editors/MMFormRelationEditor.qml b/app/qml/form/editors/MMFormRelationEditor.qml
@@ -40,8 +40,8 @@ MMInputs.MMBaseInput {
 
   contentItemHeight: privates.itemHeight * privates.rows + 2 * flow.spacing + 20 * __dp
 
-  Component.onCompleted: root.recalculate()
-  onWidthChanged: root.recalculate()
+  Component.onCompleted: root.recalculateVisibleItems()
+  onWidthChanged: root.recalculateVisibleItems()
 
   title: _fieldShouldShowTitle ? _fieldTitle : ""
 
@@ -93,7 +93,10 @@ MMInputs.MMBaseInput {
             // Repeater does not necesarry clear delegates immediately if they are invisible,
             // we need to do hard reload in this case so that recalculateVisibleItems() is triggered
 
-            root.recalculate()
+            repeater.model = null
+            repeater.model = rmodel
+
+            root.recalculateVisibleItems()
           }
         }
 
@@ -120,11 +123,7 @@ MMInputs.MMBaseInput {
             onClicked: root.openLinkedFeature( model.FeaturePair )
           }
 
-          onVisibleChanged: {
-            if(!visible) {
-              repeater.invisibleIds++
-            }
-          }
+          onVisibleChanged: root.recalculateVisibleItems()
         }
       }
 
@@ -161,10 +160,17 @@ MMInputs.MMBaseInput {
     }
   }
 
-  function recalculate() {
-    repeater.invisibleIds = 0
-    repeater.model = null
-    repeater.model = rmodel
+  function recalculateVisibleItems() {
+    let invisibles_count = 0
+
+    for ( let i = 0; i < repeater.count; i++ ) {
+      let delegate_i = repeater.itemAt( i )
+      if ( delegate_i && !delegate_i.visible ) {
+        invisibles_count++
+      }
+    }
+
+    repeater.invisibleIds = invisibles_count
   }
 
   Loader {