Merge pull request #16030 from craftcms/bugfix/16026-embedded-index-a…

…nd-reordering

fixes issue with nested elements reordering when count >= 50

CHANGELOG.md

@@ -19,6 +19,7 @@
 - Fixed a bug where structure data wasn’t getting deleted for drafts when moving an entry out of a Structure section. ([#15949](https://github.com/craftcms/cms/issues/15949), [#16014](https://github.com/craftcms/cms/pull/16014))
 - Fixed a bug where loading spinners weren’t always centered. ([#16013](https://github.com/craftcms/cms/pull/16013))
 - Fixed a race condition that could break default entry creation for Matrix fields. ([#15999](https://github.com/craftcms/cms/pull/15999))
+- Fixed a JavaScript error that occurred when sorting nested elements in an embedded element index, if the index was paginated. ([#16026](https://github.com/craftcms/cms/issues/16026))
 - Updated Axios to 1.7.7. ([#15958](https://github.com/craftcms/cms/issues/15958))
 
 ## 5.4.9 - 2024-10-22

src/web/assets/cp/src/js/BaseElementIndexView.js

@@ -123,9 +123,10 @@ Craft.BaseElementIndexView = Garnish.Base.extend(
       // Give sub-classes a chance to do post-initialization stuff here
       this.afterInit();
 
-      // Set up lazy-loading
+      // Set up $scroller for reordering
       if (
-        !this.elementIndex.paginated &&
+        (!this.elementIndex.paginated ||
+          this.elementIndex.settings.context === 'embedded-index') &&
         this.elementIndex.settings.batchSize
       ) {
         if (this.settings.context === 'index') {
@@ -135,8 +136,12 @@ Craft.BaseElementIndexView = Garnish.Base.extend(
         }
 
         this.$scroller.scrollTop(0);
-        this.addListener(this.$scroller, 'scroll', 'maybeLoadMore');
-        this.maybeLoadMore();
+
+        // and if we're not in a paginated view, set up lazy-loading
+        if (!this.elementIndex.paginated) {
+          this.addListener(this.$scroller, 'scroll', 'maybeLoadMore');
+          this.maybeLoadMore();
+        }
       }
     },
 

src/web/assets/cp/src/js/ElementTableSorter.js

@@ -187,7 +187,10 @@ Craft.ElementTableSorter = Garnish.DragSort.extend(
       this._setTargetLevelBounds();
 
       // Check to see if we should load more elements now
-      this.tableView.maybeLoadMore();
+
+      if (!this.tableView.elementIndex.paginated) {
+        this.tableView.maybeLoadMore();
+      }
 
       this.base();
     },