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
Prev Previous commit
Next Next commit
Use experimental version of PlainText in Shortcode block
  • Loading branch information
@fluiddot
fluiddot committed May 19, 2022
commit 9df81c0d26e2776f0ab64d62949283193f3432b1
42 changes: 27 additions & 15 deletions packages/block-library/src/shortcode/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@ export function ShortcodeEdit( props ) {
onFocus,
onBlur,
getStylesFromColorScheme,
blockWidth,
} = props;
const titleStyle = getStylesFromColorScheme(
styles.blockTitle,
styles.blockTitleDark
);
const shortcodeContainerStyle = getStylesFromColorScheme(
styles.blockShortcodeContainer,
styles.blockShortcodeContainerDark
);
const shortcodeStyle = getStylesFromColorScheme(
styles.blockShortcode,
styles.blockShortcodeDark
Expand All @@ -40,21 +45,28 @@ export function ShortcodeEdit( props ) {
return (
<View>
<Text style={ titleStyle }>{ __( 'Shortcode' ) }</Text>
<PlainText
value={ attributes.text }
style={ shortcodeStyle }
multiline={ true }
underlineColorAndroid="transparent"
onChange={ ( text ) => setAttributes( { text } ) }
placeholder={ __( 'Add a shortcode…' ) }
aria-label={ __( 'Shortcode' ) }
isSelected={ props.isSelected }
onFocus={ onFocus }
onBlur={ onBlur }
autoCorrect={ false }
autoComplete="off"
placeholderTextColor={ placeholderStyle.color }
/>
<View style={ shortcodeContainerStyle }>
<PlainText
__experimentalVersion={ 2 }
value={ attributes.text }
style={ shortcodeStyle }
onChange={ ( text ) => setAttributes( { text } ) }
placeholder={ __( 'Add a shortcode…' ) }
aria-label={ __( 'Shortcode' ) }
isSelected={ props.isSelected }
onFocus={ onFocus }
onBlur={ onBlur }
placeholderTextColor={ placeholderStyle.color }
maxWidth={
blockWidth -
styles.blockShortcodeContainer.paddingLeft +
styles.blockShortcodeContainer.paddingRight
}
// TODO: Add autocorrect and autocomplete options
// autoCorrect={ false }
// autoComplete="off"
/>
</View>
</View>
);
}
Expand Down
14 changes: 10 additions & 4 deletions packages/block-library/src/shortcode/style.native.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,24 @@
color: $gray-50;
}

.blockShortcodeContainer {
padding: 12px;
border-radius: 4px;
background-color: $gray-light;
}

.blockShortcodeContainerDark {
background-color: $gray-100;
}

.blockShortcode {
font-family: $default-monospace-font;
font-weight: 400;
font-size: 14px;
padding: 12px;
border-radius: 4px;
background-color: $gray-light;
}

.blockShortcodeDark {
color: $white;
background-color: $gray-100;
}

.placeholder {
Expand Down