fix js error when clicking more link

fullcalendar · Dec 28, 2018 · d874e65 · d874e65
1 parent ff94cb2
commit d874e65
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/src/interactions/EventClicking.ts b/src/interactions/EventClicking.ts
@@ -25,9 +25,12 @@ export default class EventClicking {
 
   handleSegClick = (ev: Event, segEl: HTMLElement) => {
     let { component } = this
-    let seg = getElSeg(segEl)!
+    let seg = getElSeg(segEl)
 
-    if (component.isValidSegDownEl(ev.target as HTMLElement)) {
+    if (
+      seg && // might be the <div> surrounding the more link
+      component.isValidSegDownEl(ev.target as HTMLElement)
+    ) {
 
       // our way to simulate a link click for elements that can't be <a> tags
       // grab before trigger fired in case trigger trashes DOM thru rerendering

diff --git a/tests/automated/legacy/eventLimit-popover.js b/tests/automated/legacy/eventLimit-popover.js
@@ -213,6 +213,42 @@ describe('eventLimit popover', function() {
         expect(el).not.toHaveClass('fc-not-end')
       })
     })
+
+    // https://github.com/fullcalendar/fullcalendar/issues/4331
+    it('displays events that were collapsed in previous days', function() {
+      initCalendar({
+        defaultDate: '2018-10-01',
+        events: [
+          {
+            title: 'e1',
+            start: '2018-10-18'
+          },
+          {
+            title: 'e2',
+            start: '2018-10-18',
+          },
+          {
+            title: 'e3',
+            start: '2018-10-18T11:00:00',
+          },
+          {
+            title: 'e4',
+            start: '2018-10-18T12:00:00',
+            end: '2018-10-19T12:00:00'
+          },
+          {
+            title: 'e5',
+            start: '2018-10-19',
+            className: 'event-e5',
+          }
+        ]
+      })
+
+      // click the second +more link
+      $('.event-e5').closest('.fc-event-container').find('.fc-more')
+        .simulate('click')
+    })
+
   })
 
   describeOptions('defaultView', {