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

Show file tree
Hide file tree
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
Next Next commit
Add prop for disabling suggestions button
  • Loading branch information
@fluiddot
fluiddot committed May 13, 2022
commit 34743a8a3f7868a43b7954a5f64b13fcfd93d1cb
1 change: 1 addition & 0 deletions packages/block-editor/src/components/rich-text/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ function removeNativeProps( props ) {
'minWidth',
'maxWidth',
'setRef',
'disableSuggestions',
] );
}

Expand Down
2 changes: 2 additions & 0 deletions packages/block-editor/src/components/rich-text/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ function RichTextWrapper(
maxWidth,
onBlur,
setRef,
disableSuggestions,
...props
},
forwardedRef
Expand Down Expand Up @@ -635,6 +636,7 @@ function RichTextWrapper(
maxWidth={ maxWidth }
onBlur={ onBlur }
setRef={ setRef }
disableSuggestions={ disableSuggestions }
// Props to be set on the editable container are destructured on the
// element itself for web (see below), but passed through rich text
// for native.
Expand Down
13 changes: 8 additions & 5 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 @@ -1050,6 +1050,7 @@ export class RichText extends Component {
baseGlobalStyles,
selectionStart,
selectionEnd,
disableSuggestions,
} = this.props;
const { currentFontSize } = this.state;

Expand Down Expand Up @@ -1230,11 +1231,13 @@ export class RichText extends Component {
onChange={ this.onFormatChange }
onFocus={ () => {} }
/>
<BlockFormatControls>
<ToolbarButtonWithOptions
options={ this.suggestionOptions() }
/>
</BlockFormatControls>
{ ! disableSuggestions && (
<BlockFormatControls>
<ToolbarButtonWithOptions
options={ this.suggestionOptions() }
/>
</BlockFormatControls>
) }
</>
) }
</View>
Expand Down