A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: prevent infinite re-render crash by decoupling scrollMargin from render-phase ref (#10602)
Mohd Sultanfa0684f4f5f5
diff --git a/apps/web/src/components/virtualized-grid/index.tsx b/apps/web/src/components/virtualized-grid/index.tsxindex 1711e5cd2..fb03a52f2 100644--- a/apps/web/src/components/virtualized-grid/index.tsx+++ b/apps/web/src/components/virtualized-grid/index.tsx@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { Virtualizer, useVirtualizer } from "@tanstack/react-virtual";import { Box } from "@theme-ui/components";-import React, { useEffect, useRef } from "react";+import React, { useEffect, useLayoutEffect, useRef, useState } from "react";type VirtualizedGridProps<T> = {virtualizerRef?: React.MutableRefObject<@@ -49,6 +49,15 @@ export function VirtualizedGrid<T>(props: VirtualizedGridProps<T>) {onEndReached} = props;const containerRef = useRef<HTMLDivElement>(null);+ const [measuredOffset, setMeasuredOffset] = useState(0);++ useLayoutEffect(() => {+ if (scrollMargin !== undefined) return;+ if (containerRef.current) {+ const offset = containerRef.current.offsetTop || 0;+ setMeasuredOffset((prev) => (prev !== offset ? offset : prev));+ }+ });const virtualizer = useVirtualizer({lanes: columns,@@ -57,7 +66,7 @@ export function VirtualizedGrid<T>(props: VirtualizedGridProps<T>) {getItemKey,getScrollElement: () =>scrollElement || containerRef.current?.closest(".ms-container") || null,- scrollMargin: scrollMargin || containerRef.current?.offsetTop || 0+ scrollMargin: scrollMargin ?? measuredOffset});useEffect(() => {diff --git a/apps/web/src/components/virtualized-list/index.tsx b/apps/web/src/components/virtualized-list/index.tsxindex 8188ce7b8..7af3bb83c 100644--- a/apps/web/src/components/virtualized-list/index.tsx+++ b/apps/web/src/components/virtualized-list/index.tsx@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.import { Virtualizer, useVirtualizer } from "@tanstack/react-virtual";import { Box, BoxProps } from "@theme-ui/components";-import React, { useRef } from "react";+import React, { useLayoutEffect, useRef, useState } from "react";export type VirtualizedListProps<T, C> = {virtualizerRef?: React.MutableRefObject<@@ -41,6 +41,7 @@ export type VirtualizedListProps<T, C> = {itemGap?: number;overscan?: number;} & BoxProps;+export function VirtualizedList<T, C>(props: VirtualizedListProps<T, C>) {const {items,@@ -57,7 +58,17 @@ export function VirtualizedList<T, C>(props: VirtualizedListProps<T, C>) {context,...containerProps} = props;+const containerRef = useRef<HTMLDivElement>(null);+ const [measuredOffset, setMeasuredOffset] = useState(0);++ useLayoutEffect(() => {+ if (scrollMargin !== undefined) return;+ if (containerRef.current) {+ const offset = containerRef.current.offsetTop || 0;+ setMeasuredOffset((prev) => (prev !== offset ? offset : prev));+ }+ });const virtualizer = useVirtualizer({count: items.length,@@ -65,7 +76,7 @@ export function VirtualizedList<T, C>(props: VirtualizedListProps<T, C>) {getItemKey: (index) => getItemKey(index, items),getScrollElement: () =>scrollElement || containerRef.current?.closest(".ms-container") || null,- scrollMargin: scrollMargin || containerRef.current?.offsetTop || 0,+ scrollMargin: scrollMargin ?? measuredOffset,overscan});