Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix last spacer #32843

Merged
merged 8 commits into from
Jan 10, 2024
Merged

Fix last spacer #32843

merged 8 commits into from
Jan 10, 2024

Conversation

perunt
Copy link
Contributor

@perunt perunt commented Dec 11, 2023

Details

The issue lies in incorrectly constraining the size of non-final spacers in lists that have a structure like:

  • ITEMS
  • SPACER
  • ITEMS

Here, the logic mistakenly applies tail spacer constraints to a middle spacer. This causes problems, especially with maintainVisibleContentPosition, leading to incorrect scrolling and the unintended virtualization of supposed-to-be-visible content. This happens because the logic is designed to prevent rapid scrolling into unmeasured areas, but it fails in lists where spacers aren't at the end.

UPSTREAM: facebook/react-native#41846

Fixed Issues

$ #32634
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

For testing purposes, copy this code into your ReportScreen and click the button. You'll see that the screen position remains unchanged, and an item gets added. Note that this behavior is effective for a single push only.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@perunt perunt changed the title Perunt/fix last spacer Fix last spacer Dec 12, 2023
@perunt perunt marked this pull request as ready for review December 13, 2023 16:48
@perunt perunt requested a review from a team as a code owner December 13, 2023 16:48
@melvin-bot melvin-bot bot requested review from grgia and removed request for a team December 13, 2023 16:49
Copy link

melvin-bot bot commented Dec 13, 2023

@grgia Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Copy link
Contributor

@janicduplessis janicduplessis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Patch looks good to me

@perunt perunt marked this pull request as ready for review December 16, 2023 13:46
grgia
grgia previously approved these changes Dec 19, 2023
@grgia
Copy link
Contributor

grgia commented Dec 19, 2023

@perunt I think you're missing a checkmark in the author checklist

@perunt
Copy link
Contributor Author

perunt commented Dec 21, 2023

It should be good now

@roryabraham
Copy link
Contributor

@situchan is going to help us out with a C+ review here

@roryabraham
Copy link
Contributor

@perunt the author checklist recently changed with a few items added, can you copy the checklist from .github/PULL_REQUEST_TEMPLATE.md and complete the updated checklist?

@situchan
Copy link
Contributor

Just to confirm: upstream PR was merged but we're just applying patch here until new RN release given the urgency of comment linking project?

@janicduplessis
Copy link
Contributor

@situchan Exactly, we also need a separate patch for RN web since the lists components are vendored and do not use the same version as react-native.

@situchan
Copy link
Contributor

@perunt the author checklist recently changed with a few items added, can you copy the checklist from .github/PULL_REQUEST_TEMPLATE.md and complete the updated checklist?

Here's one - #30699

@situchan
Copy link
Contributor

For testing purposes, copy this code into your ReportScreen and click the button. You'll see that the screen position remains unchanged, and an item gets added. Note that this behavior is effective for a single push only.

can you provide complete code? i.e. generatePosts function is missing
Otherwise, any easy way to test this?

Also, please complete Screenshots/Videos section

@perunt
Copy link
Contributor Author

perunt commented Dec 30, 2023

can you provide complete code? i.e. generatePosts function is missing
Otherwise, any easy way to test this?
Also, please complete Screenshots/Videos section

The generatePosts function can be found at the bottom of the page at the provided link. Additionally, you can reference the upstream code snippet available here: https://gist.github.com/janicduplessis/b67d1fafc08ef848378263208ab93d4c.

We haven't implemented this in our app yet. Would you like me to use the snipped above to demonstrate how it works?
By the way the upstream pull request has been successfully merged and the changes will be included in the upcoming React Native update

@roryabraham roryabraham self-requested a review January 1, 2024 19:27
@situchan
Copy link
Contributor

situchan commented Jan 5, 2024

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@situchan
Copy link
Contributor

situchan commented Jan 5, 2024

I don't see any difference before and after applying patch

Screen.Recording.2024-01-05.at.2.53.21.PM.mov
Screen.Recording.2024-01-05.at.2.54.52.PM.mov

@situchan
Copy link
Contributor

situchan commented Jan 9, 2024

@perunt any feedback on #32843 (comment)?

@perunt
Copy link
Contributor Author

perunt commented Jan 9, 2024

