Skip to content

Commit f3ea6f8

Browse files
NathanBPjquense
authored andcommitted
fix: bug with dayWrapper not applying (jquense#1196)
* Fixed bug with dayWrapper not applying * Removed packagelock.json, updated dayWrapper to timeSlotWrapper
1 parent 0e0ebb2 commit f3ea6f8

File tree

6 files changed

+19
-12
lines changed

6 files changed

+19
-12
lines changed

examples/demos/basic.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ import dates from '../../src/utils/dates'
55

66
let allViews = Object.keys(BigCalendar.Views).map(k => BigCalendar.Views[k])
77

8+
const ColoredDateCellWrapper = ({ children }) =>
9+
React.cloneElement(React.Children.only(children), {
10+
style: {
11+
backgroundColor: 'lightblue',
12+
},
13+
})
14+
815
let Basic = ({ localizer }) => (
916
<BigCalendar
1017
events={events}
@@ -13,6 +20,9 @@ let Basic = ({ localizer }) => (
1320
showMultiDayTimes
1421
max={dates.add(dates.endOf(new Date(2015, 17, 1), 'day'), -1, 'hours')}
1522
defaultDate={new Date(2015, 3, 1)}
23+
components={{
24+
timeSlotWrapper: ColoredDateCellWrapper,
25+
}}
1626
localizer={localizer}
1727
/>
1828
)

src/Calendar.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,6 @@ class Calendar extends React.Component {
643643
* event: MyEvent, // used by each view (Month, Day, Week)
644644
* eventWrapper: MyEventWrapper,
645645
* eventContainerWrapper: MyEventContainerWrapper,
646-
* dayWrapper: MyDayWrapper,
647646
* dateCellWrapper: MyDateCellWrapper,
648647
* timeSlotWrapper: MyTimeSlotWrapper,
649648
* timeGutterHeader: MyTimeGutterWrapper,
@@ -674,7 +673,6 @@ class Calendar extends React.Component {
674673
event: elementType,
675674
eventWrapper: elementType,
676675
eventContainerWrapper: elementType,
677-
dayWrapper: elementType,
678676
dateCellWrapper: elementType,
679677
timeSlotWrapper: elementType,
680678
timeGutterHeader: elementType,
@@ -793,7 +791,6 @@ class Calendar extends React.Component {
793791
components: defaults(components[view] || {}, omit(components, names), {
794792
eventWrapper: NoopWrapper,
795793
eventContainerWrapper: NoopWrapper,
796-
dayWrapper: NoopWrapper,
797794
dateCellWrapper: NoopWrapper,
798795
weekWrapper: NoopWrapper,
799796
timeSlotWrapper: NoopWrapper,

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Object.assign(Calendar, {
1414
move,
1515
components: {
1616
eventWrapper: EventWrapper,
17-
dayWrapper: BackgroundWrapper,
17+
timeSlotWrapper: BackgroundWrapper,
1818
dateCellWrapper: BackgroundWrapper,
1919
},
2020
})

stories/Calendar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ storiesOf('Big Calendar', module)
165165
/>
166166
)
167167
})
168-
.add('add custom dayWrapper', () => {
168+
.add('add custom timeSlotWrapper', () => {
169169
return (
170170
<Calendar
171171
defaultView={Calendar.Views.DAY}
172172
events={events}
173173
components={{
174-
dayWrapper: customComponents.dayWrapper,
174+
timeSlotWrapper: customComponents.timeSlotWrapper,
175175
}}
176176
/>
177177
)

stories/DragAndDrop.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ storiesOf('Drag and Drop', module)
6161
/>
6262
)
6363
})
64-
.add('draggable and resizable with custom dayWrapper', () => {
64+
.add('draggable and resizable with custom timeSlotWrapper', () => {
6565
return (
6666
<DragAndDropCalendar
6767
components={{
68-
dayWrapper: customComponents.dayWrapper,
68+
timeSlotWrapper: customComponents.timeSlotWrapper,
6969
}}
7070
defaultDate={new Date()}
7171
defaultView={Calendar.Views.WEEK}

stories/helpers/customComponents.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ const customComponents = {
2727
</div>
2828
)
2929
},
30-
dayWrapper: dayWrapperProps => {
30+
timeSlotWrapper: timeSlotWrapperProps => {
3131
// Show different styles at arbitrary time
32-
const hasCustomInfo = dayWrapperProps.value
33-
? dayWrapperProps.value.getHours() === 4
32+
const hasCustomInfo = timeSlotWrapperProps.value
33+
? timeSlotWrapperProps.value.getHours() === 4
3434
: false
3535
const style = {
3636
display: 'flex',
@@ -40,7 +40,7 @@ const customComponents = {
4040
return (
4141
<div style={style}>
4242
{hasCustomInfo && 'Custom Day Wrapper'}
43-
{dayWrapperProps.children}
43+
{timeSlotWrapperProps.children}
4444
</div>
4545
)
4646
},

0 commit comments

Comments
 (0)