From 335b05a5e1fb3c3a5f51a9dd8196c1d8c17be09e Mon Sep 17 00:00:00 2001
From: Illia Zolotukha
Date: Fri, 30 Jun 2023 01:29:55 +0300
Subject: [PATCH] select current board at modalWindow
---
src/components/BoardItem/BoardItem.jsx | 15 +++++++++------
src/components/BoardList/BoardList.jsx | 3 ++-
.../BoardModalWindow/BoardModalWindow.jsx | 17 +++++++++--------
.../BoxRadioBackgroundGroup.jsx | 7 +++----
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/components/BoardItem/BoardItem.jsx b/src/components/BoardItem/BoardItem.jsx
index 3457d96..5554437 100644
--- a/src/components/BoardItem/BoardItem.jsx
+++ b/src/components/BoardItem/BoardItem.jsx
@@ -14,27 +14,28 @@ import { BoardModalWindow } from '../BoardModalWindow/BoardModalWindow';
import { Modal } from '../Modal/Modal';
export const BoardItem = ({
+ id,
boardName,
icon,
+ background = "default",
theme,
onClick,
isCurrent,
- id,
}) => {
const [isOpenEditModal, setIsOpenEditModal] = useState(false);
const [isOpenRemoveModal, setIsOpenRemoveModal] = useState(false);
const dispatch = useDispatch();
const navigate = useNavigate();
- const editSubmit = dataBoard => {
- dispatch(editBoard({ dataBoard, id }));
- dispatch(getBoardById(id));
+ const editSubmit = async dataBoard => {
+ await dispatch(editBoard({ dataBoard, id }));
+ dispatch(getBoardById(id));
};
const handleOpenEditModal = e => {
e.stopPropagation();
setIsOpenEditModal(true);
- // dispatch(getBoardById(id));
+
};
const handleCloseEditModal = () => {
setIsOpenEditModal(false);
@@ -99,11 +100,12 @@ export const BoardItem = ({
{isOpenEditModal && (
)}
{isOpenRemoveModal && (
@@ -140,6 +142,7 @@ export const BoardItem = ({
BoardItem.propTypes = {
boardName: PropTypes.string.isRequired,
icon: PropTypes.string.isRequired,
+ background: PropTypes.string.isRequired,
theme: PropTypes.string.isRequired,
onClick: PropTypes.func.isRequired,
isCurrent: PropTypes.bool.isRequired,
diff --git a/src/components/BoardList/BoardList.jsx b/src/components/BoardList/BoardList.jsx
index a542d62..60f536a 100644
--- a/src/components/BoardList/BoardList.jsx
+++ b/src/components/BoardList/BoardList.jsx
@@ -16,11 +16,12 @@ export const BoardList = ({ theme, boards, currentBoard }) => {
}, [currentBoard?._id]);
return (
- {boards.map(({ title, icon, _id }) => (
+ {boards.map(({ title, icon, _id, background }) => (
{
const theme = useSelector(selectorTheme);
const [title, setTitle] = useState(inputTitle);
- const [background, setBackground] = useState();
+ const [background, setBackground] = useState(activeBackground);
const [icon, setIcon] = useState('');
const [isValid, setIsValid] = useState(false);
const [errorTitleMaxLength, setErrorTitleMaxLength] = useState(false);
@@ -85,7 +86,7 @@ export const BoardModalWindow = ({
)}
-
+