From 3e946ffda9d9c97daa9c228ae008dcbbe25d15ee Mon Sep 17 00:00:00 2001 From: Noemi Erli Date: Tue, 12 Dec 2023 22:39:33 +0200 Subject: [PATCH] Backed out changeset c5f52ea7e7d0 (bug 1857634) for causing failures in test_fxview_tab_list.html --- .../components/firefoxview/card-container.mjs | 25 +--- .../firefoxview/fxview-tab-list.mjs | 41 +++--- browser/components/firefoxview/history.mjs | 7 -- browser/components/firefoxview/opentabs.mjs | 12 +- .../components/firefoxview/recentlyclosed.mjs | 13 +- browser/components/firefoxview/syncedtabs.mjs | 3 - .../browser_firefoxview_paused.js | 118 ------------------ browser/components/firefoxview/viewpage.mjs | 19 --- 8 files changed, 33 insertions(+), 205 deletions(-) diff --git a/browser/components/firefoxview/card-container.mjs b/browser/components/firefoxview/card-container.mjs index 31864c8d3be3..45dfbd6f7b5c 100644 --- a/browser/components/firefoxview/card-container.mjs +++ b/browser/components/firefoxview/card-container.mjs @@ -23,12 +23,7 @@ import { MozLitElement } from "chrome://global/content/lit-utils.mjs"; * @property {boolean} toggleDisabled - Optional property given if the card container should not be collapsible */ class CardContainer extends MozLitElement { - constructor() { - super(); - this.initiallyExpanded = true; - this.isExpanded = false; - this.visible = false; - } + initiallyExpanded = true; static properties = { sectionLabel: { type: String }, @@ -40,7 +35,6 @@ class CardContainer extends MozLitElement { shortPageName: { type: String }, showViewAll: { type: Boolean }, toggleDisabled: { type: Boolean }, - visible: { type: Boolean }, }; static queries = { @@ -75,8 +69,6 @@ class CardContainer extends MozLitElement { } this.isExpanded = this.detailsExpanded; - this.updateTabLists(); - if (!this.shortPageName) { return; } @@ -109,21 +101,6 @@ class CardContainer extends MozLitElement { ); } - willUpdate(changes) { - if (changes.has("visible")) { - this.updateTabLists(); - } - } - - updateTabLists() { - let tabLists = this.querySelectorAll("fxview-tab-list"); - if (tabLists) { - tabLists.forEach(tabList => { - tabList.updatesPaused = !this.visible || !this.isExpanded; - }); - } - } - render() { return html` item.updateComplete)); @@ -237,13 +252,8 @@ export default class FxviewTabList extends MozLitElement { } } - shouldUpdate(changes) { - if (changes.has("updatesPaused")) { - if (this.updatesPaused) { - this.clearIntervalTimer(); - } - } - return !this.updatesPaused; + shouldUpdate() { + return this.visible; } itemTemplate = (tabItem, i) => { @@ -735,13 +745,6 @@ export class VirtualList extends MozLitElement { } } - recalculateAfterWindowResize() { - this.maxRenderCountEstimate = Math.max( - 40, - 2 * Math.ceil(window.innerHeight / this.itemHeightEstimate) - ); - } - firstUpdated() { this.intersectionObserver.observe(this); if (this.isSubList && this.children[0]) { diff --git a/browser/components/firefoxview/history.mjs b/browser/components/firefoxview/history.mjs index 514febc8684a..0259ddc5da55 100644 --- a/browser/components/firefoxview/history.mjs +++ b/browser/components/firefoxview/history.mjs @@ -75,8 +75,6 @@ class HistoryInView extends ViewPage { SEARCH_DEBOUNCE_RATE_MS, SEARCH_DEBOUNCE_TIMEOUT_MS ); - - this.toggleVisibilityInCardContainer(); } async connectedCallback() { @@ -119,8 +117,6 @@ class HistoryInView extends ViewPage { if (!this.searchTask.isFinalized) { this.searchTask.finalize(); } - - this.toggleVisibilityInCardContainer(); } disconnectedCallback() { @@ -361,9 +357,6 @@ class HistoryInView extends ViewPage { updated() { this.fullyUpdated = true; - if (this.lists?.length) { - this.toggleVisibilityInCardContainer(); - } } panelListTemplate() { diff --git a/browser/components/firefoxview/opentabs.mjs b/browser/components/firefoxview/opentabs.mjs index 40a6a65105f8..3893bc95404e 100644 --- a/browser/components/firefoxview/opentabs.mjs +++ b/browser/components/firefoxview/opentabs.mjs @@ -481,15 +481,15 @@ class OpenTabsInViewCard extends ViewPageContent { } viewVisibleCallback() { - this.getRootNode().host.toggleVisibilityInCardContainer(true); + if (this.tabList) { + this.tabList.visible = true; + } } viewHiddenCallback() { - this.getRootNode().host.toggleVisibilityInCardContainer(true); - } - - firstUpdated() { - this.getRootNode().host.toggleVisibilityInCardContainer(true); + if (this.tabList) { + this.tabList.visible = false; + } } render() { diff --git a/browser/components/firefoxview/recentlyclosed.mjs b/browser/components/firefoxview/recentlyclosed.mjs index 6f54f8c0f51a..710baeaeb335 100644 --- a/browser/components/firefoxview/recentlyclosed.mjs +++ b/browser/components/firefoxview/recentlyclosed.mjs @@ -95,8 +95,6 @@ class RecentlyClosedTabsInView extends ViewPage { this ); } - - this.toggleVisibilityInCardContainer(); } stop() { @@ -120,8 +118,6 @@ class RecentlyClosedTabsInView extends ViewPage { this ); } - - this.toggleVisibilityInCardContainer(); } disconnectedCallback() { @@ -146,11 +142,6 @@ class RecentlyClosedTabsInView extends ViewPage { this.start(); } - firstUpdated() { - this.firstUpdateComplete = true; - this.toggleVisibilityInCardContainer(); - } - getTabStateValue(tab, key) { let value = ""; const tabEntries = tab.state.entries; @@ -271,6 +262,10 @@ class RecentlyClosedTabsInView extends ViewPage { this.fullyUpdated = false; } + firstUpdated() { + this.firstUpdateComplete = true; + } + updated() { this.fullyUpdated = true; } diff --git a/browser/components/firefoxview/syncedtabs.mjs b/browser/components/firefoxview/syncedtabs.mjs index d38cfba2aab0..043c89e8371d 100644 --- a/browser/components/firefoxview/syncedtabs.mjs +++ b/browser/components/firefoxview/syncedtabs.mjs @@ -182,8 +182,6 @@ class SyncedTabsInView extends ViewPage { isVisible ? "closed" : "hidden" ); } - - this.toggleVisibilityInCardContainer(); } async observe(subject, topic, errorState) { @@ -671,7 +669,6 @@ class SyncedTabsInView extends ViewPage { updated() { this.fullyUpdated = true; - this.toggleVisibilityInCardContainer(); } sendTabTelemetry(numTabs) { diff --git a/browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_paused.js b/browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_paused.js index 0b673d722f8b..3b559d20564e 100644 --- a/browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_paused.js +++ b/browser/components/firefoxview/tests/browser/firefoxview-next/browser_firefoxview_paused.js @@ -201,85 +201,6 @@ add_task(async function test_recentbrowsing() { "Found the recent-browsing recently-closed tabs list" ); - // Collapse the Open Tabs card - let cardContainer = recentBrowsingOpenTabsView.viewCards[0]?.cardEl; - await EventUtils.synthesizeMouseAtCenter( - cardContainer.summaryEl, - {}, - content - ); - await TestUtils.waitForCondition( - () => !cardContainer.detailsEl.hasAttribute("open") - ); - - ok( - recentBrowsingOpenTabsList.updatesPaused, - "The Open Tabs list is paused after its card is collapsed." - ); - ok( - !recentBrowsingOpenTabsList.intervalID, - "The intervalID for the Open Tabs list is undefined while updates are paused." - ); - - // Expand the Open Tabs card - await EventUtils.synthesizeMouseAtCenter( - cardContainer.summaryEl, - {}, - content - ); - await TestUtils.waitForCondition(() => - cardContainer.detailsEl.hasAttribute("open") - ); - - ok( - !recentBrowsingOpenTabsList.updatesPaused, - "The Open Tabs list is unpaused after its card is expanded." - ); - ok( - recentBrowsingOpenTabsList.intervalID, - "The intervalID for the Open Tabs list is defined while updates are unpaused." - ); - - // Collapse the Recently Closed card - let recentlyClosedCardContainer = - recentBrowsingRecentlyClosedTabsView.cardEl; - await EventUtils.synthesizeMouseAtCenter( - recentlyClosedCardContainer.summaryEl, - {}, - content - ); - await TestUtils.waitForCondition( - () => !recentlyClosedCardContainer.detailsEl.hasAttribute("open") - ); - - ok( - recentBrowsingRecentlyClosedTabsList.updatesPaused, - "The Recently Closed list is paused after its card is collapsed." - ); - ok( - !recentBrowsingRecentlyClosedTabsList.intervalID, - "The intervalID for the Open Tabs list is undefined while updates are paused." - ); - - // Expand the Recently Closed card - await EventUtils.synthesizeMouseAtCenter( - recentlyClosedCardContainer.summaryEl, - {}, - content - ); - await TestUtils.waitForCondition(() => - recentlyClosedCardContainer.detailsEl.hasAttribute("open") - ); - - ok( - !recentBrowsingRecentlyClosedTabsList.updatesPaused, - "The Recently Closed list is unpaused after its card is expanded." - ); - ok( - recentBrowsingRecentlyClosedTabsList.intervalID, - "The intervalID for the Recently Closed list is defined while updates are unpaused." - ); - await checkFxRenderCalls( browser, { @@ -310,45 +231,6 @@ add_task(async function test_opentabs() { ok(!openTabsView.paused, "The open tabs view is un-paused"); is(openTabsView.slot, "selected", "The open tabs view is selected"); - // Collapse the Open Tabs card - let cardContainer = openTabsView.viewCards[0]?.cardEl; - await EventUtils.synthesizeMouseAtCenter( - cardContainer.summaryEl, - {}, - content - ); - await TestUtils.waitForCondition( - () => !cardContainer.detailsEl.hasAttribute("open") - ); - - ok( - openTabsList.updatesPaused, - "The Open Tabs list is paused after its card is collapsed." - ); - ok( - !openTabsList.intervalID, - "The intervalID for the Open Tabs list is undefined while updates are paused." - ); - - // Expand the Open Tabs card - await EventUtils.synthesizeMouseAtCenter( - cardContainer.summaryEl, - {}, - content - ); - await TestUtils.waitForCondition(() => - cardContainer.detailsEl.hasAttribute("open") - ); - - ok( - !openTabsList.updatesPaused, - "The Open Tabs list is unpaused after its card is expanded." - ); - ok( - openTabsList.intervalID, - "The intervalID for the Open Tabs list is defined while updates are unpaused." - ); - await checkFxRenderCalls( browser, { diff --git a/browser/components/firefoxview/viewpage.mjs b/browser/components/firefoxview/viewpage.mjs index f50a35a71e6f..ae40966179fe 100644 --- a/browser/components/firefoxview/viewpage.mjs +++ b/browser/components/firefoxview/viewpage.mjs @@ -158,25 +158,6 @@ export class ViewPage extends ViewPageContent { ); } - toggleVisibilityInCardContainer(isOpenTabs) { - let cards = []; - let tabLists = []; - if (!isOpenTabs) { - cards = this.shadowRoot.querySelectorAll("card-container"); - tabLists = this.shadowRoot.querySelectorAll("fxview-tab-list"); - } else { - this.viewCards.forEach(viewCard => { - cards.push(viewCard.cardEl); - tabLists.push(viewCard.tabList); - }); - } - if (tabLists.length && cards.length) { - cards.forEach(cardEl => { - cardEl.visible = !this.paused; - }); - } - } - enter() { this.selectedTab = true; if (this.isVisible) {