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.

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

Homework completed #24

Closed
wants to merge 6 commits into from
Closed
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: 8 additions & 1 deletion src/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { createElement } from './utils.js';
import { WordFormRu } from './helpers.js';
import './styles.css';

/**
Expand Down Expand Up @@ -27,7 +28,13 @@ function App({ store }) {
onClick={() => store.selectItem(item.code)}
>
<div className="Item-code">{item.code}</div>
<div className="Item-title">{item.title}</div>

<div className="Item-title">
{item.title}
{!!item.selectedCount &&
`| Выделяли ${item.selectedCount} ${WordFormRu(item.selectedCount)}`}
</div>

<div className="Item-actions">
<button onClick={() => store.deleteItem(item.code)}>Удалить</button>
</div>
Expand Down
13 changes: 13 additions & 0 deletions src/helpers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export const WordFormRu = (count, wordforms = ['раз', 'раза', 'раз']) => {
const [single, twoFour, many, ...rest] = wordforms;

let value = count % 100;

if (value >= 10 && value < 20) return many;

value %= 10;

if (value === 1) return single;
else if (value === 0 || value > 4) return many;
else return twoFour;
};
27 changes: 26 additions & 1 deletion src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
class Store {
constructor(initState = {}) {
this.state = initState;

this.codesItems =
Object.keys(initState).length > 0 ? initState.list.map(item => item.code) : [];

this.listeners = []; // Слушатели изменений состояния
}

Expand Down Expand Up @@ -42,10 +46,25 @@ class Store {
* Добавление новой записи
*/
addItem() {
const newCode = this.getLastCodeALLItems() + 1;

this.setState({
...this.state,
list: [...this.state.list, { code: this.state.list.length + 1, title: 'Новая запись' }],
list: [...this.state.list, { code: newCode, title: 'Новая запись' }],
});

this.addCodeItem(newCode);
}

/**
* Для сохранения всех codes, в том числе и удаленных
*/
getLastCodeALLItems() {
return this.codesItems.at(-1);
}

addCodeItem(code) {
this.codesItems.push(code);
}

/**
Expand All @@ -69,7 +88,13 @@ class Store {
list: this.state.list.map(item => {
if (item.code === code) {
item.selected = !item.selected;

if (!item.selected) item.selectedCount = item.selectedCount || 0;
else item.selectedCount = (item.selectedCount || 0) + 1;
} else {
item.selected = false;
}

return item;
}),
});
Expand Down
Loading