File tree Expand file tree Collapse file tree 3 files changed +30
-3
lines changed
src/utils/layout-algorithms Expand file tree Collapse file tree 3 files changed +30
-3
lines changed Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ export default function ({
51
51
const y4 = se2 . style . top + se2 . style . height
52
52
53
53
// be friends when overlapped
54
- if ( ( y3 <= y1 && y1 < y4 ) || ( y1 <= y3 && y3 < y2 ) ) {
54
+ if ( ( y3 <= y1 && y1 <= y4 ) || ( y1 <= y3 && y3 <= y2 ) ) {
55
55
// TODO : hashmap would be effective for performance
56
56
se1 . friends . push ( se2 )
57
57
se2 . friends . push ( se1 )
Original file line number Diff line number Diff line change @@ -13,10 +13,12 @@ export default {
13
13
14
14
const Template = ( args ) => < Calendar { ...args } />
15
15
16
+ const defaultDate = new Date ( )
17
+
16
18
export const EventLayout = Template . bind ( { } )
17
19
EventLayout . args = {
18
20
defaultView : Views . DAY ,
19
- defaultDate : new Date ( ) ,
21
+ defaultDate,
20
22
timeslots : 4 ,
21
23
events : createEvents ( 1 ) ,
22
24
}
@@ -174,3 +176,26 @@ export const ZeroDurationOddities = () => {
174
176
/>
175
177
)
176
178
}
179
+
180
+ export const ZeroDurationOverlap = ( ) => {
181
+ return (
182
+ < DragAndDropCalendar
183
+ defaultDate = { defaultDate }
184
+ events = { [
185
+ {
186
+ title : 'event a' ,
187
+ start : defaultDate ,
188
+ end : defaultDate ,
189
+ } ,
190
+ {
191
+ title : 'event b' ,
192
+ start : defaultDate ,
193
+ end : defaultDate ,
194
+ } ,
195
+ ] }
196
+ dayLayoutAlgorithm = { 'no-overlap' }
197
+ scrollToTime = { defaultDate }
198
+ defaultView = { Views . WEEK }
199
+ />
200
+ )
201
+ }
Original file line number Diff line number Diff line change @@ -22,7 +22,9 @@ const localizer = momentLocalizer(moment)
22
22
export const date = ( ...args ) => moment ( ...args ) . toDate ( )
23
23
24
24
export const Calendar = ( props ) => (
25
- < BaseCalendar localizer = { localizer } { ...props } />
25
+ < div style = { { height : 650 } } >
26
+ < BaseCalendar localizer = { localizer } { ...props } />
27
+ </ div >
26
28
)
27
29
28
30
export const DragAndDropCalendar = withDragAndDrop ( Calendar )
You can’t perform that action at this time.
0 commit comments