Merge pull request #5237 from bsclifton/master

Properly handle a null row / zero rows
brave · Oct 28, 2016 · e26ffd8 · e26ffd8
2 parents 09e858c + e882655
commit e26ffd8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/js/components/sortableTable.js b/js/components/sortableTable.js
@@ -363,14 +363,15 @@ class SortableTable extends React.Component {
               ? this.getRowAttributes(row, i)
               : null
 
-            const classes = [rowAttributes.className]
+            const classes = []
+            if (rowAttributes) classes.push(rowAttributes.className)
             if (this.hasRowClassNames) classes.push(this.props.rowClassNames[i])
             if (this.stateOwner.state.selection.includes(this.getGlobalIndex(i))) classes.push('selected')
             if (this.sortingDisabled) classes.push('no-sort')
 
             return row.length
               ? <tr {...rowAttributes}
-                data-context-menu-disable={rowAttributes.onContextMenu ? true : undefined}
+                data-context-menu-disable={rowAttributes && rowAttributes.onContextMenu ? true : undefined}
                 data-table-id={this.tableID}
                 data-row-index={i}
                 className={classes.join(' ')}>{entry}</tr>