Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jquense/react-big-calendar
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.10.3
Choose a base ref
...
head repository: jquense/react-big-calendar
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 3,102 additions and 1,767 deletions.
  1. +3 −3 .github/workflows/release.yml
  2. +3 −4 .github/workflows/test.yml
  3. +176 −0 CHANGELOG.md
  4. +32 −0 CITATION.cff
  5. +42 −0 CONTRIBUTING_AR.md
  6. +5 −1 README.md
  7. +167 −0 docs/README-ar.md
  8. +1 −1 package.json
  9. +1 −1 rollup.config.mjs
  10. +5 −8 src/Agenda.js
  11. +34 −8 src/Calendar.js
  12. +1 −6 src/DateHeader.js
  13. +9 −9 src/DayColumn.js
  14. +1 −1 src/EventCell.js
  15. +21 −1 src/EventEndingRow.js
  16. +35 −23 src/Selection.js
  17. +192 −80 src/TimeGrid.js
  18. +1 −1 src/TimeGridEvent.js
  19. +1 −1 src/TimeGridHeader.js
  20. +215 −0 src/TimeGridHeaderResources.js
  21. +36 −6 src/addons/dragAndDrop/EventContainerWrapper.js
  22. +3 −2 src/addons/dragAndDrop/WeekWrapper.js
  23. +1 −1 src/localizers/date-fns.js
  24. +1 −0 src/sass/month.scss
  25. +1 −1 src/sass/reset.scss
  26. +13 −3 src/sass/styles.scss
  27. +11 −0 src/sass/time-grid.scss
  28. +1 −0 src/sass/toolbar.scss
  29. +10 −3 src/utils/TimeSlots.js
  30. +39 −1 stories/Calendar.stories.js
  31. +1 −1 stories/addons/dragAndDrop/props/API.stories.mdx
  32. +1 −1 stories/addons/dragAndDrop/props/onDropFromOutside.mdx
  33. +1 −1 stories/demos/dragAndDrop.stories.mdx
  34. +4 −1 stories/demos/exampleCode/dnd.js
  35. +3 −3 stories/demos/exampleCode/dndOutsideSource.js
  36. +104 −41 stories/demos/exampleCode/resource.js
  37. +1 −1 stories/guides/Dates.stories.mdx
  38. +30 −0 stories/helpers/index.js
  39. +1 −1 stories/props/API.stories.mdx
  40. +2 −0 stories/props/components.mdx
  41. +2 −2 stories/props/date.mdx
  42. +1 −1 stories/props/dayPropGetter.mdx
  43. +10 −0 stories/props/eventIdAccessor.mdx
  44. +33 −0 stories/props/eventIdAccessor.stories.js
  45. +1 −1 stories/props/messages.mdx
  46. +1 −1 stories/props/onSelectSlot.mdx
  47. +1 −1 stories/props/onSelecting.mdx
  48. +46 −0 stories/props/resourceGroupingLayout.mdx
  49. +57 −0 stories/props/resourceGroupingLayout.stories.js
  50. +1 −1 stories/props/selected.mdx
  51. +1 −0 stories/props/storyDefaults.js
  52. +2 −2 stories/props/view.mdx
  53. +22 −0 stories/resources/CustomDayColumnWrapper.js
  54. +23 −0 stories/resources/customComponents.js
  55. +1,692 −1,543 yarn.lock
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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

7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -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
176 changes: 176 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,179 @@
## [1.17.1](https://github.com/jquense/react-big-calendar/compare/v1.17.0...v1.17.1) (2024-12-19)


### Bug Fixes

