diff --git a/.travis.yml b/.travis.yml
index 65363f1..aff794e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
     - stage: "lint"
       language: node_js
       os: linux
-      node_js: "8"
+      node_js: "10"
       script: 
         - cd src && npm run ci.tslint
         - cd ../demo && npm run ci.tslint
@@ -39,7 +39,7 @@ matrix:
         - Type="VanillaJS"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -53,7 +53,7 @@ matrix:
         - Type="VueJS"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -67,7 +67,7 @@ matrix:
         - Type="Angular"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -78,33 +78,36 @@ matrix:
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_NG?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_NG/$IOS_PACKAGE_NG"
     - language: android
       os: linux
+      dist: trusty
       env:
         - WebpackAndroid="28"
         - Type="VanillaJS"
       jdk: oraclejdk8
-      before_install: nvm install 8
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../demo && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_JS?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_JS/app-debug.apk"
     - language: android
       os: linux
+      dist: trusty
       env:
         - WebpackAndroid="28"
         - Type="VueJS"
       jdk: oraclejdk8
-      before_install: nvm install 8
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/app-debug.apk"
     - language: android
       os: linux
+      dist: trusty
       env:
         - WebpackAndroid="28"
         - Type="Angular"
       jdk: oraclejdk8
-      before_install: nvm install 8
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../publish && sh pack.sh
@@ -112,22 +115,26 @@ matrix:
         - npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot --copy-to "./outputs/app-debug.apk"
         - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_NG?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_NG/app-debug.apk"
     - language: android
+      os: linux
+      dist: trusty
       env:
         - BuildAndroid="28"
         - Type="VanillaJS"
-      os: linux
+
       jdk: oraclejdk8
-      before_install: nvm install 8.11.4
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../demo && tns build android
     - language: android
+      os: linux
+      dist: trusty
       env:
         - BuildAndroid="28"
         - Type="Angular"
-      os: linux
+
       jdk: oraclejdk8
-      before_install: nvm install 8.11.4
+      before_install: nvm install 10
       script:
         - cd src && npm run build
         - cd ../demo-angular && tns build android
@@ -138,7 +145,7 @@ matrix:
         - Type="VanillaJS"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -151,7 +158,7 @@ matrix:
         - Type="Angular"
       osx_image: xcode10.0
       language: node_js
-      node_js: "8"
+      node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
@@ -163,7 +170,7 @@ matrix:
         - Type="Angular"
       language: node_js
       os: linux
-      node_js: "8"
+      node_js: "10"
       script:
         - npm i -g appium
         - cd demo-angular && npm i
@@ -173,7 +180,7 @@ matrix:
         - iOS="12.0"
         - Type="Angular"
       language: node_js
-      node_js: "8"
+      node_js: "10"
       script:
         - npm i -g appium
         - cd demo-angular && npm i
