From c821d41fd611e1b878c7eae145f7467b67fc5d28 Mon Sep 17 00:00:00 2001
From: EddyVerbruggen <eddyverbruggen@gmail.com>
Date: Fri, 26 Jul 2019 18:35:59 +0200
Subject: [PATCH] Using returnPress event on html attribute (Angular) #31

---
 .gitignore                                    |   1 +
 .../{ => src/main}/AndroidManifest.xml        |   0
 .../main/res}/drawable-hdpi/background.png    | Bin
 .../{ => src/main/res}/drawable-hdpi/icon.png | Bin
 .../{ => src/main/res}/drawable-hdpi/logo.png | Bin
 .../main/res}/drawable-ldpi/background.png    | Bin
 .../{ => src/main/res}/drawable-ldpi/icon.png | Bin
 .../{ => src/main/res}/drawable-ldpi/logo.png | Bin
 .../main/res}/drawable-mdpi/background.png    | Bin
 .../{ => src/main/res}/drawable-mdpi/icon.png | Bin
 .../{ => src/main/res}/drawable-mdpi/logo.png | Bin
 .../res}/drawable-nodpi/splash_screen.xml     |   0
 .../main/res}/drawable-xhdpi/background.png   | Bin
 .../main/res}/drawable-xhdpi/icon.png         | Bin
 .../main/res}/drawable-xhdpi/logo.png         | Bin
 .../main/res}/drawable-xxhdpi/background.png  | Bin
 .../main/res}/drawable-xxhdpi/icon.png        | Bin
 .../main/res}/drawable-xxhdpi/logo.png        | Bin
 .../main/res}/drawable-xxxhdpi/background.png | Bin
 .../main/res}/drawable-xxxhdpi/icon.png       | Bin
 .../main/res}/drawable-xxxhdpi/logo.png       | Bin
 .../{ => src/main/res}/values-v21/colors.xml  |   0
 .../{ => src/main/res}/values-v21/styles.xml  |   0
 .../{ => src/main/res}/values/colors.xml      |   0
 .../{ => src/main/res}/values/styles.xml      |   0
 demo/app/app.ts                               |   2 +-
 demo/app/main-page.ts                         |   8 +
 demo/app/main-page.xml                        |   2 +-
 demo/app/vendor-platform.android.ts           |   9 +
 demo/app/vendor-platform.ios.ts               |   3 +
 demo/app/vendor.ts                            |  10 +
 demo/karma.conf.js                            | 108 ++++
 demo/nsconfig.json                            |   3 +
 demo/package.json                             |  28 +-
 demo/tsconfig.json                            |  10 +-
 demo/tsconfig.tns.json                        |   7 +
 ...ativescript-numeric-keyboard-directives.js |   8 +-
 src/numeric-keyboard.ios.ts                   |   8 +-
 src/package-lock.json                         | 485 ------------------
 src/package.json                              |  19 +-
 src/tsconfig.json                             |  39 +-
 41 files changed, 211 insertions(+), 539 deletions(-)
 rename demo/app/App_Resources/Android/{ => src/main}/AndroidManifest.xml (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/background.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/icon.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-hdpi/logo.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/background.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/icon.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-ldpi/logo.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/background.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/icon.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-mdpi/logo.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-nodpi/splash_screen.xml (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/background.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/icon.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xhdpi/logo.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/background.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/icon.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xxhdpi/logo.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/background.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/icon.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/drawable-xxxhdpi/logo.png (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/values-v21/colors.xml (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/values-v21/styles.xml (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/values/colors.xml (100%)
 rename demo/app/App_Resources/Android/{ => src/main/res}/values/styles.xml (100%)
 create mode 100644 demo/app/vendor-platform.android.ts
 create mode 100644 demo/app/vendor-platform.ios.ts
 create mode 100644 demo/app/vendor.ts
 create mode 100644 demo/karma.conf.js
 create mode 100644 demo/nsconfig.json
 create mode 100644 demo/tsconfig.tns.json
 delete mode 100644 src/package-lock.json

diff --git a/.gitignore b/.gitignore
index 29fb978..473a8e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .vscode
 *.js
 *.log
+*.map
 *.tgz
 !src/angular/*.js
 !demo/karma.conf.js
diff --git a/demo/app/App_Resources/Android/AndroidManifest.xml b/demo/app/App_Resources/Android/src/main/AndroidManifest.xml
similarity index 100%
rename from demo/app/App_Resources/Android/AndroidManifest.xml
rename to demo/app/App_Resources/Android/src/main/AndroidManifest.xml
diff --git a/demo/app/App_Resources/Android/drawable-hdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-hdpi/background.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png
diff --git a/demo/app/App_Resources/Android/drawable-hdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-hdpi/icon.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
diff --git a/demo/app/App_Resources/Android/drawable-hdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-hdpi/logo.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
diff --git a/demo/app/App_Resources/Android/drawable-ldpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-ldpi/background.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png
diff --git a/demo/app/App_Resources/Android/drawable-ldpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-ldpi/icon.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
diff --git a/demo/app/App_Resources/Android/drawable-ldpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-ldpi/logo.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
diff --git a/demo/app/App_Resources/Android/drawable-mdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-mdpi/background.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png
diff --git a/demo/app/App_Resources/Android/drawable-mdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-mdpi/icon.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
diff --git a/demo/app/App_Resources/Android/drawable-mdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-mdpi/logo.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
diff --git a/demo/app/App_Resources/Android/drawable-nodpi/splash_screen.xml b/demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-nodpi/splash_screen.xml
rename to demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
diff --git a/demo/app/App_Resources/Android/drawable-xhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xhdpi/background.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
diff --git a/demo/app/App_Resources/Android/drawable-xhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xhdpi/icon.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
diff --git a/demo/app/App_Resources/Android/drawable-xhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xhdpi/logo.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
diff --git a/demo/app/App_Resources/Android/drawable-xxhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xxhdpi/background.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
diff --git a/demo/app/App_Resources/Android/drawable-xxhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xxhdpi/icon.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
diff --git a/demo/app/App_Resources/Android/drawable-xxhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xxhdpi/logo.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
diff --git a/demo/app/App_Resources/Android/drawable-xxxhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xxxhdpi/background.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
diff --git a/demo/app/App_Resources/Android/drawable-xxxhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xxxhdpi/icon.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/demo/app/App_Resources/Android/drawable-xxxhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
similarity index 100%
rename from demo/app/App_Resources/Android/drawable-xxxhdpi/logo.png
rename to demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
diff --git a/demo/app/App_Resources/Android/values-v21/colors.xml b/demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml
similarity index 100%
rename from demo/app/App_Resources/Android/values-v21/colors.xml
rename to demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml
diff --git a/demo/app/App_Resources/Android/values-v21/styles.xml b/demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml
similarity index 100%
rename from demo/app/App_Resources/Android/values-v21/styles.xml
rename to demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml
diff --git a/demo/app/App_Resources/Android/values/colors.xml b/demo/app/App_Resources/Android/src/main/res/values/colors.xml
similarity index 100%
rename from demo/app/App_Resources/Android/values/colors.xml
rename to demo/app/App_Resources/Android/src/main/res/values/colors.xml
diff --git a/demo/app/App_Resources/Android/values/styles.xml b/demo/app/App_Resources/Android/src/main/res/values/styles.xml
similarity index 100%
rename from demo/app/App_Resources/Android/values/styles.xml
rename to demo/app/App_Resources/Android/src/main/res/values/styles.xml
diff --git a/demo/app/app.ts b/demo/app/app.ts
index 98f8260..e7f8779 100644
--- a/demo/app/app.ts
+++ b/demo/app/app.ts
@@ -1,2 +1,2 @@
 import * as application from 'application';
-application.start({ moduleName: "main-page" });
+application.run({ moduleName: "main-page" });
diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index d5f8a87..bfe499a 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -44,6 +44,14 @@ export function pageLoaded(args: EventData) {
   }
 }
 
+export function textChange(args: EventData) {
+  console.log("textChange");
+}
+
+export function returnPress(args: EventData) {
+  console.log("returnPress");
+}
+
 export function onMyTextLoaded(args: EventData) {
   args.object.on("textChange", (args: EventData) => {
     let numkey = <TextField>args.object;
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 8ee88b9..5400bdb 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -14,7 +14,7 @@
         <TextField id="defaultPluginKeyboard" maxLength="4" keyboardType="number" row="2" col="1" text="{{ myTextPlugin }}" loaded="onMyTextLoadedPluginCode"/>
 
         <Label row="3" col="0" text="Custom button title (max 4)"/>
-        <NumKey:NumericKeyboardView maxLength="4" row="3" col="1" returnKeyButtonBackgroundColor="red" returnKeyTitle="OK :)" text="{{ myTextFieldPlugin }}" loaded="onMyTextLoadedPluginView"/>
+        <NumKey:NumericKeyboardView textChange="textChange" returnPress="returnPress" maxLength="4" row="3" col="1" returnKeyButtonBackgroundColor="red" returnKeyTitle="OK :)" text="{{ myTextFieldPlugin }}" xloaded="onMyTextLoadedPluginView"/>
 
         <Label row="4" col="0" text="No decimals"/>
         <NumKey:NumericKeyboardView row="4" col="1" returnKeyButtonBackgroundColor="#333333" noDecimals="true" text="345"/>
diff --git a/demo/app/vendor-platform.android.ts b/demo/app/vendor-platform.android.ts
new file mode 100644
index 0000000..719f264
--- /dev/null
+++ b/demo/app/vendor-platform.android.ts
@@ -0,0 +1,9 @@
+require("application");
+if (!global["__snapshot"]) {
+    // In case snapshot generation is enabled these modules will get into the bundle
+    // but will not be required/evaluated.
+    // The snapshot webpack plugin will add them to the tns-java-classes.js bundle file.
+    // This way, they will be evaluated on app start as early as possible.
+    require("ui/frame");
+    require("ui/frame/activity");
+}
diff --git a/demo/app/vendor-platform.ios.ts b/demo/app/vendor-platform.ios.ts
new file mode 100644
index 0000000..5ce49d8
--- /dev/null
+++ b/demo/app/vendor-platform.ios.ts
@@ -0,0 +1,3 @@
+// There is a bug in angular: https://github.com/angular/angular-cli/pull/8589/files
+// Legendary stuff, its webpack plugin pretty much doesn't work with empty TypeScript files in v1.8.3
+void 0;
diff --git a/demo/app/vendor.ts b/demo/app/vendor.ts
new file mode 100644
index 0000000..8a38137
--- /dev/null
+++ b/demo/app/vendor.ts
@@ -0,0 +1,10 @@
+// Snapshot the ~/app.css and the theme
+const application = require("application");
+require("ui/styling/style-scope");
+const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/);
+global.registerWebpackModules(appCssContext);
+application.loadAppCss();
+
+require("./vendor-platform");
+
+require("bundle-entry-points");
diff --git a/demo/karma.conf.js b/demo/karma.conf.js
new file mode 100644
index 0000000..7974602
--- /dev/null
+++ b/demo/karma.conf.js
@@ -0,0 +1,108 @@
+module.exports = function (config) {
+  const options = {
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+
+    // list of files / patterns to load in the browser
+    files: ['app/tests/**/*.*'],
+
+
+    // list of files to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: [],
+
+    customLaunchers: {
+      android: {
+        base: 'NS',
+        platform: 'android'
+      },
+      ios: {
+        base: 'NS',
+        platform: 'ios'
+      },
+      ios_simulator: {
+        base: 'NS',
+        platform: 'ios',
+        arguments: ['--emulator']
+      }
+    },
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: false
+  };
+
+  setWebpackPreprocessor(config, options);
+  setWebpack(config, options);
+
+  config.set(options);
+}
+
+function setWebpackPreprocessor(config, options) {
+  if (config && config.bundle) {
+    if (!options.preprocessors) {
+      options.preprocessors = {};
+    }
+
+    options.files.forEach(file => {
+      if (!options.preprocessors[file]) {
+        options.preprocessors[file] = [];
+      }
+      options.preprocessors[file].push('webpack');
+    });
+  }
+}
+
+function setWebpack(config, options) {
+  if (config && config.bundle) {
+    const env = {};
+    env[config.platform] = true;
+    env.sourceMap = config.debugBrk;
+    options.webpack = require('./webpack.config')(env);
+    delete options.webpack.entry;
+    delete options.webpack.output.libraryTarget;
+    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
+    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
+  }
+}
diff --git a/demo/nsconfig.json b/demo/nsconfig.json
new file mode 100644
index 0000000..252955f
--- /dev/null
+++ b/demo/nsconfig.json
@@ -0,0 +1,3 @@
+{
+  "useLegacyWorkflow": false
+}
\ No newline at end of file
diff --git a/demo/package.json b/demo/package.json
index 93c9c44..6239d8a 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -1,25 +1,27 @@
 {
   "nativescript": {
     "id": "org.nativescript.demo",
-    "tns-ios": {
-      "version": "5.2.0"
-    },
     "tns-android": {
-      "version": "5.2.0"
+      "version": "6.0.0"
+    },
+    "tns-ios": {
+      "version": "6.0.1"
     }
   },
   "dependencies": {
-    "nativescript-numeric-keyboard": "file:../src",
-    "nativescript-unit-test-runner": "~0.3.0",
-    "tns-core-modules": "~5.2.0"
+    "nativescript-numeric-keyboard": "../src",
+    "nativescript-unit-test-runner": "0.7.0",
+    "tns-core-modules": "~6.0.1"
   },
   "devDependencies": {
-    "babel-traverse": "^6.24.1",
-    "babel-types": "^6.24.1",
-    "babylon": "^6.16.1",
+    "babel-traverse": "6.26.0",
+    "babel-types": "6.26.0",
+    "babylon": "6.18.0",
     "lazy": "1.0.11",
-    "nativescript-dev-typescript": "~0.6.0",
-    "tns-platform-declarations": "~5.2.0",
-    "typescript": "~2.8.0"
+    "nativescript-dev-webpack": "~1.0.0",
+    "tns-platform-declarations": "6.0.1",
+    "tslint": "~5.4.3",
+    "typescript": "~3.4.0",
+    "karma-webpack": "3.0.5"
   }
 }
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
index 19bd5e8..af89f11 100644
--- a/demo/tsconfig.json
+++ b/demo/tsconfig.json
@@ -5,23 +5,23 @@
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
         "noEmitHelpers": true,
-        "noEmitOnError": false,
+        "noEmitOnError": true,
         "lib": [
-            "es2015.iterable",
             "es6",
             "dom"
         ],
         "baseUrl": ".",
         "paths": {
+            "~/*": [
+                "app/*"
+            ],
             "*": [
-                "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
             ]
         }
     },
     "exclude": [
         "node_modules",
-        "platforms",
-        "**/*.aot.ts"
+        "platforms"
     ]
 }
\ No newline at end of file
diff --git a/demo/tsconfig.tns.json b/demo/tsconfig.tns.json
new file mode 100644
index 0000000..95f2ece
--- /dev/null
+++ b/demo/tsconfig.tns.json
@@ -0,0 +1,7 @@
+{
+    "extends": "./tsconfig",
+    "compilerOptions": {
+        "module": "es2015",
+        "moduleResolution": "node"
+    }
+}
diff --git a/src/angular/nativescript-numeric-keyboard-directives.js b/src/angular/nativescript-numeric-keyboard-directives.js
index d1218c2..a173c7d 100644
--- a/src/angular/nativescript-numeric-keyboard-directives.js
+++ b/src/angular/nativescript-numeric-keyboard-directives.js
@@ -2,17 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var elementRegistryModule = require("nativescript-angular/element-registry");
 var core_1 = require("@angular/core");
-var _1 = require("../");
+var __1 = require("../");
 var NumericKeyboardDirective = (function () {
     function NumericKeyboardDirective() {
     }
     NumericKeyboardDirective = __decorate([
         core_1.Directive({
             selector: "NumericKeyboard"
-        })
+        }),
+        __metadata("design:paramtypes", [])
     ], NumericKeyboardDirective);
     return NumericKeyboardDirective;
 }());
 exports.NumericKeyboardDirective = NumericKeyboardDirective;
 exports.NSNUMKEY_DIRECTIVES = [NumericKeyboardDirective];
