little fixes

fullcalendar · May 5, 2021 · 3d39804 · 3d39804
1 parent 2bb3c2c
commit 3d39804
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/packages/common/src/common/MoreLinkRoot.tsx b/packages/common/src/common/MoreLinkRoot.tsx
@@ -29,7 +29,7 @@ export interface MoreLinkRootProps { // what the MoreLinkRoot component receives
   hiddenSegs: Seg[]
   extraDateSpan?: Dictionary
   alignmentElRef: RefObject<HTMLElement>
-  defaultContent?: (hookProps: MoreLinkContentArg) => ComponentChildren // not used by anyone yet
+  defaultContent?: (hookProps: MoreLinkContentArg) => ComponentChildren
   popoverContent?: () => VNode
   children: MoreLinkChildren
 }
@@ -90,7 +90,7 @@ export class MoreLinkRoot extends BaseComponent<MoreLinkRootProps, MoreLinkRootS
               </RenderHook>
               {this.state.isPopoverOpen && (
                 <MorePopover
-                  date={this.computeDate(props.allDayDate, props.hiddenSegs, context)}
+                  date={this.computeDate(props.allDayDate, props.hiddenSegs)}
                   dateProfile={props.dateProfile}
                   todayRange={props.todayRange}
                   extraDateSpan={props.extraDateSpan}
@@ -111,7 +111,7 @@ export class MoreLinkRoot extends BaseComponent<MoreLinkRootProps, MoreLinkRootS
   handleClick = (ev: MouseEvent) => {
     let { props, context } = this
     let { moreLinkClick } = context.options
-    let date = context.dateEnv.toDate(this.computeDate(props.allDayDate, props.hiddenSegs, context))
+    let date = context.dateEnv.toDate(this.computeDate(props.allDayDate, props.hiddenSegs))
 
     function buildPublicSeg(seg: Seg) {
       let { def, instance, range } = seg.eventRange
@@ -160,7 +160,6 @@ function getEarlierSeg(seg0, seg1) {
   return seg0.eventRange.range.start < seg1.eventRange.range.start ? seg0 : seg1
 }
 
-function computeDate(allDayDate: DateMarker, segs: Seg[], context: ViewContext) {
-  return allDayDate ? context.dateEnv.toDate(allDayDate) :
-    context.dateEnv.toDate(getEarliestSeg(segs).eventRange.range.start)
+function computeDate(allDayDate: DateMarker, segs: Seg[]) {
+  return allDayDate ? allDayDate : getEarliestSeg(segs).eventRange.range.start
 }
diff --git a/packages/timegrid/src/TimeCol.tsx b/packages/timegrid/src/TimeCol.tsx
@@ -182,22 +182,25 @@ export class TimeCol extends BaseComponent<TimeColProps> {
   // will already have eventMinHeight applied because segInputs already had it
   renderHiddenGroups(hiddenGroups: SegEntryGroup[], segs: TimeColsSeg[]) {
     let { extraDateSpan, dateProfile, todayRange, nowDate, eventSelection } = this.props
-
-    return hiddenGroups.map((hiddenGroup) => {
-      let positionCss = this.computeSegTopBottomCss(hiddenGroup)
-      return (
-        <TimeColMoreLink
-          hiddenSegs={compileSegsFromEntries(hiddenGroup.entries, segs)}
-          top={positionCss.top}
-          bottom={positionCss.bottom}
-          extraDateSpan={extraDateSpan}
-          dateProfile={dateProfile}
-          todayRange={todayRange}
-          nowDate={nowDate}
-          eventSelection={eventSelection}
-        />
-      )
-    })
+    return (
+      <Fragment>
+        {hiddenGroups.map((hiddenGroup) => {
+          let positionCss = this.computeSegTopBottomCss(hiddenGroup)
+          return (
+            <TimeColMoreLink
+              hiddenSegs={compileSegsFromEntries(hiddenGroup.entries, segs)}
+              top={positionCss.top}
+              bottom={positionCss.bottom}
+              extraDateSpan={extraDateSpan}
+              dateProfile={dateProfile}
+              todayRange={todayRange}
+              nowDate={nowDate}
+              eventSelection={eventSelection}
+            />
+          )
+        })}
+      </Fragment>
+    )
   }
 
   buildSegInputs(segs: TimeColsSeg[]): SegInput[] {