fix macos list size

Author: shakyShane

special-pages/pages/new-tab/app/activity/ActivityProvider.js

@@ -227,14 +227,14 @@ export function SignalStateProvider({ children }) {
                 console.warn('unhandled action:', action);
             }
         } else if (toggle) {
-            if (state.config?.expansion === 'collapsed') {
+            if (state.config?.expansion === 'collapsed' && batched) {
                 const next = activity.value.urls.slice(0, Math.min(service.INITIAL, activity.value.urls.length));
                 setVisibleRange(next);
             }
         }
     }
 
-    const didClick = useCallback(didClick_, [service, state.config.expansion]);
+    const didClick = useCallback(didClick_, [service, batched, state.config.expansion]);
     const firstUrls = state.data.activity.map((x) => x.url);
     const keys = useSignal(normalizeKeys([], firstUrls));
 
@@ -276,7 +276,7 @@ export function SignalStateProvider({ children }) {
         fillHoles();
     }
 
-    useSignalEffect(() => {
+    useEffect(() => {
         if (!service) return console.warn('could not access service');
         const src = /** @type {BatchedActivityService} */ (service);
         const unsub = src.onData((evt) => {
@@ -288,7 +288,12 @@ export function SignalStateProvider({ children }) {
                 });
                 const visible = keys.value;
                 const all = activity.value.urls;
-                const nextVisibleRange = all.slice(0, Math.max(service.INITIAL, Math.max(service.INITIAL, visible.length)));
+
+                // prettier-ignore
+                const nextVisibleRange = batched
+                    ? all.slice(0, Math.max(service.INITIAL, Math.max(service.INITIAL, visible.length)))
+                    : all
+
                 setVisibleRange(nextVisibleRange);
                 fillHoles();
             });
@@ -297,7 +302,7 @@ export function SignalStateProvider({ children }) {
         return () => {
             unsub();
         };
-    });
+    }, [service, batched, activity, keys]);
 
     useEffect(() => {
         window.addEventListener('activity.next', showNextChunk);

special-pages/pages/new-tab/app/activity/integration-tests/activity.page.js

@@ -1,5 +1,6 @@
 import { activityMocks } from '../mocks/activity.mocks.js';
 import { expect } from '@playwright/test';
+import { generateSampleData } from '../mocks/activity.mock-transport.js';
 
 /**
  * @typedef {import('../../../types/new-tab.js').NewTabMessages['subscriptions']['subscriptionEvent']} SubscriptionEventNames
@@ -234,6 +235,16 @@ export class ActivityPage {
         });
     }
 
+    /**
+     * Simulates the subscription message with a new list of activity data.
+     *
+     * @param {number} count - The number of items to generate in the new list.
+     */
+    async acceptsNewList(count) {
+        const next = generateSampleData(count);
+        await this.ntp.mocks.simulateSubscriptionMessage('activity_onDataUpdate', { activity: next });
+    }
+
     async acceptsUpdatedFavorite() {
         const { page } = this;
         const initial = structuredClone(activityMocks.few);

special-pages/pages/new-tab/app/activity/integration-tests/activity.spec.js

@@ -20,6 +20,17 @@ test.describe('activity widget', () => {
 
         await ap.didRender();
     });
+    test('Accepts update (pushing items to front)', async ({ page }, workerInfo) => {
+        const ntp = NewtabPage.create(page, workerInfo);
+        const widget = new ActivityPage(page, ntp).withEntries(5);
+        await ntp.reducedMotion();
+        await ntp.openPage({ additional: { feed: 'activity', activity: widget.entries } });
+        await widget.didRender();
+        await widget.acceptsNewList(6);
+        await widget.hasRows(6);
+        await widget.canCollapseList();
+        await widget.hasRows(6);
+    });
     test('Accepts update (subscription)', async ({ page }, workerInfo) => {
         const ntp = NewtabPage.create(page, workerInfo);
         const ap = new ActivityPage(page, ntp);
@@ -175,8 +186,9 @@ test.describe('activity widget', () => {
             await widget.hasRows(5);
             await batching.triggerNext();
             await widget.hasRows(15);
+            await page.waitForTimeout(500);
             await batching.triggerNext();
-            await page.waitForTimeout(100);
+            await page.waitForTimeout(500);
             await widget.hasRows(25);
         });
         test('patching in place', async ({ page }, workerInfo) => {