There should be some mistakes. Let's do all steps from the beginning
Copy this to ReportScreen (I removed comments and made the pagination batch bigger)

import {
  Button,
  StyleSheet,
  Text,
  View,
} from "react-native";
import FlatList from "@components/FlatList/MVCPFlatList";

function ReportScreen() {
  const pageSize = 50;
  const dat = useMemo(() => generatePosts(5000), []);
  const initial = useRef(true);
  const [page, setPage] = useState(0);

  const renderItem = ({ item }) => <Item data={item} />;
  const keyExtractor = (item) => item.id.toString();

  const data = useMemo(() =>  dat.slice(2000 - pageSize * page, 2050), [page]);

  useEffect(() => {
    initial.current = false;
  }, []);

  const onLoadNewerChats = () => {
    setPage((p) => p + 3);
  };

  return (
    <View style={{ flex: 1 }}>
      <FlatList
        data={data}
        inverted
        renderItem={renderItem}
        keyExtractor={keyExtractor}
        onStartReachedThreshold={0.75}
        windowSize={21}
        initialNumToRender={50}
        maintainVisibleContentPosition={{
          minIndexForVisible: 0,
        }}
      />
      <Button title="load newer" onPress={onLoadNewerChats} />
    </View>
  );
}

function Item({ data }) {
  return (
    <View style={[styles.item, { padding: data.padding }]}>
      <Text style={styles.title}>
        {data.id} - {data.title}
      </Text>
    </View>
  );
}

const styles = StyleSheet.create({
  item: {
    backgroundColor: "#f9c2ff",
    marginVertical: 8,
    marginHorizontal: 16,
  },
  title: {
    fontSize: 24,
  },
});

const generatePosts = (count, start = 0) =>
  Array.from({ length: count }, (_, i) => ({
    title: `Title ${start + i + 1}`,
    vote: 10,
    id: start + i,
    padding: 20,
  }));

export default ReportScreen;

you should see the following result
before:

+720.mov

after:

720+.mov

@perunt
Copy link
Contributor Author

perunt commented Jan 9, 2024

@situchan, please ping me if it doesn't work for you

@situchan
Copy link
Contributor

situchan commented Jan 9, 2024

I am getting crash after applying your code

Simulator Screenshot - iPhone 15 - 2024-01-09 at 14 48 55

@perunt
Copy link
Contributor Author

perunt commented Jan 9, 2024

For mobile you should replace

import FlatList from "@components/FlatList/MVCPFlatList";

to

import FlatList from '@components/FlatList';

as MVCPFlatList is only for web component
@situchan can you check this?

@situchan
Copy link
Contributor

situchan commented Jan 9, 2024

as MVCPFlatList is only for web component
@situchan can you check this?

crash happened on web as well

@perunt
Copy link
Contributor Author

perunt commented Jan 9, 2024

Let me run it with a 'clean' flag and recheck it. Meantime please double check if your branch is up to date.

@perunt
Copy link
Contributor Author

perunt commented Jan 9, 2024

@situchan I cleared my cache, and everything is working for me. Did you check if your local branch is up to date with mine?

Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

waiting on c+ re-review to merge

@perunt
Copy link
Contributor Author

perunt commented Jan 10, 2024

@situchan, please can you check it?

@situchan
Copy link
Contributor

I confirmed working on both web and native. Before this PR, there's bug indeed

@grgia let's merge!

@roryabraham roryabraham merged commit ce67e8a into Expensify:main Jan 10, 2024
9 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.4.24-4 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 cancelled 🔪
🕸 web 🕸 success ✅

@kavimuru
Copy link

kavimuru commented Jan 11, 2024

@perunt Can you help with the QA steps? What should we be validating after sending the linked code in a chat?

You'll see that the screen position remains unchanged, and an item gets added. Note that this behavior is effective for a single push only.

@perunt
Copy link
Contributor Author

perunt commented Jan 11, 2024

This PR fixes a bug where adding over 50 new messages at once causes issues. It's hard to replicate this in the app right now as we don't have such functionality, but PR #30269 makes it possible to test it

@situchan
Copy link
Contributor

I think for now it's [No QA]. It can be fully tested in that comment linking live PR

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.24-8 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

7 participants