Skip to content
This repository was archived by the owner on May 19, 2025. It is now read-only.

Commit bfe2f6c

Browse files
committed
Merge pull request #40 from stijndeschuymer/allow-day-cell-margin
allow Day cells to have margin
2 parents 7b3823c + 7d3d6d8 commit bfe2f6c

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

lib/styles.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ exports['default'] = function () {
170170

171171
var calendarWidth = defaultTheme.Calendar.width;
172172
var calendarPadding = defaultTheme.Calendar.padding;
173+
var cellMargin = defaultTheme.Day.margin || 0;
173174

174175
if (customTheme.Calendar && customTheme.Calendar.hasOwnProperty('width')) {
175176
calendarWidth = customTheme.Calendar.width;
@@ -179,7 +180,11 @@ exports['default'] = function () {
179180
calendarPadding = customTheme.Calendar.padding;
180181
}
181182

182-
var cellSize = (parseInt(calendarWidth) - parseInt(calendarPadding) * 2) / 7;
183+
if (customTheme.Day && customTheme.Day.hasOwnProperty('margin')) {
184+
cellMargin = customTheme.Day.margin;
185+
}
186+
187+
var cellSize = (parseInt(calendarWidth) - parseInt(calendarPadding) * 2) / 7 - parseInt(cellMargin) * 2;
183188

184189
return {
185190
DateRange: _extends({}, defaultTheme.DateRange, customTheme.DateRange),

src/styles.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ export default (customTheme = {}) => {
163163

164164
let calendarWidth = defaultTheme.Calendar.width;
165165
let calendarPadding = defaultTheme.Calendar.padding;
166+
let cellMargin = defaultTheme.Day.margin || 0;
166167

167168
if ( customTheme.Calendar && customTheme.Calendar.hasOwnProperty('width') ) {
168169
calendarWidth = customTheme.Calendar.width;
@@ -172,7 +173,11 @@ export default (customTheme = {}) => {
172173
calendarPadding = customTheme.Calendar.padding;
173174
}
174175

175-
const cellSize = ( parseInt(calendarWidth) - parseInt(calendarPadding) * 2 ) / 7;
176+
if ( customTheme.Day && customTheme.Day.hasOwnProperty('margin') ) {
177+
cellMargin = customTheme.Day.margin;
178+
}
179+
180+
const cellSize = (( parseInt(calendarWidth) - parseInt(calendarPadding) * 2 ) / 7 ) - ( parseInt(cellMargin) * 2 );
176181

177182
return {
178183
DateRange : { ...defaultTheme.DateRange, ...customTheme.DateRange },

0 commit comments

Comments
 (0)