-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add background events feature #1851
Merged
jquense
merged 15 commits into
jquense:master
from
kamildebicki:add-background-events-feature
Jan 29, 2021
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
11bcbc8
feat: Add background events
rrjoson 6b92983
Clean up time grid background event
rrjoson e029e77
Update time grid background event name
rrjoson 458bb99
Add storybook example
rrjoson 84164ea
Fix typo in documentation
rrjoson b0079bf
Remove unused props in documentation
rrjoson 841a436
Clean up Background Events feature in preparation for merge
jmauzy f6f7f92
Merge upstream data
jmauzy 0a00e77
Remove package-lock.json
jmauzy 4c196ee
Code clean up
jmauzy e62b716
#1727 Add better background events example and address code review
jmauzy c9ed1e8
Merge remote-tracking branch 'upstream/master' into add-background-ev…
kamildebicki 16e2100
Remove changes not related to the background event feature
kamildebicki 0df77cb
Fix <Calendar /> background event story
kamildebicki 559663e
Fix background event width calculation
kamildebicki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
export default [ | ||
{ | ||
id: 0, | ||
title: 'Available for Clients', | ||
start: new Date(2015, 3, 13, 6), | ||
end: new Date(2015, 3, 13, 18), | ||
}, | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import React from 'react' | ||
import { Calendar, Views } from 'react-big-calendar' | ||
import events from '../events' | ||
import backgroundEvents from '../backgroundEvents' | ||
import * as dates from '../../src/utils/dates' | ||
|
||
let allViews = Object.keys(Views).map(k => Views[k]) | ||
|
||
let Basic = ({ localizer }) => ( | ||
<Calendar | ||
events={events} | ||
defaultView={Views.DAY} | ||
views={allViews} | ||
step={60} | ||
showMultiDayTimes | ||
max={dates.add(dates.endOf(new Date(2015, 17, 1), 'day'), -1, 'hours')} | ||
defaultDate={new Date(2015, 3, 13)} | ||
localizer={localizer} | ||
backgroundEvents={backgroundEvents} | ||
dayLayoutAlgorithm={'no-overlap'} | ||
/> | ||
) | ||
|
||
export default Basic |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Observation/Suggestion: It feels like the
isBackgroundEvent
property here may be confusing since the name is singular, but it applies to all events passed in.How do we feel about keeping the current state where
renderEvents
doesn't accept arguments, and instead we get bothevents
andbackgroundEvents
from the props withinrenderEvents
and merge them into a single collection of events such that background events have a propertyisBackgroundEvent
set to true?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merging
events
andbackgroundEvents
will causeno-overlap
algorithm to treat them as colliding events, and place them next to each other instead of one on top of each other.