From ca0af4733dda5462f68fdc76c940312fd355568a Mon Sep 17 00:00:00 2001
From: Lauri Eskola <lauri.eskola@acquia.com>
Date: Mon, 22 Jun 2020 16:51:21 +0300
Subject: [PATCH] Issue #3145930 by bnjmnm, msuthars, nod_: Tableheader should
 recalculate on toolbar tray toggle

---
 core/misc/tableheader.es6.js | 6 +++---
 core/misc/tableheader.js     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/misc/tableheader.es6.js b/core/misc/tableheader.es6.js
index 9d3bceecbcac..8b3967665116 100644
--- a/core/misc/tableheader.es6.js
+++ b/core/misc/tableheader.es6.js
@@ -139,12 +139,12 @@
   // Bind to custom Drupal events.
   $(document).on({
     /**
-     * Recalculate columns width when window is resized and when show/hide
-     * weight is triggered.
+     * Recalculate columns width when window is resized, when show/hide weight
+     * is triggered, or when toolbar tray is toggled.
      *
      * @ignore
      */
-    'columnschange.TableHeader': tableHeaderResizeHandler,
+    'columnschange.TableHeader drupalToolbarTrayChange': tableHeaderResizeHandler,
 
     /**
      * Recalculate TableHeader.topOffset when viewport is resized.
diff --git a/core/misc/tableheader.js b/core/misc/tableheader.js
index f01301907be1..061b708dae42 100644
--- a/core/misc/tableheader.js
+++ b/core/misc/tableheader.js
@@ -78,7 +78,7 @@
     'scroll.TableHeader': tableHeaderOnScrollHandler
   });
   $(document).on({
-    'columnschange.TableHeader': tableHeaderResizeHandler,
+    'columnschange.TableHeader drupalToolbarTrayChange': tableHeaderResizeHandler,
     'drupalViewportOffsetChange.TableHeader': tableHeaderOffsetChangeHandler
   });
   $.extend(TableHeader, {
-- 
GitLab