Merge pull request #321 from Agontuk/period-marking-fix

Tautvilas Mečinskas · web-flow · commit 1639f0f0c001 · 2018-02-01T12:20:52.000+02:00
getDrawingStyle: use marking data from given parameter instead of from current props
diff --git a/src/calendar/day/period/index.js b/src/calendar/day/period/index.js
@@ -58,9 +58,9 @@ class Day extends Component {
     if (!marking) {
       return defaultStyle;
     }
-    if (this.props.marking.disabled) {
+    if (marking.disabled) {
       defaultStyle.textStyle.color = this.theme.textDisabledColor;
-    } else if (this.props.marking.selected) {
+    } else if (marking.selected) {
       defaultStyle.textStyle.color = this.theme.selectedDayTextColor;
     }
     const resultStyle = ([marking]).reduce((prev, next) => {

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ class Day extends Component {`
`58`	`58`	`if (!marking) {`
`59`	`59`	`return defaultStyle;`
`60`	`60`	`}`
`61`		`- if (this.props.marking.disabled) {`
	`61`	`+ if (marking.disabled) {`
`62`	`62`	`defaultStyle.textStyle.color = this.theme.textDisabledColor;`
`63`		`- } else if (this.props.marking.selected) {`
	`63`	`+ } else if (marking.selected) {`
`64`	`64`	`defaultStyle.textStyle.color = this.theme.selectedDayTextColor;`
`65`	`65`	`}`
`66`	`66`	`const resultStyle = ([marking]).reduce((prev, next) => {`