0.26.2 (#645)

0.26.2
namespace-ee · Sep 9, 2019 · 3b31adf · 3b31adf
2 parents fef9272 + 26b69ec
commit 3b31adf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres (more or less) to [Semantic Versioning](http://semver.o
 
 ## Unreleased
 
+## 0.26.2
+
+* render the items layer after columns and rows for layring @ilaiwi
+
 ## 0.26.1
 
 * fix issue where mouse down gets stuck when scrolling the timeline #526 @KhalidArdah

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-calendar-timeline",
-  "version": "0.26.1",
+  "version": "0.26.2",
   "description": "react calendar timeline",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/lib/Timeline.js b/src/lib/Timeline.js
@@ -1041,25 +1041,25 @@ export default class ReactCalendarTimeline extends Component {
                   isInteractingWithItem={isInteractingWithItem}
                 >
                   <MarkerCanvas>
-                    {this.items(
+                    {this.columns(
                       canvasTimeStart,
-                      zoom,
                       canvasTimeEnd,
                       canvasWidth,
                       minUnit,
-                      dimensionItems,
-                      groupHeights,
-                      groupTops
+                      timeSteps,
+                      height
                     )}
-                    {this.columns(
+                    {this.rows(canvasWidth, groupHeights, groups)}
+                    {this.items(
                       canvasTimeStart,
+                      zoom,
                       canvasTimeEnd,
                       canvasWidth,
                       minUnit,
-                      timeSteps,
-                      height
+                      dimensionItems,
+                      groupHeights,
+                      groupTops
                     )}
-                    {this.rows(canvasWidth, groupHeights, groups)}
                     {this.childrenWithProps(
                       canvasTimeStart,
                       canvasTimeEnd,