-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Add support for the paste and match style command #9880
Conversation
There is one thing with the edit menu on desktop. Currently, we have two Paste and Match style menu items under Edit in the system menu. One is provided by electron, which has a slightly different shortcut. Second we add ourselves. We have to have an item in the system menu for a keyboard shortcut to register. A context menu item with the shortcut is not enough. What I have tried:
Options:
|
I have no clue about it so far. I will dig in and let you know. It would also be good to hear the pros of each option.
What is different with native one? |
Electron provides us with the standard shortcut for paste and match style on mac (used in Text Edit, Safari, etc.), which includes alt. We can decide to honor it because the input context menu makes the shortcut evident to the user. The only change would be this in contextMenu({
append: (defaultActions, parameters) => [
new MenuItem({
visible: parameters.isEditable,
role: 'pasteAndMatchStyle',
accelerator: 'CmdOrCtrl+Alt+Shift+V',
}),
],
}); Result: |
Keeping both items has the disadvantage of adding Paste and Match Style twice in the Edit menu, once for each shortcut. (This is not the case for the context menu.) It has the advantage of supporting both shortcuts. Making Honoring the standard shortcut has the advantage of making the least amount of changes in I think that because the context menu item makes the shortcut hard to miss, the shortcut itself is slightly less important. |
I will test this tomorrow. Thanks for the details. |
I've found that while chrome shows |
I am also in favor of using the system default. I wonder what is used for safari. |
Safari and other native mac apps use the standard. |
I will test it shortly and open a discussion about this on the issue to get a consensus for different shortcuts on MAC. |
Here it is in action: mac-desktop.mp4 |
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.
I have suggested a few things that I feel are more reasonable. Feel free to discuss in case, you don't like any change. I am happy to get better ideas.
src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
Outdated
Show resolved
Hide resolved
src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
Outdated
Show resolved
Hide resolved
I have updated the description with a testing step for desktop and with the video showing all new desktop functionality. |
src/pages/home/report/ContextMenu/ContextMenuUtils/index.native.js
Outdated
Show resolved
Hide resolved
src/pages/home/report/ContextMenu/ContextMenuUtils/index.native.js
Outdated
Show resolved
Hide resolved
src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
Outdated
Show resolved
Hide resolved
src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
Outdated
Show resolved
Hide resolved
I've updated the description with a video for Safari and fixed related steps. |
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.
What do you think of the suggestions?
src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
Outdated
Show resolved
Hide resolved
@parasharrajat I've added your latest suggestions to this version. What do you think? |
Looking much better. let's try to revert the unnecessary changes. |
src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
Outdated
Show resolved
Hide resolved
src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
Outdated
Show resolved
Hide resolved
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.
It's not working on Safari and firefox. I understand the reason for firefox but what about safari.
It is working in Safari. Have you followed the steps? |
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.
OK, looking good to me.
A few points about the PR.
- We have implemented the native support for paste and match formatting instead of using
Ctrl+Shift+V
on all platforms. It may be technically impossible for some of the platforms to use a custom shortcut for such a feature. But most of the platform supportsCtrl+Shift+V
for the same.
cc: @roryabraham
PR 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 verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 notonIconClick
). - 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 was added in all
src/languages/*
files - I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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
- 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.
- 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 usingAvatar
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 */
- Any functional components have the
displayName
property - 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. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - 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 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 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 thatAvatar
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.
- I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
@marktoman Please mention in the tests and QA steps that this does not work on Firefox Web. Also, Please add QA steps. If tests and QA steps are same copy paste them. |
🚀 Deployed to staging by @roryabraham in version: 1.1.87-1 🚀
|
🚀 Deployed to production by @yuwenmemon in version: 1.1.87-9 🚀
|
Details
Fixed Issues
$ #9240
Test Steps
Desktop (new functionality)
Steps
Result
Input has formatting in 3. and loses it in 4 and 5.
Web, except Firefox (new functionality)
Steps
Result
Input has formatting in 3. and loses it in 4-6.
Mobile web and Firefox (retaining existing functionality)
Steps
Result
Input has formatting.
PR Review Checklist
Contributor (PR Author) Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)PR Reviewer Checklist
The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
).src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
have been tested & I retested again)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)QA Steps
@Expensify/applauseleads please add this new functionality to the regression test suite
Desktop (new functionality)
Steps
Result
Input has formatting in 3. and loses it in 4 and 5.
Web, except Firefox (new functionality)
Steps
Result
Input has formatting in 3. and loses it in 4-6.
Mobile web and Firefox (retaining existing functionality)
Steps
Result
Input has formatting.
Screenshots
Web
mac-chrome.mp4
mac-safari.mp4
win-chrome.mp4
win-firefox.mp4
Mobile Web
android-chrome.mp4
android-firefox.mp4
ios-safari.mp4
Desktop
mac-desktop.mp4
mac-desktop.mp4
iOS
ios-native.mp4
Android
android-native.mp4