fix issue #7

Author: nicolaschengdev

WYPopoverController/WYPopoverController.m

@@ -1356,7 +1356,7 @@ - (WYPopoverArrowDirection)arrowDirectionForRect:(CGRect)aRect
                         permittedArrowDirections:(WYPopoverArrowDirection)arrowDirections;
 
 - (CGSize)sizeForRect:(CGRect)aRect
-               inView:(UIView*)aView
+               inView:(UIView *)aView
           arrowHeight:(CGFloat)arrowHeight
        arrowDirection:(WYPopoverArrowDirection)arrowDirection;
 
@@ -1781,7 +1781,7 @@ - (CGAffineTransform)transformForArrowDirection:(WYPopoverArrowDirection)arrowDi
     CGAffineTransform transform = containerView.transform;
 
     UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
-    
+
     CGSize containerViewSize = containerView.frame.size;
 
     if (containerView.arrowHeight > 0)
@@ -1890,10 +1890,12 @@ - (void)positionPopover
 
     // Position of the popover
     //
+    CGFloat keyboardHeight = UIInterfaceOrientationIsPortrait(orientation) ? keyboardRect.size.height : keyboardRect.size.width;
+    
     minX -= containerView.outerShadowInsets.left;
     maxX += containerView.outerShadowInsets.right;
     minY -= containerView.outerShadowInsets.top;
-    maxY += containerView.outerShadowInsets.bottom - ((UIInterfaceOrientationIsPortrait(orientation)) ? keyboardRect.size.height : keyboardRect.size.width);
+    maxY += containerView.outerShadowInsets.bottom - keyboardHeight;
 
     if (arrowDirection == WYPopoverArrowDirectionDown)
     {
@@ -2120,6 +2122,22 @@ - (void)positionPopover
 
     [containerView setViewController:viewController];
 
+    // keyboard support
+    //
+    if (keyboardHeight > 0) {
+        
+        CGFloat keyboardY = UIInterfaceOrientationIsPortrait(orientation) ? keyboardRect.origin.y : keyboardRect.origin.x;
+        
+        if (containerFrame.origin.y + containerFrame.size.height > keyboardY) {
+            
+            containerFrame.origin.y -= (containerFrame.origin.y + containerFrame.size.height - keyboardY);
+            
+            if (containerFrame.origin.y < minY) {
+                containerFrame.origin.y = minY;
+            }
+        }
+    }
+    
     CGPoint containerOrigin = containerFrame.origin;
 
     containerView.transform = CGAffineTransformMakeRotation(WYInterfaceOrientationAngleOfOrientation(orientation));
@@ -2128,6 +2146,8 @@ - (void)positionPopover
 
     containerFrame.origin = WYPointRelativeToOrientation(containerOrigin, containerFrame.size, orientation);
 
+    
+    
     containerView.frame = containerFrame;
 }
 
@@ -2457,13 +2477,16 @@ - (CGSize)sizeForRect:(CGRect)aRect
 
     CGFloat minX, maxX, minY, maxY = 0;
 
+    CGFloat keyboardHeight = UIInterfaceOrientationIsPortrait(orientation) ? keyboardRect.size.height : keyboardRect.size.width;
+    
     CGFloat overlayWidth = UIInterfaceOrientationIsPortrait(orientation) ? overlayView.bounds.size.width : overlayView.bounds.size.height;
+    
     CGFloat overlayHeight = UIInterfaceOrientationIsPortrait(orientation) ? overlayView.bounds.size.height : overlayView.bounds.size.width;
 
     minX = popoverLayoutMargins.left;
     maxX = overlayWidth - popoverLayoutMargins.right;
     minY = WYStatusBarHeight() + popoverLayoutMargins.top;
-    maxY = overlayHeight - popoverLayoutMargins.bottom;
+    maxY = overlayHeight - popoverLayoutMargins.bottom - keyboardHeight;
 
     CGSize result = CGSizeZero;
 
@@ -2681,6 +2704,13 @@ - (void)keyboardWillShow:(NSNotification *)notification
 {
     NSDictionary *info = [notification userInfo];
     keyboardRect = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    
+    UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+    
+    WY_LOG(@"orientation = %@", WYStringFromOrientation(orientation));
+    
+    WY_LOG(@"keyboardRect = %@", NSStringFromCGRect(keyboardRect));
+    
     [self positionPopover];
     [containerView setNeedsDisplay];
 }

demos/Demo/WYPopoverDemo/WYAllDirectionsViewController.m

@@ -109,9 +109,9 @@ - (IBAction)showpopover:(id)sender
 
         [settingsPopoverController presentPopoverFromRect:btn.bounds
                                                    inView:btn
-                                 permittedArrowDirections:WYPopoverArrowDirectionRight
+                                 permittedArrowDirections:WYPopoverArrowDirectionAny
                                                  animated:YES
-                                                  options:WYPopoverAnimationOptionScale];
+                                                  options:WYPopoverAnimationOptionFadeWithScale];
     }
     else
     {

demos/Demo/WYPopoverDemo/WYStoryboard.storyboard

@@ -201,13 +201,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="content view" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b5a-DZ-4CQ">
-                                <rect key="frame" x="20" y="261" width="280" height="45"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.47414970397949219" green="0.47413551807403564" blue="0.47414353489875793" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" id="Rnx-YT-9jY">
+                                <rect key="frame" x="44" y="20" width="233" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>