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.

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

Agenda no events msg #923

Merged
merged 5 commits into from
Jul 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17,877 changes: 17,877 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
"license": "MIT",
"main": "lib/index.js",
"style": "lib/css/react-big-calendar.css",
"files": ["lib/", "LICENSE", "README.md", "CHANGELOG.md"],
"files": [
"lib/",
"LICENSE",
"README.md",
"CHANGELOG.md"
],
"keywords": [
"scheduler",
"react-component",
Expand All @@ -20,18 +25,13 @@
"clean": "rimraf lib",
"clean:examples": "rimraf examples/static",
"l": "lessc --autoprefix=\"ie >= 10, safari >= 8, last 2 versions\" ",
"less":
"npm run l src/less/styles.less ./lib/css/react-big-calendar.css && npm run less-dnd",
"less-dnd":
"npm run l src/addons/dragAndDrop/styles.less ./lib/addons/dragAndDrop/styles.css",
"less": "npm run l src/less/styles.less ./lib/css/react-big-calendar.css && npm run less-dnd",
"less-dnd": "npm run l src/addons/dragAndDrop/styles.less ./lib/addons/dragAndDrop/styles.css",
"assets": "cpy src/less/* lib/less && npm run assets-addons",
"assets-addons": "cpy addons/**/*.less ../lib/ --cwd=src --parents",
"build":
"npm run clean && babel src --out-dir lib && npm run assets && npm run less",
"build:examples":
"npm run clean:examples && webpack --config examples/webpack.config.js",
"examples":
"npm run clean:examples && webpack-dev-server --inline --hot --config examples/webpack.config.js",
"build": "npm run clean && babel src --out-dir lib && npm run assets && npm run less",
"build:examples": "npm run clean:examples && webpack --config examples/webpack.config.js",
"examples": "npm run clean:examples && webpack-dev-server --inline --hot --config examples/webpack.config.js",
"lint": "eslint src test",
"storybook": "start-storybook -p 9002",
"test": "npm run lint && jest",
Expand All @@ -43,7 +43,10 @@
"lint-staged": {
"src/**/*.js": "eslint",
"test/**/*.js": "eslint",
"*.{js,json,css,md}": ["prettier --write", "git add"]
"*.{js,json,css,md}": [
"prettier --write",
"git add"
]
},
"prettier": {
"printWidth": 80,
Expand Down
48 changes: 28 additions & 20 deletions src/Agenda.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,32 @@ class Agenda extends React.Component {

return (
<div className="rbc-agenda-view">
<table ref="header" className="rbc-agenda-table">
<thead>
<tr>
<th className="rbc-header" ref="dateCol">
{messages.date}
</th>
<th className="rbc-header" ref="timeCol">
{messages.time}
</th>
<th className="rbc-header">{messages.event}</th>
</tr>
</thead>
</table>
<div className="rbc-agenda-content" ref="content">
<table className="rbc-agenda-table">
<tbody ref="tbody">
{range.map((day, idx) => this.renderDay(day, events, idx))}
</tbody>
</table>
</div>
{events.length !== 0 ? (
<React.Fragment>
<table ref="header" className="rbc-agenda-table">
<thead>
<tr>
<th className="rbc-header" ref="dateCol">
{messages.date}
</th>
<th className="rbc-header" ref="timeCol">
{messages.time}
</th>
<th className="rbc-header">{messages.event}</th>
</tr>
</thead>
</table>
<div className="rbc-agenda-content" ref="content">
<table className="rbc-agenda-table">
<tbody ref="tbody">
{range.map((day, idx) => this.renderDay(day, events, idx))}
</tbody>
</table>
</div>
</React.Fragment>
) : (
<span className="rbc-agenda-empty">{messages.noEventsInRange}</span>
)}
</div>
)
}
Expand Down Expand Up @@ -164,6 +170,8 @@ class Agenda extends React.Component {
}

_adjustHeader = () => {
if (!this.refs.tbody) return

let header = this.refs.header
let firstRow = this.refs.tbody.firstChild

Expand Down
1 change: 1 addition & 0 deletions src/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,7 @@ class Calendar extends React.Component {
date: PropTypes.node,
time: PropTypes.node,
event: PropTypes.node,
noEventsInRange: PropTypes.node,
showMore: PropTypes.func,
}),
}
Expand Down
2 changes: 1 addition & 1 deletion src/DayColumn.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class DayColumn extends React.Component {
events,
accessors,
slotMetrics,
minimumStartDifference: Math.ceil(step * timeslots / 2),
minimumStartDifference: Math.ceil((step * timeslots) / 2),
})

return styledEvents.map(({ event, style }, idx) => {
Expand Down
5 changes: 4 additions & 1 deletion src/EventEndingRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ class EventEndingRow extends React.Component {
}

render() {
let { segments, slotMetrics: { slots } } = this.props
let {
segments,
slotMetrics: { slots },
} = this.props
let rowSegments = eventLevels(segments).levels[0]

let current = 1,
Expand Down
6 changes: 5 additions & 1 deletion src/EventRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ class EventRow extends React.Component {
...EventRowMixin.defaultProps,
}
render() {
let { segments, slotMetrics: { slots }, className } = this.props
let {
segments,
slotMetrics: { slots },
className,
} = this.props

let lastEnd = 1

Expand Down
2 changes: 1 addition & 1 deletion src/EventRowMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default {
},

renderSpan(slots, len, key, content = ' ') {
let per = Math.abs(len) / slots * 100 + '%'
let per = (Math.abs(len) / slots) * 100 + '%'

return (
<div
Expand Down
5 changes: 4 additions & 1 deletion src/Toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ class Toolbar extends React.Component {
}

render() {
let { localizer: { messages }, label } = this.props
let {
localizer: { messages },
label,
} = this.props

return (
<div className="rbc-toolbar">
Expand Down
6 changes: 3 additions & 3 deletions src/utils/TimeSlots.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {
if (dates.lt(date, start, 'minutes')) return slots[0]

const diffMins = dates.diff(start, date, 'minutes')
return slots[(diffMins - diffMins % step) / step + offset]
return slots[(diffMins - (diffMins % step)) / step + offset]
},

startsBeforeDay(date) {
Expand All @@ -129,11 +129,11 @@ export function getSlotMetrics({ min: start, max: end, step, timeslots }) {

const rangeStartMin = positionFromDate(rangeStart)
const rangeEndMin = positionFromDate(rangeEnd)
const top = rangeStartMin / totalMin * 100
const top = (rangeStartMin / totalMin) * 100

return {
top,
height: rangeEndMin / totalMin * 100 - top,
height: (rangeEndMin / totalMin) * 100 - top,
start: positionFromDate(rangeStart),
startDate: rangeStart,
end: positionFromDate(rangeEnd),
Expand Down
2 changes: 2 additions & 0 deletions src/utils/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ let defaultMessages = {
today: 'today',
agenda: 'agenda',

noEventsInRange: 'There are no events in this range.',

showMore: total => `+${total} more`,
}

Expand Down
12 changes: 12 additions & 0 deletions stories/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,15 @@ storiesOf('Big Calendar', module)
/>
)
})
.add('add custom no agenda events label', () => {
return (
<Calendar
defaultView={Calendar.Views.AGENDA}
events={events}
messages={{
noEventsInRange:
'There are no special events in this range [test message]',
}}
/>
)
})