Skip to content

Fix bugs when use console in a popup view controller #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HubertZhang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bugs when use console in a popup view controller #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c81e748
fix misplaced prompt cells
HubertZhang Jul 18, 2017
0903035
Use auto layout in Console View Controller, remove unnecessary space …
HubertZhang Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 36 additions & 44 deletions WBWebViewConsole/Controllers/WBWebDebugConsoleViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,13 @@
#import "WBKeyboardObserver.h"

@interface WBWebDebugConsoleViewController () <UITableViewDataSource, UITableViewDelegate, WBWebViewConsoleInputViewDelegate, WBWebViewConsoleMessageCellDelegate>
{
struct {
unsigned int viewAppeared: 1;
} _flags;
}

@property (nonatomic, strong) WBWebViewConsole * console;
@property (nonatomic, strong) UITableView * tableView;
@property (nonatomic, strong) WBWebViewConsoleInputView * inputView;

@property (nonatomic, strong) NSLayoutConstraint * inputViewHeightConstraint;
@property (nonatomic, strong) NSLayoutConstraint * bottomConstraint;
@end

@implementation WBWebDebugConsoleViewController
Expand Down Expand Up @@ -60,6 +57,7 @@ - (void)viewDidLoad
self.tableView.dataSource = self;
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;

self.tableView.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.tableView];

self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Clear", nil) style:UIBarButtonItemStylePlain target:self action:@selector(clearMessages)];
Expand All @@ -68,35 +66,28 @@ - (void)viewDidLoad
[self.inputView setDelegate:self];
[self.inputView setFont:[WBWebViewConsoleMessageCell messageFont]];
[self.inputView setConsole:self.console];
self.inputView.translatesAutoresizingMaskIntoConstraints = NO;
[self.view addSubview:self.inputView];

NSMutableArray *constraints = [[NSMutableArray alloc] init];
[constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[tableView]|" options:0 metrics:nil views:@{@"tableView":self.tableView}]];
[constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[inputView]|" options:0 metrics:nil views:@{@"inputView":self.inputView}]];
[constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[tableView][inputView]" options:0 metrics:nil views:@{@"tableView":self.tableView, @"inputView":self.inputView}]];
[NSLayoutConstraint activateConstraints:constraints];

self.inputViewHeightConstraint = [NSLayoutConstraint constraintWithItem:self.inputView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:self.inputView.desiredHeight];
self.inputViewHeightConstraint.active = YES;

self.bottomConstraint = [NSLayoutConstraint constraintWithItem:self.view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self.inputView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
self.bottomConstraint.active = YES;

if (self.initialCommand.length)
{
[self.inputView setText:self.initialCommand];
[self.inputView.textView becomeFirstResponder];
}
}

- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];

dispatch_async(dispatch_get_main_queue(), ^{
[self relayoutViewsAnimated:NO];

_flags.viewAppeared = YES;
});
}

- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];

dispatch_async(dispatch_get_main_queue(), ^{
_flags.viewAppeared = NO;
});
}

- (void)dismiss:(id)sender
{
[self dismissViewControllerAnimated:YES completion:NULL];
Expand Down Expand Up @@ -126,27 +117,19 @@ - (CGFloat)keyboardHeight
return MAX([UIScreen mainScreen].bounds.size.height - endFrame.origin.y, 0);
}

- (void)relayoutViewsAnimated:(BOOL)animated
{
- (void)viewDidLayoutSubviews {
// [self.view setNeedsUpdateConstraints];
CGFloat keyboardHeight = [self keyboardHeight];
CGFloat inputViewHeight = self.inputView.desiredHeight;

if (animated)
{
WBKeyboardObserver * keyboard = [WBKeyboardObserver sharedObserver];

[UIView beginAnimations:nil context:NULL];
[UIView setAnimationCurve:keyboard.animationCurve];
[UIView setAnimationDuration:keyboard.animationDuration ? : 0.15];
}
CGRect absolutePosition = [self.view convertRect:self.view.bounds toView:self.view.window];

self.inputView.frame = CGRectMake(0, self.view.wbtHeight - inputViewHeight - keyboardHeight, self.view.wbtWidth, inputViewHeight);
self.tableView.frame = CGRectMake(0, 0, self.view.wbtWidth, self.view.wbtHeight - inputViewHeight - keyboardHeight);
CGFloat bottomHeight = CGRectGetMaxY(absolutePosition);

if (animated)
{
[UIView commitAnimations];
}
[self.view layoutIfNeeded];
[UIView animateWithDuration:0.25 animations:^{
self.bottomConstraint.constant = MAX(bottomHeight - (self.view.window.wbtHeight - keyboardHeight), 0);
[self.view layoutIfNeeded];
}];
}

#pragma mark - TableView Datasource
Expand Down Expand Up @@ -291,7 +274,7 @@ - (void)clearMessages

- (void)consoleInputViewHeightChanged:(WBWebViewConsoleInputView *)inputView
{
[self relayoutViewsAnimated:_flags.viewAppeared];
self.inputViewHeightConstraint.constant = self.inputView.desiredHeight;
}

- (void)consoleInputViewDidBeginEditing:(WBWebViewConsoleInputView *)inputView
Expand All @@ -308,7 +291,16 @@ - (void)consoleInputView:(WBWebViewConsoleInputView *)inputView didCommitCommand

- (void)keyboardFrameDidChangeNotification:(NSNotification *)notification
{
[self relayoutViewsAnimated:YES];
CGFloat keyboardHeight = [self keyboardHeight];

CGRect absolutePosition = [self.view convertRect:self.view.bounds toView:self.view.window];

CGFloat bottomHeight = CGRectGetMaxY(absolutePosition);

[UIView animateWithDuration:0.25 animations:^{
self.bottomConstraint.constant = MAX(bottomHeight - (self.view.window.wbtHeight - keyboardHeight), 0);
[self.view layoutIfNeeded];
}];
}

@end
3 changes: 2 additions & 1 deletion WBWebViewConsole/Views/WBWebViewConsoleInputView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ - (UITableView *)promptCompletionTableView
if (!_promptCompletionTableView)
{
_promptCompletionTableView = [[UITableView alloc] initWithFrame:CGRectZero];
_promptCompletionTableView.estimatedRowHeight = 36;
_promptCompletionTableView.delegate = self.promptCompletionDatasource;
_promptCompletionTableView.dataSource = self.promptCompletionDatasource;
_promptCompletionTableView.bounces = NO;
Expand All @@ -275,7 +276,7 @@ - (void)updatePromptTableViewFrame

CGRect frameInWindow = [self.window convertRect:self.bounds fromView:self];

self.promptCompletionTableView.frame = CGRectMake(0, CGRectGetMinY(frameInWindow) - height, CGRectGetWidth(frameInWindow), height);
self.promptCompletionTableView.frame = CGRectMake(CGRectGetMinX(frameInWindow), CGRectGetMinY(frameInWindow) - height, CGRectGetWidth(frameInWindow), height);
}

- (void)updatePromptCompletionWithSuggestions:(NSArray *)suggestions replacementRange:(NSRange)replacementRange
Expand Down