Skip to content

Commit f0a2de6

Browse files
M-i-k-e-lethanshar
M-i-k-e-l
and
ethanshar
authored
Infra/keyboard tracking view allow package temp 2 (#669)
* Allow us to work along side react-native-keyboard-tracking-view (temporary) * Add missing import * Add screens to menu Co-authored-by: Ethan Sharabi <[email protected]>
1 parent 514000b commit f0a2de6

File tree

12 files changed

+153
-152
lines changed

12 files changed

+153
-152
lines changed

‎lib/components/Keyboard/KeyboardInput/KeyboardAccessoryView.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ const IsAndroid = Platform.OS === 'android';
1818

1919
const IOS_SCROLL_BEHAVIORS = IsIOS
2020
? {
21-
NONE: NativeModules.KeyboardTrackingViewManager.KeyboardTrackingScrollBehaviorNone,
21+
NONE: NativeModules.KeyboardTrackingViewTempManager.KeyboardTrackingScrollBehaviorNone,
2222
SCROLL_TO_BOTTOM_INVERTED_ONLY:
23-
NativeModules.KeyboardTrackingViewManager.KeyboardTrackingScrollBehaviorScrollToBottomInvertedOnly,
24-
FIXED_OFFSET: NativeModules.KeyboardTrackingViewManager.KeyboardTrackingScrollBehaviorFixedOffset
23+
NativeModules.KeyboardTrackingViewTempManager.KeyboardTrackingScrollBehaviorScrollToBottomInvertedOnly,
24+
FIXED_OFFSET: NativeModules.KeyboardTrackingViewTempManager.KeyboardTrackingScrollBehaviorFixedOffset
2525
}
2626
: {};
2727

‎lib/components/Keyboard/KeyboardTracking/KeyboardTrackingView.ios.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import PropTypes from 'prop-types';
66
import React, {PureComponent} from 'react';
77
import ReactNative, {requireNativeComponent, NativeModules} from 'react-native';
88

9-
const NativeKeyboardTrackingView = requireNativeComponent('KeyboardTrackingView', null);
10-
const KeyboardTrackingViewManager = NativeModules.KeyboardTrackingViewManager;
9+
const NativeKeyboardTrackingView = requireNativeComponent('KeyboardTrackingViewTemp', null);
10+
const KeyboardTrackingViewTempManager = NativeModules.KeyboardTrackingViewTempManager;
1111

1212
/**
1313
* @description: A UI component that enables “keyboard tracking" for this view and it's sub-views.
@@ -37,15 +37,15 @@ class KeyboardTrackingView extends PureComponent {
3737
}
3838

3939
async getNativeProps() {
40-
if (this.ref && KeyboardTrackingViewManager && KeyboardTrackingViewManager.getNativeProps) {
41-
return await KeyboardTrackingViewManager.getNativeProps(ReactNative.findNodeHandle(this.ref));
40+
if (this.ref && KeyboardTrackingViewTempManager && KeyboardTrackingViewTempManager.getNativeProps) {
41+
return await KeyboardTrackingViewTempManager.getNativeProps(ReactNative.findNodeHandle(this.ref));
4242
}
4343
return {};
4444
}
4545

4646
scrollToStart() {
47-
if (this.ref && KeyboardTrackingViewManager && KeyboardTrackingViewManager.scrollToStart) {
48-
KeyboardTrackingViewManager.scrollToStart(ReactNative.findNodeHandle(this.ref));
47+
if (this.ref && KeyboardTrackingViewTempManager && KeyboardTrackingViewTempManager.scrollToStart) {
48+
KeyboardTrackingViewTempManager.scrollToStart(ReactNative.findNodeHandle(this.ref));
4949
}
5050
}
5151
}

‎lib/ios/reactnativeuilib.xcodeproj/project.pbxproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
10823FAF23AFB12900429E9A /* KeyboardTrackingViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FAE23AFB12900429E9A /* KeyboardTrackingViewManager.m */; };
11-
10823FB123AFB14700429E9A /* ObservingInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FB023AFB14700429E9A /* ObservingInputAccessoryView.m */; };
12-
10823FB323AFB15D00429E9A /* UIResponder+FirstResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FB223AFB15D00429E9A /* UIResponder+FirstResponder.m */; };
10+
1054385623BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1054385523BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m */; };
11+
1054385923BBA27900D04E48 /* UIResponder+FirstResponderTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1054385823BBA27900D04E48 /* UIResponder+FirstResponderTemp.m */; };
12+
1054385C23BC748700D04E48 /* KeyboardTrackingViewTempManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1054385A23BC748700D04E48 /* KeyboardTrackingViewTempManager.m */; };
1313
10823FBE23B0BAA200429E9A /* Color+Interpolation.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FBD23B0BAA200429E9A /* Color+Interpolation.m */; };
1414
10823FC023B0BE5600429E9A /* LNAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FBF23B0BE5600429E9A /* LNAnimator.m */; };
1515
10823FC223B0BE9100429E9A /* LNInterpolable.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FC123B0BE9100429E9A /* LNInterpolable.m */; };
@@ -38,12 +38,12 @@
3838
/* End PBXCopyFilesBuildPhase section */
3939