-elementRegistryModule.registerElement("NumericKeyboard", function () { return _1.NumericKeyboardView; });
+elementRegistryModule.registerElement("NumericKeyboard", function () { return __1.NumericKeyboardView; });
+//# sourceMappingURL=nativescript-numeric-keyboard-directives.js.map
\ No newline at end of file
diff --git a/src/numeric-keyboard.ios.ts b/src/numeric-keyboard.ios.ts
index d2dea1d..f612959 100644
--- a/src/numeric-keyboard.ios.ts
+++ b/src/numeric-keyboard.ios.ts
@@ -1,4 +1,5 @@
 import { Color } from "tns-core-modules/color";
+import { TextField } from "tns-core-modules/ui/text-field";
 import {
   localeProperty,
   noDecimalsProperty,
@@ -6,7 +7,8 @@ import {
   noReturnKeyProperty,
   NumericKeyboardApi,
   NumericKeyboardOptions,
-  NumericKeyboardViewBase, returnKeyButtonBackgroundColorProperty,
+  NumericKeyboardViewBase,
+  returnKeyButtonBackgroundColorProperty,
   returnKeyTitleProperty,
   TextAndDecimalSeparatorHolder
 } from "./numeric-keyboard.common";
@@ -265,6 +267,10 @@ class MMNumberKeyboardDelegateImpl extends NSObject implements MMNumberKeyboardD
   }
 
   public numberKeyboardShouldReturn(keyboard: MMNumberKeyboard): boolean {
+    const owner = <any>this._owner.get();
+    if (owner) {
+      owner.notify({ eventName: TextField.returnPressEvent, object: owner });
+    }
     if (this._onReturnKeyPressedCallback) {
       return this._onReturnKeyPressedCallback();
     } else {
diff --git a/src/package-lock.json b/src/package-lock.json
deleted file mode 100644
index 66b9d1c..0000000
--- a/src/package-lock.json
+++ /dev/null
@@ -1,485 +0,0 @@
-{
-  "name": "nativescript-numeric-keyboard",
-  "version": "4.1.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@angular/common": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.0.3.tgz",
-      "integrity": "sha1-F0coletCXygSs6eRYrW0lNJQals=",
-      "dev": true
-    },
-    "@angular/compiler": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.0.3.tgz",
-      "integrity": "sha1-izytM4rFOTKOEKakv6oFcJT3vIk=",
-      "dev": true
-    },
-    "@angular/core": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.0.3.tgz",
-      "integrity": "sha1-Yb4h22qld44zFZ/9OMu+uvFhINk=",
-      "dev": true
-    },
-    "@angular/forms": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.0.3.tgz",
-      "integrity": "sha1-+45uCu3ngr9Ycwox0RebMjJxgW4=",
-      "dev": true
-    },
-    "@angular/http": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.0.3.tgz",
-      "integrity": "sha1-77twGiFex3BMAhZ2SEuF7Uc5L0s=",
-      "dev": true
-    },
-    "@angular/platform-browser": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.0.3.tgz",
-      "integrity": "sha1-FwsY1a9O4Cskiqah8eBYSshBaB4=",
-      "dev": true
-    },
-    "@angular/platform-browser-dynamic": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.0.3.tgz",
-      "integrity": "sha1-X6O5j3JZmbYx19cXTm5D3L9qqaw=",
-      "dev": true
-    },
-    "@angular/router": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.0.3.tgz",
-      "integrity": "sha1-JBhOmxJmxK0BeyvoFXNGSx5MXfo=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        }
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "commander": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-      "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "nativescript-angular": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/nativescript-angular/-/nativescript-angular-1.5.2.tgz",
-      "integrity": "sha1-xMpHdQpV7iLTqu82LgAUfycjjaU=",
-      "dev": true,
-      "requires": {
-        "@angular/common": "~4.0.0",
-        "@angular/compiler": "~4.0.0",
-        "@angular/core": "~4.0.0",
-        "@angular/forms": "~4.0.0",
-        "@angular/http": "~4.0.0",
-        "@angular/platform-browser": "~4.0.0",
-        "@angular/platform-browser-dynamic": "~4.0.0",
-        "@angular/router": "~4.0.0",
-        "nativescript-intl": "~0.0.8",
-        "punycode": "1.3.2",
-        "querystring": "0.2.0",
-        "reflect-metadata": "~0.1.8",
-        "rxjs": "^5.0.1",
-        "url": "0.10.3"
-      }
-    },
-    "nativescript-intl": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/nativescript-intl/-/nativescript-intl-0.0.10.tgz",
-      "integrity": "sha1-KjEPB/YnNE9121Rxd9sYKY1DCw4=",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-      "dev": true
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "reflect-metadata": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.12.tgz",
-      "integrity": "sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz",
-      "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.5"
-      }
-    },
-    "rxjs": {
-      "version": "5.5.12",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
-      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
-      "dev": true,
-      "requires": {
-        "symbol-observable": "1.0.1"
-      }
-    },
-    "semver": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-      "dev": true
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
-    },
-    "symbol-observable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-      "dev": true
-    },
-    "tns-core-modules": {
-      "version": "3.4.1",
-      "resolved": "http://registry.npmjs.org/tns-core-modules/-/tns-core-modules-3.4.1.tgz",
-      "integrity": "sha512-sz/yTmoW7WyDPpr4JEC+trlfiEI14X365jGF//tMCT/G6ISzANr43wc17fgbGH1UA1XbKzujbAl0xPNssRHVUA==",
-      "dev": true,
-      "requires": {
-        "tns-core-modules-widgets": "3.4.0"
-      }
-    },
-    "tns-core-modules-widgets": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/tns-core-modules-widgets/-/tns-core-modules-widgets-3.4.0.tgz",
-      "integrity": "sha512-WEtjDRTjjKB+C1NhY1CJSNyhK9DPCYzBgM+yKgq5AmphK/QdQEMAP1U2ttOv8yWWfsvLZGOnzyLCzcyeoG0Gfw==",
-      "dev": true
-    },
-    "tns-platform-declarations": {
-      "version": "3.4.1",
-      "resolved": "http://registry.npmjs.org/tns-platform-declarations/-/tns-platform-declarations-3.4.1.tgz",
-      "integrity": "sha512-GCvUvmtZ2Nne9GIppYF5xzUQzYP+KF43R+ce9kFMT1erDP0I6thLrRkLEo8JgAYD7ukMqXAb80MlYMv/VDGSCw==",
-      "dev": true
-    },
-    "tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
-    },
-    "tslint": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz",
-      "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.22.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^3.2.0",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.7.0",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.27.2"
-      }
-    },
-    "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "typescript": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
-      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "zone.js": {
-      "version": "0.8.26",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.26.tgz",
-      "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==",
-      "dev": true
-    }
-  }
-}
diff --git a/src/package.json b/src/package.json
index 6f6837d..dca4d04 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-numeric-keyboard",
-  "version": "4.2.3",
+  "version": "4.3.0",
   "description": "Handy and elegant numeric keyboard for iOS NativeScript apps. On Android we fall back to the regular numeric keyboard.",
   "main": "numeric-keyboard",
   "typings": "index.d.ts",
