Disable reusable and editable HTML support for Form > Field blocks (#631

) * Reusable and Editible Supports Opt Out Handles #618 & #619 Added options to `supports` object to disable `html` and `reusable` properties. * added reusable and html to FieldDefaults.supports
godaddy-wordpress · Jul 3, 2019 · 0cfdcf3 · 0cfdcf3
1 parent 1cdd481
commit 0cfdcf3
Showing 1 changed file with 13 additions and 23 deletions.
diff --git a/src/blocks/form/edit.js b/src/blocks/form/edit.js
@@ -35,6 +35,7 @@ const FieldDefaults = {
 	supports: {
 		reusable: false,
 		html: false,
+		inserter: false,
 	},
 	attributes: {
 		label: {
@@ -83,9 +84,6 @@ export const childBlocks = [
 			title: __( 'Name' ),
 			description: __( 'A text field for names.' ),
 			icon: icons.name,
-			supports: {
-				inserter: false,
-			},
 			edit: props => (
 				<CoBlocksFieldName
 					type={ 'name' }
@@ -108,9 +106,6 @@ export const childBlocks = [
 			keywords: [ __( 'e-mail' ), __( 'mail' ), 'email' ],
 			description: __( 'An email address field.' ),
 			icon: icons.email,
-			supports: {
-				inserter: false,
-			},
 			edit: editField( 'email' ),
 		},
 	},
@@ -122,9 +117,6 @@ export const childBlocks = [
 			keywords: [ __( 'Textarea' ), 'textarea', __( 'Multiline text' ) ],
 			description: __( 'A text box for longer responses.' ),
 			icon: icons.textarea,
-			supports: {
-				inserter: false,
-			},
 			edit: props => (
 				<CoBlocksFieldTextarea
 					label={ getFieldLabel( props ) }
@@ -306,9 +298,11 @@ class FormEdit extends Component {
 			coblocks_google_recaptcha_site_key: this.state.recaptchaSiteKey,
 			coblocks_google_recaptcha_secret_key: this.state.recaptchaSecretKey,
 		} );
-		model.save().then( response => {
+		model.save().then( () => {
 			this.setState( { isSavedKey: true, keySaved: true } );
-			setTimeout( () => { this.setState( { isSaving: false } ) }, 1000 );
+			setTimeout( () => {
+				this.setState( { isSaving: false } );
+			}, 1000 );
 			settings.fetch();
 		} );
 	}
@@ -324,7 +318,7 @@ class FormEdit extends Component {
 				coblocks_google_recaptcha_site_key: '',
 				coblocks_google_recaptcha_secret_key: '',
 			} );
-			model.save().then( response => {
+			model.save().then( () => {
 				this.setState( { isSavedKey: false, isSaving: false, keySaved: false } );
 				settings.fetch();
 			} );
@@ -366,16 +360,13 @@ class FormEdit extends Component {
 	}
 
 	render() {
-
 		const {
-			attributes,
 			className,
-			setAttributes,
 		} = this.props;
 
 		const classes = classnames(
- 			className,
- 			'coblocks-form',
+			className,
+			'coblocks-form',
 		);
 
 		return (
@@ -390,7 +381,7 @@ class FormEdit extends Component {
 						initialOpen={ this.state.recaptchaSecretKey ? false : true }
 						className="components-coblocks-block-settings-sidebar"
 					>
-						<p>{ __( 'Add your reCAPTCHA site and secret keys to protect your form from spam.') }</p>
+						<p>{ __( 'Add your reCAPTCHA site and secret keys to protect your form from spam.' ) }</p>
 						<p>
 							<Fragment>
 								<ExternalLink href={ RETRIEVE_KEY_URL }>{ this.state.recaptchaSiteKey === '' && this.state.recaptchaSecretKey === '' ? __( 'Generate keys' ) : __( 'My keys' ) }</ExternalLink>|&nbsp;
@@ -400,13 +391,13 @@ class FormEdit extends Component {
 						<TextControl
 							label={ __( 'Site Key' ) }
 							value={ this.state.recaptchaSiteKey }
-							onChange={ value => this.setState({ recaptchaSiteKey: value }) }
+							onChange={ value => this.setState( { recaptchaSiteKey: value } ) }
 							className="components-block-coblocks-form-recaptcha-key__custom-input"
 						/>
 						<TextControl
 							label={ __( 'Secret Key' ) }
 							value={ this.state.recaptchaSecretKey }
-							onChange={ value => this.setState({ recaptchaSecretKey: value }) }
+							onChange={ value => this.setState( { recaptchaSecretKey: value } ) }
 							className="components-block-coblocks-form-recaptcha-key__custom-input"
 						/>
 						<div className="components-base-control components-block-coblocks-form-recaptcha-buttons">
@@ -426,7 +417,7 @@ class FormEdit extends Component {
 										onClick={ this.removeRecaptchaKey }
 										disabled={ this.state.recaptchaSiteKey === '' || this.state.recaptchaSecretKey === '' }
 									>
-										{ __('Remove') }
+										{ __( 'Remove' ) }
 									</Button>
 								</Fragment>
 							}
@@ -445,8 +436,7 @@ class FormEdit extends Component {
 				</div>
 			</Fragment>
 		);
-
 	}
-};
+}
 
 export default FormEdit;