fix apply patch to fork #1

DylanDylann · 2023-10-17T12:14:21Z

Details

This PR will apply all the changes in the patch file to the fork package

Fixed Issues

$ Expensify/App#28797
PROPOSAL: Expensify/App#28797 (comment)

Tests

Open app => Request money => Choose "Distance" tab
Add more than one waypoint
Use drag-and-drop to reorder waypoints
Make sure it work as normal

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open app => Request money => Choose "Distance" tab
Add more than one waypoint
Use drag-and-drop to reorder waypoints
Make sure it work as normal

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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

android-chrome-money.mp4

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screencast.from.18-10-2023.23.15.31.webm

MacOS: Desktop

hayata-suenaga · 2023-10-18T23:23:08Z

@DylanDylann please use @Expensify/pullerbear to assign a C+ when the PR is ready

DylanDylann · 2023-10-18T23:52:46Z

@hayata-suenaga

please use @Expensify/pullerbear to assign a C+ when the PR is ready

Sorry, I cannot do this, can you help me, please

hayata-suenaga · 2023-10-19T00:05:08Z

ah I completely forgot that this is a new repository. thank you for reminding me of that 😅

I gonna ask some C+ to review this PR 👍

.gitignore

.size-snapshot.json

src/view/use-sensor-marshal/sensors/use-touch-sensor.js

DylanDylann · 2023-10-23T02:33:14Z

@allroundexperts just removed all the dist files. Please help check.

src/view/use-sensor-marshal/use-sensor-marshal.js

allroundexperts · 2023-10-23T02:47:41Z

src/view/use-sensor-marshal/sensors/use-touch-sensor.js

+        if (!handle) {
+          if (process.env.NODE_ENV !== 'production') {
+            invariant(false, 'Touch sensor unable to find drag handle');
+          } else {
+            invariant(false);
+          }
+        }


invariant(false, process.env.NODE_ENV !== 'production' ? 'Touch sensor unable to find drag handle' : undefined)

Sorry, what do you mean here?

@allroundexperts updated PR based on your suggestion code

allroundexperts · 2023-10-24T02:59:47Z

src/view/use-sensor-marshal/sensors/use-touch-sensor.js

