Skip to content

feat/tracking view allow safeArea #1017

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

Merged
merged 9 commits into from
Nov 3, 2020
Merged

feat/tracking view allow safeArea #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6c673d
Replace unsafe method with getDerivedStateFromProps
mendyEdri Sep 10, 2020
fda4551
Merge branch 'master' of github.com:wix/react-native-ui-lib
mendyEdri Sep 15, 2020
5a4a19e
Merge branch 'master' of github.com:wix/react-native-ui-lib
mendyEdri Sep 15, 2020
83e91f6
Merge branch 'master' of github.com:wix/react-native-ui-lib
mendyEdri Sep 21, 2020
2032f89
Merge branch 'master' of github.com:wix/react-native-ui-lib
mendyEdri Oct 12, 2020
6689b7c
Merge branch 'master' of github.com:wix/react-native-ui-lib
mendyEdri Oct 26, 2020
4054506
Merge branch 'master' of github.com:wix/react-native-ui-lib
mendyEdri Nov 2, 2020
8a76eb8
allow tracking view to controll safe-area sapce, was allways true
mendyEdri Nov 2, 2020
122e313
add native code to support useSafeArea prop
mendyEdri Nov 2, 2020
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
11 changes: 10 additions & 1 deletion lib/components/Keyboard/KeyboardTracking/KeyboardTrackingView.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,16 @@ class KeyboardTrackingView extends PureComponent {
* (This is caused because of the usage of inputAccessory to be able to track the
* keyboard interactive change and it introduces this bug)
*/
trackInteractive: PropTypes.bool
trackInteractive: PropTypes.bool,
/**
* Allow control safe area
*/
useSafeArea: PropTypes.bool
};

/** V6 should be change to default false */
static defaultProps = {
useSafeArea: true
};

render() {
Expand Down
4 changes: 3 additions & 1 deletion lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ @interface KeyboardTrackingViewTemp : UIView
@property (nonatomic) CGFloat originalHeight;
@property (nonatomic) KeyboardTrackingScrollBehavior scrollBehavior;
@property (nonatomic) BOOL addBottomView;
@property (nonatomic) BOOL useSafeArea;
@property (nonatomic) BOOL scrollToFocusedInput;
@property (nonatomic) BOOL allowHitsOutsideBounds;

Expand Down Expand Up @@ -483,7 +484,7 @@ -(CGFloat)getBottomSafeArea
{
CGFloat bottomSafeArea = 0;
#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
if (@available(iOS 11.0, *)) {
if (@available(iOS 11.0, *) && self.useSafeArea) {
bottomSafeArea = self.superview ? self.superview.safeAreaInsets.bottom : self.safeAreaInsets.bottom;
}
#endif
Expand Down Expand Up @@ -632,6 +633,7 @@ @implementation KeyboardTrackingViewTempManager
RCT_REMAP_VIEW_PROPERTY(manageScrollView, manageScrollView, BOOL)
RCT_REMAP_VIEW_PROPERTY(requiresSameParentToManageScrollView, requiresSameParentToManageScrollView, BOOL)
RCT_REMAP_VIEW_PROPERTY(addBottomView, addBottomView, BOOL)
RCT_REMAP_VIEW_PROPERTY(useSafeArea, useSafeArea, BOOL)
RCT_REMAP_VIEW_PROPERTY(scrollToFocusedInput, scrollToFocusedInput, BOOL)
RCT_REMAP_VIEW_PROPERTY(allowHitsOutsideBounds, allowHitsOutsideBounds, BOOL)

Expand Down