Virtualizer: Merge scrollref prop with container ref (microsoft#28829)

* make sure scrollViewRef prop is merged * Change file * Uniform change style
spmonahan · Aug 16, 2023 · e40f118 · e40f118
1 parent 7e2ba9c
commit e40f118
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/change/@fluentui-react-virtualizer-5bc6cfeb-7159-424d-8126-dc7da21c53ff.json b/change/@fluentui-react-virtualizer-5bc6cfeb-7159-424d-8126-dc7da21c53ff.json
@@ -0,0 +1,7 @@
+{
+ "type": "prerelease",
+ "comment": "Fix: Ensure scrollViewRef is merged with container ref",
+ "packageName": "@fluentui/react-virtualizer",
+ "email": "mifraser@microsoft.com",
+ "dependentChangeType": "patch"
+}
diff --git a/...onents/react-virtualizer/src/components/VirtualizerScrollView/useVirtualizerScrollView.ts b/...onents/react-virtualizer/src/components/VirtualizerScrollView/useVirtualizerScrollView.ts
@@ -19,7 +19,7 @@ export function useVirtualizerScrollView_unstable(props: VirtualizerScrollViewPr
  if (virtualizerLengthRef.current !== virtualizerLength) {
  virtualizerLengthRef.current = virtualizerLength;
  }
- const scrollViewRef = useMergedRefs(React.useRef<HTMLDivElement>(null), scrollRef) as React.RefObject<HTMLDivElement>;
+ const scrollViewRef = useMergedRefs(props.scrollViewRef, scrollRef) as React.RefObject<HTMLDivElement>;
  const imperativeVirtualizerRef = React.useRef<VirtualizerDataRef | null>(null);
  const scrollCallbackRef = React.useRef<null | ((index: number) => void)>(null);
 

diff --git a/...irtualizer/src/components/VirtualizerScrollViewDynamic/useVirtualizerScrollViewDynamic.ts b/...irtualizer/src/components/VirtualizerScrollViewDynamic/useVirtualizerScrollViewDynamic.ts
@@ -29,7 +29,7 @@ export function useVirtualizerScrollViewDynamic_unstable(
  if (virtualizerLengthRef.current !== virtualizerLength) {
  virtualizerLengthRef.current = virtualizerLength;
  }
- const scrollViewRef = useMergedRefs(React.useRef<HTMLDivElement>(null), scrollRef) as React.RefObject<HTMLDivElement>;
+ const scrollViewRef = useMergedRefs(props.scrollViewRef, scrollRef) as React.RefObject<HTMLDivElement>;
  const scrollCallbackRef = React.useRef<null | ((index: number) => void)>(null);
 
  const _imperativeVirtualizerRef = useMergedRefs(React.useRef<VirtualizerDataRef>(null), imperativeVirtualizerRef);