diff --git a/package-lock.json b/package-lock.json index b462b61..2532c70 100755 --- a/package-lock.json +++ b/package-lock.json @@ -13747,6 +13747,11 @@ "prop-types": "^15.6.2" } }, + "reactive-button": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/reactive-button/-/reactive-button-1.3.3.tgz", + "integrity": "sha512-XV7wuiu72Ie55FYmXu4X148Wl4w7rbTfZV+tlvdhcxIcgCWe8k9fpr3wGCh7dx5BnwTpOKI391l7lDS0CajsMg==" + }, "reactstrap": { "version": "8.4.1", "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.4.1.tgz", diff --git a/package.json b/package.json index f5a5609..7ee94e5 100755 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "react-router-dom": "^5.2.0", "react-s-alert": "^1.4.1", "react-scripts": "3.4.1", + "reactive-button": "^1.3.3", "reactstrap": "^8.4.1", "serve": "^11.3.2", "standard": "^14.3.4", diff --git a/src/diary/Diary.js b/src/diary/Diary.js index 7100662..582cb09 100644 --- a/src/diary/Diary.js +++ b/src/diary/Diary.js @@ -16,29 +16,7 @@ import { Card } from 'antd' import AddActivityDiaryModal from './AddActivityDiaryModal' import FoodStatCardsList from './FoodStatCardsList' import { Button } from '@material-ui/core' -import AwesomeButtonProgress from 'react-awesome-button' - -const addProductsButton = memoize(addProductsHandler => ( - addProductsHandler} - > - Primary - -)) - -const deleteButton = memoize(deleteHandler => ( - -)) - -const addActivitiesButton = memoize(addActivitiesHandler => ( - -)) +import ReactiveButton from 'reactive-button' const conditionalRowStyles = [ { @@ -200,6 +178,33 @@ class Diary extends React.Component { } } + addProductsButton = addProductsHandler => ( + + ) + + deleteButton = deleteHandler => ( + + ) + + addActivitiesButton = addActivitiesHandler => ( + + ) + handleOpenModal = () => { this.setState({ open: true }) } @@ -332,8 +337,8 @@ class Diary extends React.Component { pointerOnHover highlightOnHover clearSelectedRows={this.state.toggleCleared} - actions={[addProductsButton(this.handleOpenModal), addActivitiesButton(this.handleOpenActivitiesModal)]} - contextActions={deleteButton(this.handleDeleteRecentProducts)} + actions={[this.addProductsButton(this.handleOpenModal), this.addActivitiesButton(this.handleOpenActivitiesModal)]} + contextActions={this.deleteButton(this.handleDeleteRecentProducts)} onSelectedRowsChange={this.handleSelectedRowClick} conditionalRowStyles={conditionalRowStyles} />