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

WhatsApp: Adjust menu size and remove some settings from block menu #18732

Merged
merged 1 commit into from
Feb 8, 2021
Merged

WhatsApp: Adjust menu size and remove some settings from block menu #18732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 40 additions & 35 deletions projects/plugins/jetpack/extensions/blocks/send-a-message/whatsapp-button/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,46 +129,51 @@ export default function WhatsAppButtonEdit( { attributes, setAttributes, classNa
);
};

const renderSettings = () => {
const renderPhoneSettings = () => {
return (
<>
<BaseControl
label={ __( 'Phone Number', 'jetpack' ) }
help={ __(
'Enter the phone number you use for WhatsApp and would like to be contacted on.',
'jetpack'
) }
className="jetpack-whatsapp-button__phonenumber"
>
<SelectControl
value={ countryCode }
onChange={ value => setAttributes( { countryCode: value } ) }
options={ countryCodes }
/>
<BaseControl
label={ __( 'Phone Number', 'jetpack' ) }
help={ __(
'Enter the phone number you use for WhatsApp and would like to be contacted on.',
'jetpack'
) }
className="jetpack-whatsapp-button__phonenumber"
>
<SelectControl
value={ countryCode }
onChange={ value => setAttributes( { countryCode: value } ) }
options={ countryCodes }
/>

<TextControl
placeholder={ __( 'Your phone number…', 'jetpack' ) }
onChange={ newPhoneNumber => {
setAttributes( { phoneNumber: newPhoneNumber } );
<TextControl
placeholder={ __( 'Your phone number…', 'jetpack' ) }
onChange={ newPhoneNumber => {
setAttributes( { phoneNumber: newPhoneNumber } );

if ( newPhoneNumber.length === 0 ) {
setIsValidPhoneNumber( true );
}
if ( newPhoneNumber.length === 0 ) {
setIsValidPhoneNumber( true );
}

if ( newPhoneNumber.length > 2 ) {
setIsValidPhoneNumber( validatePhoneNumber( newPhoneNumber ) );
}
} }
value={ phoneNumber }
/>
if ( newPhoneNumber.length > 2 ) {
setIsValidPhoneNumber( validatePhoneNumber( newPhoneNumber ) );
}
} }
value={ phoneNumber }
/>

{ ! isValidPhoneNumber && (
<HelpMessage isError className="jetpack-whatsapp-error">
{ __( 'Please enter a valid phone number.', 'jetpack' ) }
</HelpMessage>
) }
</BaseControl>
{ ! isValidPhoneNumber && (
<HelpMessage isError className="jetpack-whatsapp-error">
{ __( 'Please enter a valid phone number.', 'jetpack' ) }
</HelpMessage>
) }
</BaseControl>
);
};

const renderSettings = () => {
return (
<>
{ renderPhoneSettings() }
<TextareaControl
label={ __( 'Default First Message', 'jetpack' ) }
help={ __(
Expand Down Expand Up @@ -206,7 +211,7 @@ export default function WhatsAppButtonEdit( { attributes, setAttributes, classNa
className="jetpack-whatsapp-button-settings-selector"
contentClassName="jetpack-whatsapp-button__popover"
renderToggle={ ( { isOpen, onToggle } ) => renderSettingsToggle( isOpen, onToggle ) }
renderContent={ () => renderSettings() }
renderContent={ () => renderPhoneSettings() }
/>
</ToolbarGroup>
</BlockControls>
Expand Down
1 change: 1 addition & 0 deletions projects/plugins/jetpack/extensions/blocks/send-a-message/whatsapp-button/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
.jetpack-whatsapp-button__popover {
.components-popover__content {
padding: 12px;
min-width: 260px;
}
}

Expand Down