@@ -17,10 +17,10 @@
     }
   },
   "scripts": {
-    "build": "tsc",
-    "demo.ios": "npm run preparedemo && cd ../demo && tns run ios --emulator",
-    "demo.ios.device": "npm run preparedemo && cd ../demo && tns platform remove ios && tns platform add ios && tns run ios",
-    "demo.android": "npm run preparedemo && cd ../demo && tns platform remove android && tns run android --justlaunch",
+    "tsc": "tsc -skipLibCheck",
+    "build": "npm i && npm run tsc",
+    "demo.ios": "npm run build && cd ../demo && tns run ios",
+    "demo.android": "npm run build && cd ../demo && tns run android",
     "preparedemo": "npm run build && cd ../demo && tns plugin remove nativescript-numeric-keyboard && tns plugin add ../src && tns install",
     "setup": "npm i && cd ../demo && npm i && cd ../src && npm run build",
     "tslint": "tslint *.ts",
@@ -52,10 +52,11 @@
   "readmeFilename": "README.md",
   "devDependencies": {
     "nativescript-angular": "^1.3.0",
+    "nativescript-dev-typescript": "~0.10.0",
     "zone.js": "~0.8.0",
-    "tns-core-modules": "~3.4.0",
-    "tns-platform-declarations": "~3.4.0",
-    "tslint": "^5.0.0",
-    "typescript": "~2.6.0"
+    "tns-core-modules": "~6.0.0",
+    "tns-platform-declarations": "~6.0.0",
+    "tslint": "~5.4.3",
+    "typescript": "~3.4.0"
   }
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 3147ae6..9cc945e 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -1,29 +1,26 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
     "target": "es5",
-    "noImplicitAny": false,
+    "module": "commonjs",
+    "declaration": false,
     "removeComments": true,
-    "preserveConstEnums": true,
-    "sourceMap": false,
-    "declaration": true,
     "noLib": false,
-    "noEmitHelpers": true,
+    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "baseUrl": ".",
-    "paths": {
-      "*": [
-        "./node_modules/tns-core-modules/*",
-        "./node_modules/*"
-      ]
-    }
+    "lib": ["es6", "dom"],
+    "sourceMap": true,
+    "pretty": true,
+    "allowUnreachableCode": false,
+    "allowUnusedLabels": false,
+    "noEmitHelpers": true,
+    "noEmitOnError": false,
+    "noImplicitAny": false,
+    "noImplicitReturns": true,
+    "noImplicitUseStrict": false,
+    "noFallthroughCasesInSwitch": true
   },
   "exclude": [
-    "node_modules",
-    "platforms"
-  ]
-}
\ No newline at end of file
+    "node_modules"
+  ],
+  "compileOnSave": false
+}