Bidirectional pagination #26166
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 |
|---|---|---|
|
|
@@ -7,23 +7,26 @@ import CONST from '../../CONST'; | |
| const propTypes = { | ||
| /** Whether to animate the skeleton view */ | ||
| shouldAnimate: PropTypes.bool, | ||
|
|
||
| /** Number of possible visible content items */ | ||
| possibleVisibleContentItems: PropTypes.number, | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| shouldAnimate: true, | ||
| possibleVisibleContentItems: 0, | ||
| }; | ||
|
|
||
| function ReportActionsSkeletonView({shouldAnimate, possibleVisibleContentItems}) { | ||
| const contentItems = possibleVisibleContentItems || Math.ceil(Dimensions.get('window').height / CONST.CHAT_SKELETON_VIEW.AVERAGE_ROW_HEIGHT); | ||
|
Contributor
There was a problem hiding this comment. Coming from #59608 checklist: On mobile web the height from window depends on visualViewport which changes when the keyboard open/hide. Given our current logic for calculating the number of loading items based on height we should switch to using screen.height |
||
| const skeletonViewLines = []; | ||
| for (let index = 0; index < contentItems; index++) { | ||
| const iconIndex = (index + 1) % 4; | ||
| switch (iconIndex) { | ||
| case 2: | ||
| skeletonViewLines.push( | ||
| <SkeletonViewLines | ||
| shouldAnimate={shouldAnimate} | ||
| numberOfRows={2} | ||
| key={`skeletonViewLines${index}`} | ||
| />, | ||
|
|
@@ -32,7 +35,7 @@ function ReportActionsSkeletonView(props) { | |
| case 0: | ||
| skeletonViewLines.push( | ||
| <SkeletonViewLines | ||
| shouldAnimate={shouldAnimate} | ||
| numberOfRows={3} | ||
| key={`skeletonViewLines${index}`} | ||
| />, | ||
|
|
@@ -41,7 +44,7 @@ function ReportActionsSkeletonView(props) { | |
| default: | ||
| skeletonViewLines.push( | ||
| <SkeletonViewLines | ||
| shouldAnimate={shouldAnimate} | ||
| numberOfRows={1} | ||
| key={`skeletonViewLines${index}`} | ||
| />, | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -477,8 +477,9 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingInitialReportActions: true, | ||
| isLoadingOlderReportActions: false, | ||
| isLoadingNewerReportActions: false, | ||
perunt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -501,7 +502,7 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingInitialReportActions: false, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -511,7 +512,7 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingInitialReportActions: false, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
@@ -737,8 +738,9 @@ function reconnect(reportID) { | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingInitialReportActions: true, | ||
| isLoadingNewerReportActions: false, | ||
| isLoadingOlderReportActions: false, | ||
| }, | ||
| }, | ||
| ], | ||
|
|
@@ -747,7 +749,7 @@ function reconnect(reportID) { | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingInitialReportActions: false, | ||
| }, | ||
| }, | ||
| ], | ||
|
|
@@ -756,7 +758,7 @@ function reconnect(reportID) { | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingInitialReportActions: false, | ||
| }, | ||
| }, | ||
| ], | ||
|
|
@@ -771,9 +773,9 @@ function reconnect(reportID) { | |
| * @param {String} reportID | ||
| * @param {String} reportActionID | ||
| */ | ||
| function getOlderActions(reportID, reportActionID) { | ||
| API.read( | ||
| 'GetOlderActions', | ||
| { | ||
| reportID, | ||
| reportActionID, | ||
|
|
@@ -784,7 +786,7 @@ function readOldestAction(reportID, reportActionID) { | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingOlderReportActions: true, | ||
| }, | ||
| }, | ||
| ], | ||
|
|
@@ -793,7 +795,7 @@ function readOldestAction(reportID, reportActionID) { | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingOlderReportActions: false, | ||
| }, | ||
| }, | ||
| ], | ||
|
|
@@ -802,7 +804,53 @@ function readOldestAction(reportID, reportActionID) { | |
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingOlderReportActions: false, | ||
| }, | ||
| }, | ||
| ], | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the newer actions that have not been read yet. | ||
| * Normally happens when you are not located at the bottom of the list and scroll down on a chat. | ||
| * | ||
| * @param {String} reportID | ||
| * @param {String} reportActionID | ||
| */ | ||
| function getNewerActions(reportID, reportActionID) { | ||
| API.read( | ||
| 'GetNewerActions', | ||
| { | ||
| reportID, | ||
| reportActionID, | ||
| }, | ||
| { | ||
| optimisticData: [ | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingNewerReportActions: true, | ||
|
Contributor
There was a problem hiding this comment. This caused a regression when we try to load more while the device is offline it will cause a loop setting the value of |
||
| }, | ||
| }, | ||
| ], | ||
| successData: [ | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingNewerReportActions: false, | ||
| }, | ||
| }, | ||
perunt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ], | ||
| failureData: [ | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, | ||
| value: { | ||
| isLoadingNewerReportActions: false, | ||
| }, | ||
| }, | ||
| ], | ||
|
|
@@ -2411,7 +2459,6 @@ export { | |
| expandURLPreview, | ||
| markCommentAsUnread, | ||
| readNewestAction, | ||
| openReport, | ||
| openReportFromDeepLink, | ||
| navigateToAndOpenReport, | ||
|
|
@@ -2436,6 +2483,8 @@ export { | |
| getReportPrivateNote, | ||
| clearPrivateNotesError, | ||
| hasErrorInPrivateNotes, | ||
| getOlderActions, | ||
| getNewerActions, | ||
| openRoomMembersPage, | ||
| savePrivateNotesDraft, | ||
| getDraftPrivateNote, | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.