Merge pull request #4750 from darkdh/4741

Fix global table indexing
brave · Oct 13, 2016 · 6c04eaf · 6c04eaf
2 parents 689b48b + 00f7026
commit 6c04eaf
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/js/components/sortableTable.js b/js/components/sortableTable.js
@@ -83,10 +83,11 @@ class SortableTable extends ImmutableComponent {
       entry.className = entry.className.replace(' selected', '')
       const tableID = entry.id
       const index = entry.rowIndex - 1
+      const globalIndex = parseInt(entry.getAttribute('data-global-index'))
       const handlerInput = this.props.totalRowObjects
-        ? (typeof this.props.totalRowObjects[parseInt(tableID)][index].toJS === 'function'
-          ? this.props.totalRowObjects[parseInt(tableID)][index].toJS()
-          : this.props.totalRowObjects[parseInt(tableID)][index])
+        ? (typeof this.props.totalRowObjects[parseInt(tableID)][globalIndex].toJS === 'function'
+          ? this.props.totalRowObjects[parseInt(tableID)][globalIndex].toJS()
+          : this.props.totalRowObjects[parseInt(tableID)][globalIndex])
         : (this.props.rowObjects.size > 0 || this.props.rowObjects.length > 0)
           ? (typeof this.props.rowObjects.toJS === 'function'
             ? this.props.rowObjects.get(index).toJS()
@@ -212,6 +213,7 @@ class SortableTable extends ImmutableComponent {
               ? <tr {...rowAttributes}
                 data-context-menu-disable={rowAttributes.onContextMenu ? true : undefined}
                 id={this.props.tableID}
+                data-global-index={i}
                 className={
                   (this.hasRowClassNames
                   ? this.props.rowClassNames[i] + ' ' + rowAttributes.className