Merge pull request #52 from Elizabethhub/fix-bug-calendar

remove onClick func in ContentWrapperCalendar
Elizabethhub · Mar 18, 2024 · 842cd75 · 842cd75
2 parents 0910cce + ce998c9
commit 842cd75
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/components/CalendarElement/CalendarElement.jsx b/src/components/CalendarElement/CalendarElement.jsx
@@ -56,16 +56,19 @@ const CalendarElement = () => {
     const parent = element.parentNode;
 
     if (parent.classList.contains('li-day')) {
-      console.log('show');
       dispatch(changeShowDaysStats(true));
     } else {
-      console.log('close');
       dispatch(changeShowDaysStats(false));
     }
   }
 
+  const rootElement = document.getElementById('root');
+  rootElement.addEventListener('click', (event) => {
+    closeDayStat(event);
+  });
+
   return (
-    <ContentWrapperCalendar onClick={() => closeDayStat(event)}>
+    <ContentWrapperCalendar>
       <HeadingWrapper>
         <MonthHeading>Month</MonthHeading>
         <MonthSwitcher>
@@ -91,7 +94,9 @@ const CalendarElement = () => {
       </HeadingWrapper>
 
       <MonthList>
-        {showDaysStats && <DaysGeneralStats />}
+        {showDaysStats && (
+          <DaysGeneralStats monthData={monthData} currentDate={currentDate} />
+        )}
         {monthData.map((item) => (
           <DayStyles
             key={item.day}

diff --git a/src/components/DaysGeneralStats/DaysGeneralStats.jsx b/src/components/DaysGeneralStats/DaysGeneralStats.jsx
@@ -1,12 +1,14 @@
 import { DayStatsContainer, UpperElem } from './DaysGeneralStats.styled';
 
-const DaysGeneralStats = () => {
+const DaysGeneralStats = ({ monthData, currentDate }) => {
+  console.log('monthData: ', monthData);
+
   return (
     <DayStatsContainer>
       <UpperElem>
         <p>
           <span>5, </span>
-          <span>Marth</span>
+          <span>{currentDate.toLocaleString('en-us', { month: 'long' })}</span>
         </p>
       </UpperElem>
       <p>