+    function startPendingDrag(
+      actions: PreDragActions,
+      point: Position,
+      target,


Hm... we should type target as well.

Hey, to type it you can check the original PR, which was used to create the patch file.

Thanks @kosmydel. @allroundexperts Just add type to the event, handle params. Let`s review it. Thanks

@allroundexperts friendly bump in case you miss it

allroundexperts · 2023-10-26T05:38:34Z

src/view/use-sensor-marshal/use-sensor-marshal.js

@@ -437,7 +439,12 @@ export default function useSensorMarshal({
      }),
    [contextId, lockAPI, registry, store],
  );
-
+  const findClosestDragHandle = useCallback(
+    function (event: Event): ?DraggableId {


This is not how typing works I think. It should be: function (event: Event): DraggableId {} instead.

because I found a lot of parts in this repo that use this. or example:

react-beautiful-dnd/src/view/use-sensor-marshal/use-sensor-marshal.js

Lines 441 to 445 in 013bfce

const findClosestDraggableId = useCallback(

(event: Event): ?DraggableId =>

findClosestDraggableIdFromEvent(contextId, event),

[contextId],

);

So what do you think about it?

Have you tested this and can confirm that this works?

Yeah. When creating this fork PR, I tried creating dist files and adding use it in Expensify node_modules, then testing it in the distance request feature, there was no error occurs

Screencast.from.18-10-2023.23.15.31.webm

You can double-check to confirm it

Instead of manually changing the node_modules you can just add it in Expensify by using npm i <local path to the packed library>.

@kosmydel thanks for your information

Have you tested this and can confirm that this works?

@allroundexperts Just to confirm that it works well from my side. If you tested and did not encounter any error, please go to next step.

hayata-suenaga · 2023-10-26T15:53:21Z

is this ready for another round of review @DylanDylann ?

DylanDylann · 2023-10-26T15:54:26Z

@hayata-suenaga yeah. I ve requested C+ to review

allroundexperts · 2023-10-30T03:17:58Z

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(themeColors.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 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

Screen.Recording.2023-11-02.at.8.51.21.AM.mov

Android: mWeb Chrome

Screen.Recording.2023-11-02.at.8.53.15.AM.mov

iOS: Native

Screen.Recording.2023-11-02.at.8.55.44.AM.mov

iOS: mWeb Safari

Screen.Recording.2023-11-02.at.8.57.34.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2023-11-02.at.8.40.21.AM.mov

MacOS: Desktop

Screen.Recording.2023-11-02.at.8.48.59.AM.mov

allroundexperts · 2023-10-30T04:59:32Z

@DylanDylann Getting this crash.

Screen.Recording.2023-10-30.at.9.58.13.AM.mov

DylanDylann · 2023-10-30T05:01:14Z

@allroundexperts how did you install the package? please help check if you have the dist folder in node_modules/react-beautiful-dnd

allroundexperts · 2023-10-30T05:05:13Z

@DylanDylann I cloned the package locally and did a npm install <path to the local package> in main repo.

DylanDylann · 2023-10-30T05:06:40Z

please help check if you have the dist folder in node_modules/react-beautiful-dnd

what about this one? @allroundexperts

allroundexperts · 2023-10-30T05:11:24Z

@DylanDylann I did and attached is the node_modules/react-beautiful-dnd/dist/react-beautiful-dnd.js file:
https://file.io/bYrbkXCb0P8v

DylanDylann · 2023-10-30T05:14:56Z

On my side, after create run webpack to create dist files, here is the result:

How do you create the dist files? @allroundexperts

allroundexperts · 2023-10-30T05:15:51Z

yarn build

DylanDylann · 2023-10-30T05:22:12Z

Here are steps to create dist files from my side @allroundexperts :

clone package: git clone https://github.com/DylanDylann/react-beautiful-dnd.git
cd to this clone: cd react-beautiful-dnd/
git checkout fix/28797-apply-patch-to-fork
yarn install
yarn build

hayata-suenaga · 2023-10-30T16:33:17Z

@allroundexperts do you still have crashes?

allroundexperts · 2023-10-31T07:01:31Z

@hayata-suenaga Yes. But I'll try again tonight.

DylanDylann · 2023-10-31T10:05:58Z

@allroundexperts if you encounter any issue, feel free to ask me

DylanDylann · 2023-11-01T23:36:58Z

@allroundexperts do you have any stuck with this one?

allroundexperts · 2023-11-02T03:11:59Z

@DylanDylann The crash is still happening.

allroundexperts · 2023-11-02T03:12:23Z

I'm following the exact steps that you mentioned here

DylanDylann · 2023-11-02T03:13:23Z

@allroundexperts please give me your dist folder`s structure after folow these steps? #1 (comment). Here is mine:

allroundexperts · 2023-11-02T03:21:44Z

Here's my directory structure.

allroundexperts · 2023-11-02T03:22:55Z

The same files are symlinked in the main repo as well.

DylanDylann · 2023-11-02T03:25:10Z

@allroundexperts yeah. But just need to move only the dist result to the main repo, like below:

allroundexperts · 2023-11-02T03:27:56Z

@allroundexperts yeah. Bu just need to move only the dist result to the main repo, like below:

Doing an npm install <path to local package> more accurately mimics the production scenario. Just copying over the dist is not a good idea IMO.

allroundexperts · 2023-11-02T03:29:14Z

Also, after copying over, have you removed the patch?

DylanDylann · 2023-11-02T03:34:21Z

Doing an npm install more accurately mimics the production scenario. Just copying over the dist is not a good idea IMO.

I think currently, we just need to test if the change works properly or not. After PR is merged, we will follow this one #1 (comment)

Also, after copying over, have you removed the patch?

Yes, I removed

allroundexperts · 2023-11-02T03:35:41Z

@kosmydel Can you please check if the crash is happening on your side?

kosmydel · 2023-11-02T09:19:54Z

I've quickly checked, and the crash doesn't affect me.

Did you pack the library, @allroundexperts?

You should:

Use yarn and yarn pack in the library root.
That command will display a path to the .tgz file.
Copy this path, and in the Expensify/App use it: npm install <path>.
Verify if the package.json was updated.
Run the app.

allroundexperts · 2023-11-02T15:43:50Z

I was missing yarn pack. It works now. Thanks @kosmydel and @DylanDylann!

allroundexperts

Looks good!

DylanDylann · 2023-11-02T15:47:36Z

Thanks @allroundexperts and @kosmydel.
@hayata-suenaga can you review this PR as C+ just approved.

DylanDylann · 2023-11-02T17:53:25Z

@hayata-suenaga can you help publish this fork package?

DylanDylann added 2 commits October 17, 2023 19:13

fix apply patch to fork

0bc2efd

fix create dist

d4cf37c

DylanDylann mentioned this pull request Oct 18, 2023

Fix/28797: Remove patch and change dependence Expensify/App#29875

Closed

59 tasks

DylanDylann marked this pull request as ready for review October 18, 2023 16:21

DylanDylann mentioned this pull request Oct 18, 2023

[HOLD #333755] [$500] [MEDIUM] Distance: Create a fork for react-beautiful-dnd and remove patch Expensify/App#28797

Closed

allroundexperts reviewed Oct 19, 2023

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

allroundexperts reviewed Oct 19, 2023

View reviewed changes

.size-snapshot.json Outdated Show resolved Hide resolved

allroundexperts reviewed Oct 19, 2023

View reviewed changes

src/view/use-sensor-marshal/sensors/use-touch-sensor.js Outdated Show resolved Hide resolved

DylanDylann added 4 commits October 19, 2023 07:27

fix remove ternary and remove redundant logic

90f394f

fix remove size snapshot file

6a1b8be

fix code factor

6c2931f

fix remove dist folder

73c7df2

allroundexperts reviewed Oct 23, 2023

View reviewed changes

src/view/use-sensor-marshal/use-sensor-marshal.js Outdated Show resolved Hide resolved

fix use const rather than var

c796945

allroundexperts reviewed Oct 23, 2023

View reviewed changes

fix refactor code

a4e2a00

allroundexperts reviewed Oct 24, 2023

View reviewed changes

DylanDylann mentioned this pull request Oct 24, 2023

Add DraggableList component Expensify/App#26307

Merged

59 tasks

DylanDylann added 2 commits October 24, 2023 21:27

fix: define type for few params

f07c9cc

fix using findClosestDragHandle

4788e83

allroundexperts reviewed Oct 26, 2023

View reviewed changes

allroundexperts mentioned this pull request Oct 26, 2023

PDF preview component Expensify/react-fast-pdf#2

Merged

allroundexperts approved these changes Nov 2, 2023

View reviewed changes

hayata-suenaga approved these changes Nov 2, 2023

View reviewed changes

hayata-suenaga merged commit c76911c into Expensify:master Nov 2, 2023

	const findClosestDraggableId = useCallback(
	(event: Event): ?DraggableId =>
	findClosestDraggableIdFromEvent(contextId, event),
	[contextId],
	);

fix apply patch to fork #1

fix apply patch to fork #1

Conversation

DylanDylann commented Oct 17, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

hayata-suenaga commented Oct 18, 2023

DylanDylann commented Oct 18, 2023 • edited Loading

hayata-suenaga commented Oct 19, 2023

DylanDylann commented Oct 23, 2023

Choose a reason for hiding this comment

DylanDylann Oct 23, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DylanDylann Oct 26, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kosmydel Oct 26, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hayata-suenaga commented Oct 26, 2023

DylanDylann commented Oct 26, 2023

allroundexperts commented Oct 30, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts commented Oct 30, 2023

DylanDylann commented Oct 30, 2023 • edited Loading

allroundexperts commented Oct 30, 2023

DylanDylann commented Oct 30, 2023

allroundexperts commented Oct 30, 2023

DylanDylann commented Oct 30, 2023

allroundexperts commented Oct 30, 2023

DylanDylann commented Oct 30, 2023 • edited Loading

hayata-suenaga commented Oct 30, 2023

allroundexperts commented Oct 31, 2023

DylanDylann commented Oct 31, 2023

DylanDylann commented Nov 1, 2023

allroundexperts commented Nov 2, 2023

allroundexperts commented Nov 2, 2023

DylanDylann commented Nov 2, 2023 • edited Loading

allroundexperts commented Nov 2, 2023

allroundexperts commented Nov 2, 2023

DylanDylann commented Nov 2, 2023 • edited Loading

allroundexperts commented Nov 2, 2023

allroundexperts commented Nov 2, 2023

DylanDylann commented Nov 2, 2023 • edited Loading

allroundexperts commented Nov 2, 2023

kosmydel commented Nov 2, 2023

allroundexperts commented Nov 2, 2023

allroundexperts left a comment

Choose a reason for hiding this comment

DylanDylann commented Nov 2, 2023 • edited Loading

DylanDylann commented Nov 2, 2023

DylanDylann commented Oct 17, 2023 •

edited

Loading

DylanDylann commented Oct 18, 2023 •

edited

Loading

DylanDylann Oct 23, 2023 •

edited

Loading

DylanDylann Oct 26, 2023 •

edited

Loading

kosmydel Oct 26, 2023 •

edited

Loading

allroundexperts commented Oct 30, 2023 •

edited

Loading

DylanDylann commented Oct 30, 2023 •

edited

Loading

DylanDylann commented Oct 30, 2023 •

edited

Loading

DylanDylann commented Nov 2, 2023 •

edited

Loading

DylanDylann commented Nov 2, 2023 •

edited

Loading

DylanDylann commented Nov 2, 2023 •

edited

Loading

DylanDylann commented Nov 2, 2023 •

edited

Loading