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

Refactor ImportForm as function component and use hooks #36938

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Refactor ImportForm as function component and use hooks #36938

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f2ead4
Refactor ImportForm as function component and use hooks
amustaque97 Nov 28, 2021
dd5389e
Remove `isStillMounted` variable
amustaque97 Dec 1, 2021
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
125 changes: 52 additions & 73 deletions packages/list-reusable-blocks/src/components/import-form/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
import { Component } from '@wordpress/element';
import { useState, useRef } from '@wordpress/element';
import { withInstanceId } from '@wordpress/compose';
import { __, _x } from '@wordpress/i18n';
import { Button, Notice } from '@wordpress/components';
Expand All @@ -11,52 +11,41 @@ import { Button, Notice } from '@wordpress/components';
*/
import importReusableBlock from '../../utils/import';

class ImportForm extends Component {
constructor() {
super( ...arguments );
this.state = {
isLoading: false,
error: null,
file: null,
};
function ImportForm( { instanceId, onUpload } ) {
const inputId = 'list-reusable-blocks-import-form-' + instanceId;

this.isStillMounted = true;
this.onChangeFile = this.onChangeFile.bind( this );
this.onSubmit = this.onSubmit.bind( this );
}
const formRef = useRef();
const [ isLoading, setIsLoading ] = useState( false );
const [ error, setError ] = useState( null );
const [ file, setFile ] = useState( null );

componentWillUnmount() {
this.isStillMounted = false;
}
const onChangeFile = ( event ) => {
setFile( event.target.files[ 0 ] );
setError( null );
};

onChangeFile( event ) {
this.setState( { file: event.target.files[ 0 ], error: null } );
}

onSubmit( event ) {
const onSubmit = ( event ) => {
event.preventDefault();
const { file } = this.state;
const { onUpload } = this.props;
if ( ! file ) {
return;
}
this.setState( { isLoading: true } );
setIsLoading( { isLoading: true } );
importReusableBlock( file )
.then( ( reusableBlock ) => {
if ( ! this.isStillMounted ) {
if ( ! formRef ) {
return;
}

this.setState( { isLoading: false } );
setIsLoading( false );
onUpload( reusableBlock );
} )
.catch( ( error ) => {
if ( ! this.isStillMounted ) {
.catch( ( errors ) => {
if ( ! formRef ) {
return;
}

let uiMessage;
switch ( error.message ) {
switch ( errors.message ) {
case 'Invalid JSON file':
uiMessage = __( 'Invalid JSON file' );
break;
Expand All @@ -67,54 +56,44 @@ class ImportForm extends Component {
uiMessage = __( 'Unknown error' );
}

this.setState( { isLoading: false, error: uiMessage } );
setIsLoading( false );
setError( uiMessage );
} );
}
};

onDismissError() {
this.setState( { error: null } );
}
const onDismissError = () => {
setError( null );
};

render() {
const { instanceId } = this.props;
const { file, isLoading, error } = this.state;
const inputId = 'list-reusable-blocks-import-form-' + instanceId;
return (
<form
className="list-reusable-blocks-import-form"
onSubmit={ this.onSubmit }
return (
<form
className="list-reusable-blocks-import-form"
onSubmit={ onSubmit }
ref={ formRef }
>
{ error && (
<Notice status="error" onRemove={ () => onDismissError() }>
{ error }
</Notice>
) }
<label
htmlFor={ inputId }
className="list-reusable-blocks-import-form__label"
>
{ __( 'File' ) }
</label>
<input id={ inputId } type="file" onChange={ onChangeFile } />
<Button
type="submit"
isBusy={ isLoading }
disabled={ ! file || isLoading }
variant="secondary"
className="list-reusable-blocks-import-form__button"
>
{ error && (
<Notice
status="error"
onRemove={ () => this.onDismissError() }
>
{ error }
</Notice>
) }
<label
htmlFor={ inputId }
className="list-reusable-blocks-import-form__label"
>
{ __( 'File' ) }
</label>
<input
id={ inputId }
type="file"
onChange={ this.onChangeFile }
/>
<Button
type="submit"
isBusy={ isLoading }
disabled={ ! file || isLoading }
variant="secondary"
className="list-reusable-blocks-import-form__button"
>
{ _x( 'Import', 'button label' ) }
</Button>
</form>
);
}
{ _x( 'Import', 'button label' ) }
</Button>
</form>
);
}

export default withInstanceId( ImportForm );