4040
/* Begin PBXFileReference section */
41-
10823FAD23AFB0C900429E9A /* KeyboardTrackingViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeyboardTrackingViewManager.h; sourceTree = "<group>"; };
42-
10823FAE23AFB12900429E9A /* KeyboardTrackingViewManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KeyboardTrackingViewManager.m; sourceTree = "<group>"; };
43-
10823FB023AFB14700429E9A /* ObservingInputAccessoryView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ObservingInputAccessoryView.m; sourceTree = "<group>"; };
44-
10823FB223AFB15D00429E9A /* UIResponder+FirstResponder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIResponder+FirstResponder.m"; sourceTree = "<group>"; };
45-
10823FB423AFB16E00429E9A /* UIResponder+FirstResponder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIResponder+FirstResponder.h"; sourceTree = "<group>"; };
46-
10823FB523AFB17B00429E9A /* ObservingInputAccessoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObservingInputAccessoryView.h; sourceTree = "<group>"; };
41+
1054385423BBA1B800D04E48 /* ObservingInputAccessoryViewTemp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObservingInputAccessoryViewTemp.h; sourceTree = "<group>"; };
42+
1054385523BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ObservingInputAccessoryViewTemp.m; sourceTree = "<group>"; };
43+
1054385723BBA26800D04E48 /* UIResponder+FirstResponderTemp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIResponder+FirstResponderTemp.h"; sourceTree = "<group>"; };
44+
1054385823BBA27900D04E48 /* UIResponder+FirstResponderTemp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIResponder+FirstResponderTemp.m"; sourceTree = "<group>"; };
45+
1054385A23BC748700D04E48 /* KeyboardTrackingViewTempManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeyboardTrackingViewTempManager.m; sourceTree = "<group>"; };
46+
1054385B23BC748700D04E48 /* KeyboardTrackingViewTempManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardTrackingViewTempManager.h; sourceTree = "<group>"; };
4747
10823FB823B0B9D000429E9A /* Color+Interpolation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Color+Interpolation.h"; sourceTree = "<group>"; };
4848
10823FB923B0B9DC00429E9A /* LNAnimator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNAnimator.h; sourceTree = "<group>"; };
4949
10823FBA23B0B9ED00429E9A /* LNInterpolable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNInterpolable.h; sourceTree = "<group>"; };
@@ -88,12 +88,12 @@
8888
10823FAC23AFB06E00429E9A /* keyboardtrackingview */ = {
8989
isa = PBXGroup;
9090
children = (
91-
10823FAD23AFB0C900429E9A /* KeyboardTrackingViewManager.h */,
92-
10823FAE23AFB12900429E9A /* KeyboardTrackingViewManager.m */,
93-
10823FB023AFB14700429E9A /* ObservingInputAccessoryView.m */,
94-
10823FB223AFB15D00429E9A /* UIResponder+FirstResponder.m */,
95-
10823FB423AFB16E00429E9A /* UIResponder+FirstResponder.h */,
96-
10823FB523AFB17B00429E9A /* ObservingInputAccessoryView.h */,
91+
1054385B23BC748700D04E48 /* KeyboardTrackingViewTempManager.h */,
92+
1054385A23BC748700D04E48 /* KeyboardTrackingViewTempManager.m */,
93+
1054385423BBA1B800D04E48 /* ObservingInputAccessoryViewTemp.h */,
94+
1054385523BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m */,
95+
1054385723BBA26800D04E48 /* UIResponder+FirstResponderTemp.h */,
96+
1054385823BBA27900D04E48 /* UIResponder+FirstResponderTemp.m */,
9797
);
9898
path = keyboardtrackingview;
9999
sourceTree = "<group>";
@@ -247,18 +247,18 @@
247247
buildActionMask = 2147483647;
248248
files = (
249249
10823FCD23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m in Sources */,
250+
1054385923BBA27900D04E48 /* UIResponder+FirstResponderTemp.m in Sources */,
250251
10823FC023B0BE5600429E9A /* LNAnimator.m in Sources */,
251252
D8AFACA2204E004D00D28FED /* SafeAreaSpacerView.m in Sources */,
253+
1054385C23BC748700D04E48 /* KeyboardTrackingViewTempManager.m in Sources */,
252254
D8AFACA0204E004D00D28FED /* SafeAreaSpacerShadowView.m in Sources */,
253255
10823FC623B0BF0C00429E9A /* NSValue+Interpolation.mm in Sources */,
254-
10823FB123AFB14700429E9A /* ObservingInputAccessoryView.m in Sources */,
255-
10823FAF23AFB12900429E9A /* KeyboardTrackingViewManager.m in Sources */,
256256
10823FC223B0BE9100429E9A /* LNInterpolable.m in Sources */,
257257
10823FB123AFB14700429E9A /* ObservingInputAccessoryView.m in Sources */,
258258
10823FAF23AFB12900429E9A /* KeyboardTrackingViewManager.m in Sources */,
259259
D8D93E7620161B1F00A39331 /* HighlighterViewManager.m in Sources */,
260+
1054385623BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m in Sources */,
260261
D8E5A538204C4F170000DA01 /* SafeAreaManager.m in Sources */,
261-
10823FB323AFB15D00429E9A /* UIResponder+FirstResponder.m in Sources */,
262262
D8AFAC9F204E004D00D28FED /* SafeAreaSpacerViewManager.m in Sources */,
263263
D8AFACA1204E004D00D28FED /* SafeAreaSpacerViewLocalData.m in Sources */,
264264
10823FCA23B0BF8400429E9A /* RCTCustomInputController.m in Sources */,

‎lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewController.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
#import "RCTCustomKeyboardViewController.h"
99

10-
#if __has_include(<KeyboardTrackingView/ObservingInputAccessoryView.h>)
11-
#import <KeyboardTrackingView/ObservingInputAccessoryView.h>
12-
#define ObservingInputAccessoryView_IsAvailable true
10+
#if __has_include(<KeyboardTrackingView/ObservingInputAccessoryViewTemp.h>)
11+
#import <KeyboardTrackingView/ObservingInputAccessoryViewTemp.h>
12+
#define ObservingInputAccessoryViewTemp_IsAvailable true
1313
#endif
1414

1515
@implementation RCTCustomKeyboardViewController
@@ -24,11 +24,11 @@ - (instancetype)init
2424

2525
self.heightConstraint = [self.inputView.heightAnchor constraintEqualToConstant:0];
2626

27-
#ifdef ObservingInputAccessoryView_IsAvailable
28-
ObservingInputAccessoryView *activeObservingInputAccessoryView = [ObservingInputAccessoryViewManager sharedInstance].activeObservingInputAccessoryView;
29-
if (activeObservingInputAccessoryView != nil)
27+
#ifdef ObservingInputAccessoryViewTemp_IsAvailable
28+
ObservingInputAccessoryViewTemp *activeObservingInputAccessoryViewTemp = [ObservingInputAccessoryViewTempManager sharedInstance].activeObservingInputAccessoryViewTemp;
29+
if (activeObservingInputAccessoryViewTemp != nil)
3030
{
31-
CGFloat keyboardHeight = activeObservingInputAccessoryView.keyboardHeight;
31+
CGFloat keyboardHeight = activeObservingInputAccessoryViewTemp.keyboardHeight;
3232
if (keyboardHeight > 0)
3333
{
3434
self.heightConstraint.constant = keyboardHeight;

‎lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewManager.h renamed to ‎lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// KeyboardTrackingViewManager.h
2+
// KeyboardTrackingViewTempManager.h
33
// ReactNativeChat
44
//
55
// Created by Artal Druk on 19/04/2016.
@@ -10,5 +10,5 @@
1010
#import <React/RCTViewManager.h>
1111
#import <React/RCTBridgeModule.h>
1212

13-
@interface KeyboardTrackingViewManager : RCTViewManager
13+
@interface KeyboardTrackingViewTempManager : RCTViewManager
1414
@end

0 commit comments

Comments
 (0)