diff --git a/demo-angular/e2e/tsconfig.json b/demo-angular/e2e/tsconfig.json
index 4aa39f6..2b7aa4b 100644
--- a/demo-angular/e2e/tsconfig.json
+++ b/demo-angular/e2e/tsconfig.json
@@ -8,7 +8,8 @@
     "sourceMap": true,
     "types": [
       "mocha",
-      "chai"
+      "chai",
+      "node"
     ],
     "lib": [
       "es2015",
diff --git a/demo-angular/package.json b/demo-angular/package.json
index fa43c29..79858f2 100644
--- a/demo-angular/package.json
+++ b/demo-angular/package.json
@@ -1,55 +1,55 @@
 {
-    "nativescript": {
-        "id": "org.nativescript.datetimepicker.demong",
-        "tns-android": {
-            "version": "5.3.0"
-        },
-        "tns-ios": {
-            "version": "5.3.0"
-        }
+  "nativescript": {
+    "id": "org.nativescript.datetimepicker.demong",
+    "tns-android": {
+      "version": "5.4.0"
     },
-    "description": "NativeScript DateTimePicker Demo NG",
-    "license": "SEE LICENSE IN LICENSE FILE",
-    "repository": "https://github.com/NativeScript/nativescript-datetimepicker",
-    "scripts": {
-        "ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
-        "build.plugin": "cd ../src && npm run build",
-        "e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js &&  tsc -p e2e  &&  mocha --opts ./e2e/config/mocha.opts ",
-        "e2e-watch": "tsc -p e2e --watch"
-    },
-    "dependencies": {
-        "@angular/animations": "~7.2.0",
-        "@angular/common": "~7.2.0",
-        "@angular/compiler": "~7.2.0",
-        "@angular/core": "~7.2.0",
-        "@angular/forms": "~7.2.0",
-        "@angular/http": "~7.2.0",
-        "@angular/platform-browser": "~7.2.0",
-        "@angular/platform-browser-dynamic": "~7.2.0",
-        "@angular/router": "~7.2.0",
-        "nativescript-angular": "~7.2.0",
-        "nativescript-datetimepicker": "file:../src",
-        "nativescript-theme-core": "~1.0.4",
-        "reflect-metadata": "~0.1.10",
-        "rxjs": "~6.4.0",
-        "tns-core-modules": "^5.0.0",
-        "zone.js": "~0.8.18"
-    },
-    "devDependencies": {
-        "@nativescript/schematics": "~0.5.0",
-        "nativescript-dev-typescript": "~0.9.0",
-        "nativescript-dev-webpack": "~0.21.0",
-        "@angular/compiler-cli": "~7.2.0",
-        "@ngtools/webpack": "~7.2.0",
-        "@types/chai": "~4.1.7",
-        "@types/mocha": "~5.2.5",
-        "@types/node": "~10.12.18",
-        "mocha": "~5.2.0",
-        "mocha-junit-reporter": "~1.18.0",
-        "mocha-multi": "~1.0.1",
-        "mochawesome": "~3.1.1",
-        "nativescript-dev-appium": "~5.0.0",
-        "tslint": "~5.11.0"
-    },
-    "readme": "NativeScript DateTimePicker Demo NG"
-}
+    "tns-ios": {
+      "version": "5.4.0"
+    }
+  },
+  "description": "NativeScript DateTimePicker Demo NG",
+  "license": "SEE LICENSE IN LICENSE FILE",
+  "repository": "https://github.com/NativeScript/nativescript-datetimepicker",
+  "scripts": {
+    "ci.tslint": "npm i && tslint --config '../tslint.json' 'src/**/*.ts'",
+    "build.plugin": "cd ../src && npm run build",
+    "e2e": "node ./node_modules/nativescript-dev-appium/check-dev-deps.js &&  tsc -p e2e  &&  mocha --opts ./e2e/config/mocha.opts ",
+    "e2e-watch": "tsc -p e2e --watch"
+  },
+  "dependencies": {
+    "@angular/animations": "~8.0.0",
+    "@angular/common": "~8.0.0",
+    "@angular/compiler": "~8.0.0",
+    "@angular/core": "~8.0.0",
+    "@angular/forms": "~8.0.0",
+    "@angular/http": "8.0.0-beta.10",
+    "@angular/platform-browser": "~8.0.0",
+    "@angular/platform-browser-dynamic": "~8.0.0",
+    "@angular/router": "~8.0.0",
+    "nativescript-angular": "~8.0.0",
+    "nativescript-datetimepicker": "file:../src",
+    "nativescript-theme-core": "~1.0.4",
+    "reflect-metadata": "~0.1.10",
+    "rxjs": "^6.3.3",
+    "tns-core-modules": "^5.0.0",
+    "typescript": "~3.4.5",
+    "zone.js": "^0.8.4"
+  },
+  "devDependencies": {
+    "@angular/compiler-cli": "~8.0.0",
+    "@ngtools/webpack": "~8.0.0",
+    "@types/chai": "~4.1.7",
+    "@types/mocha": "~5.2.5",
+    "@types/node": "~10.12.18",
+    "mocha": "~5.2.0",
+    "mocha-junit-reporter": "~1.18.0",
+    "mocha-multi": "~1.0.1",
+    "mochawesome": "~3.1.1",
+    "nativescript-dev-appium": "~5.2.0",
+    "nativescript-dev-typescript": "~0.10.0",
+    "nativescript-dev-webpack": "~0.24.0",
+    "tslint": "~5.11.0"
+  },
+  "readme": "NativeScript DateTimePicker Demo NG"
+}
\ No newline at end of file
diff --git a/demo-angular/src/app/home/home.component.ts b/demo-angular/src/app/home/home.component.ts
index 55f8206..8f4e9e2 100644
--- a/demo-angular/src/app/home/home.component.ts
+++ b/demo-angular/src/app/home/home.component.ts
@@ -26,7 +26,7 @@ export class HomeComponent implements OnInit {
     public customVisibility: string;
     private _expandedId: string;
 
-    @ViewChild("scrollView") scrollView: ElementRef;
+    @ViewChild("scrollView", { static: false }) scrollView: ElementRef;
 
     constructor() {
         // Use the component constructor to inject providers.
diff --git a/demo-vue/package.json b/demo-vue/package.json
index d5c2468..588de42 100644
--- a/demo-vue/package.json
+++ b/demo-vue/package.json
@@ -2,10 +2,10 @@
     "nativescript": {
         "id": "org.nativescript.datetimepicker.demovue",
         "tns-android": {
-            "version": "5.3.0"
+            "version": "5.4.0"
         },
         "tns-ios": {
-            "version": "5.3.0"
+            "version": "5.4.0"
         }
     },
     "description": "NativeScript DateTimePicker Demo Vue",
@@ -14,16 +14,16 @@
     "dependencies": {
         "nativescript-datetimepicker": "file:../src",
         "nativescript-theme-core": "~1.0.4",
-        "nativescript-vue": "~2.0.0",
+        "nativescript-vue": "~2.2.0",
         "tns-core-modules": "^5.0.0"
     },
     "devDependencies": {
         "@babel/core": "~7.2.0",
         "@babel/preset-env": "~7.2.0",
         "babel-loader": "~8.0.0",
-        "nativescript-dev-typescript": "~0.9.0",
-        "nativescript-dev-webpack": "~0.21.0",
-        "nativescript-vue-template-compiler": "~2.0.2",
+        "nativescript-dev-typescript": "~0.10.0",
+        "nativescript-dev-webpack": "~0.24.0",
+        "nativescript-vue-template-compiler": "~2.2.0",
         "node-sass": "~4.9.0",
         "vue-loader": "~15.4.0"
     },
diff --git a/demo/package.json b/demo/package.json
index 57a03a8..7c26a9c 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -2,10 +2,10 @@
     "nativescript": {
         "id": "org.nativescript.datetimepicker.demo",
         "tns-android": {
-            "version": "5.3.0"
+            "version": "5.4.0"
         },
         "tns-ios": {
-            "version": "5.3.0"
+            "version": "5.4.0"
         }
     },
     "description": "NativeScript DateTimePicker Demo Core",
@@ -21,8 +21,8 @@
         "tns-core-modules": "^5.0.0"
     },
     "devDependencies": {
-        "nativescript-dev-typescript": "~0.9.0",
-        "nativescript-dev-webpack": "~0.21.0",
+        "nativescript-dev-typescript": "~0.10.0",
+        "nativescript-dev-webpack": "~0.24.0",
         "tslint": "~5.11.0"
     },
     "readme": "NativeScript DateTimePicker Demo Core"
diff --git a/src/package.json b/src/package.json
index 5ed340a..0e35e24 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,81 +1,81 @@
 {
-    "name": "nativescript-datetimepicker",
-    "version": "1.2.0",
-    "description": "A NativeScript plugin for picking date and time.",
-    "typings": "index.d.ts",
-    "nativescript": {
-        "platforms": {
-            "android": "5.0.0",
-            "ios": "5.0.0"
-        }
-    },
-    "scripts": {
-        "tsc": "npm i && tsc",
-        "build": "npm run tsc",
-        "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"**/platforms/**\"",
-        "plugin.tscwatch": "npm run tsc -- -w",
-        "demo.ios": "npm run build && cd ../demo && tns run ios --syncAllFiles --emulator",
-        "demo.android": "npm run build && cd ../demo && tns run android --syncAllFiles --emulator",
-        "demo.reset": "cd ../demo && npx rimraf -- hooks node_modules platforms package-lock.json",
-        "demo.ng.ios": "npm run build && cd ../demo-angular && tns run ios --syncAllFiles --emulator",
-        "demo.ng.android": "npm run build && cd ../demo-angular && tns run android --syncAllFiles --emulator",
-        "demo.ng.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json",
-        "demo.vue.ios": "npm run build && cd ../demo-vue && tns run ios --bundle --syncAllFiles --emulator",
-        "demo.vue.android": "npm run build && cd ../demo-vue && tns run android --bundle --syncAllFiles --emulator",
-        "demo.vue.reset": "cd ../demo-vue && npx rimraf -- hooks node_modules platforms package-lock.json",
-        "plugin.prepare": "npm run build && cd ../demo && tns plugin remove nativescript-datetimepicker && tns plugin add ../src",
-        "clean": "npm run demo.reset && npx rimraf -- node_modules package-lock.json && npm i",
-        "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**'",
-        "ngc": "ngc -p tsconfig.json",
-        "prepack": "npm i && npm run ngc",
-        "pack": "bash ../publish/pack.sh"
-    },
-    "keywords": [
-        "NativeScript",
-        "JavaScript",
-        "Android",
-        "iOS",
-        "DatePicker",
-        "TimePicker",
-        "Date",
-        "Time"
-    ],
-    "author": {
-        "name": "NativeScript Team",
-        "email": "nativescriptplugins@progress.com"
-    },
-    "bugs": {
-        "url": "https://github.com/NativeScript/nativescript-datetimepicker/issues"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/NativeScript/nativescript-datetimepicker.git"
-    },
-    "license": "Apache-2.0",
-    "homepage": "https://github.com/NativeScript/nativescript-datetimepicker",
-    "readmeFilename": "README.md",
-    "devDependencies": {
-        "tns-core-modules": "^5.0.0",
-        "tns-platform-declarations": "^5.0.0",
-        "typescript": "~3.1.6",
-        "prompt": "^1.0.0",
-        "rimraf": "^2.6.2",
-        "tslint": "^5.11.0",
-        "semver": "^5.6.0",
-        "nativescript-angular": "~7.2.0",
-        "@angular/core": "~7.2.0",
-        "@angular/common": "~7.2.0",
-        "@angular/compiler": "~7.2.0",
-        "@angular/compiler-cli": "~7.2.0",
-        "@angular/forms": "~7.2.0",
-        "@angular/http": "~7.2.0",
-        "@angular/platform-browser": "~7.2.0",
-        "@angular/platform-browser-dynamic": "~7.2.0",
-        "@angular/router": "~7.2.0",
-        "rxjs": "~6.4.0",
-        "zone.js": "~0.8.26",
-        "nativescript-vue": "~2.0.0"
-    },
-    "dependencies": {},
-    "bootstrapper": "nativescript-plugin-seed"
+  "name": "nativescript-datetimepicker",
+  "version": "1.2.0",
+  "description": "A NativeScript plugin for picking date and time.",
+  "typings": "index.d.ts",
+  "nativescript": {
+    "platforms": {
+      "android": "5.0.0",
+      "ios": "5.0.0"
+    }
+  },
+  "scripts": {
+    "tsc": "npm i && tsc",
+    "build": "npm run tsc",
+    "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"**/platforms/**\"",
+    "plugin.tscwatch": "npm run tsc -- -w",
+    "demo.ios": "npm run build && cd ../demo && tns run ios --syncAllFiles --emulator",
+    "demo.android": "npm run build && cd ../demo && tns run android --syncAllFiles --emulator",
+    "demo.reset": "cd ../demo && npx rimraf -- hooks node_modules platforms package-lock.json",
+    "demo.ng.ios": "npm run build && cd ../demo-angular && tns run ios --syncAllFiles --emulator",
+    "demo.ng.android": "npm run build && cd ../demo-angular && tns run android --syncAllFiles --emulator",
+    "demo.ng.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json",
+    "demo.vue.ios": "npm run build && cd ../demo-vue && tns run ios --bundle --syncAllFiles --emulator",
+    "demo.vue.android": "npm run build && cd ../demo-vue && tns run android --bundle --syncAllFiles --emulator",
+    "demo.vue.reset": "cd ../demo-vue && npx rimraf -- hooks node_modules platforms package-lock.json",
+    "plugin.prepare": "npm run build && cd ../demo && tns plugin remove nativescript-datetimepicker && tns plugin add ../src",
+    "clean": "npm run demo.reset && npx rimraf -- node_modules package-lock.json && npm i",
+    "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**'",
+    "ngc": "ngc -p tsconfig.json",
+    "prepack": "npm i && npm run ngc",
+    "pack": "bash ../publish/pack.sh"
+  },
+  "keywords": [
+    "NativeScript",
+    "JavaScript",
+    "Android",
+    "iOS",
+    "DatePicker",
+    "TimePicker",
+    "Date",
+    "Time"
+  ],
+  "author": {
+    "name": "NativeScript Team",
+    "email": "nativescriptplugins@progress.com"
+  },
+  "bugs": {
+    "url": "https://github.com/NativeScript/nativescript-datetimepicker/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/NativeScript/nativescript-datetimepicker.git"
+  },
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/NativeScript/nativescript-datetimepicker",
+  "readmeFilename": "README.md",
+  "devDependencies": {
+    "@angular/common": "~8.0.0",
+    "@angular/compiler": "~8.0.0",
+    "@angular/compiler-cli": "~8.0.0",
+    "@angular/core": "~8.0.0",
+    "@angular/forms": "~8.0.0",
+    "@angular/http": "8.0.0-beta.10",
+    "@angular/platform-browser": "~8.0.0",
+    "@angular/platform-browser-dynamic": "~8.0.0",
+    "@angular/router": "~8.0.0",
+    "nativescript-angular": "~8.0.0",
+    "nativescript-vue": "~2.2.0",
+    "prompt": "^1.0.0",
+    "rimraf": "^2.6.2",
+    "rxjs": "^6.3.3",
+    "semver": "^5.6.0",
+    "tns-core-modules": "^5.0.0",
+    "tns-platform-declarations": "^5.0.0",
+    "tslint": "^5.11.0",
+    "typescript": "~3.4.5",
+    "zone.js": "^0.8.4"
+  },
+  "dependencies": {},
+  "bootstrapper": "nativescript-plugin-seed"
 }