Commit d5fb9f2c authored by Ermolaev Timur's avatar Ermolaev Timur

Merge branch 'task-133-fix/autoselect-fix' into 'development'

#133 пофиксил баг, сделал анимации чуть плавнее

See merge request !107
parents bfb45f27 31849cfa
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"axios": "^1.1.2", "axios": "^1.1.2",
"dayjs": "^1.11.6", "dayjs": "^1.11.6",
"react-datepicker": "^4.8.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react": "^18.2.0", "react": "^18.2.0",
......
...@@ -27,9 +27,11 @@ const CalendarTask = ({ setCurrentTask, handleOpen, task, setCopyTask, width, le ...@@ -27,9 +27,11 @@ const CalendarTask = ({ setCurrentTask, handleOpen, task, setCopyTask, width, le
borderRadius: '10px', borderRadius: '10px',
alignItems: 'center', alignItems: 'center',
zIndex: '5', zIndex: '5',
transition: '0.3s',
'&:hover': { '&:hover': {
transition: '0.3s',
cursor: 'pointer', cursor: 'pointer',
boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)' boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.4)'
}, },
} }
}, [width, left, top, color]) }, [width, left, top, color])
......
...@@ -11,7 +11,9 @@ const CalendarStandartCell = ({ children, xs, hours, dayNumber, createTaskInCell ...@@ -11,7 +11,9 @@ const CalendarStandartCell = ({ children, xs, hours, dayNumber, createTaskInCell
height: linesInDay?.length ? `${heightCell * linesInDay.length + 5}px` : `${45}px`, height: linesInDay?.length ? `${heightCell * linesInDay.length + 5}px` : `${45}px`,
borderRight: '1px solid black', borderRight: '1px solid black',
borderBottom: week ? '1px solid black' : null, borderBottom: week ? '1px solid black' : null,
transition: '0.3s',
'&:hover': { '&:hover': {
transition: '0.3s',
cursor: children ? null : '#d6d2d2', cursor: children ? null : '#d6d2d2',
background: children ? null : '#d6d2d2' background: children ? null : '#d6d2d2'
}, },
......
...@@ -46,8 +46,10 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen, ...@@ -46,8 +46,10 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex, handleOpen,
zIndex: zIndexStyle, zIndex: zIndexStyle,
textAlign: 'left', textAlign: 'left',
overflow: 'hidden', overflow: 'hidden',
transition: '0.2s',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
'&:hover': { '&:hover': {
transition: '0.2s',
cursor: 'pointer', cursor: 'pointer',
boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)' boxShadow: 'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
}, },
......
...@@ -260,7 +260,6 @@ function WeekCalendar() { ...@@ -260,7 +260,6 @@ function WeekCalendar() {
setUserCalendarId(null) setUserCalendarId(null)
} }
}, [dispatch, user.id, userId]) }, [dispatch, user.id, userId])
return ( return (
<> <>
<DefaultModal <DefaultModal
...@@ -270,7 +269,7 @@ function WeekCalendar() { ...@@ -270,7 +269,7 @@ function WeekCalendar() {
<CalendarModalWorkerContent <CalendarModalWorkerContent
workerInfo={workerInfo} workerInfo={workerInfo}
allUserProjects={allUserProjects} allUserProjects={allUserProjects}
workers={project?.project?.members} workers={workerInfo?.project?.members}
onChangeProjectHandler={onChangeProjectHandler} onChangeProjectHandler={onChangeProjectHandler}
onChangeWorkerHandler={onChangeWorkerHandler} onChangeWorkerHandler={onChangeWorkerHandler}
handleClose={handleClose} handleClose={handleClose}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment