Fix maintainVisibleContentPosition calculations and add tests + docs [fixes #25239] #57294
+6,643
−60
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # Test FlatList maintainVisibleContentPosition with append (baseline) | ||
| # Appending items should NOT affect scroll offset (delta ~0) | ||
| appId: ${APP_ID} | ||
| --- | ||
| - launchApp | ||
| # Change to portrait | ||
| - setOrientation: portrait | ||
| - waitForAnimationToEnd: | ||
| timeout: 3000 | ||
| # Find test | ||
| - assertVisible: "Components" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "FlatList" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "FlatList" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "maintainVisibleContentPosition" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "maintainVisibleContentPosition" | ||
| # Scroll to offset 500 | ||
| - tapOn: | ||
| text: "ScrollToOffset 500" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Append item (should NOT affect scroll offset) | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetBefore = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| - tapOn: | ||
| text: "Add 1 item at bottom" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetAfter = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| - assertTrue: ${output.offsetAfter - output.offsetBefore >= -5 && output.offsetAfter - output.offsetBefore <= 5} | ||
| # Multiple appends | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetBefore = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| - tapOn: | ||
| text: "Add 1 item at bottom" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetAfter = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| - assertTrue: ${output.offsetAfter - output.offsetBefore >= -5 && output.offsetAfter - output.offsetBefore <= 5} | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetBefore = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| - tapOn: | ||
| text: "Reset" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetAfter = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| - assertTrue: ${output.offsetAfter >= 0 && output.offsetAfter <= 50} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| # Test FlatList maintainVisibleContentPosition — complex concurrent mutations | ||
| # Tests prepend + append + delete in sequence | ||
| appId: ${APP_ID} | ||
| --- | ||
| - launchApp | ||
| - setOrientation: portrait | ||
| - waitForAnimationToEnd: | ||
| timeout: 3000 | ||
| - assertVisible: "Components" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "FlatList" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "FlatList" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "maintainVisibleContentPosition" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "maintainVisibleContentPosition" | ||
| # Scroll to offset 200 | ||
| - tapOn: | ||
| text: "ScrollToOffset 100" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Record offset before mutations | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetBefore = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| # Add items at top and bottom (simulates complex mutations) | ||
| - tapOn: | ||
| text: "Add 1 item at top" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| - tapOn: | ||
| text: "Add 1 item at bottom" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Record offset after mutations | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetAfter = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| # Delta should be ~44px (only top prepend affects anchor) | ||
| - assertTrue: ${output.offsetAfter - output.offsetBefore >= 42 && output.offsetAfter - output.offsetBefore <= 46} | ||
| - tapOn: | ||
| text: "Reset" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| # Test FlatList maintainVisibleContentPosition — delete anchor item | ||
| # When the anchor item (first visible) is deleted, MVCP should select a new anchor | ||
| appId: ${APP_ID} | ||
| --- | ||
| - launchApp | ||
| - setOrientation: portrait | ||
| - waitForAnimationToEnd: | ||
| timeout: 3000 | ||
| - assertVisible: "Components" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "FlatList" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "FlatList" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "maintainVisibleContentPosition" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "maintainVisibleContentPosition" | ||
| # Scroll to offset 200 (item 5 should be visible) | ||
| - tapOn: | ||
| text: "ScrollToOffset 100" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Record offset before delete | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetBefore = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| # Clear the list (simulates delete of all items including anchor) | ||
| - tapOn: | ||
| text: "Clear (empty list)" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Reset to restore items | ||
| - tapOn: | ||
| text: "Reset" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Verify list is restored | ||
| - assertVisible: "0" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # Test FlatList maintainVisibleContentPosition — delete from middle | ||
| # When items are deleted from the middle, MVCP should adjust scroll offset | ||
| appId: ${APP_ID} | ||
| --- | ||
| - launchApp | ||
| - setOrientation: portrait | ||
| - waitForAnimationToEnd: | ||
| timeout: 3000 | ||
| - assertVisible: "Components" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "FlatList" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "FlatList" | ||
| - scrollUntilVisible: | ||
| element: | ||
| id: "maintainVisibleContentPosition" | ||
| direction: DOWN | ||
| speed: 40 | ||
| - tapOn: | ||
| id: "maintainVisibleContentPosition" | ||
| # Scroll to offset 400 (item 10 should be visible) | ||
| - tapOn: | ||
| text: "ScrollToOffset 500" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Record offset before delete | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetBefore = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| # Add items at top (shifts middle items up) | ||
| - tapOn: | ||
| text: "Add 3 items at top" | ||
| - waitForAnimationToEnd: | ||
| timeout: 2000 | ||
| # Record offset after prepend | ||
| - copyTextFrom: | ||
| id: "scroll-offset-display" | ||
| - evalScript: ${output.offsetAfter = parseInt(maestro.copiedText.split(":")[1].trim())} | ||
| # Delta should be ~132px (3 items × 44px) | ||
| - assertTrue: ${output.offsetAfter - output.offsetBefore >= 128 && output.offsetAfter - output.offsetBefore <= 136} | ||
| - tapOn: | ||
| text: "Reset" |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc @sammy-SC is this check safe to remove?