From d028e568e1f2589252a7a69c7c0cff3feeb48ddc Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 10 Apr 2019 23:58:34 +0200
Subject: [PATCH] Update the sorter index, try to use the one from the model

---
 src/utils/Sorter.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
index f8874b0fa..99af3d98f 100644
--- a/src/utils/Sorter.js
+++ b/src/utils/Sorter.js
@@ -6,7 +6,8 @@ import {
   matches,
   getElement,
   getPointerEvent,
-  isTextNode
+  isTextNode,
+  getModel
 } from 'utils/mixins';
 const $ = Backbone.$;
 
@@ -823,6 +824,8 @@ module.exports = Backbone.View.extend({
 
     for (var i = 0, len = ch.length; i < len; i++) {
       var el = ch[i];
+      const model = getModel(el, $);
+      const elIndex = model ? model.index() : i;
 
       if (!isTextNode(el) && !this.matches(el, this.itemSel)) {
         continue;
@@ -835,7 +838,7 @@ module.exports = Backbone.View.extend({
       else if (dir == 'h') dir = false;
       else dir = this.isInFlow(el, trg);
 
-      dim.push(dir, el, indexOf(trg.childNodes, el));
+      dim.push(dir, el, elIndex);
       dims.push(dim);
     }