Swizzle it just a little bit (#197)

* initial implementation with swizzle tracking * remove swizzle tracking, add class prefix checking * reduce unnecessary string allocation in unswizzle * revert README.md to reenable cordova.plugins.Keyboard.hideKeyboardAccessoryBar * added attributions for swizzling approach * fixed indenting (tabs->spaces) * fixed indenting (tabs->spaces) * change approach from class swizzling to method swizzling * replaced c function to IMP cast with block-based imp * removed cruft
ionic-team · May 10, 2016 · d2ff48e · d2ff48e · RigoOnRails · May 29, 2016
1 parent a0f44f8
commit d2ff48e
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 157 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The `cordova.plugins.Keyboard` object provides functions to make interacting wit
 Methods
 -------
 
-- ~~cordova.plugins.Keyboard.hideKeyboardAccessoryBar~~ (**removed in 2.0, see below**)
+- cordova.plugins.Keyboard.hideKeyboardAccessoryBar
 - cordova.plugins.Keyboard.close
 - cordova.plugins.Keyboard.disableScroll
 - cordova.plugins.Keyboard.show
@@ -30,11 +30,9 @@ These events are fired on the window.
 
 # API reference
 
-~~Keyboard.hideKeyboardAccessoryBar~~
+Keyboard.hideKeyboardAccessoryBar
 =================
 
-**NOTE: This method started causing apps to be rejected from the App Store, so has been removed until a workaround is found.**
-
 Hide the keyboard accessory bar with the next, previous and done buttons.
 
     cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true);

diff --git a/plugin.xml b/plugin.xml
@@ -38,13 +38,8 @@
                 <param name="ios-package" value="IonicKeyboard" onload="true" />
             </feature>
         </config-file>
-
         <header-file src="src/ios/IonicKeyboard.h" />
         <source-file src="src/ios/IonicKeyboard.m" />
-    <!--
-        <header-file src="src/ios/UIWebViewExtension.h" />
-        <source-file src="src/ios/UIWebViewExtension.m" />
-     -->
     </platform>
 
 	<!-- browser -->

diff --git a/src/ios/IonicKeyboard.h b/src/ios/IonicKeyboard.h
@@ -1,11 +1,14 @@
 #import <Cordova/CDVPlugin.h>
+#import <objc/runtime.h>
 
 @interface IonicKeyboard : CDVPlugin <UIScrollViewDelegate> {
     @protected
     id _keyboardShowObserver, _keyboardHideObserver;
+    IMP wkOriginalImp, uiOriginalImp, nilImp;
+    Method wkMethod, uiMethod;
 }
 
-// @property (readwrite, assign) BOOL hideKeyboardAccessoryBar;
+@property (readwrite, assign) BOOL hideKeyboardAccessoryBar;
 @property (readwrite, assign) BOOL disableScroll;
 //@property (readwrite, assign) BOOL styleDark;
 

diff --git a/src/ios/IonicKeyboard.m b/src/ios/IonicKeyboard.m
@@ -4,20 +4,29 @@
 
 @implementation IonicKeyboard
 
-// @synthesize hideKeyboardAccessoryBar = _hideKeyboardAccessoryBar;
+@synthesize hideKeyboardAccessoryBar = _hideKeyboardAccessoryBar;
 @synthesize disableScroll = _disableScroll;
 //@synthesize styleDark = _styleDark;
 
 - (void)pluginInitialize {
 
-    NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
-    __weak IonicKeyboard* weakSelf = self;
-
+    Class wkClass = NSClassFromString([@[@"UI", @"Web", @"Browser", @"View"] componentsJoinedByString:@""]);
+    wkMethod = class_getInstanceMethod(wkClass, @selector(inputAccessoryView));
+    wkOriginalImp = method_getImplementation(wkMethod);
+    Class uiClass = NSClassFromString([@[@"WK", @"Content", @"View"] componentsJoinedByString:@""]);
+    uiMethod = class_getInstanceMethod(uiClass, @selector(inputAccessoryView));
+    uiOriginalImp = method_getImplementation(uiMethod);
+    nilImp = imp_implementationWithBlock(^(id _s) {
+        return nil;
+    });
+
     //set defaults
-    // self.hideKeyboardAccessoryBar = YES;
+    self.hideKeyboardAccessoryBar = YES;
     self.disableScroll = NO;
     //self.styleDark = NO;
-
+
+    NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
+    __weak IonicKeyboard* weakSelf = self;
     _keyboardShowObserver = [nc addObserverForName:UIKeyboardWillShowNotification
                                object:nil
                                queue:[NSOperationQueue mainQueue]
@@ -42,6 +51,7 @@ - (void)pluginInitialize {
                                    [weakSelf.commandDelegate evalJs:@"cordova.fireWindowEvent('native.hidekeyboard'); "];
                                }];
 }
