From 1162e1d1ad021281e376b59c03876c8bce1d1c05 Mon Sep 17 00:00:00 2001
From: Nainesh <nainesh@2jcommerce.in>
Date: Tue, 19 Feb 2019 11:27:36 +0530
Subject: [PATCH] fixes-for-#20237-2-2

---
 .../Magento_Ui/web/css/source/module/_data-grid.less     | 5 +++--
 .../app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php     | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index 065f870dbfe01..5863d31d97b8e 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -403,7 +403,7 @@ body._in-resize {
     .data-grid-checkbox-cell {
         overflow: hidden;
         padding: 0;
-        vertical-align: top;
+        vertical-align: middle;
         width: @control-checkbox-radio__size + @data-grid-checkbox-cell-inner__padding-horizontal * 2;
 
         &:hover {
@@ -1090,8 +1090,9 @@ body._in-resize {
     }
 
     .data-grid-checkbox-cell-inner {
-        margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
+        margin: 0 @data-grid-checkbox-cell-inner__padding-horizontal 0;
         padding: 0;
+        text-align: center;
     }
 
     //  Content Hierarchy specific
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
index 235b0d096533f..c6ff9377d1247 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -162,6 +162,11 @@ class DataGrid extends Grid
      */
     protected $currentPage = ".//*[@data-ui-id='current-page-input'][not(ancestor::*[@class='sticky-header'])]";
 
+    /**
+     * Top page element to implement a scrolling in case of grid element not visible.
+     */
+    private $topElementToScroll = 'header.page-header';
+
     /**
      * Clear all applied Filters.
      *
@@ -368,6 +373,10 @@ public function selectItems(array $items, $isSortable = true)
             $this->sortGridByField('ID');
         }
         foreach ($items as $item) {
+            //Scroll to the top of the page in case current page input is not visible.
+            if (!$this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->isVisible()) {
+                $this->browser->find($this->topElementToScroll)->hover();
+            }
             $this->_rootElement->find($this->currentPage, Locator::SELECTOR_XPATH)->setValue('');
             $this->waitLoader();
             $selectItem = $this->getRow($item)->find($this->selectItem);