Merge branch 'jquense:master' into master

.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
           registry-url: 'https://registry.npmjs.org'
@@ -24,7 +24,7 @@ jobs:
       - name: Install Dependencies
         run: yarn install
 
-# test and build prior to release
+      # test and build prior to release
       - name: Unit Test & Linting
         run: yarn test
 

.github/workflows/test.yml

@@ -2,19 +2,18 @@ name: Test
 
 on: [pull_request]
 
-
 jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18.13.0'
+          node-version: '20.17.0'
 
       - name: Install Dependencies
         run: yarn install

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.16.0](https://github.com/jquense/react-big-calendar/compare/v1.15.0...v1.16.0) (2024-11-21)
+
+
+### Features
+
+* implement Conditional Resource Grouping ([#2679](https://github.com/jquense/react-big-calendar/issues/2679)) ([d52f836](https://github.com/jquense/react-big-calendar/commit/d52f836b1170106c87d1f9a64bb8c2c3484278f5))
+
 # [1.15.0](https://github.com/jquense/react-big-calendar/compare/v1.14.1...v1.15.0) (2024-10-01)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-big-calendar",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "Calendar! with events",
   "author": {
     "name": "Jason Quense",

rollup.config.mjs

@@ -7,7 +7,7 @@ import replace from '@rollup/plugin-replace'
 import clear from 'rollup-plugin-clear'
 // removed sizeSnapshot, as it is not compatible with ESM
 import { terser } from 'rollup-plugin-terser'
-import pkg from './package.json' assert { type: 'json' }
+import pkg from './package.json' with { type: 'json' }
 
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 

src/Calendar.js

@@ -1,28 +1,28 @@
+import clsx from 'clsx'
 import PropTypes from 'prop-types'
 import React from 'react'
 import { uncontrollable } from 'uncontrollable'
-import clsx from 'clsx'
 import {
   accessor,
+  views as componentViews,
   dateFormat,
   dateRangeFormat,
   DayLayoutAlgorithmPropType,
-  views as componentViews,
 } from './utils/propTypes'
 
-import { notify } from './utils/helpers'
-import { navigate, views } from './utils/constants'
 import { mergeWithDefaults } from './localizer'
+import NoopWrapper from './NoopWrapper'
+import Toolbar from './Toolbar'
+import { navigate, views } from './utils/constants'
+import { notify } from './utils/helpers'
 import message from './utils/messages'
 import moveDate from './utils/move'
 import VIEWS from './Views'
-import Toolbar from './Toolbar'
-import NoopWrapper from './NoopWrapper'
 
-import omit from 'lodash/omit'
 import defaults from 'lodash/defaults'
-import transform from 'lodash/transform'
 import mapValues from 'lodash/mapValues'
+import omit from 'lodash/omit'
+import transform from 'lodash/transform'
 import { wrapAccessor } from './utils/accessors'
 
 function viewNames(_views) {
@@ -632,6 +632,13 @@ class Calendar extends React.Component {
      */
     enableAutoScroll: PropTypes.bool,
 
+    /**
+     * Determines the layout of resource groups in the calendar.
+     * When `true`, resources will be grouped by date in the week view.
+     * When `false`, resources will be grouped by week.
+     */
+    resourceGroupingLayout: PropTypes.bool,
+
     /**
      * Specify a specific culture code for the Calendar.
      *
@@ -1008,6 +1015,7 @@ class Calendar extends React.Component {
       toolbar,
       events,
       backgroundEvents,
+      resourceGroupingLayout,
       style,
       className,
       elementProps,
@@ -1071,6 +1079,7 @@ class Calendar extends React.Component {
           onSelectSlot={this.handleSelectSlot}
           onShowMore={onShowMore}
           doShowMoreDrillDown={doShowMoreDrillDown}
+          resourceGroupingLayout={resourceGroupingLayout}
         />
       </div>
     )

src/DateHeader.js

@@ -7,12 +7,7 @@ const DateHeader = ({ label, drilldownView, onDrillDown }) => {
   }
 
   return (
-    <button
-      type="button"
-      className="rbc-button-link"
-      onClick={onDrillDown}
-      role="cell"
-    >
+    <button type="button" className="rbc-button-link" onClick={onDrillDown}>
       {label}
     </button>
   )