added position absolute and some flexbox so I could remov changes in display and setTimeout, added tests and types, did some renaming

This commit is contained in:
Patrick O'Carroll
2018-07-25 10:29:55 +02:00
parent b8a4b7771a
commit f4ab432542
4 changed files with 99 additions and 66 deletions
+1 -1
View File
@@ -55,7 +55,7 @@ export class TeamList extends React.Component<Props, any> {
<a href={teamUrl}>{team.memberCount}</a>
</td>
<td className="text-right">
<DeleteButton confirmDelete={() => this.deleteTeam(team)} />
<DeleteButton onConfirmDelete={() => this.deleteTeam(team)} />
</td>
</tr>
);
@@ -0,0 +1,44 @@
import React from 'react';
import DeleteButton from './DeleteButton';
import { shallow } from 'enzyme';
describe('DeleteButton', () => {
let wrapper;
let deleted;
beforeAll(() => {
deleted = false;
function deleteItem() {
deleted = true;
}
wrapper = shallow(<DeleteButton onConfirmDelete={() => deleteItem()} />);
});
it('should show confirm delete when clicked', () => {
expect(wrapper.state().showConfirm).toBe(false);
wrapper.find('.delete-button').simulate('click');
expect(wrapper.state().showConfirm).toBe(true);
});
it('should hide confirm delete when clicked', () => {
wrapper.find('.delete-button').simulate('click');
expect(wrapper.state().showConfirm).toBe(true);
wrapper
.find('.confirm-delete')
.find('.btn')
.at(0)
.simulate('click');
expect(wrapper.state().showConfirm).toBe(false);
});
it('should show confirm delete when clicked', () => {
expect(deleted).toBe(false);
wrapper
.find('.confirm-delete')
.find('.btn')
.at(1)
.simulate('click');
expect(deleted).toBe(true);
});
});
@@ -1,73 +1,61 @@
import React, { Component } from 'react';
import React, { PureComponent } from 'react';
export default class DeleteButton extends Component<any, any> {
state = {
deleteButton: 'delete-button--show',
confirmSpan: 'confirm-delete--removed',
export interface DeleteButtonProps {
onConfirmDelete();
}
export interface DeleteButtonStates {
showConfirm: boolean;
}
export default class DeleteButton extends PureComponent<DeleteButtonProps, DeleteButtonStates> {
state: DeleteButtonStates = {
showConfirm: false,
};
handleDelete = event => {
onClickDelete = event => {
if (event) {
event.preventDefault();
}
this.setState({
deleteButton: 'delete-button--hide',
showConfirm: true,
});
setTimeout(() => {
this.setState({
deleteButton: 'delete-button--removed',
});
}, 100);
setTimeout(() => {
this.setState({
confirmSpan: 'confirm-delete--hide',
});
}, 100);
setTimeout(() => {
this.setState({
confirmSpan: 'confirm-delete--show',
});
}, 150);
};
cancelDelete = event => {
event.preventDefault();
onClickCancel = event => {
if (event) {
event.preventDefault();
}
this.setState({
confirmSpan: 'confirm-delete--hide',
showConfirm: false,
});
setTimeout(() => {
this.setState({
confirmSpan: 'confirm-delete--removed',
deleteButton: 'delete-button--hide',
});
}, 140);
setTimeout(() => {
this.setState({
deleteButton: 'delete-button--show',
});
}, 190);
};
render() {
const { confirmDelete } = this.props;
const onClickConfirm = this.props.onConfirmDelete;
let showConfirm;
let showDeleteButton;
if (this.state.showConfirm) {
showConfirm = 'show';
showDeleteButton = 'hide';
} else {
showConfirm = 'hide';
showDeleteButton = 'show';
}
return (
<span className="delete-button-container">
<a className={this.state.deleteButton + ' btn btn-danger btn-small'} onClick={this.handleDelete}>
<a className={'delete-button ' + showDeleteButton + ' btn btn-danger btn-small'} onClick={this.onClickDelete}>
<i className="fa fa-remove" />
</a>
<span className="confirm-delete-container">
<span className={this.state.confirmSpan}>
<a className="btn btn-small" onClick={this.cancelDelete}>
<span className={'confirm-delete ' + showConfirm}>
<a className="btn btn-small" onClick={this.onClickCancel}>
Cancel
</a>
<a className="btn btn-danger btn-small" onClick={confirmDelete}>
<a className="btn btn-danger btn-small" onClick={onClickConfirm}>
Confirm Delete
</a>
</span>