* **Toolbar:** cursor styling on hover ([#2700](https://github.com/jquense/react-big-calendar/issues/2700)) ([7029eb3](https://github.com/jquense/react-big-calendar/commit/7029eb3e7ee09134ca9e490c828dffcf98019a7e)), closes [#2697](https://github.com/jquense/react-big-calendar/issues/2697)

# [1.17.0](https://github.com/jquense/react-big-calendar/compare/v1.16.3...v1.17.0) (2024-12-11)


### Features

* adds a new event id accessor ([#2693](https://github.com/jquense/react-big-calendar/issues/2693)) ([9883ace](https://github.com/jquense/react-big-calendar/commit/9883ace5ae79829f41bbc3721a61e9f5fa45f61b))

## [1.16.3](https://github.com/jquense/react-big-calendar/compare/v1.16.2...v1.16.3) (2024-11-26)


### Bug Fixes

* update doc type of onDropFromOutside function signature ([5438fb5](https://github.com/jquense/react-big-calendar/commit/5438fb51e019111742228a6b22825aa694cac256))

## [1.16.2](https://github.com/jquense/react-big-calendar/compare/v1.16.1...v1.16.2) (2024-11-25)


### Bug Fixes

* Customize drag from outside event's length ([#2681](https://github.com/jquense/react-big-calendar/issues/2681)) ([2ed9465](https://github.com/jquense/react-big-calendar/commit/2ed9465b159f08c7fa6c09f699a353137304260b)), closes [#2680](https://github.com/jquense/react-big-calendar/issues/2680)

## [1.16.1](https://github.com/jquense/react-big-calendar/compare/v1.16.0...v1.16.1) (2024-11-25)


### Bug Fixes

* add appearance: button for better cross-browser button styling c… ([#2677](https://github.com/jquense/react-big-calendar/issues/2677)) ([85be249](https://github.com/jquense/react-big-calendar/commit/85be24990fc17992c0f7fadb0dc1b1e427d305ac)), closes [#2676](https://github.com/jquense/react-big-calendar/issues/2676)

# [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)


### Features

* **components:** showMore component customization ([#2537](https://github.com/jquense/react-big-calendar/issues/2537)) ([afb3138](https://github.com/jquense/react-big-calendar/commit/afb31384d1c68a075112ef2f3fc5499f975f0d03)), closes [#2391](https://github.com/jquense/react-big-calendar/issues/2391)

## [1.14.1](https://github.com/jquense/react-big-calendar/compare/v1.14.0...v1.14.1) (2024-09-16)


### Bug Fixes

* **dnd:** added check for null dragFromOutsideItem, updated example ([#2651](https://github.com/jquense/react-big-calendar/issues/2651)) ([17e62a3](https://github.com/jquense/react-big-calendar/commit/17e62a3d3bf999197e24bd9fb6e68b4cb0fc4873)), closes [#2616](https://github.com/jquense/react-big-calendar/issues/2616) [#2383](https://github.com/jquense/react-big-calendar/issues/2383)

# [1.14.0](https://github.com/jquense/react-big-calendar/compare/v1.13.4...v1.14.0) (2024-09-12)


### Features

* **dayPropGetter:** pass resourceId to method ([#2650](https://github.com/jquense/react-big-calendar/issues/2650)) ([272eb88](https://github.com/jquense/react-big-calendar/commit/272eb88d53343d1283621b5626603e052100d092)), closes [#2634](https://github.com/jquense/react-big-calendar/issues/2634)

## [1.13.4](https://github.com/jquense/react-big-calendar/compare/v1.13.3...v1.13.4) (2024-08-23)


### Bug Fixes

* Update Slack channel invite in README.md ([47dadc3](https://github.com/jquense/react-big-calendar/commit/47dadc380598e5ecd5f9ffb89cb7c00b7c65c0f8))
* Update Slack channel invite link in README-ar.md ([de8dd0f](https://github.com/jquense/react-big-calendar/commit/de8dd0fed3a025e57aa2929ced0b8c88fec6da25))

## [1.13.3](https://github.com/jquense/react-big-calendar/compare/v1.13.2...v1.13.3) (2024-08-19)


### Bug Fixes

* Sass warning on latest version ([d5b6b87](https://github.com/jquense/react-big-calendar/commit/d5b6b8729f3d0960d1df5628a467a0a92f4bcb97))

## [1.13.2](https://github.com/jquense/react-big-calendar/compare/v1.13.1...v1.13.2) (2024-08-06)


### Bug Fixes

* correct nested sass ([#2641](https://github.com/jquense/react-big-calendar/issues/2641)) ([88bdf77](https://github.com/jquense/react-big-calendar/commit/88bdf77d05d0548cf9228b11f49c550adbc07c4c))

## [1.13.1](https://github.com/jquense/react-big-calendar/compare/v1.13.0...v1.13.1) (2024-07-12)


### Bug Fixes

* warning defaultProps in Agenda ([#2620](https://github.com/jquense/react-big-calendar/issues/2620)) ([d1c31c2](https://github.com/jquense/react-big-calendar/commit/d1c31c2d55e5a4a74043261a4e1f5de80396e071))

# [1.13.0](https://github.com/jquense/react-big-calendar/compare/v1.12.2...v1.13.0) (2024-06-11)


### Features

* pass resource prop to DayColumnWrapper ([77760aa](https://github.com/jquense/react-big-calendar/commit/77760aa7ca60c83eaaf587fb2711e29586f5f635)), closes [#2607](https://github.com/jquense/react-big-calendar/issues/2607)

## [1.12.2](https://github.com/jquense/react-big-calendar/compare/v1.12.1...v1.12.2) (2024-05-14)


### Bug Fixes

* bug with dnd drag drop ([#2602](https://github.com/jquense/react-big-calendar/issues/2602)) ([799a72a](https://github.com/jquense/react-big-calendar/commit/799a72ad5d1782f4d8518e834585728c32e1b7e3)), closes [#2601](https://github.com/jquense/react-big-calendar/issues/2601)

## [1.12.1](https://github.com/jquense/react-big-calendar/compare/v1.12.0...v1.12.1) (2024-04-30)


### Bug Fixes

* fixing Drag and Drop Examples link ([fa4a378](https://github.com/jquense/react-big-calendar/commit/fa4a378f32ed298394fc4716f9d788c22205347e)), closes [#2585](https://github.com/jquense/react-big-calendar/issues/2585)

# [1.12.0](https://github.com/jquense/react-big-calendar/compare/v1.11.7...v1.12.0) (2024-04-25)


### Features

* **translations:** translate CONTRIBUTING.md to Arabic ([#2558](https://github.com/jquense/react-big-calendar/issues/2558)) ([ae64158](https://github.com/jquense/react-big-calendar/commit/ae64158f102c10e3d1dc555e394c02cca85d7cc2))

## [1.11.7](https://github.com/jquense/react-big-calendar/compare/v1.11.6...v1.11.7) (2024-04-25)


### Bug Fixes

* correcting doubleClick ([#2571](https://github.com/jquense/react-big-calendar/issues/2571)) ([775993c](https://github.com/jquense/react-big-calendar/commit/775993cee756c681a351678874007b175258714d)), closes [#2565](https://github.com/jquense/react-big-calendar/issues/2565)

## [1.11.6](https://github.com/jquense/react-big-calendar/compare/v1.11.5...v1.11.6) (2024-04-15)


### Bug Fixes

* **docs:** correct link for 'props' in 'Understanding Dates' guide ([#2562](https://github.com/jquense/react-big-calendar/issues/2562)) ([59982ae](https://github.com/jquense/react-big-calendar/commit/59982ae073e9afda4370a8a5f1589c65b0d4580d))

## [1.11.5](https://github.com/jquense/react-big-calendar/compare/v1.11.4...v1.11.5) (2024-04-15)


### Bug Fixes

* **stories:** fix not working links in docs ([#2559](https://github.com/jquense/react-big-calendar/issues/2559)) ([295957c](https://github.com/jquense/react-big-calendar/commit/295957c352a9e416c4ba43cb2fb81eaae2d62a69))

## [1.11.4](https://github.com/jquense/react-big-calendar/compare/v1.11.3...v1.11.4) (2024-04-15)


### Bug Fixes

* Correct selection issues ([def4934](https://github.com/jquense/react-big-calendar/commit/def4934b45804c1ccdeaa4c5c8ddb52b346b0d08))

## [1.11.3](https://github.com/jquense/react-big-calendar/compare/v1.11.2...v1.11.3) (2024-04-02)


### Bug Fixes

* **Selection:** handling of terminating event ([937b4c5](https://github.com/jquense/react-big-calendar/commit/937b4c5019a327310d7e27dbbf6f6bd71876aaf4))

## [1.11.2](https://github.com/jquense/react-big-calendar/compare/v1.11.1...v1.11.2) (2024-03-12)


### Bug Fixes

* correct slotMetrics issue in TimeGrid ([e25f187](https://github.com/jquense/react-big-calendar/commit/e25f1878a8d8aaf37b7b5721f76a1be4ceb0e988)), closes [#2529](https://github.com/jquense/react-big-calendar/issues/2529)

## [1.11.1](https://github.com/jquense/react-big-calendar/compare/v1.11.0...v1.11.1) (2024-03-04)


### Bug Fixes

* replace deprecated onKeyPress by onKeyDown ([21f51f2](https://github.com/jquense/react-big-calendar/commit/21f51f2bc4e218542fb09bf0e7d22be99ed50028))

# [1.11.0](https://github.com/jquense/react-big-calendar/compare/v1.10.3...v1.11.0) (2024-02-26)


### Features

* add citation file ([#2523](https://github.com/jquense/react-big-calendar/issues/2523)) ([3de0059](https://github.com/jquense/react-big-calendar/commit/3de00592fd68a93582511e83ce9051078188e100))

## [1.10.3](https://github.com/jquense/react-big-calendar/compare/v1.10.2...v1.10.3) (2024-02-21)


32 changes: 32 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
cff-version: 1.2.0
title: Big Calendar
message: >-
If you use this software, please cite it using the
metadata from this file.
type: software
authors:
- given-names: Jason
family-names: Quense
email: monastic.panic@gmail.com
- given-names: Stephen
family-names: Blades
alias: Cutter
website: https://cutterscrossing.com
email: no.junk@cutterscrossing.com
- given-names: Bogdan
family-names: Chadkin
alias: TrySound
- given-names: Tobias
family-names: Andersen
email: j.tobiasandersen@gmail.com
repository-code: 'https://github.com/jquense/react-big-calendar'
url: 'https://jquense.github.io/react-big-calendar/examples'
repository-artifact: 'https://registry.npmjs.org/react-big-calendar'
abstract: >-
Big Calendar is a full featured Calendar component for
managing events and dates.
keywords:
- scheduler
- calendar
- events
license: MIT
42 changes: 42 additions & 0 deletions CONTRIBUTING_AR.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<div dir="rtl">

# كيفية المساهمة

Big Calendar يحب أن يرحب بمساهماتك. هناك عدة طرق للمساعدة:

- إنشاء [مشكلة](https://github.com/jquense/react-big-calendar/issues) على GitHub، إذا وجدت خللاً.
- كتابة حالات اختبار أو تقديم أمثلة لمشاكل الأخطاء المفتوحة. يمكنك استنساخ [نموذج الخطأ](https://codesandbox.io/s/react-big-calendar-example-v9wdyd) الخاص بنا في CodeSandbox للبدء.
- كتابة تصحيحات لمشاكل الأخطاء/الميزات المفتوحة.

هناك بعض الإرشادات التي نحتاج من المساهمين اتباعها لكي نكون على قمة الأمور.

## البدء

- تأكد من أن لديك [حساب](https://github.com/signup/free) على GitHub.
- قدّم [مشكلة](https://github.com/jquense/react-big-calendar/issues)، وفي حال لم يكن هناك مشكلة بالفعل.

- وصف المشكلة بوضوح بما في ذلك الخطوات المطلوبة لإعادة إنتاجها في حال كانت خطأً.
- تأكد من تعبئة أقدم إصدار تعرف عليه بهذه المشكلة.

- استنسخ النسخة في GitHub.

## عمل التغييرات

- إنشاء فرع للموضوع من حيث تريد أن تبدأ عملك.

- هذا عادة ما يكون الفرع الرئيسي.
- لإنشاء فرع للموضوع بسرعة استنادًا إلى الرئيسي؛ استخدم `git branch feat/my_contribution master` ثم قم بالتحقق من الفرع الجديد بـ `git checkout feat/my_contribution`. من الأفضل تجنب العمل مباشرةً على الفرع الرئيسي، لتجنب الصراعات في حال استلام تحديثات من المصدر.

- قم بعمل عمليات تأكيد لوحدات منطقية.

- كتابة/تغيير `القصص` التي تعرض الميزات الجديدة أو الخصائص.
- التحقق من تغييراتك مقابل `القصص` الموجودة بالفعل عند الضرورة.

- استخدم رسائل التأكيد الوصفية وفقًا [لتنسيق التأكيد](https://www.conventionalcommits.org/en/v1.0.0/) التقليدي وأشير إلى رقم المشكلة.

## تقديم التغييرات

- دفع تغييراتك إلى فرع الموضوع في نسخة الشوكة الخاصة بك من المستودع.
- قدّم طلب سحب إلى المستودع.

</div>
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -165,5 +165,9 @@ Big Calendar. Carefully test each change accordingly.

## Join The Community

Help us improve Big Calendar! Join us on [Slack](https://join.slack.com/t/bigcalendar/shared_invite/zt-2cerpqegz-mGzcbm7LxYLFPjcTa0gLgw).
Help us improve Big Calendar! Join us on [Slack](https://join.slack.com/t/bigcalendar/shared_invite/zt-2tjko9jqq-ZeXs1U01zulNM~FRU9YTFA).
(Slack invite links do expire. If you can't get in, just file an issue and we'll get a new link.)

## Translations

- [العربية](/docs/README-ar.md)
Loading