Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"devDependencies": {
"@cypress/react18": "^2.0.1",
"@mate-academy/scripts": "^1.8.5",
"@mate-academy/scripts": "^2.1.3",
"@mate-academy/students-ts-config": "*",
"@mate-academy/stylelint-config": "*",
"@types/node": "^20.14.10",
Expand Down
131 changes: 84 additions & 47 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,58 +15,95 @@ export const goods = [
'Garlic',
];

export const App: React.FC = () => (
<main className="section container">
<h1 className="title">No goods selected</h1>
type State = {
selectedGood: string;
};

<h1 className="title is-flex is-align-items-center">
Jam is selected
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<button data-cy="ClearButton" type="button" className="delete ml-3" />
</h1>
export class App extends React.Component<{}, State> {
state = {
selectedGood: 'Jam',
};

<table className="table">
<tbody>
<tr data-cy="Good">
<td>
<button data-cy="AddButton" type="button" className="button">
+
</button>
</td>
selectGood = (good: string) => {
this.setState({
selectedGood: good,
});
};

<td data-cy="GoodTitle" className="is-vcentered">
Dumplings
</td>
</tr>
deleteGood = () => {
this.setState({
selectedGood: '',
});
};
Comment on lines +33 to +37

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method has the same implementation as clearSelectedGood. To avoid code duplication and follow the DRY (Don't Repeat Yourself) principle, you can remove one of them and use the other in both places.

Comment on lines +33 to +37

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method has the exact same functionality as clearSelectedGood. You can remove this one and reuse clearSelectedGood for the RemoveButton's onClick handler to avoid code duplication.


<tr data-cy="Good" className="has-background-success-light">
<td>
clearSelectedGood = () => {
this.setState({
selectedGood: '',
});
};

render() {
const { selectedGood } = this.state;

return (
<main className="section container">
{selectedGood.length === 0 ? (
<h1 className="title">No goods selected</h1>
) : (
<h1 className="title is-flex is-align-items-center">
{selectedGood} is selected
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<button
data-cy="RemoveButton"
data-cy="ClearButton"
type="button"
className="button is-info"
>
-
</button>
</td>

<td data-cy="GoodTitle" className="is-vcentered">
Jam
</td>
</tr>
className="delete ml-3"
onClick={this.clearSelectedGood}
/>
</h1>
)}

<tr data-cy="Good">
<td>
<button data-cy="AddButton" type="button" className="button">
+
</button>
</td>
<table className="table">
<tbody>
{goods.map((good) => {
return (
<tr
key={good}
data-cy="Good"
className={
good === selectedGood ? 'has-background-success-light' : ''
}
>
<td>
{good === selectedGood ? (
<button
data-cy="RemoveButton"
type="button"
className="button is-info"
onClick={this.deleteGood}
>
-
</button>
) : (
<button
data-cy="AddButton"
type="button"
className="button"
onClick={() => this.selectGood(good)}
>
+
</button>
)}
</td>

<td data-cy="GoodTitle" className="is-vcentered">
Garlic
</td>
</tr>
</tbody>
</table>
</main>
);
<td data-cy="GoodTitle" className="is-vcentered">
{good}
</td>
</tr>
);
})}
</tbody>
</table>
</main>
);
}
}