iOS crashes when the return button is pressed when 'decorate' is used #34

Author: EddyVerbruggen

demo/app/main-page.xml

@@ -11,7 +11,7 @@
         <TextField class="unenhancedTextField" keyboardType="phone" row="1" col="1" text="12.34"/>
 
         <Label row="2" col="0" text="Plugin keyboard (by code, max 4)"/>
-        <TextField id="defaultPluginKeyboard" maxLength="4" keyboardType="number" row="2" col="1" text="{{ myTextPlugin }}" loaded="onMyTextLoadedPluginCode"/>
+        <TextField id="defaultPluginKeyboard" maxLength="4" keyboardType="number" row="2" col="1" text="{{ myTextPlugin }}" loaded="onMyTextLoadedPluginCode" returnPress="returnPress"/>
 
         <Label row="3" col="0" text="Custom button title (max 4)"/>
         <NumKey:NumericKeyboardView textChange="textChange" returnPress="returnPress" maxLength="4" row="3" col="1" returnKeyButtonBackgroundColor="red" returnKeyTitle="OK :)" text="{{ myTextFieldPlugin }}" xloaded="onMyTextLoadedPluginView"/>

demo/package.json

@@ -2,24 +2,24 @@
   "nativescript": {
     "id": "org.nativescript.demo",
     "tns-android": {
-      "version": "6.0.0"
+      "version": "6.0.2"
     },
     "tns-ios": {
-      "version": "6.0.1"
+      "version": "6.0.2"
     }
   },
   "dependencies": {
     "nativescript-numeric-keyboard": "../src",
     "nativescript-unit-test-runner": "0.7.0",
-    "tns-core-modules": "~6.0.1"
+    "tns-core-modules": "~6.0.7"
   },
   "devDependencies": {
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
     "lazy": "1.0.11",
     "nativescript-dev-webpack": "~1.0.0",
-    "tns-platform-declarations": "6.0.1",
+    "tns-platform-declarations": "~6.0.7",
     "tslint": "~5.4.3",
     "typescript": "~3.4.0",
     "karma-webpack": "3.0.5"

src/index.d.ts

@@ -2,7 +2,7 @@
  * iOS and Android apis should match.
  * It doesn't matter if you export `.ios` or `.android`, either one but only one.
  */
-export * from './numeric-keyboard.ios';
+export * from './numeric-keyboard.android';
 
 // Export any shared classes, constants, etc.
 export * from './numeric-keyboard.common';

src/numeric-keyboard.ios.ts

@@ -68,7 +68,7 @@ export class NumericKeyboard implements NumericKeyboardApi, TextAndDecimalSepara
       // not exposing this just yet (not too useful)
       // keyboard.returnKeyButtonStyle = MMNumberKeyboardButtonStyleDone; // (Done = default, there's also White and Gray)
 
-      this._keyboardDelegate = MMNumberKeyboardDelegateImpl.initWithOwner(new WeakRef(this));
+      this._keyboardDelegate = MMNumberKeyboardDelegateImpl.initWithOwner(new WeakRef(this), args.textField);
       this._keyboard.delegate = this._keyboardDelegate;
 
       if (args.onReturnKeyPressed) {
@@ -209,10 +209,12 @@ class MMNumberKeyboardDelegateImpl extends NSObject implements MMNumberKeyboardD
   public static ObjCProtocols = [MMNumberKeyboardDelegate];
 
   private _owner: WeakRef<TextAndDecimalSeparatorHolder>;
+  private _textFieldToNotify?: TextField;
 
-  public static initWithOwner(owner: WeakRef<TextAndDecimalSeparatorHolder>): MMNumberKeyboardDelegateImpl {
+  public static initWithOwner(owner: WeakRef<TextAndDecimalSeparatorHolder>, textFieldToNotify?: TextField): MMNumberKeyboardDelegateImpl {
     const delegate = <MMNumberKeyboardDelegateImpl>MMNumberKeyboardDelegateImpl.new();
     delegate._owner = owner;
+    delegate._textFieldToNotify = textFieldToNotify;
     return delegate;
   }
 
@@ -267,10 +269,15 @@ 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._textFieldToNotify && this._textFieldToNotify.notify) {
+      this._textFieldToNotify.notify({ eventName: TextField.returnPressEvent, object: this._textFieldToNotify });
+    } else {
+      const owner = <any>this._owner.get();
+      if (owner && owner.notify) {
+        owner.notify({ eventName: TextField.returnPressEvent, object: owner });
+      }
     }
+
     if (this._onReturnKeyPressedCallback) {
       return this._onReturnKeyPressedCallback();
     } else {

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-numeric-keyboard",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "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",