99#import " UIScrollView+ESFloatingView.h"
1010#import < objc/runtime.h>
1111
12- #define kScreenHeight [UIScreen mainScreen ].bounds.size.height
13- #define kKeyWindow [UIApplication sharedApplication ].keyWindow
12+ #define ScreenHeight [UIScreen mainScreen ].bounds.size.height
13+ #define KeyWindow [UIApplication sharedApplication ].keyWindow
1414
1515static char KEY_ES_floatingView;
16- static char KEY_ES_isFloating;
17- static char KEY_displayLink;
18- static char KEY_targetOffsetY;
19-
20- @interface UIScrollView ()
21-
22- @property (nonatomic , assign ) CGFloat targetOffsetY;
23- @property (strong , nonatomic ) CADisplayLink *displayLink;
24-
25- @end
2616
2717@implementation UIScrollView (ESFloatingView)
2818
@@ -41,87 +31,48 @@ + (void)load
4131- (instancetype )ESFloatView_initWithFrame : (CGRect )frame
4232{
4333 UIScrollView *instance = [self ESFloatView_initWithFrame: frame];
44- [[ NSNotificationCenter defaultCenter ] addObserver: self selector: @selector ( ESFloatView_ReceivedNotification_KeyboardWillShow: ) name: UIKeyboardWillShowNotification object: nil ];
34+ [instance ESFloatView_setup ];
4535 return instance;
4636}
4737
4838- (instancetype )ESFloatView_initWithCoder : (NSCoder *)coder
4939{
5040 UIScrollView *instance = [self ESFloatView_initWithCoder: coder];
51- [[ NSNotificationCenter defaultCenter ] addObserver: self selector: @selector ( ESFloatView_ReceivedNotification_KeyboardWillShow: ) name: UIKeyboardWillShowNotification object: nil ];
41+ [instance ESFloatView_setup ];
5242 return instance;
5343}
5444
45+ - (void )ESFloatView_setup
46+ {
47+ [[NSNotificationCenter defaultCenter ] addObserver: self selector: @selector (ESFloatView_ReceivedNotification_KeyboardWillShow: ) name: UIKeyboardWillShowNotification object: nil ];
48+ }
49+
5550
5651- (void )ESFloatView_ReceivedNotification_KeyboardWillShow : (NSNotification *)notification
5752{
53+ self.autoresizesSubviews = NO ;
5854 CGFloat keyboardH = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue ].size .height ;
5955
6056 if (self.ES_floatingView == NULL )
6157 {
6258 return ;
6359 }
6460
65- CGRect absFrame = [self .ES_floatingView.superview convertRect: self .ES_floatingView.frame toView: kKeyWindow ];
61+ CGRect absFrame = [self .ES_floatingView.superview convertRect: self .ES_floatingView.frame toView: KeyWindow ];
6662
67- CGFloat benchmarkY = kScreenHeight - keyboardH - absFrame.size .height ;
63+ CGFloat benchmarkY = ScreenHeight - keyboardH - absFrame.size .height ;
6864
6965 CGFloat tableVOffset = self.contentOffset .y - (benchmarkY - absFrame.origin .y );
7066
71-
72- self.targetOffsetY = tableVOffset;
73-
74- if (self.contentOffset .y != self.targetOffsetY ) {
75- [self .displayLink addToRunLoop: [NSRunLoop currentRunLoop ] forMode: NSDefaultRunLoopMode ];
76- }
77- }
78-
79- - (void )ESFloatView_scrollToOffset
80- {
81- if (self.contentOffset .y - self.targetOffsetY < 2 && self.contentOffset .y - self.targetOffsetY > -2 )
82- {
83- CGPoint tmpOffset = self.contentOffset ;
84- tmpOffset.y = self.targetOffsetY ;
85- self.contentOffset = tmpOffset;
86-
87- [self .displayLink invalidate ];
88- self.displayLink = nil ;
89-
90- self.ES_isFloating = NO ;
67+ if (tableVOffset < -self.contentInset .top ) {
9168 return ;
9269 }
9370
94- self.ES_isFloating = YES ;
9571 CGPoint tmpOffset = self.contentOffset ;
96- tmpOffset.y += (self. targetOffsetY - self. contentOffset . y ) * 0.15 ;
72+ tmpOffset.y = tableVOffset ;
9773 self.contentOffset = tmpOffset;
9874}
9975
100- - (void )setTargetOffsetY : (CGFloat )targetOffsetY
101- {
102- objc_setAssociatedObject (self, &KEY_targetOffsetY, @(targetOffsetY), OBJC_ASSOCIATION_RETAIN_NONATOMIC );
103- }
104-
105-
106- - (CGFloat )targetOffsetY
107- {
108- return [objc_getAssociatedObject (self , &KEY_targetOffsetY) doubleValue ];
109- }
110-
111- - (void )setDisplayLink : (CADisplayLink *)displayLink
112- {
113- objc_setAssociatedObject (self, &KEY_displayLink, displayLink, OBJC_ASSOCIATION_RETAIN_NONATOMIC );
114- }
115-
116- - (CADisplayLink *)displayLink
117- {
118- if (objc_getAssociatedObject (self, &KEY_displayLink) == NULL ) {
119- CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget: self selector: @selector (ESFloatView_scrollToOffset )];
120- objc_setAssociatedObject (self, &KEY_displayLink, displayLink, OBJC_ASSOCIATION_RETAIN_NONATOMIC );
121- }
122-
123- return objc_getAssociatedObject (self, &KEY_displayLink);
124- }
12576
12677- (void )setES_floatingView : (UIView *)floatView
12778{
@@ -133,16 +84,5 @@ - (UIView *)ES_floatingView
13384 return objc_getAssociatedObject (self, &KEY_ES_floatingView);
13485}
13586
136- - (void )setES_isFloating : (BOOL )ES_isFloating
137- {
138- objc_setAssociatedObject (self, &KEY_ES_isFloating, @(ES_isFloating), OBJC_ASSOCIATION_RETAIN_NONATOMIC );
139- }
140-
141- - (BOOL )ES_isFloating
142- {
143- return [objc_getAssociatedObject (self , &KEY_ES_isFloating) boolValue ];
144- }
145-
146-
14787
14888@end
0 commit comments