Skip to content

[RNMobile] Fix drag mode not being enabled when long-pressing over Shortcode block #41155

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

Merged
fluiddot merged 13 commits into from
May 20, 2022
Merged

[RNMobile] Fix drag mode not being enabled when long-pressing over Shortcode block #41155

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
34743a8
Add prop for disabling suggestions button
fluiddot May 13, 2022
0d38829
Use allowed formats in format types calculation
fluiddot May 13, 2022
6c90982
Add RichText version to PlainText component
fluiddot May 18, 2022
9df81c0
Use experimental version of PlainText in Shortcode block
fluiddot May 19, 2022
d2b2e6a
Add disableAutocorrection prop to RichText
fluiddot May 19, 2022
9b98382
Disable autocorrection in Shortcode block
fluiddot May 19, 2022
630f5c9
Update PlainText props in Shortcode block
fluiddot May 19, 2022
4b9a25c
Use pre as tagName in PlainText
fluiddot May 19, 2022
77ddf1a
Rename replaceLineBreaks function
fluiddot May 19, 2022
81af835
Update shortcode block unit tests
fluiddot May 19, 2022
76e58ed
Prevent text input focus when selecting Shortcode block
fluiddot May 19, 2022
af35786
Force text color in Shortcode block
fluiddot May 19, 2022
0433a92
Remove tagName prop from PlainText component
fluiddot May 20, 2022
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
Prev Previous commit
Next Next commit
Use allowed formats in format types calculation
  • Loading branch information
@fluiddot
fluiddot committed May 13, 2022
commit 0d388292d28563e8dfbfd6ce9d02f1c078cfba80
13 changes: 10 additions & 3 deletions packages/rich-text/src/component/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,10 +1252,17 @@ RichText.defaultProps = {
};

const withFormatTypes = ( WrappedComponent ) => ( props ) => {
const {
clientId,
identifier,
withoutInteractiveFormatting,
allowedFormats,
} = props;
const { formatTypes } = useFormatTypes( {
clientId: props.clientId,
identifier: props.identifier,
withoutInteractiveFormatting: props.withoutInteractiveFormatting,
clientId,
identifier,
withoutInteractiveFormatting,
allowedFormats,
Comment on lines +1256 to +1266
Copy link
Contributor Author

@fluiddot fluiddot May 19, 2022

Choose a reason for hiding this comment

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

I found out that the format types weren't taking into account the allowed formats calculated in the RichText component:

gutenberg/packages/block-editor/src/components/rich-text/index.native.js

Lines 194 to 198 in a1e1fdc

const adjustedAllowedFormats = getAllowedFormats( {
allowedFormats,
formattingControls,
disableFormats,
} );

This was causing that setting the prop __unstableDisableFormats doesn't hide the text color format button from the toolbar, as well as preventing hiding other format buttons when using the allowedFormats prop.

} );

return <WrappedComponent { ...props } formatTypes={ formatTypes } />;
Expand Down