Skip to content

Commit ff9bb8f

Browse files
committed
Merge pull request #112 from alexgarbarev/master
Make 'scrolling to active textfield' available for cases when their dele...
2 parents 151fd37 + 6ebb49a commit ff9bb8f

3 files changed

Lines changed: 6 additions & 24 deletions

File tree

TPKeyboardAvoiding/TPKeyboardAvoidingCollectionView.m

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ @implementation TPKeyboardAvoidingCollectionView
1717
- (void)setup {
1818
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
1919
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
20+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextViewTextDidBeginEditingNotification object:nil];
21+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextFieldTextDidBeginEditingNotification object:nil];
2022
}
2123

2224
-(id)initWithFrame:(CGRect)frame {
@@ -86,14 +88,6 @@ -(BOOL)textFieldShouldReturn:(UITextField *)textField {
8688
return YES;
8789
}
8890

89-
-(void)textFieldDidBeginEditing:(UITextField *)textField {
90-
[self scrollToActiveTextField];
91-
}
92-
93-
-(void)textViewDidBeginEditing:(UITextView *)textView {
94-
[self scrollToActiveTextField];
95-
}
96-
9791
-(void)layoutSubviews {
9892
[super layoutSubviews];
9993
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(TPKeyboardAvoiding_assignTextDelegateForViewsBeneathView:) object:self];

TPKeyboardAvoiding/TPKeyboardAvoidingScrollView.m

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ @implementation TPKeyboardAvoidingScrollView
1717
- (void)setup {
1818
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
1919
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
20+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextViewTextDidBeginEditingNotification object:nil];
21+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextFieldTextDidBeginEditingNotification object:nil];
2022
}
2123

2224
-(id)initWithFrame:(CGRect)frame {
@@ -79,14 +81,6 @@ -(BOOL)textFieldShouldReturn:(UITextField *)textField {
7981
return YES;
8082
}
8183

82-
-(void)textFieldDidBeginEditing:(UITextField *)textField {
83-
[self scrollToActiveTextField];
84-
}
85-
86-
-(void)textViewDidBeginEditing:(UITextView *)textView {
87-
[self scrollToActiveTextField];
88-
}
89-
9084
-(void)layoutSubviews {
9185
[super layoutSubviews];
9286
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(TPKeyboardAvoiding_assignTextDelegateForViewsBeneathView:) object:self];

TPKeyboardAvoiding/TPKeyboardAvoidingTableView.m

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ @implementation TPKeyboardAvoidingTableView
1717
- (void)setup {
1818
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
1919
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(TPKeyboardAvoiding_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
20+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextViewTextDidBeginEditingNotification object:nil];
21+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(scrollToActiveTextField) name:UITextFieldTextDidBeginEditingNotification object:nil];
2022
}
2123

2224
-(id)initWithFrame:(CGRect)frame {
@@ -81,14 +83,6 @@ -(BOOL)textFieldShouldReturn:(UITextField *)textField {
8183
return YES;
8284
}
8385

84-
-(void)textFieldDidBeginEditing:(UITextField *)textField {
85-
[self scrollToActiveTextField];
86-
}
87-
88-
-(void)textViewDidBeginEditing:(UITextView *)textView {
89-
[self scrollToActiveTextField];
90-
}
91-
9286
-(void)layoutSubviews {
9387
[super layoutSubviews];
9488
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(TPKeyboardAvoiding_assignTextDelegateForViewsBeneathView:) object:self];

0 commit comments

Comments
 (0)