guan404ming commented on code in PR #60806: URL: https://github.com/apache/airflow/pull/60806#discussion_r2710756657
########## airflow-core/src/airflow/ui/src/pages/TaskInstance/Logs/utils.ts: ########## @@ -0,0 +1,88 @@ +/*! + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import type { Virtualizer } from "@tanstack/react-virtual"; + +type VirtualizerInstance = Virtualizer<HTMLDivElement, Element>; + +type ScrollToTopOptions = { + element: HTMLElement; + virtualizer: VirtualizerInstance; +}; + +/** + * Scroll to the top of the list + */ +export const scrollToTop = ({ element, virtualizer }: ScrollToTopOptions): void => { + if (typeof virtualizer.scrollToOffset === "function") { + try { + virtualizer.scrollToOffset(0); + } catch { + virtualizer.scrollToIndex(0, { align: "start" }); + } + } else { + virtualizer.scrollToIndex(0, { align: "start" }); + } + + element.scrollTop = 0; + + requestAnimationFrame(() => { + element.scrollTop = 0; + }); +}; + +type ScrollToBottomOptions = { + element: HTMLElement; + itemCount: number; + virtualizer: VirtualizerInstance; +}; + +/** + * Scroll to the bottom of the list + */ +export const scrollToBottom = ({ element, itemCount, virtualizer }: ScrollToBottomOptions): void => { + const total = virtualizer.getTotalSize(); + const clientH = element.clientHeight || 0; + const offset = Math.max(0, Math.floor(total - clientH)); + + if (typeof virtualizer.scrollToOffset === "function") { + try { + virtualizer.scrollToOffset(offset); + } catch { + virtualizer.scrollToIndex(itemCount - 1, { align: "end" }); + } + } else { + virtualizer.scrollToIndex(itemCount - 1, { align: "end" }); + } + + element.scrollTop = offset; + + requestAnimationFrame(() => { + element.scrollTop = offset; + requestAnimationFrame(() => { + element.scrollTop = offset; + const lastItem = element.querySelector<HTMLElement>( + `[data-testid="virtualized-item-${itemCount - 1}"]`, + ); Review Comment: I originally thought the nested requestAnimationFrame was needed to ensure the scroll position was applied after the virtualizer had finished updating the DOM. The idea was to wait for one frame for the virtualizer to process, then another frame to ensure the scroll stuck. However, after local testing without them, it turns out they're redundant. The simpler approach of just calling `virtualizer.scrollToOffset()` followed by setting `element.scrollTop` works reliably. Removed the unnecessary complexity. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
