Changeset 237196 in webkit

Timestamp:

Oct 16, 2018 12:13:15 PM (6 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Canvas recording sidebar scroll position lost after switching tabs
​https://bugs.webkit.org/show_bug.cgi?id=190482

Reviewed by Joseph Pecoraro.

• UserInterface/Views/Sidebar.js:

(WI.Sidebar.prototype.removeSidebarPanel):
(WI.Sidebar.prototype.set selectedSidebarPanel):
Call hidden before setting selected to false, as that sets display: none; on the
element, which sets the scrollTop to 0.

• UserInterface/Views/SidebarPanel.js:

(WI.SidebarPanel.prototype.shown):
(WI.SidebarPanel.prototype.hidden):
(WI.SidebarPanel.prototype.get scrollElement): Added.
Allow subclasses to specify the scrolling element for saving/restoring the scroll position.

• UserInterface/Views/CanvasSidebarPanel.js:

(WI.CanvasSidebarPanel.prototype.get scrollElement): Added.

• UserInterface/Views/RecordingStateDetailsSidebarPanel.js:

(WI.RecordingStateDetailsSidebarPanel.prototype.get scrollElement): Added.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CanvasSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/RecordingStateDetailsSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/Sidebar.js (modified) (3 diffs)
• UserInterface/Views/SidebarPanel.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-10-16  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Canvas recording sidebar scroll position lost after switching tabs
+        https://bugs.webkit.org/show_bug.cgi?id=190482
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/Sidebar.js:
+        (WI.Sidebar.prototype.removeSidebarPanel):
+        (WI.Sidebar.prototype.set selectedSidebarPanel):
+        Call `hidden` before setting `selected` to `false`, as that sets `display: none;` on the
+        element, which sets the `scrollTop` to `0`.
+
+        * UserInterface/Views/SidebarPanel.js:
+        (WI.SidebarPanel.prototype.shown):
+        (WI.SidebarPanel.prototype.hidden):
+        (WI.SidebarPanel.prototype.get scrollElement): Added.
+        Allow subclasses to specify the scrolling element for saving/restoring the scroll position.
+
+        * UserInterface/Views/CanvasSidebarPanel.js:
+        (WI.CanvasSidebarPanel.prototype.get scrollElement): Added.
+        * UserInterface/Views/RecordingStateDetailsSidebarPanel.js:
+        (WI.RecordingStateDetailsSidebarPanel.prototype.get scrollElement): Added.
+
 2018-10-16  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js

@@ -223 +223 @@
     // Protected
 
+    get scrollElement()
+    {
+        return this._recordingContentContainer;
+    }
+
     hasCustomFilters()
     {

trunk/Source/WebInspectorUI/UserInterface/Views/RecordingStateDetailsSidebarPanel.js

@@ -73 +73 @@
 
         this.updateLayoutIfNeeded();
+    }
+
+    // Protected
+
+    get scrollElement()
+    {
+        return this._dataGrid.scrollContainer;
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js

@@ -94 +94 @@
             return;
 
-        sidebarPanel.selected = false;
-
         if (sidebarPanel.visible) {
             sidebarPanel.hidden();
@@ -101 +99 @@
         }
 
+        sidebarPanel.selected = false;
+
         if (this._selectedSidebarPanel === sidebarPanel) {
             var index = this._sidebarPanels.indexOf(sidebarPanel);
@@ -127 +127 @@
 
         if (this._selectedSidebarPanel) {
-            var wasVisible = this._selectedSidebarPanel.visible;
-
-            this._selectedSidebarPanel.selected = false;
-
-            if (wasVisible) {
+            if (this._selectedSidebarPanel.visible) {
                 this._selectedSidebarPanel.hidden();
                 this._selectedSidebarPanel.visibilityDidChange();
             }
+
+            this._selectedSidebarPanel.selected = false;
         }
 

trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js

@@ -95 +95 @@
     shown()
     {
-        this._contentView.element.scrollTop = this._savedScrollPosition;
+        this.scrollElement.scrollTop = this._savedScrollPosition;
 
         // FIXME: remove once <https://webkit.org/b/150741> is fixed.
@@ -105 +105 @@
     hidden()
     {
-        this._savedScrollPosition = this._contentView.element.scrollTop;
+        this._savedScrollPosition = this.scrollElement.scrollTop;
 
         // Implemented by subclasses.
@@ -114 +114 @@
         // Implemented by subclasses.
     }
+
+    // Protected
+
+    get scrollElement()
+    {
+        // Overridden by sub-classes if needed.
+        return this.contentView.element;
+    }
 };