ywana-core8 0.0.574 → 0.0.575

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.574",
+  "version": "0.0.575",
   "description": "ywana-core8",
   "homepage": "https://ywana.github.io/workspace",
   "author": "Ernesto Roldan Garcia",

package/src/widgets/planner/Planner.js

@@ -23,9 +23,8 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
     const thisMondayElement = useRef(null)
     
     useEffect(() => {
-        console.log(thisMondayElement.current)
         if (thisMondayElement.current) { showThisWeek() }
-    })
+    }, [thisMondayElement])
 
     useEffect(() => {
         const element = document.getElementById(focusEvent)
@@ -131,8 +130,13 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
                             const isWekend = [0, 6].includes(date.moment.day());
                             const weekend = isWekend ? "weekend" : "";
                             const thisWeek = moment().startOf('week').isSame(date.moment, "week") ? "thisWeek" : "";
+
+                            const today = moment()
+                            var weekStart = today.clone().startOf('week')
+                            const isThisMonday = (date.moment.isSame(weekStart))
+
                             return (
-                                <div className="column-header">
+                                <div className="column-header" ref={isThisMonday ? thisMondayElement : null}>
                                     <div className={`date-header ${weekend} ${thisWeek}`}>
                                         <Text use="headline6">{date.moment.format("DD")}</Text>
                                         &nbsp;
@@ -143,7 +147,7 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
                         })}
                     </div>
 
-                    {lanes.map((lane) => <PlannerRow key={lane.id} lane={lane} events={events} period={period} onSelectCell={selectCell} onChange={onChange} thisMondayRef={thisMondayElement} />)}
+                    {lanes.map((lane) => <PlannerRow key={lane.id} lane={lane} events={events} period={period} onSelectCell={selectCell} onChange={onChange} />)}
 
                 </div>
             </main>
@@ -156,7 +160,7 @@ export const Planner = ({ title, events = [], lanes = [], navigation = true, onS
  */
 const PlannerRow = (props) => {
 
-    const { lane, events = [], period, onSelectCell, onChange, thisMondayRef } = props
+    const { lane, events = [], period, onSelectCell, onChange } = props
     const rowEvents = events.filter(event => event.lane === lane.id)
 
 
@@ -175,7 +179,7 @@ const PlannerRow = (props) => {
                     return eventDate.getTime() === slotDate.getTime();
                 })
                 return (
-                    <PlannerCell key={`${lane.id}-${slotDate.toString()}`} lane={lane} date={date} events={cellEvents} onSelect={onSelectCell} onDrop={change} thisMondayRef={thisMondayRef} />
+                    <PlannerCell key={`${lane.id}-${slotDate.toString()}`} lane={lane} date={date} events={cellEvents} onSelect={onSelectCell} onDrop={change} />
                 );
             })}
         </div>
@@ -185,7 +189,7 @@ const PlannerRow = (props) => {
 /**
  * Planner Cell
  */
-const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, onSelect, onDrop, editable = false, thisMondayRef }) => {
+const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, onSelect, onDrop, editable = false }) => {
 
     const [dragOver, setDragOver] = useState(false);
 
@@ -223,11 +227,10 @@ const PlannerCell = ({ lane, events, date, disabled = false, onAdd, onDelete, on
 
     const today = moment()
     var weekStart = today.clone().startOf('week')
-    const isThisMonday = (date.moment.isSame(weekStart))
     const thisMonday = (date.moment.isSame(weekStart)) ? "thisMonday" : ""
     const dragOverStyle = dragOver ? "drag-over" : ""
     return (
-        <div className={`cell ${thisMonday} ${weekend} ${dragOverStyle}`} ref={isThisMonday ? thisMondayRef : null} onDragOver={onDragOver} onDragLeave={onDragLeave} onDrop={drop} onClick={select}>
+        <div className={`cell ${thisMonday} ${weekend} ${dragOverStyle}`} onDragOver={onDragOver} onDragLeave={onDragLeave} onDrop={drop} onClick={select}>
             {events.map(event => {
                 const { Renderer = EventCard } = event
                 return <Renderer key={event.id} event={event} />