Block now returns the keyboard's frame. Useful for more complicated interface changes.

danielamitay · danielamitay · commit df6175697a61 · 2012-07-20T00:43:57.000-04:00
diff --git a/DAKeyboardControl/DAKeyboardControl.h b/DAKeyboardControl/DAKeyboardControl.h
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-typedef void (^DAKeyboardDidMoveBlock)(CGPoint keyboardOriginInView);
+typedef void (^DAKeyboardDidMoveBlock)(CGRect keyboardFrameInView);
 
 @interface UIView (DAKeyboardControl)
 
@@ -19,6 +19,6 @@ typedef void (^DAKeyboardDidMoveBlock)(CGPoint keyboardOriginInView);
 
 - (void)removeKeyboardControl;
 
-- (CGPoint)keyboardOriginInView;
+- (CGRect)keyboardFrameInView;
 
 @end
diff --git a/DAKeyboardControl/DAKeyboardControl.m b/DAKeyboardControl/DAKeyboardControl.m
@@ -93,17 +93,21 @@ - (void)addKeyboardControl:(BOOL)panning actionHandler:(DAKeyboardDidMoveBlock)a
     }
 }
 
-- (CGPoint)keyboardOriginInView
+- (CGRect)keyboardFrameInView
 {
     if (self.keyboardActiveView)
     {
-        CGPoint keyboardWindowOrigin = self.keyboardActiveView.frame.origin;
-        return [self convertPoint:keyboardWindowOrigin fromView:self.keyboardActiveView.window];
+        CGRect keyboardFrameInView = [self convertRect:self.keyboardActiveView.frame
+                                              fromView:self.keyboardActiveView.window];
+        return keyboardFrameInView;
     }
     else
     {
-        CGPoint keyboardWindowOrigin = CGPointMake(0.0f, [[UIScreen mainScreen] bounds].size.height);
-        return [self convertPoint:keyboardWindowOrigin fromView:self.keyboardActiveView.window];
+        CGRect keyboardFrameInView = CGRectMake(0.0f,
+                                                [[UIScreen mainScreen] bounds].size.height,
+                                                0.0f,
+                                                0.0f);
+        return keyboardFrameInView;
     }
 }
 
@@ -188,7 +192,7 @@ - (void)keyboardWillShow:(NSNotification *)notification
                         options:keyboardTransitionAnimationCurve
                      animations:^{
                          if (self.keyboardDidMoveBlock)
-                             self.keyboardDidMoveBlock(keyboardEndFrameView.origin);
+                             self.keyboardDidMoveBlock(keyboardEndFrameView);
                      }
                      completion:^(BOOL finished){
                      }];
@@ -226,7 +230,7 @@ - (void)keyboardWillChangeFrame:(NSNotification *)notification
                         options:keyboardTransitionAnimationCurve
                      animations:^{
                          if (self.keyboardDidMoveBlock)
-                             self.keyboardDidMoveBlock(keyboardEndFrameView.origin);
+                             self.keyboardDidMoveBlock(keyboardEndFrameView);
                      }
                      completion:^(BOOL finished){
                      }];
@@ -255,7 +259,7 @@ - (void)keyboardWillHide:(NSNotification *)notification
                         options:keyboardTransitionAnimationCurve
                      animations:^{
                          if (self.keyboardDidMoveBlock)
-                             self.keyboardDidMoveBlock(keyboardEndFrameView.origin);
+                             self.keyboardDidMoveBlock(keyboardEndFrameView);
                      }
                      completion:^(BOOL finished){
                      }];
@@ -332,7 +336,7 @@ - (void)panGestureDidChange:(UIPanGestureRecognizer *)gesture
                                  animations:^{
                                      [self.keyboardActiveView setFrame:newKeyboardViewFrame];
                                      if (self.keyboardDidMoveBlock)
-                                         self.keyboardDidMoveBlock(newKeyboardViewFrameInView.origin);
+                                         self.keyboardDidMoveBlock(newKeyboardViewFrameInView);
                                  }
                                  completion:^(BOOL finished){
                                  }];
