Merge pull request #617 from fullcalendar/next-release

Next release

.changeset/brave-doors-approve.md

@@ -0,0 +1,5 @@
+---
+"@fullcalendar/core": patch
+---
+
+patch release!

.github/workflows/release.yaml

@@ -87,15 +87,15 @@ jobs:
             --filter '!@fullcalendar/angular' \
             run test
 
-      # - name: Tag & Create GitHub Releases
-      #   env:
-      #     GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }} # for GitHub CLI
-      #   run: pnpm run tag-and-release
-
-      # - name: Publish to NPM
-      #   env:
-      #     NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      #   run: pnpm run publish
+      - name: Tag & Create GitHub Releases
+        env:
+          GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }} # for GitHub CLI
+        run: pnpm run tag-and-release
+
+      - name: Publish to NPM
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: pnpm run publish
 
       - name: Sync Repos
         # Don't mark the whole workflow as failed if this set fails

contrib/react/package.json

@@ -25,11 +25,13 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.9.0",
     "@babel/preset-react": "^7.9.4",
+    "@fullcalendar/adaptive": "~6.1.10",
     "@fullcalendar/core": "~6.1.10",
     "@fullcalendar/daygrid": "~6.1.10",
     "@fullcalendar/list": "~6.1.10",
     "@fullcalendar/resource": "~6.1.10",
     "@fullcalendar/resource-timeline": "~6.1.10",
+    "@fullcalendar/timegrid": "~6.1.10",
     "@rollup/plugin-babel": "^5.0.0",
     "@rollup/plugin-commonjs": "^12.0.0",
     "@rollup/plugin-json": "^4.0.3",

contrib/react/src/index.tsx

@@ -52,6 +52,9 @@ export default class FullCalendar extends Component<CalendarOptions, CalendarSta
   }
 
   componentDidMount() {
+    // reset b/c react strict-mode calls componentWillUnmount/componentDidMount
+    this.isUnmounting = false
+
     const customRenderingStore = new CustomRenderingStore<unknown>()
     this.handleCustomRendering = customRenderingStore.handle.bind(customRenderingStore)
 

contrib/react/tests/index.jsx

@@ -1,11 +1,13 @@
-import React, { useState, useEffect, useContext, useCallback, createContext } from 'react'
+import React, { useState, useEffect, useContext, useCallback, createContext, createRef } from 'react'
 import { act } from 'react-dom/test-utils'
 import { render } from '@testing-library/react'
 import FullCalendar from '../dist/index.js'
+import adaptivePlugin from '@fullcalendar/adaptive'
 import { sliceEvents } from '@fullcalendar/core'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import listPlugin from '@fullcalendar/list'
 import resourceTimelinePlugin from '@fullcalendar/resource-timeline'
+import timeGridPlugin from '@fullcalendar/timegrid'
 import { anyElsIntersect } from './utils.js'
 
 const NOW_DATE = new Date()
@@ -696,6 +698,38 @@ it('custom view receives enough props for slicing', () => {
   expect(container.querySelector('.custom-view-events').innerText).toBe('1 events')
 })
 
+// https://github.com/fullcalendar/fullcalendar/issues/7419
+it('render custom event JSX during print-mode', (done) => {
+  let calendarRef = createRef()
+
+  const { container } = render(
+    <FullCalendar
+      ref={calendarRef}
+      initialDate={NOW_DATE}
+      plugins={[timeGridPlugin, adaptivePlugin]}
+      initialView="timeGridWeek"
+      initialEvents={[
+        {
+          title: 'event1',
+          start: NOW_DATE,
+        }
+      ]}
+      eventContent={(eventArg) => <i>{eventArg.event.title}</i>}
+    />
+  )
+
+  act(() => {
+    const api = calendarRef.current.getApi()
+    api.trigger('_beforeprint')
+
+    setTimeout(() => {
+      const eventEls = getEventEls(container)
+      expect(eventEls[0].offsetHeight).toBeGreaterThan(10)
+      done()
+    })
+  })
+})
+
 // FullCalendar data utils
 // -------------------------------------------------------------------------------------------------
 

examples/next13-app-scheduler/.gitignore

@@ -0,0 +1,35 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

examples/next13-app-scheduler/README.md

@@ -0,0 +1,36 @@
+This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.js`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.

examples/next13-app-scheduler/app/globals.css

@@ -0,0 +1,6 @@
+
+.calendar-container {
+  width: 100%;
+  max-width: 1200px;
+  margin: 0 auto;
+}

examples/next13-app-scheduler/app/layout.js

@@ -0,0 +1,17 @@
+import { Inter } from 'next/font/google'
+import './globals.css'
+
+const inter = Inter({ subsets: ['latin'] })
+
+export const metadata = {
+  title: 'Create Next App',
+  description: 'Generated by create next app',
+}
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body className={inter.className}>{children}</body>
+    </html>
+  )
+}

examples/next13-app-scheduler/app/page.js

@@ -0,0 +1,45 @@
+'use client';
+
+import FullCalendar from '@fullcalendar/react';
+import dayGridPlugin from '@fullcalendar/daygrid';
+import resourceTimelinePlugin from '@fullcalendar/resource-timeline';
+import timeGridPlugin from '@fullcalendar/timegrid';
+
+export default function Home() {
+  return (
+    <div className="calendar-container">
+      <FullCalendar
+        plugins={[resourceTimelinePlugin, dayGridPlugin, timeGridPlugin]}
+        headerToolbar={{
+          left: 'prev,next today',
+          center: 'title',
+        }}
+        initialView="resourceTimelineDay"
+        nowIndicator={true}
+        editable={true}
+        selectable={true}
+        selectMirror={true}
+        resources={[
+          { id: 'a', title: 'Auditorium A' },
+          { id: 'b', title: 'Auditorium B', eventColor: 'green' },
+          { id: 'c', title: 'Auditorium C', eventColor: 'orange' },
+        ]}
+        initialEvents={[
+          { title: 'event1', start: new Date(), resourceId: 'a' },
+          { title: 'event2', start: new Date(), resourceId: 'a' },
+          { title: 'event3', start: new Date(), resourceId: 'a' },
+          { title: 'event4', start: new Date(), resourceId: 'a' },
+          { title: 'event5', start: new Date(), resourceId: 'a' },
+        ]}
+        eventContent={(eventInfo) => {
+          return (
+            <>
+              <b>{eventInfo.timeText}</b>
+              <i>{eventInfo.event.title}</i>
+            </>
+          );
+        }}
+      />
+    </div>
+  );
+}

examples/next13-app-scheduler/jsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./*"]
+    }
+  }
+}

examples/next13-app-scheduler/next.config.js

@@ -0,0 +1,4 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {}
+
+module.exports = nextConfig

examples/next13-app-scheduler/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "@fullcalendar-examples/next13-app-scheduler",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@fullcalendar/core": "^6.1.10",
+    "@fullcalendar/daygrid": "^6.1.10",
+    "@fullcalendar/interaction": "^6.1.10",
+    "@fullcalendar/react": "^6.1.10",
+    "@fullcalendar/resource": "^6.1.10",
+    "@fullcalendar/resource-timeline": "^6.1.10",
+    "@fullcalendar/timegrid": "^6.1.10",
+    "react": "^18",
+    "react-dom": "^18",
+    "next": "13.5.6"
+  }
+}