ENGCOM-4522: #19835 Fix admin header buttons flicker #21791

- Merge Pull Request #21791 from OlehWolf/magento2:19835-admin-header-buttons-flicker - Merged commits: 1. 68d793d
magento · Mar 18, 2019 · 5e63603 · 5e63603
2 parents 3666e03 + 68d793d
commit 5e63603
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($block->getChildHtml()):?>
-    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
+    <div data-mage-init='{"floatingHeader": {}}' class="page-actions floating-header" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
         <?= $block->getChildHtml() ?>
     </div>
 <?php endif; ?>
diff --git a/...gn/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less b/...gn/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less
@@ -45,6 +45,10 @@
 .page-actions {
     @_page-action__indent: 1.3rem;
 
+    &.floating-header {
+        &:extend(.page-actions-buttons all);
+    }
+
     .page-main-actions & {
         &._fixed {
             left: @page-wrapper__indent-left;

diff --git a/lib/web/mage/backend/floating-header.js b/lib/web/mage/backend/floating-header.js
@@ -48,6 +48,7 @@ define([
             this.element.wrapInner($('<div/>', {
                 'class': 'page-actions-inner', 'data-title': title
             }));
+            this.element.removeClass('floating-header');
         },
 
         /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,7 @@ define([ @@
                 this.element.wrapInner($('<div/>', {
                     'class': 'page-actions-inner', 'data-title': title
                 }));
+                this.element.removeClass('floating-header');
             },
             /**
@@ Expand Down @@