Changeset 228722 in webkit

Timestamp:

Feb 19, 2018 6:04:30 PM (6 years ago)

Author:

Matt Baker

Message:

Web Inspector: Canvas tab: hide navigation sidebar when viewing the overview
​https://bugs.webkit.org/show_bug.cgi?id=182597
<rdar://problem/37341564>

Reviewed by Devin Rousso.

Support showing/hiding the navigation sidebar panel based on the current
represented object. Individual TabContentViews can opt-in to this behavior,
by overriding TabContentView.prototype.managesNavigationSidebarPanel.

• UserInterface/Views/CanvasSidebarPanel.js:

(WI.CanvasSidebarPanel.prototype.canShowRepresentedObject):

• UserInterface/Views/CanvasTabContentView.js:

(WI.CanvasTabContentView.prototype.get managesNavigationSidebarPanel):
Hide the Canvas navigation sidebar when viewing the overview.

• UserInterface/Views/ContentBrowserTabContentView.js:

(WI.ContentBrowserTabContentView):
(WI.ContentBrowserTabContentView.prototype.showNavigationSidebarPanel):
(WI.ContentBrowserTabContentView.prototype._navigationSidebarCollapsedStateDidChange):
(WI.ContentBrowserTabContentView.prototype._contentBrowserCurrentRepresentedObjectsDidChange):

• UserInterface/Views/NavigationSidebarPanel.js:

(WI.NavigationSidebarPanel.prototype.canShowRepresentedObject):
Provide default implementation that just defers to the TabContentView.
This exists so that a NavigationSidebarPanel that implements canShowRepresentedObject
will have a meaningful default to fall back on.

• UserInterface/Views/TabBrowser.js:

(WI.TabBrowser.prototype._sidebarCollapsedStateDidChange):
(WI.TabBrowser.prototype._showNavigationSidebarPanelForTabContentView):

• UserInterface/Views/TabContentView.js:

(WI.TabContentView.prototype.get managesNavigationSidebarPanel):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CanvasSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/CanvasTabContentView.js (modified) (1 diff)
• UserInterface/Views/ContentBrowserTabContentView.js (modified) (4 diffs)
• UserInterface/Views/NavigationSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/TabBrowser.js (modified) (2 diffs)
• UserInterface/Views/TabContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-02-19  Matt Baker  <mattbaker@apple.com>
+
+        Web Inspector: Canvas tab: hide navigation sidebar when viewing the overview
+        https://bugs.webkit.org/show_bug.cgi?id=182597
+        <rdar://problem/37341564>
+
+        Reviewed by Devin Rousso.
+
+        Support showing/hiding the navigation sidebar panel based on the current
+        represented object. Individual TabContentViews can opt-in to this behavior,
+        by overriding TabContentView.prototype.managesNavigationSidebarPanel.
+
+        * UserInterface/Views/CanvasSidebarPanel.js:
+        (WI.CanvasSidebarPanel.prototype.canShowRepresentedObject):
+        * UserInterface/Views/CanvasTabContentView.js:
+        (WI.CanvasTabContentView.prototype.get managesNavigationSidebarPanel):
+        Hide the Canvas navigation sidebar when viewing the overview.
+
+        * UserInterface/Views/ContentBrowserTabContentView.js:
+        (WI.ContentBrowserTabContentView):
+        (WI.ContentBrowserTabContentView.prototype.showNavigationSidebarPanel):
+        (WI.ContentBrowserTabContentView.prototype._navigationSidebarCollapsedStateDidChange):
+        (WI.ContentBrowserTabContentView.prototype._contentBrowserCurrentRepresentedObjectsDidChange):
+
+        * UserInterface/Views/NavigationSidebarPanel.js:
+        (WI.NavigationSidebarPanel.prototype.canShowRepresentedObject):
+        Provide default implementation that just defers to the TabContentView.
+        This exists so that a NavigationSidebarPanel that implements canShowRepresentedObject
+        will have a meaningful default to fall back on.
+
+        * UserInterface/Views/TabBrowser.js:
+        (WI.TabBrowser.prototype._sidebarCollapsedStateDidChange):
+        (WI.TabBrowser.prototype._showNavigationSidebarPanelForTabContentView):
+
+        * UserInterface/Views/TabContentView.js:
+        (WI.TabContentView.prototype.get managesNavigationSidebarPanel):
+
 2018-02-16  Matt Baker  <mattbaker@apple.com>
 

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

@@ -152 +152 @@
     }
 
+    canShowRepresentedObject(representedObject)
+    {
+        if (representedObject instanceof WI.CanvasCollection)
+            return false;
+
+        return super.canShowRepresentedObject(representedObject);
+    }
+
     // Protected
 

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

@@ -86 +86 @@
     }
 
