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.

Sign up for GitHub

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

Jump to bottom

21345 - Upgrade Electron to latest #21885

Merged
merged 7 commits into from
Jul 12, 2023
Merged

21345 - Upgrade Electron to latest #21885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a208554
upgraded electron to the latest version
Skalakid Jun 29, 2023
1c0b8a6
fixed pressable bugs
Skalakid Jun 29, 2023
7bef11f
Merge branch 'main' into 21345-upgrade-electron
Skalakid Jul 3, 2023
cb238d2
Merge branch 'main' into 21345-upgrade-electron
Skalakid Jul 4, 2023
742d3f7
Merge branch 'main' into 21345-upgrade-electron
Skalakid Jul 4, 2023
31332da
Merge branch 'main' into 21345-upgrade-electron
Skalakid Jul 10, 2023
373e1ff
Merge branch 'main' into 21345-upgrade-electron
Skalakid Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
"css-loader": "^6.7.2",
"diff-so-fancy": "^1.3.0",
"dotenv": "^16.0.3",
"electron": "22.3.14",
"electron": "^25.2.0",
"electron-builder": "24.5.0",
"eslint": "^7.6.0",
"eslint-config-expensify": "^2.0.38",
Expand Down
1 change: 1 addition & 0 deletions src/components/Pressable/GenericPressable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const WebGenericPressable = forwardRef((props, ref) => (
aria-label={props.accessibilityLabel}
aria-labelledby={props.accessibilityLabelledBy}
aria-valuenow={props.accessibilityValue}
nativeID={props.nativeID || 'no-drag-area'}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Won't it break the pressable functionality if props.nativeID is passed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think no, why it could break Pressable functionality? As they wrote in the docs:

And note that if you have made the whole window draggable, you must also mark buttons as non-draggable, otherwise it would be impossible for users to click on them

We should mark all of our Pressables with -webkit-app-region: no-drag; and we are doing it using nativeID

Copy link
Collaborator

Choose a reason for hiding this comment

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

All right looks good! We just need to test this out and out!

/>
));

Expand Down