From fdb2d3a451cbe9a73489568a77968882f692698e Mon Sep 17 00:00:00 2001
From: Sergey Solodyagin <solodyagin@gmail.com>
Date: Tue, 9 Nov 2021 09:45:21 +0300
Subject: [PATCH] small fix

---
 lib/components/GGanttBar.vue |  7 +++++++
 package-lock.json            | 22 +++++++++++-----------
 package.json                 |  6 +++---
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/lib/components/GGanttBar.vue b/lib/components/GGanttBar.vue
index 433bac5..afe7540 100644
--- a/lib/components/GGanttBar.vue
+++ b/lib/components/GGanttBar.vue
@@ -392,6 +392,13 @@ export default {
       //   return true
       // }
 
+      if (
+        !this.chartProps.pushOnOverlap ||
+        this.barConfig.pushOnOverlap === false
+      ) {
+        return false
+      }
+
       const isSqueezeToLeft =
         newXStart &&
         moment(this.localBar[this.barStartKey]).isBefore(
diff --git a/package-lock.json b/package-lock.json
index 07f613c..fc62c8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,19 @@
 {
   "name": "@tenrok/vue-ganttastic",
-  "version": "0.10.17",
+  "version": "0.10.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@tenrok/vue-ganttastic",
-      "version": "0.10.17",
+      "version": "0.10.18",
       "license": "MIT",
       "dependencies": {
         "vue": "^2.6.12"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.15",
-        "@vue/cli-plugin-eslint": "~4.5.0",
+        "@vue/cli-plugin-eslint": "~4.5.15",
         "@vue/cli-service": "~4.5.15",
         "babel-eslint": "^10.1.0",
         "eslint": "^6.7.2",
@@ -2183,12 +2183,12 @@
       }
     },
     "node_modules/@vue/cli-plugin-eslint": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.14.tgz",
-      "integrity": "sha512-8leK9mZ4Ia4hARWMfVAbcgPBFKjdeOW9S0nG+pt6OBnnwK+V1jf/C7ytfXH+H086KgisU8R9nz1xNaz+9QET0g==",
+      "version": "4.5.15",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.15.tgz",
+      "integrity": "sha512-/2Fl6wY/5bz3HD035oSnFRMsKNxDxU396KqBdpCQdwdvqk4mm6JAbXqihpcBRTNPeTO6w+LwGe6FE56PVbJdbg==",
       "dev": true,
       "dependencies": {
-        "@vue/cli-shared-utils": "^4.5.14",
+        "@vue/cli-shared-utils": "^4.5.15",
         "eslint-loader": "^2.2.1",
         "globby": "^9.2.0",
         "inquirer": "^7.1.0",
@@ -18074,12 +18074,12 @@
       }
     },
     "@vue/cli-plugin-eslint": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.14.tgz",
-      "integrity": "sha512-8leK9mZ4Ia4hARWMfVAbcgPBFKjdeOW9S0nG+pt6OBnnwK+V1jf/C7ytfXH+H086KgisU8R9nz1xNaz+9QET0g==",
+      "version": "4.5.15",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.15.tgz",
+      "integrity": "sha512-/2Fl6wY/5bz3HD035oSnFRMsKNxDxU396KqBdpCQdwdvqk4mm6JAbXqihpcBRTNPeTO6w+LwGe6FE56PVbJdbg==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.5.14",
+        "@vue/cli-shared-utils": "^4.5.15",
         "eslint-loader": "^2.2.1",
         "globby": "^9.2.0",
         "inquirer": "^7.1.0",
diff --git a/package.json b/package.json
index 22ea026..42b086f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tenrok/vue-ganttastic",
-  "version": "0.10.17",
+  "version": "0.10.18",
   "description": "A simple and customizable Gantt chart component for Vue.js",
   "keywords": [
     "gantt",
@@ -19,7 +19,7 @@
   "author": {
     "name": "Marko Zunic",
     "email": "marko.zunic06@gmail.com",
-    "url": "https://github.com/InfectoOne/vue-ganttastic"
+    "url": "https://github.com/InfectoOne"
   },
   "contributors": [
     {
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.15",
-    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.15",
     "@vue/cli-service": "~4.5.15",
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",