+    get managesNavigationSidebarPanel()
+    {
+        return true;
+    }
+
     canShowRepresentedObject(representedObject)
     {

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

@@ -40 +40 @@
         this._contentBrowser.delegate = this;
 
+        this._ignoreNavigationSidebarPanelCollapsedEvent = false;
+        this._ignoreDetailsSidebarPanelCollapsedEvent = false;
+        this._ignoreDetailsSidebarPanelSelectedEvent = false;
+
         this._lastSelectedDetailsSidebarPanelSetting = new WI.Setting(identifier + "-last-selected-details-sidebar-panel", null);
 
-        this._contentBrowser.addEventListener(WI.ContentBrowser.Event.CurrentRepresentedObjectsDidChange, this.showDetailsSidebarPanels, this);
+        this._contentBrowser.addEventListener(WI.ContentBrowser.Event.CurrentRepresentedObjectsDidChange, this._contentBrowserCurrentRepresentedObjectsDidChange, this);
         this._contentBrowser.addEventListener(WI.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
 
@@ -133 +137 @@
     {
         return true;
+    }
+
+    showNavigationSidebarPanel()
+    {
+        if (!this.visible)
+            return;
+
+        if (!this.navigationSidebarPanel)
+            return;
+
+        this._ignoreNavigationSidebarPanelCollapsedEvent = true;
+
+        let currentRepresentedObjects = this._contentBrowser.currentRepresentedObjects;
+        let shouldShowSidebar = currentRepresentedObjects.some((object) => this.navigationSidebarPanel.canShowRepresentedObject(object));
+
+        if (shouldShowSidebar) {
+            if (!this.navigationSidebarPanel.parentSidebar)
+                WI.navigationSidebar.addSidebarPanel(this.navigationSidebarPanel);
+        } else if (this.navigationSidebarPanel.parentSidebar)
+            WI.navigationSidebar.removeSidebarPanel(this.navigationSidebarPanel);
+
+        if (this.navigationSidebarPanel.parentSidebar) {
+            WI.navigationSidebar.selectedSidebarPanel = this.navigationSidebarPanel;
+            WI.navigationSidebar.collapsed = this.navigationSidebarCollapsedSetting.value;
+        } else
+            WI.navigationSidebar.collapsed = true;
+
+        this._ignoreNavigationSidebarPanelCollapsedEvent = false;
+
+        this._showNavigationSidebarItem.enabled = !!this.navigationSidebarPanel.parentSidebar;
     }
 
@@ -221 +255 @@
     _navigationSidebarCollapsedStateDidChange(event)
     {
+        if (!this.visible)
+            return;
+
         this._showNavigationSidebarItem.activated = !WI.navigationSidebar.collapsed;
+
+        if (this._ignoreNavigationSidebarPanelCollapsedEvent)
+            return;
+
+        this.navigationSidebarCollapsedSetting.value = WI.navigationSidebar.collapsed;
     }
 
@@ -280 +322 @@
             this.navigationSidebarPanel.contentTreeOutline.selectedTreeElement.deselect(true);
     }
+
+    _contentBrowserCurrentRepresentedObjectsDidChange()
+    {
+        if (this.managesNavigationSidebarPanel)
+            this.showNavigationSidebarPanel();
+        this.showDetailsSidebarPanels();
+    }
 };

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

@@ -202 +202 @@
     }
 
+    canShowRepresentedObject(representedObject)
+    {
+        let selectedTabContentView = WI.tabBrowser.selectedTabContentView;
+        console.assert(selectedTabContentView instanceof WI.TabContentView, "Missing TabContentView for NavigationSidebarPanel.");
+        return selectedTabContentView && selectedTabContentView.canShowRepresentedObject(representedObject);
+    }
+
     saveStateToCookie(cookie)
     {

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

@@ -322 +322 @@
             return;
 
-        if (event.target === this._navigationSidebar)
+        if (event.target === this._navigationSidebar && !tabContentView.managesNavigationSidebarPanel)
             tabContentView.navigationSidebarCollapsedSetting.value = this._navigationSidebar.collapsed;
         else if (event.target === this._detailsSidebar && !tabContentView.managesDetailsSidebarPanels)
@@ -374 +374 @@
         }
 
+        if (tabContentView.managesNavigationSidebarPanel) {
+            tabContentView.showNavigationSidebarPanel();
+            this._ignoreSidebarEvents = false;
+            return;
+        }
+
         this._navigationSidebar.addSidebarPanel(navigationSidebarPanel);
         this._navigationSidebar.selectedSidebarPanel = navigationSidebarPanel;

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

@@ -100 +100 @@
     }
 
+    get managesNavigationSidebarPanel()
+    {
+        // Implemented by subclasses.
+        return false;
+    }
+
     get managesDetailsSidebarPanels()
     {