canvas-datagrid 0.3.19 → 0.3.23

package/lib/draw.js

@@ -164,6 +164,34 @@ export default function (self) {
     self.ctx.fill();
     return ml + aw + mr;
   }
+  function drawFilterButtonArrow(x, y) {
+    var mt =
+        ((self.style.filterButtonHeight - self.style.filterButtonArrowHeight) /
+          2) *
+        self.scale,
+      ml =
+        ((self.style.filterButtonWidth - self.style.filterButtonArrowWidth) /
+          2) *
+        self.scale,
+      aw = self.style.filterButtonArrowWidth * self.scale,
+      ah = self.style.filterButtonArrowHeight * self.scale;
+    x += self.canvasOffsetLeft;
+    y += self.canvasOffsetTop;
+    self.ctx.fillStyle = self.style.filterButtonArrowColor;
+    self.ctx.strokeStyle = self.style.filterButtonArrowBorderColor;
+    self.ctx.beginPath();
+    x = x + ml;
+    y = y + mt;
+
+    self.ctx.moveTo(x, y);
+    self.ctx.lineTo(x + aw, y);
+    self.ctx.lineTo(x + aw * 0.5, y + ah);
+    self.ctx.moveTo(x, y);
+
+    self.ctx.stroke();
+    self.ctx.fill();
+    return ml + aw;
+  }
   function radiusRect(x, y, w, h, radius) {
     x += self.canvasOffsetLeft;
     y += self.canvasOffsetTop;
@@ -816,6 +844,9 @@ export default function (self) {
           isCorner = /cornerCell/.test(cellStyle),
           isRowHeader = 'rowHeaderCell' === cellStyle,
           isColumnHeader = 'columnHeaderCell' === cellStyle,
+          isFilterable =
+            self.filterable.rows.includes(rowIndex) &&
+            self.filterable.columns.includes(headerIndex),
           wrap = self.style.cellWhiteSpace !== 'nowrap',
           selected =
             self.selections[rowOrderIndex] &&
@@ -824,6 +855,9 @@ export default function (self) {
             self.hovers.rowIndex === rowOrderIndex &&
             (self.attributes.hoverMode === 'row' ||
               self.hovers.columnIndex === columnOrderIndex),
+          openedFilter =
+            self.selectedFilterButton.rowIndex == rowIndex &&
+            self.selectedFilterButton.columnIndex == headerIndex,
           active =
             self.activeCell.rowIndex === rowOrderIndex &&
             self.activeCell.columnIndex === columnOrderIndex,
@@ -915,6 +949,8 @@ export default function (self) {
           isColumnHeader: isColumnHeader,
           isColumnHeaderCellCap: isColumnHeaderCellCap,
           isRowHeader: isRowHeader,
+          isFilterable: isFilterable,
+          openedFilter: openedFilter,
           rowOpen: rowOpen,
           header: header,
 
@@ -1114,6 +1150,10 @@ export default function (self) {
         }
         self.ctx.restore();
 
+        if (isFilterable) {
+          drawFilterButton(cell);
+        }
+
         // Gaps may occur in row numbers between consecutively rendered rows
         // when we are filtering. We draw attention to this by drawing a thick
         // border overlapping the two consecutive row headers. If sorting, visible
@@ -1154,6 +1194,34 @@ export default function (self) {
         return cell.width;
       };
     }
+    function drawFilterButton(cell, ev) {
+      var posX = cell.x + cell.width - self.style.filterButtonWidth - 1;
+      var posY = cell.y + cell.height - self.style.filterButtonHeight - 2;
+      if (self.dispatchEvent('beforerenderfilterbutton', ev)) {
+        return;
+      }
+      self.ctx.save();
+      self.ctx.strokeStyle = self.style.filterButtonBorderColor;
+      self.ctx.fillStyle = self.style.filterButtonBackgroundColor;
+      if (cell.openedFilter) {
+        self.ctx.fillStyle = self.style.filterButtonActiveBackgroundColor;
+      } else if (cell.hovered && self.hovers.onFilterButton) {
+        self.ctx.fillStyle = self.style.filterButtonHoverBackgroundColor;
+      }
+      radiusRect(
+        posX,
+        posY,
+        self.style.filterButtonWidth,
+        self.style.filterButtonHeight,
+        self.style.filterButtonBorderRadius,
+      );
+      self.ctx.stroke();
+      self.ctx.fill();
+      drawFilterButtonArrow(posX, posY);
+      self.ctx.clip();
+      self.dispatchEvent('afterrenderfilterbutton', ev);
+      self.ctx.restore();
+    }
     function drawRowHeader(rowData, rowIndex, rowOrderIndex) {
       if (self.attributes.showRowHeaders) {
         x = 0;

package/lib/events/index.js

@@ -468,7 +468,26 @@ export default function (self) {
         self.hovers = {
           rowIndex: cell.rowIndex,
           columnIndex: cell.columnIndex,
+          onFilterButton: false,
         };
+        if (
+          cell.isFilterable &&
+          x >
+            cell.x +
+              cell.width +
+              self.canvasOffsetLeft -
+              self.style.filterButtonWidth &&
+          x < cell.x + cell.width + self.canvasOffsetLeft &&
+          y >
+            cell.y +
+              cell.height +
+              self.canvasOffsetTop -
+              self.style.filterButtonHeight &&
+          y < cell.y + cell.height + self.canvasOffsetTop
+        ) {
+          self.hovers.onFilterButton = true;
+          self.draw();
+        }
       }
       if (self.selecting || self.reorderObject) {
         delta = {
@@ -512,30 +531,57 @@ export default function (self) {
           ) {
             self.selectRow(cell.rowIndex, ctrl, null, true);
           } else if (self.attributes.selectionMode !== 'row') {
-            if (!self.dragAddToSelection && cell.rowIndex !== undefined) {
-              if (
-                self.selections[cell.rowIndex] &&
-                self.selections[cell.rowIndex].indexOf(cell.columnIndex) !== -1
-              ) {
-                self.selections[cell.rowIndex].splice(
-                  self.selections[cell.rowIndex].indexOf(cell.columnIndex),
-                  1,
-                );
+            if (cell.hovered && self.hovers.onFilterButton) {
+              if (cell.openedFilter) {
+                cell.openedFilter = false;
+                self.selectedFilterButton = {
+                  columnIndex: -1,
+                  rowIndex: -1,
+                };
+              } else {
+                self.selectedFilterButton.rowIndex = cell.rowIndex;
+                self.selectedFilterButton.columnIndex = cell.columnIndex;
+                self.contextmenuEvent(e, {
+                  x: cell.x + cell.width - self.style.filterButtonWidth,
+                  y: cell.y + cell.height,
+                  rect: { left: 0, top: 0 },
+                });
               }
+              self.draw();
+              return;
             } else {
-              self.selections[cell.rowIndex] =
-                self.selections[cell.rowIndex] || [];
-              if (
-                self.selections[cell.rowIndex].indexOf(cell.columnIndex) === -1
-              ) {
-                self.selections[cell.rowIndex].push(cell.columnIndex);
-                const event = {
-                  selections: self.selections,
-                  selectedData: self.getSelectedData(),
-                  selectedCells: self.getSelectedCells(),
-                  selectionBounds: self.getSelectionBounds(),
-                };
-                self.dispatchEvent('selectionchanged', event);
+              self.selectedFilterButton = {
+                columnIndex: -1,
+                rowIndex: -1,
+              };
+              if (self.hovers.onFilterButton) return;
+              if (!self.dragAddToSelection && cell.rowIndex !== undefined) {
+                if (
+                  self.selections[cell.rowIndex] &&
+                  self.selections[cell.rowIndex].indexOf(cell.columnIndex) !==
+                    -1
+                ) {
+                  self.selections[cell.rowIndex].splice(
+                    self.selections[cell.rowIndex].indexOf(cell.columnIndex),
+                    1,
+                  );
+                }
+              } else {
+                self.selections[cell.rowIndex] =
+                  self.selections[cell.rowIndex] || [];
+                if (
+                  self.selections[cell.rowIndex].indexOf(cell.columnIndex) ===
+                  -1
+                ) {
+                  self.selections[cell.rowIndex].push(cell.columnIndex);
+                  var event = {
+                    selections: self.selections,
+                    selectedData: self.getSelectedData(),
+                    selectedCells: self.getSelectedCells(),
+                    selectionBounds: self.getSelectionBounds(),
+                  };
+                  self.dispatchEvent('selectionchanged', event);
+                }
               }
             }
           }
@@ -548,13 +594,18 @@ export default function (self) {
             dragBounds.right !== self.selectionBounds.right) &&
           !ctrl
         ) {
-          self.selections = [];
+          if (!(cell.hovered && self.hovers.onFilterButton)) {
+            self.selections = [];
+          }
+          if (dragBounds.top === -1) {
+            dragBounds.top = 0;
+          }
           sBounds = dragBounds;
           if (self.attributes.selectionMode === 'row') {
             for (i = sBounds.top; i <= sBounds.bottom; i += 1) {
               self.selectRow(i, true, null, true);
             }
-          } else if (dragBounds.top !== -1) {
+          } else {
             self.selectArea(sBounds, true);
             if (sBounds.left == -1 && sBounds.top !== sBounds.bottom)
               self.isMultiRowsSelected = true;
@@ -632,7 +683,9 @@ export default function (self) {
         -1 &&
       !ctrl
     ) {
-      self.setActiveCell(i.columnIndex, i.rowIndex);
+      if (!self.hovers.onFilterButton) {
+        self.setActiveCell(i.columnIndex, i.rowIndex);
+      }
     }
     if (self.currentCell.context === 'cell') {
       if (self.currentCell.style === 'cornerCell') {
@@ -744,7 +797,26 @@ export default function (self) {
     }
     self.ellipsisCache = {};
   };
-  self.stopDragResize = function () {
+  self.stopDragResize = function (event) {
+    const pos = self.getLayerPos(event);
+
+    if (self.dragMode === 'ew-resize') {
+      const hasMoved = !!(pos.x - self.dragStart.x);
+      // Check that dragItem is selected or part of selection.
+      const dragItemIsSelected = self.isColumnSelected(
+        self.dragItem.columnIndex,
+      );
+
+      if (hasMoved && dragItemIsSelected) {
+        const width = Math.max(
+          self.resizingStartingWidth + pos.x - self.dragStart.x,
+          self.style.minColumnWidth,
+        );
+        // If the column is selected, resize it to width plus any other selected columns.
+        self.fitSelectedColumns(width);
+      }
+    }
+
     self.resize();
     document.body.removeEventListener(
       'mousemove',
@@ -1173,8 +1245,12 @@ export default function (self) {
       !freeze &&
       !resize
     ) {
-      if (!(self.dragMode == 'row-reorder' && self.isMultiRowsSelected))
+      if (
+        !(self.dragMode == 'row-reorder' && self.isMultiRowsSelected) &&
+        !(self.currentCell.hovered && self.hovers.onFilterButton)
+      ) {
         self.selections = [];
+      }
     }
     if (self.dragStartObject.isGrid) {
       return;
@@ -1371,6 +1447,8 @@ export default function (self) {
       self.selectNone();
     } else if (ctrl && e.key === 'a') {
       self.selectAll();
+    } else if (['Backspace', 'Delete'].includes(e.key)) {
+      self.deleteSelectedData();
     } else if (e.key === 'ArrowDown') {
       y += 1;
     } else if (e.key === 'ArrowUp') {
@@ -1550,13 +1628,26 @@ export default function (self) {
       self.currentCell.context === 'ew-resize' &&
       self.currentCell.style === 'columnHeaderCell'
     ) {
-      self.fitColumnToValues(self.currentCell.header.name);
+      // Check that double-clicked cell is selected or part of selection.
+      const currentCellIsSelected = self.isColumnSelected(
+        self.currentCell.columnIndex,
+      );
+
+      if (currentCellIsSelected) {
+        // There might be more
+        self.fitSelectedColumns();
+      } else {
+        self.fitColumnToValues(self.currentCell.header.name);
+      }
     } else if (
       self.currentCell.context === 'ew-resize' &&
       self.currentCell.style === 'cornerCell'
     ) {
       self.autosize();
-    } else if (['cell', 'activeCell'].indexOf(self.currentCell.style) !== -1) {
+    } else if (
+      ['cell', 'activeCell'].includes(self.currentCell.style) &&
+      !self.hovers.onFilterButton
+    ) {
       self.beginEditAt(self.currentCell.columnIndex, self.currentCell.rowIndex);
     }
   };
@@ -1780,104 +1871,38 @@ export default function (self) {
     });
   };
   self.cut = function (e) {
-    self.copy(e);
-    const schema = self.getSchema();
-
-    var affectedCells = [];
-    for (const [rowIndex, row] of self.selections.entries()) {
-      if (!row) continue;
+    if (self.dispatchEvent('cut', { NativeEvent: e })) {
+      return;
+    }
 
-      const boundRowIndex = self.getBoundRowIndexFromViewRowIndex(rowIndex);
+    // Expecting instance of `ClipboardEvent` with `clipboardData` attribute
+    if (!self.hasFocus || !e.clipboardData) {
+      return;
+    }
 
-      for (const columnIndex of row) {
-        const boundColumnIndex = self.getBoundColumnIndexFromViewColumnIndex(
-          columnIndex,
-        );
-        const colName = schema[boundColumnIndex].name;
+    self.copySelectedCellsToClipboard(e.clipboardData);
 
-        self.viewData[rowIndex][colName] = '';
+    const affectedCells = self.clearSelectedCells();
 
-        affectedCells.push([
-          rowIndex,
-          columnIndex,
-          boundRowIndex,
-          boundColumnIndex,
-        ]);
-      }
-    }
+    self.dispatchEvent('aftercut', {
+      cells: affectedCells,
+    });
 
-    if (self.dispatchEvent('cut', { NativeEvent: e, cells: affectedCells })) {
-      return;
-    }
+    requestAnimationFrame(() => self.draw());
   };
   self.copy = function (e) {
     if (self.dispatchEvent('copy', { NativeEvent: e })) {
       return;
     }
+
+    // Expecting instance of `ClipboardEvent` with `clipboardData` attribute
     if (!self.hasFocus || !e.clipboardData) {
       return;
     }
-    var t = '',
-      d = '',
-      textRows = [],
-      sData = self.getSelectedData(),
-      s = self.getSchema(),
-      sSorted = [],
-      firstRowKeys,
-      isNeat = true; // Selected like [[0, 1], [0, 1]] of [[0, 3]] is neat; Selected like [[0, 1], [1, 2]] is untidy
-    function htmlSafe(v) {
-      if (typeof v === 'number') return v;
-      return v.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-    }
-    s.forEach(function (column, columnIndex) {
-      sSorted.push(s[self.orders.columns[columnIndex]]);
-    });
-    if (sData.length > 0) {
-      sData.forEach((row) => {
-        if (!row) return;
-        var rowKeys = Object.keys(row);
-        var textRow = [];
-        if (!firstRowKeys) firstRowKeys = Object.keys(row);
-        if (isNeat && rowKeys.length !== firstRowKeys.length) isNeat = false;
-        sSorted.forEach(function (column, columnIndex) {
-          if (rowKeys.indexOf(String(column.name)) < 0) {
-            if (firstRowKeys.indexOf(String(column.name)) < 0) {
-              return;
-            } else if (isNeat) {
-              isNeat = false;
-            }
-          }
-          textRow.push(row[column.name] || '');
-        });
-        textRows.push(textRow);
-      });
-      if (isNeat) {
-        t = textRows.map((row) => row.join('\t')).join('\n');
-        /**
-         * The html content copied by Excel has not header
-         */
-        d += '<table>';
-        d += textRows
-          .map(
-            (row) =>
-              '<tr>' +
-              row.map((value) => '<td>' + htmlSafe(value) + '</td>').join('') +
-              '</tr>',
-          )
-          .join('');
-        d += '</table>';
-      } else {
-        t = textRows.map((row) => row.join('')).join('');
-        d = t;
-      }
-      if (t) {
-        e.clipboardData.setData('text/html', d);
-        e.clipboardData.setData('text/plain', t);
-        e.clipboardData.setData('text/csv', t);
-        e.clipboardData.setData('application/json', JSON.stringify(sData));
-      }
-      e.preventDefault();
-    }
+
+    self.copySelectedCellsToClipboard(e.clipboardData);
+
+    e.preventDefault();
   };
   return;
 }

package/lib/events/util.js

@@ -86,11 +86,49 @@ const parseData = function (data, mimeType) {
   return parseText(data);
 };
 
+const htmlSafe = (value) => {
+  if (typeof value === 'number') return value;
+  return value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+};
+
+const createTextString = (selectedData, isNeat) => {
+  // Selected like [[0, 1], [0, 1]] of [[0, 3]] is neat; Selected like [[0, 1], [1, 2]] is untidy.
+  // If not isNeat we just return a simple string of concatenated values.
+  if (!isNeat)
+    return selectedData.map((row) => Object.values(row).join('')).join('');
+
+  // If isNeat, we can create tab separated mutti-line text.
+  return selectedData.map((row) => Object.values(row).join('\t')).join('\n');
+};
+
+const createHTMLString = (selectedData, isNeat) => {
+  if (!isNeat) return createTextString(selectedData, isNeat);
+
+  // If isNeat, we can create a HTML table with the selected data.
+  let htmlString = '<table>';
+  htmlString += selectedData
+    .map(
+      (row) =>
+        '<tr>' +
+        Object.values(row)
+          .map((value) => '<td>' + htmlSafe(value) + '</td>')
+          .join('') +
+        '</tr>',
+    )
+    .join('');
+  htmlString += '</table>';
+
+  return htmlString;
+};
+
 export {
+  createTextString,
+  createHTMLString,
   isSupportedHtml,
-  sanitizeElementData,
+  htmlSafe,
   parseData,
   parseHtmlTable,
   parseHtmlText,
   parseText,
+  sanitizeElementData,
 };

package/lib/intf.js

@@ -2,6 +2,8 @@
 /*globals HTMLElement: false, Reflect: false, define: true, MutationObserver: false, requestAnimationFrame: false, performance: false, btoa: false*/
 'use strict';
 
+import { createHTMLString, createTextString } from './events/util';
+
 export default function (self, ctor) {
   self.scale = 1;
   self.orders = {
@@ -61,6 +63,14 @@ export default function (self, ctor) {
     trees: {},
   };
   self.selections = [];
+  self.filterable = {
+    rows: [],
+    columns: [],
+  };
+  self.selectedFilterButton = {
+    columnIndex: -1,
+    rowIndex: -1,
+  };
   self.hovers = {};
   self.attributes = {};
   self.style = {};
@@ -88,6 +98,7 @@ export default function (self, ctor) {
   self.eventNames = [
     'afterdraw',
     'afterrendercell',
+    'afterrenderfilterbutton',
     'attributechanged',
     'beforebeginedit',
     'beforecreatecellgrid',
@@ -95,6 +106,7 @@ export default function (self, ctor) {
     'beforeendedit',
     'beforerendercell',
     'beforerendercellgrid',
+    'beforerenderfilterbutton',
     'beginedit',
     'cellmouseout',
     'cellmouseover',
@@ -232,6 +244,89 @@ export default function (self, ctor) {
 
     return selectedCells;
   };
+  self.copySelectedCellsToClipboard = function (clipboardData) {
+    const selectedData = [];
+    const schema = self.getSchema();
+    let firstRowAsString;
+    let isNeat = true; // Selected like [[0, 1], [0, 1]] of [[0, 3]] is neat; Selected like [[0, 1], [1, 2]] is untidy
+
+    for (const [rowIndex, row] of self.selections.entries()) {
+      // If no cells are selected for a particular rowIndex the selections array will contain an empty element for that rowIndex.
+      if (!row) continue;
+
+      // Convert to string for easy comparison to the first row.
+      const rowAsString = row.join(',').toString();
+      const rowDict = {};
+
+      if (!firstRowAsString) firstRowAsString = row.join(',').toString();
+      if (isNeat && rowAsString !== firstRowAsString) isNeat = false;
+
+      const boundRowIndex = self.getBoundRowIndexFromViewRowIndex(rowIndex);
+
+      for (let columnIndex of row) {
+        // If the whole row is selected the columnIndex for the rowHeader is -1.
+        if (columnIndex < 0) continue;
+
+        const boundColumnIndex = self.getBoundColumnIndexFromViewColumnIndex(
+          columnIndex,
+        );
+        const columnName = schema[boundColumnIndex].name;
+
+        const value = self.originalData[boundRowIndex][columnName];
+
+        rowDict[columnName] = value;
+      }
+      selectedData.push(rowDict);
+    }
+
+    if (selectedData.length > 0) {
+      const textString = createTextString(selectedData, isNeat);
+      const htmlString = createHTMLString(selectedData, isNeat);
+
+      const copiedData = {
+        'text/plain': textString,
+        'text/html': htmlString,
+        'text/csv': textString,
+        'application/json': JSON.stringify(selectedData),
+      };
+
+      for (const [mimeType, data] of Object.entries(copiedData)) {
+        clipboardData.setData(mimeType, data);
+      }
+    }
+  };
+  self.clearSelectedCells = function () {
+    const schema = self.getSchema();
+    const affectedCells = [];
+
+    for (const [rowIndex, row] of self.selections.entries()) {
+      // If no cells are selected for a particular rowIndex the selections array will contain an empty element for that rowIndex.
+      if (!row) continue;
+
+      const boundRowIndex = self.getBoundRowIndexFromViewRowIndex(rowIndex);
+
+      for (let columnIndex of row) {
+        // If the whole row is selected the columnIndex for the rowHeader is -1.
+        if (columnIndex < 0) continue;
+
+        const boundColumnIndex = self.getBoundColumnIndexFromViewColumnIndex(
+          columnIndex,
+        );
+        const columnName = schema[boundColumnIndex].name;
+
+        self.viewData[boundRowIndex][columnName] = '';
+
+        affectedCells.push([
+          rowIndex,
+          columnIndex,
+          boundRowIndex,
+          boundColumnIndex,
+        ]);
+      }
+    }
+
+    return affectedCells;
+  };
   self.getBoundRowIndexFromViewRowIndex = function (viewRowIndex) {
     if (self.boundRowIndexMap && self.boundRowIndexMap.has(viewRowIndex)) {
       return self.boundRowIndexMap.get(viewRowIndex);
@@ -301,6 +396,27 @@ export default function (self, ctor) {
   self.createRowOrders = function () {
     self.orders.rows = fillArray(0, self.originalData.length - 1);
   };
+  self.fitSelectedColumns = function (width) {
+    const selectedColumns = self.selections[0];
+    const schema = self.getSchema();
+
+    for (const selectedColumn of selectedColumns) {
+      // Make sure the column is not the row header and that the whole column has in fact been selected.
+      if (selectedColumn >= 0 && self.isColumnSelected(selectedColumn)) {
+        if (isNaN(width)) {
+          const column = schema[self.orders.columns[selectedColumn]];
+          self.fitColumnToValues(column.name);
+        } else {
+          self.sizes.columns[selectedColumn] = width;
+          self.dispatchEvent('resizecolumn', {
+            x: width,
+            y: self.resizingStartingHeight,
+            draggingItem: self.currentCell,
+          });
+        }
+      }
+    }
+  };
   self.getVisibleSchema = function () {
     return self.getSchema().filter(function (col) {
       return !col.hidden;
@@ -547,6 +663,7 @@ export default function (self, ctor) {
     self.controlInput.removeEventListener('keypress', self.keypress, false);
     self.controlInput.removeEventListener('keyup', self.keyup, false);
     self.controlInput.removeEventListener('keydown', self.keydown, false);
+    document.body.removeEventListener('mousemove', self.mousemove);
     window.removeEventListener('resize', self.resize);
     if (self.observer && self.observer.disconnect) {
       self.observer.disconnect();
@@ -724,6 +841,7 @@ export default function (self, ctor) {
     self.pointerLockPosition = { x: 0, y: 0 };
     Object.keys(self.style).forEach(self.parseStyleValue);
     self.intf.moveSelection = self.moveSelection;
+    self.intf.deleteSelectedData = self.deleteSelectedData;
     self.intf.moveTo = self.moveTo;
     self.intf.addEventListener = self.addEventListener;
     self.intf.removeEventListener = self.removeEventListener;
@@ -755,6 +873,7 @@ export default function (self, ctor) {
     self.intf.clearChangeLog = self.clearChangeLog;
     self.intf.gotoCell = self.gotoCell;
     self.intf.gotoRow = self.gotoRow;
+    self.intf.addButton = self.addButton;
     self.intf.getHeaderByName = self.getHeaderByName;
     self.intf.findColumnScrollLeft = self.findColumnScrollLeft;
     self.intf.findRowScrollTop = self.findRowScrollTop;
@@ -1534,6 +1653,9 @@ export default function (self, ctor) {
       if (!preventScrollEvent) {
         self.scroll();
       }
+      if (self.button) {
+        self.moveButtonPos();
+      }
     }
     function setScrollLeft(value, preventScrollEvent) {
       if (isNaN(value)) {
@@ -1552,6 +1674,9 @@ export default function (self, ctor) {
       if (!preventScrollEvent) {
         self.scroll();
       }
+      if (self.button) {
+        self.moveButtonPos();
+      }
     }
     self.scrollBox.toString = function () {
       return (