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

Unblock Button block for production #20093

Merged
merged 10 commits into from
Feb 14, 2020
Merged

Unblock Button block for production #20093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f25e623
Unblock Button block for production
lukewalczak Feb 7, 2020
20c21f4
Resolve blockers
lukewalczak Feb 10, 2020
01ebaca
Resolve non-blockers
lukewalczak Feb 10, 2020
946775e
Correct Button outline
lukewalczak Feb 11, 2020
501772f
Correct Button outline vol2
lukewalczak Feb 11, 2020
0b734c4
Refactor outline
lukewalczak Feb 11, 2020
49a04a4
Merge branch 'master' into rnmobile/unblock-button
lukewalczak Feb 12, 2020
3e1cb68
Correct focusing Button
lukewalczak Feb 12, 2020
4070fbb
Refactor after CR
lukewalczak Feb 13, 2020
3d36f32
Correct container style
lukewalczak Feb 13, 2020
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: 22 additions & 16 deletions packages/block-library/src/button/color-background.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,28 @@ function ColorBackground( { children, borderRadiusValue, backgroundColor } ) {
};
}

if ( gradientValue ) {
const { colors, locations, angle } = transformGradient();
return (
<LinearGradient
colors={ colors }
useAngle={ true }
angle={ angle }
locations={ locations }
angleCenter={ { x: 0.5, y: 0.5 } }
style={ wrapperStyles }
>
{ children }
</LinearGradient>
);
}
return <View style={ wrapperStyles }>{ children }</View>;
const { colors, locations, angle } = gradientValue
? transformGradient()
: {};

return (
<View style={ wrapperStyles }>
{ gradientValue && (
<LinearGradient
colors={ colors }
useAngle={ true }
angle={ angle }
locations={ locations }
angleCenter={ { x: 0.5, y: 0.5 } }
style={ [
styles.linearGradient,
{ borderRadius: borderRadiusValue },
] }
/>
) }
{ children }
</View>
);
}

export default ColorBackground;
241 changes: 130 additions & 111 deletions packages/block-library/src/button/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const NEW_TAB_REL = 'noreferrer noopener';
const MIN_BORDER_RADIUS_VALUE = 0;
const MAX_BORDER_RADIUS_VALUE = 50;
const INITIAL_MAX_WIDTH = 108;
const PREPEND_HTTP = 'http://';

