github-issue-tower-defence-management 1.101.5 → 1.101.7

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsolePage.test.tsx

@@ -391,103 +391,6 @@ describe('ConsolePage swipe navigation', () => {
   });
 });
 
-describe('ConsolePage detail scroll reset', () => {
-  beforeEach(() => {
-    localStorage.clear();
-    window.history.replaceState({}, '', '/projects/umino/prs?k=token');
-    const fetchMock = jest.fn(async (url: string) => {
-      const listMatch = url.match(/\/projects\/[^/]+\/([^/]+)\/list\.json/);
-      if (listMatch !== null) {
-        return {
-          ok: true,
-          status: 200,
-          json: async () =>
-            listMatch[1] === 'prs'
-              ? twoItemPrPayload()
-              : { ...twoItemPrPayload(), items: [] },
-        };
-      }
-      return { ok: true, status: 200, json: async () => ({ body: '# body' }) };
-    });
-    global.fetch = fetchMock as unknown as typeof fetch;
-  });
-
-  it('resets the detail scroll container to the top when navigating to the next item', async () => {
-    const { container, getByText, findByText } = render(<ConsolePage />);
-    await waitFor(() => {
-      expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
-    });
-    fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
-
-    const scrollContainer = container.querySelector('.console-detail');
-    expect(scrollContainer).not.toBeNull();
-    (scrollContainer as HTMLElement).scrollTop = 240;
-    expect((scrollContainer as HTMLElement).scrollTop).toBe(240);
-
-    const detailScreen = container.querySelector('.console-detail-screen');
-    swipeDetailScreen(
-      detailScreen as HTMLElement,
-      { clientX: 240, clientY: 100 },
-      { clientX: 40, clientY: 110 },
-    );
-
-    await waitFor(() => {
-      expect(window.location.hash).toBe('#item/PVTI_2');
-    });
-    await waitFor(() => {
-      expect((scrollContainer as HTMLElement).scrollTop).toBe(0);
-    });
-  });
-});
-
-describe('ConsolePage next item prefetch', () => {
-  beforeEach(() => {
-    localStorage.clear();
-    window.history.replaceState({}, '', '/projects/umino/prs?k=token');
-  });
-
-  it('warms the next pending item resources while the current item is open', async () => {
-    const fetchMock = jest.fn(async (url: string) => {
-      const listMatch = url.match(/\/projects\/[^/]+\/([^/]+)\/list\.json/);
-      if (listMatch !== null) {
-        return {
-          ok: true,
-          status: 200,
-          json: async () =>
-            listMatch[1] === 'prs'
-              ? twoItemPrPayload()
-              : { ...twoItemPrPayload(), items: [] },
-        };
-      }
-      return { ok: true, status: 200, json: async () => ({ body: '# body' }) };
-    });
-    global.fetch = fetchMock as unknown as typeof fetch;
-
-    const { getByText, findByText, queryByText } = render(<ConsolePage />);
-    await waitFor(() => {
-      expect(getByText('Add serveConsole subcommand')).toBeInTheDocument();
-    });
-    fireEvent.click(getByText('Add serveConsole subcommand'));
-    expect(await findByText('Approve')).toBeInTheDocument();
-    expect(window.location.hash).toBe('#item/PVTI_1');
-    expect(queryByText('Add server-side console API handlers')).toBeNull();
-
-    const nextItemUrlFragment = encodeURIComponent(
-      'https://github.com/o/r/pull/852',
-    );
-    await waitFor(() => {
-      const calledNextItemBody = fetchMock.mock.calls.some(
-        ([url]) =>
-          typeof url === 'string' &&
-          url.includes('/api/itembody') &&
-          url.includes(nextItemUrlFragment),
-      );
-      expect(calledNextItemBody).toBe(true);
-    });
-  });
-});
-
 describe('ConsolePage auto-advance', () => {
   beforeEach(() => {
     localStorage.clear();

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsolePage.tsx

@@ -191,44 +191,6 @@ export const ConsolePage = () => {
   );
 
   const detailScreenRef = useConsoleSwipeNavigation(handleSwipe);
-  const detailScrollElementRef = useRef<HTMLElement | null>(null);
-
-  useEffect(() => {
-    if (selectedItemKey === null) {
-      return;
-    }
-    const element = detailScrollElementRef.current;
-    if (element !== null) {
-      element.scrollTop = 0;
-    }
-  }, [selectedItemKey]);
-
-  const nextPendingItem = useMemo<ConsoleListItem | null>(() => {
-    if (selectedItemKey === null) {
-      return null;
-    }
-    const nextKey = nextPendingKeyBrowse(orderedPendingKeys, selectedItemKey);
-    if (nextKey === null) {
-      return null;
-    }
-    return (
-      pendingItems.find((item) => overlayKeyForItem(item) === nextKey) ?? null
-    );
-  }, [selectedItemKey, orderedPendingKeys, pendingItems]);
-
-  useEffect(() => {
-    if (nextPendingItem === null) {
-      return;
-    }
-    const key = `${nextPendingItem.repo}#${nextPendingItem.number}`;
-    const url = nextPendingItem.url;
-    void caches.body.load(key, url);
-    void caches.state.load(key, url);
-    if (nextPendingItem.isPr) {
-      void caches.files.load(key, url);
-      void caches.commits.load(key, url);
-    }
-  }, [nextPendingItem, caches]);
 
   return (
     <main className="console-app">
@@ -273,7 +235,6 @@ export const ConsolePage = () => {
             overlayStatus={overlayStatusForSelected}
             now={now}
             onQueueAction={handleQueueAction}
-            scrollRef={detailScrollElementRef}
           />
         </div>
       )}

package/src/adapter/entry-points/console/ui/src/index.css

@@ -33,10 +33,8 @@ body {
 .console-app {
   max-width: 920px;
   margin: 0 auto;
-  height: 100dvh;
   display: flex;
   flex-direction: column;
-  min-height: 0;
 }
 
 .console-tabbar {
@@ -116,10 +114,6 @@ body {
   list-style: none;
   margin: 0;
   padding: 12px 18px 18px;
-  flex: 1;
-  min-height: 0;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
 }
 
 .console-list-group {
@@ -264,10 +258,6 @@ body {
 }
 
 .console-detail {
-  flex: 1;
-  min-height: 0;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
   display: flex;
   flex-direction: column;
   gap: 12px;
@@ -473,11 +463,14 @@ body {
 }
 
 .console-actionbar {
-  flex-shrink: 0;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
   background: #161b22;
   border-top: 2px solid #30363d;
   padding: 10px 16px;
-  padding-bottom: calc(10px + env(safe-area-inset-bottom));
 }
 
 .console-operation-bar {
@@ -568,10 +561,7 @@ body {
 }
 
 .console-detail-screen {
-  flex: 1;
-  min-height: 0;
-  display: flex;
-  flex-direction: column;
+  padding-bottom: 140px;
 }
 
 .console-panel-open-link {