@@ -355,7 +359,7 @@ - (void)panGestureDidChange:(UIPanGestureRecognizer *)gesture
                              animations:^{
                                  [self.keyboardActiveView setFrame:newKeyboardViewFrame];
                                  if (self.keyboardDidMoveBlock)
-                                     self.keyboardDidMoveBlock(newKeyboardViewFrameInView.origin);
+                                     self.keyboardDidMoveBlock(newKeyboardViewFrameInView);
                              }
                              completion:^(BOOL finished){
                                  if (!within44Pixels)
@@ -383,7 +387,7 @@ - (void)panGestureDidChange:(UIPanGestureRecognizer *)gesture
                              animations:^{
                                  [self.keyboardActiveView setFrame:newKeyboardViewFrame];
                                  if (self.keyboardDidMoveBlock)
-                                     self.keyboardDidMoveBlock(newKeyboardViewFrameInView.origin);
+                                     self.keyboardDidMoveBlock(newKeyboardViewFrameInView);
                              }
                              completion:^(BOOL finished){
                                  if (!within44Pixels)
diff --git a/DAKeyboardControlExample/DAKeyboardControlExample/ViewController.m b/DAKeyboardControlExample/DAKeyboardControlExample/ViewController.m
@@ -56,7 +56,7 @@ - (void)viewDidLoad
     
     self.view.keyboardTriggerOffset = toolBar.bounds.size.height;
     
-    [self.view addKeyboardPanningWithActionHandler:^(CGPoint keyboardOriginInView) {
+    [self.view addKeyboardPanningWithActionHandler:^(CGRect keyboardFrameInView) {
         /* 
          Try not to call "self" inside this block (retain cycle).
          But if you do, make sure to remove DAKeyboardControl
@@ -65,7 +65,7 @@ - (void)viewDidLoad
          */
         
         CGRect toolBarFrame = toolBar.frame;
-        toolBarFrame.origin.y = keyboardOriginInView.y - toolBarFrame.size.height;
+        toolBarFrame.origin.y = keyboardFrameInView.origin.y - toolBarFrame.size.height;
         toolBar.frame = toolBarFrame;
         
         CGRect tableViewFrame = tableView.frame;
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Example project included (DAKeyboardControlExample)
 ### Adding pan-to-dismiss (functionality introduced in iMessages)
 
 ```objective-c
-[self.view addKeyboardPanningWithActionHandler:^(CGPoint keyboardOriginInView) {
+[self.view addKeyboardPanningWithActionHandler:^(CGRect keyboardFrameInView) {
         // Move interface objects accordingly
 		// Animation block is handled for you
     }];
@@ -31,7 +31,7 @@ Example project included (DAKeyboardControlExample)
 ### Adding keyboard awareness (appearance and disappearance only)
 
 ```objective-c
-[self.view addKeyboardNonpanningWithActionHander:^(CGPoint keyboardOriginInView) {
+[self.view addKeyboardNonpanningWithActionHander:^(CGRect keyboardFrameInView) {
         // Move interface objects accordingly
 		// Animation block is handled for you
     }];
@@ -44,7 +44,7 @@ The `keyboardTriggerOffset` property allows you to choose at what point the user
 ```objective-c
 self.view.keyboardTriggerOffset = 44.0f;	// Input view frame height
 
-[self.view addKeyboardPanningWithActionHandler:^(CGPoint keyboardOriginInView) {
+[self.view addKeyboardPanningWithActionHandler:^(CGRect keyboardFrameInView) {
         // Move input view accordingly
 		// Animation block is handled for you
     }];

Original file line number	Diff line number	Diff line change
`@@ -93,17 +93,21 @@ - (void)addKeyboardControl:(BOOL)panning actionHandler:(DAKeyboardDidMoveBlock)a`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`-- (CGPoint)keyboardOriginInView`
	`96`	`+- (CGRect)keyboardFrameInView`
`97`	`97`	`{`
`98`	`98`	`if (self.keyboardActiveView)`
`99`	`99`	`{`
`100`		`- CGPoint keyboardWindowOrigin = self.keyboardActiveView.frame.origin;`
`101`		`- return [self convertPoint:keyboardWindowOrigin fromView:self.keyboardActiveView.window];`
	`100`	`+ CGRect keyboardFrameInView = [self convertRect:self.keyboardActiveView.frame`
	`101`	`+ fromView:self.keyboardActiveView.window];`
	`102`	`+ return keyboardFrameInView;`
`102`	`103`	`}`
`103`	`104`	`else`
`104`	`105`	`{`
`105`		`- CGPoint keyboardWindowOrigin = CGPointMake(0.0f, [[UIScreen mainScreen] bounds].size.height);`
`106`		`- return [self convertPoint:keyboardWindowOrigin fromView:self.keyboardActiveView.window];`
	`106`	`+ CGRect keyboardFrameInView = CGRectMake(0.0f,`
	`107`	`+ [[UIScreen mainScreen] bounds].size.height,`
	`108`	`+ 0.0f,`
	`109`	`+ 0.0f);`
	`110`	`+ return keyboardFrameInView;`
`107`	`111`	`}`
`108`	`112`	`}`
`109`	`113`
`@@ -188,7 +192,7 @@ - (void)keyboardWillShow:(NSNotification *)notification`
`188`	`192`	`options:keyboardTransitionAnimationCurve`
`189`	`193`	`animations:^{`
`190`	`194`	`if (self.keyboardDidMoveBlock)`
`191`		`- self.keyboardDidMoveBlock(keyboardEndFrameView.origin);`
	`195`	`+ self.keyboardDidMoveBlock(keyboardEndFrameView);`
`192`	`196`	`}`
`193`	`197`	`completion:^(BOOL finished){`
`194`	`198`	`}];`
`@@ -226,7 +230,7 @@ - (void)keyboardWillChangeFrame:(NSNotification *)notification`
`226`	`230`	`options:keyboardTransitionAnimationCurve`
`227`	`231`	`animations:^{`
`228`	`232`	`if (self.keyboardDidMoveBlock)`
`229`		`- self.keyboardDidMoveBlock(keyboardEndFrameView.origin);`
	`233`	`+ self.keyboardDidMoveBlock(keyboardEndFrameView);`
`230`	`234`	`}`
`231`	`235`	`completion:^(BOOL finished){`
`232`	`236`	`}];`
`@@ -255,7 +259,7 @@ - (void)keyboardWillHide:(NSNotification *)notification`
`255`	`259`	`options:keyboardTransitionAnimationCurve`
`256`	`260`	`animations:^{`
`257`	`261`	`if (self.keyboardDidMoveBlock)`
`258`		`- self.keyboardDidMoveBlock(keyboardEndFrameView.origin);`
	`262`	`+ self.keyboardDidMoveBlock(keyboardEndFrameView);`
`259`	`263`	`}`
`260`	`264`	`completion:^(BOOL finished){`
`261`	`265`	`}];`
`@@ -332,7 +336,7 @@ - (void)panGestureDidChange:(UIPanGestureRecognizer *)gesture`
`332`	`336`	`animations:^{`
`333`	`337`	`[self.keyboardActiveView setFrame:newKeyboardViewFrame];`
`334`	`338`	`if (self.keyboardDidMoveBlock)`
`335`		`- self.keyboardDidMoveBlock(newKeyboardViewFrameInView.origin);`
	`339`	`+ self.keyboardDidMoveBlock(newKeyboardViewFrameInView);`
`336`	`340`	`}`
`337`	`341`	`completion:^(BOOL finished){`
`338`	`342`	`}];`
`@@ -355,7 +359,7 @@ - (void)panGestureDidChange:(UIPanGestureRecognizer *)gesture`
`355`	`359`	`animations:^{`
`356`	`360`	`[self.keyboardActiveView setFrame:newKeyboardViewFrame];`
`357`	`361`	`if (self.keyboardDidMoveBlock)`
`358`		`- self.keyboardDidMoveBlock(newKeyboardViewFrameInView.origin);`
	`362`	`+ self.keyboardDidMoveBlock(newKeyboardViewFrameInView);`
`359`	`363`	`}`
`360`	`364`	`completion:^(BOOL finished){`
`361`	`365`	`if (!within44Pixels)`
`@@ -383,7 +387,7 @@ - (void)panGestureDidChange:(UIPanGestureRecognizer *)gesture`
`383`	`387`	`animations:^{`
`384`	`388`	`[self.keyboardActiveView setFrame:newKeyboardViewFrame];`
`385`	`389`	`if (self.keyboardDidMoveBlock)`
`386`		`- self.keyboardDidMoveBlock(newKeyboardViewFrameInView.origin);`
	`390`	`+ self.keyboardDidMoveBlock(newKeyboardViewFrameInView);`
`387`	`391`	`}`
`388`	`392`	`completion:^(BOOL finished){`
`389`	`393`	`if (!within44Pixels)`