From 8e76a5974f90b8861a48219494bcd13b52003ba7 Mon Sep 17 00:00:00 2001
From: zunicma <marko.zunic@informance.it>
Date: Thu, 2 Jul 2020 16:00:15 +0200
Subject: [PATCH] Fix: bars with pushOnOverlap: false not considered when
 computing drag limits

---
 package-lock.json   | 2 +-
 package.json        | 5 +++--
 src/GGanttChart.vue | 8 +++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 66dd574..8c07a3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-ganttastic",
-  "version": "0.9.21",
+  "version": "0.9.23",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 43d0785..89dbe0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-ganttastic",
-  "version": "0.9.21",
+  "version": "0.9.23",
   "description": "A simple and customizable Gantt chart component for Vue.js",
   "repository": {
     "type": "git",
@@ -32,5 +32,6 @@
   },
   "peerDependencies": {
     "moment": "^2.26.0"
-  }
+  },
+  "dependencies": {}
 }
diff --git a/src/GGanttChart.vue b/src/GGanttChart.vue
index 5b2fba4..57a9f89 100644
--- a/src/GGanttChart.vue
+++ b/src/GGanttChart.vue
@@ -241,9 +241,10 @@ export default {
       if(side === "left"){
         allBarsLeftOrRight = bar.$parent.$children.filter(gBar => {
           return gBar.$options.name === GGanttBar.name 
-                && gBar.$parent === bar.$parent 
-                && gBar.$refs['g-gantt-bar']
-                && gBar.$refs['g-gantt-bar'].offsetLeft < bar.$refs['g-gantt-bar'].offsetLeft
+                  && gBar.$parent === bar.$parent 
+                  && gBar.$refs['g-gantt-bar']
+                  && gBar.$refs['g-gantt-bar'].offsetLeft < bar.$refs['g-gantt-bar'].offsetLeft
+                  && gBar.barConfig.pushOnOverlap !== false
         })
       } else {
         allBarsLeftOrRight = bar.$parent.$children.filter(gBar => {
@@ -251,6 +252,7 @@ export default {
                   && gBar.$parent === bar.$parent 
                   && gBar.$refs['g-gantt-bar']
                   && gBar.$refs['g-gantt-bar'].offsetLeft > bar.$refs['g-gantt-bar'].offsetLeft
+                  && gBar.barConfig.pushOnOverlap !== false
         })
       }
       if(allBarsLeftOrRight.length > 0){