draft

fabOnReact · Jul 8, 2022 · f72cac2 · f72cac2
1 parent 06fb1dd
commit f72cac2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/Libraries/Lists/FlatList.js b/Libraries/Lists/FlatList.js
@@ -348,6 +348,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
    * Check out [scrollToOffset](docs/virtualizedlist.html#scrolltooffset) of VirtualizedList
    */
   scrollToOffset(params: {animated?: ?boolean, offset: number, ...}) {
+    console.log('TESTING::FlatList scrollToOffset');
     if (this._listRef) {
       this._listRef.scrollToOffset(params);
     }
@@ -434,6 +435,7 @@ class FlatList<ItemT> extends React.PureComponent<Props<ItemT>, void> {
   }
 
   componentDidUpdate(prevProps: Props<ItemT>) {
+    console.log('TESTING::FlatList componentDidUpdate');
     invariant(
       prevProps.numColumns === this.props.numColumns,
       'Changing numColumns on the fly is not supported. Change the key prop on FlatList when ' +

diff --git a/Libraries/Lists/VirtualizedList.js b/Libraries/Lists/VirtualizedList.js
@@ -388,13 +388,14 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     const animated = params ? params.animated : true;
     const veryLast = this.props.getItemCount(this.props.data) - 1;
     const frame = this.__getFrameMetricsApprox(veryLast);
-    const offset = Math.max(
-      0,
+    console.log('TESTING::VirtualizedList scrollToEnd');
+    console.log('TESTING::VirtualizedList frame', frame);
+    const offsetCalculation =
       frame.offset +
-        frame.length +
-        this._footerLength -
-        this._scrollMetrics.visibleLength,
-    );
+      frame.length +
+      this._footerLength -
+      this._scrollMetrics.visibleLength;
+    const offset = Math.max(0, offsetCalculation);
 
     if (this._scrollRef == null) {
       return;
@@ -751,6 +752,17 @@ class VirtualizedList extends React.PureComponent<Props, State> {
         parentDebugInfo: this.context.debugInfo,
       });
     }
+    if (this.props.inverted) {
+      console.log('');
+      // this.scrollToEnd({animated: false});
+      // const veryLast = this.props.getItemCount(this.props.data) - 1;
+      const veryLast = 4;
+      const frame = this.__getFrameMetricsApprox(veryLast);
+      this.scrollToOffset({offset: frame.offset, animated: true});
+      console.log('TESTING::VirtualizedList veryLast', veryLast);
+      console.log('TESTING::VirtualizedList frame', frame);
+      // this.scrollToOffset({offset: 310, animated: true});
+    }
   }
 
   componentWillUnmount() {
@@ -953,7 +965,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           0,
           lastInitialIndex,
         );
-        this.scrollToOffset({offset: 0, animated: false});
+        // this.scrollToOffset({offset: 0, animated: false});
       }
       const firstAfterInitial = Math.max(lastInitialIndex + 1, first);
       if (!isVirtualizationDisabled && first > lastInitialIndex + 1) {
@@ -1016,7 +1028,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
           0,
           lastInitialIndex,
         );
-        this.scrollToEnd({animated: false});
+        // this.scrollToOffset({offset: 1300, animated: true});
       }
       if (!this._hasWarned.keys && _usedIndexForKey) {
         console.warn(

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -127,6 +127,7 @@ public ReactHorizontalScrollView(Context context, @Nullable FpsListener fpsListe
             I18nUtil.getInstance().isRTL(context)
                 ? ViewCompat.LAYOUT_DIRECTION_RTL
                 : ViewCompat.LAYOUT_DIRECTION_LTR);
+    fullScroll(View.FOCUS_DOWN);
   }
 
   public boolean getScrollEnabled() {

diff --git a/packages/rn-tester/js/examples/FlatList/FlatListExampleIndex.js b/packages/rn-tester/js/examples/FlatList/FlatListExampleIndex.js
@@ -17,6 +17,7 @@ import onViewableItemsChangedExample from './FlatList-onViewableItemsChanged';
 import WithSeparatorsExample from './FlatList-withSeparators';
 import MultiColumnExample from './FlatList-multiColumn';
 import StickyHeadersExample from './FlatList-stickyHeaders';
+import NestedExample from './FlatList-nested';
 
 export default ({
   framework: 'React',
@@ -34,5 +35,6 @@ export default ({
     WithSeparatorsExample,
     MultiColumnExample,
     StickyHeadersExample,
+    NestedExample,
   ],
 }: RNTesterModule);