+
 - (BOOL)disableScroll {
     return _disableScroll;
 }
@@ -62,24 +72,28 @@ - (void)setDisableScroll:(BOOL)disableScroll {
     _disableScroll = disableScroll;
 }
 
+//keyboard swizzling inspired by:
+//https://github.com/cjpearson/cordova-plugin-keyboard/
+
+- (BOOL)hideKeyboardAccessoryBar {
+    return _hideKeyboardAccessoryBar;
+}
 
-// - (BOOL)hideKeyboardAccessoryBar {
-//     return _hideKeyboardAccessoryBar;
-// }
-//
-// - (void)setHideKeyboardAccessoryBar:(BOOL)hideKeyboardAccessoryBar {
-//     if (hideKeyboardAccessoryBar == _hideKeyboardAccessoryBar || ![self.webView isKindOfClass:[UIWebView class]]) {
-//         return;
-//     }
-//     if (hideKeyboardAccessoryBar) {
-//         ((UIWebView*)self.webView).hackishlyHidesInputAccessoryView = YES;
-//     }
-//     else {
-//         ((UIWebView*)self.webView).hackishlyHidesInputAccessoryView = NO;
-//     }
-//
-//     _hideKeyboardAccessoryBar = hideKeyboardAccessoryBar;
-// }
+- (void)setHideKeyboardAccessoryBar:(BOOL)hideKeyboardAccessoryBar {
+    if (hideKeyboardAccessoryBar == _hideKeyboardAccessoryBar) {
+        return;
+    }
+
+    if (hideKeyboardAccessoryBar) {
+        method_setImplementation(wkMethod, nilImp);
+        method_setImplementation(uiMethod, nilImp);
+    } else {
+        method_setImplementation(wkMethod, wkOriginalImp);
+        method_setImplementation(uiMethod, uiOriginalImp);
+    }
+
+    _hideKeyboardAccessoryBar = hideKeyboardAccessoryBar;
+}
 
 /*
 - (BOOL)styleDark {
@@ -129,15 +143,15 @@ - (void) disableScroll:(CDVInvokedUrlCommand*)command {
     }
 }
 
-// - (void) hideKeyboardAccessoryBar:(CDVInvokedUrlCommand*)command {
-//     if (!command.arguments || ![command.arguments count]){
-//       return;
-//     }
-//     id value = [command.arguments objectAtIndex:0];
-//     if (value != [NSNull null]) {
-//       self.hideKeyboardAccessoryBar = [value boolValue];
-//     }
-// }
+- (void) hideKeyboardAccessoryBar:(CDVInvokedUrlCommand*)command {
+    if (!command.arguments || ![command.arguments count]){
+        return;
+    }
+    id value = [command.arguments objectAtIndex:0];
+    if (value != [NSNull null]) {
+        self.hideKeyboardAccessoryBar = [value boolValue];
+    }
+}
 
 - (void) close:(CDVInvokedUrlCommand*)command {
     [self.webView endEditing:YES];

diff --git a/src/ios/UIWebViewExtension.h b/src/ios/UIWebViewExtension.h
diff --git a/src/ios/UIWebViewExtension.m b/src/ios/UIWebViewExtension.m
diff --git a/www/ios/keyboard.js b/www/ios/keyboard.js
@@ -8,8 +8,7 @@ var Keyboard = function() {
 };
 
 Keyboard.hideKeyboardAccessoryBar = function(hide) {
-    // exec(null, null, "Keyboard", "hideKeyboardAccessoryBar", [hide]);
-    console.warn('hideKeyboardAccessoryBar has been temporarily removed on iOS until an Apple-approved method is found.');
+    exec(null, null, "Keyboard", "hideKeyboardAccessoryBar", [hide]);
 };
 
 Keyboard.close = function() {