Skip to content
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.

Sign up for GitHub

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

Update TimeGrid on resources list change #1135

Merged
merged 3 commits into from
Dec 10, 2018
Merged

Update TimeGrid on resources list change #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30cce7a
Update TimeGrid on resources list change
Dec 3, 2018
b440fc3
Show all events if resources list is not provided but event objects h…
Dec 3, 2018
e09457c
Refactor resourcec-related fix
Dec 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/TimeGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import cn from 'classnames'
import raf from 'dom-helpers/util/requestAnimationFrame'
import React, { Component } from 'react'
import { findDOMNode } from 'react-dom'
import memoize from 'memoize-one'

import dates from './utils/dates'
import DayColumn from './DayColumn'
Expand Down Expand Up @@ -65,8 +66,6 @@ export default class TimeGrid extends Component {
this.state = { gutterWidth: undefined, isOverflowing: null }

this.scrollRef = React.createRef()

this.resources = Resources(props.resources, props.accessors)
}

componentWillMount() {
Expand Down Expand Up @@ -95,6 +94,7 @@ export default class TimeGrid extends Component {
raf.cancel(this.rafHandle)
this.rafHandle = raf(this.checkOverflow)
}

componentWillUnmount() {
window.removeEventListener('resize', this.handleResize)

Expand Down Expand Up @@ -144,9 +144,10 @@ export default class TimeGrid extends Component {
renderEvents(range, events, now) {
let { min, max, components, accessors, localizer } = this.props

const groupedEvents = this.resources.groupEvents(events)
const resources = this.memoizedResources(this.props.resources, accessors)
const groupedEvents = resources.groupEvents(events)

return this.resources.map(([id, resource], i) =>
return resources.map(([id, resource], i) =>
range.map((date, jj) => {
let daysEvents = (groupedEvents.get(id) || []).filter(event =>
dates.inRange(
Expand Down Expand Up @@ -233,7 +234,7 @@ export default class TimeGrid extends Component {
getNow={getNow}
localizer={localizer}
selected={selected}
resources={this.resources}
resources={this.memoizedResources(resources, accessors)}
selectable={this.props.selectable}
accessors={accessors}
getters={getters}
Expand Down Expand Up @@ -314,4 +315,6 @@ export default class TimeGrid extends Component {
})
}
}

memoizedResources = memoize((resources, accessors) => Resources(resources, accessors))
}
6 changes: 6 additions & 0 deletions src/utils/Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ export default function Resources(resources, accessors) {

groupEvents(events) {
const eventsByResource = new window.Map()

if (!resources) {
// Return all events if resources are not provided
eventsByResource.set(NONE, events)
}

events.forEach(event => {
const id = accessors.resource(event) || NONE
let resourceEvents = eventsByResource.get(id) || []
Expand Down