class ButtonEdit extends Component {
constructor( props ) {
Expand All @@ -54,16 +55,20 @@ class ButtonEdit extends Component {
this.getURLFromClipboard = this.getURLFromClipboard.bind( this );
this.onToggleLinkSettings = this.onToggleLinkSettings.bind( this );
this.onToggleButtonFocus = this.onToggleButtonFocus.bind( this );
this.setRef = this.setRef.bind( this );

// `isEditingURL` property is used to prevent from automatically pasting
// URL from clipboard while trying to clear `Button URL` field and then
// manually adding specific link
this.isEditingURL = false;

const isButtonFocused =
Platform.OS === 'ios' ? ! props.hasParents : true;

this.state = {
maxWidth: INITIAL_MAX_WIDTH,
isLinkSheetVisible: false,
isButtonFocused: true,
isButtonFocused,
};
}

Expand Down Expand Up @@ -144,17 +149,12 @@ class ButtonEdit extends Component {
}

getBackgroundColor() {
const { backgroundColor, attributes } = this.props;
const { backgroundColor } = this.props;
if ( backgroundColor.color ) {
// `backgroundColor` which should be set when we are able to resolve it
return backgroundColor.color;
} else if ( attributes.backgroundColor ) {
// `backgroundColor` which should be set when we can’t resolve
// the button `backgroundColor` that was created on web
return styles.fallbackButton.backgroundColor;
// `backgroundColor` which should be set when `Button` is created on mobile
}
return styles.button.backgroundColor;
return styles.fallbackButton.backgroundColor;
}

onChangeText( value ) {
Expand All @@ -180,13 +180,6 @@ class ButtonEdit extends Component {
setAttributes( { url: value } );
}

onLayout( { nativeEvent } ) {
const { width } = nativeEvent.layout;
const { marginRight, paddingRight, borderWidth } = styles.button;
const buttonSpacing = 2 * ( marginRight + paddingRight + borderWidth );
this.setState( { maxWidth: width - buttonSpacing } );
}

onChangeOpenInNewTab( value ) {
const { setAttributes, attributes } = this.props;
const { rel } = attributes;
Expand Down Expand Up @@ -227,12 +220,19 @@ class ButtonEdit extends Component {
this.setState( { isLinkSheetVisible: false } );
}

onLayout( { nativeEvent } ) {
const { width } = nativeEvent.layout;
const { marginRight } = styles.button;
const buttonSpacing = 2 * marginRight;
this.setState( { maxWidth: width - buttonSpacing } );
}

getLinkSettings( url, rel, linkTarget, isCompatibleWithSettings ) {
return (
<>
<TextControl
icon={ ! isCompatibleWithSettings && link }
label={ __( 'Button URL' ) }
label={ __( 'Button Link URL' ) }
value={ url || '' }
valuePlaceholder={ __( 'Add URL' ) }
onChange={ this.onChangeURL }
Expand Down Expand Up @@ -260,15 +260,27 @@ class ButtonEdit extends Component {
onChange={ this.onChangeLinkRel }
autoCapitalize="none"
autoCorrect={ false }
separatorType={ 'fullWidth' }
separatorType={
isCompatibleWithSettings ? 'none' : 'fullWidth'
}
keyboardType="url"
/>
</>
);
}

setRef( richText ) {
this.richTextRef = richText;
}

render() {
const { attributes, textColor, isSelected, clientId } = this.props;
const {
attributes,
textColor,
isSelected,
clientId,
onReplace,
} = this.props;
const {
placeholder,
text,
Expand Down Expand Up @@ -305,105 +317,108 @@ class ButtonEdit extends Component {
? ''
: placeholder || __( 'Add text…' );

const backgroundColor = this.getBackgroundColor();

return (
<View style={ { flex: 1 } } onLayout={ this.onLayout }>
<View
style={ [
styles.container,
isSelected && {
borderColor: this.getBackgroundColor(),
borderRadius: outlineBorderRadius,
borderWidth: styles.button.borderWidth,
},
] }
<ColorBackground
borderRadiusValue={ borderRadiusValue }
backgroundColor={ backgroundColor }
isSelected={ isSelected }
>
<ColorBackground
borderRadiusValue={ borderRadiusValue }
backgroundColor={ this.getBackgroundColor() }
>
<RichText
setRef={ ( richText ) => {
this.richTextRef = richText;
} }
placeholder={ placeholderText }
value={ text }
onChange={ this.onChangeText }
style={ {
...richTextStyle.richText,
color: textColor.color || '#fff',
} }
textAlign="center"
placeholderTextColor={ 'lightgray' }
identifier="content"
tagName="p"
minWidth={ minWidth }
maxWidth={ maxWidth }
id={ clientId }
isSelected={ isButtonFocused }
withoutInteractiveFormatting
unstableOnFocus={ () =>
this.onToggleButtonFocus( true )
}
__unstableMobileNoFocusOnMount={ ! isSelected }
selectionColor={ textColor.color || '#fff' }
{ isSelected && (
<View
pointerEvents="none"
style={ [
styles.outline,
{
borderRadius: outlineBorderRadius,
borderWidth: styles.button.borderWidth,
borderColor: backgroundColor,
},
] }
/>
</ColorBackground>

{ isButtonFocused && (
<BlockControls>
<ToolbarGroup>
<ToolbarButton
title={ __( 'Edit image' ) }
icon={ link }
onClick={ this.onToggleLinkSettings }
/>
</ToolbarGroup>
</BlockControls>
) }

<BottomSheet
isVisible={ isLinkSheetVisible }
onClose={ this.onToggleLinkSettings }
hideHeader
>
{ this.getLinkSettings( url, rel, linkTarget ) }
<BottomSheet.Cell
label={ __( 'Remove link' ) }
labelStyle={ styles.clearLinkButton }
separatorType={ 'none' }
onPress={ this.onClearSettings }
/>
</BottomSheet>

<InspectorControls>
<PanelBody title={ __( 'Border Settings' ) }>
<RangeControl
label={ __( 'Border Radius' ) }
minimumValue={ MIN_BORDER_RADIUS_VALUE }
maximumValue={ MAX_BORDER_RADIUS_VALUE }
value={ borderRadiusValue }
onChange={ this.onChangeBorderRadius }
separatorType="none"
<RichText
setRef={ this.setRef }
placeholder={ placeholderText }
value={ text }
onChange={ this.onChangeText }
style={ {
...richTextStyle.richText,
color: textColor.color || '#fff',
} }
textAlign="center"
placeholderTextColor={
styles.placeholderTextColor.color
}
identifier="content"
tagName="p"
minWidth={ minWidth }
maxWidth={ maxWidth }
id={ clientId }
isSelected={ isButtonFocused }
withoutInteractiveFormatting
unstableOnFocus={ () =>
this.onToggleButtonFocus( true )
}
__unstableMobileNoFocusOnMount={ ! isSelected }
selectionColor={ textColor.color || '#fff' }
onReplace={ onReplace }
onRemove={ () => onReplace( [] ) }
/>
</ColorBackground>

{ isSelected && (
<BlockControls>
<ToolbarGroup>
<ToolbarButton
title={ __( 'Edit image' ) }
icon={ link }
onClick={ this.onToggleLinkSettings }
isActive={ url && url !== PREPEND_HTTP }
/>
</PanelBody>
<PanelBody title={ __( 'Link Settings' ) }>
{ this.getLinkSettings(
url,
rel,
linkTarget,
true
</ToolbarGroup>
</BlockControls>
) }

<BottomSheet
isVisible={ isLinkSheetVisible }
onClose={ this.onToggleLinkSettings }
hideHeader
>
{ this.getLinkSettings( url, rel, linkTarget ) }
<BottomSheet.Cell
label={ __( 'Remove link' ) }
labelStyle={ styles.clearLinkButton }
separatorType={ 'none' }
onPress={ this.onClearSettings }
/>
</BottomSheet>

<InspectorControls>
<PanelBody title={ __( 'Border Settings' ) }>
<RangeControl
label={ __( 'Border Radius' ) }
minimumValue={ MIN_BORDER_RADIUS_VALUE }
maximumValue={ MAX_BORDER_RADIUS_VALUE }
value={ borderRadiusValue }
onChange={ this.onChangeBorderRadius }
separatorType="none"
/>
</PanelBody>
<PanelBody title={ __( 'Link Settings' ) }>
{ this.getLinkSettings( url, rel, linkTarget, true ) }
</PanelBody>
<PanelBody>
<UnsupportedFooterControl
label={ __(
'Button color settings are coming soon.'
) }
</PanelBody>
<PanelBody title={ __( 'Color Settings' ) }>
<UnsupportedFooterControl
label={ __(
'Note: Theme colors are not available at this time.'
) }
separatorType="none"
/>
</PanelBody>
</InspectorControls>
</View>
separatorType="none"
/>
</PanelBody>
</InspectorControls>
</View>
);
}
Expand All @@ -414,13 +429,17 @@ export default compose( [
withColors( 'backgroundColor', { textColor: 'color' } ),
withSelect( ( select ) => {
const { isEditorSidebarOpened } = select( 'core/edit-post' );
const { getSelectedBlockClientId } = select( 'core/block-editor' );
const { getSelectedBlockClientId, getBlockParents } = select(
'core/block-editor'
);

const selectedId = getSelectedBlockClientId();
const hasParents = getBlockParents( selectedId ).length > 0;

return {
selectedId,
editorSidebarOpened: isEditorSidebarOpened(),
hasParents,
};
} ),
] )( ButtonEdit );
Loading