Skip to content

Commit d0e31ee

Browse files
authored
Rename LNAnimator to LNAnimatorTemp (#763)
* Rename LNAnimator to LNAnimatorTemp * Rename RCTCustomInputController to RCTCustomInputControllerTemp and update project file
1 parent 84c11b0 commit d0e31ee

File tree

7 files changed

+36
-38
lines changed

7 files changed

+36
-38
lines changed

lib/components/Keyboard/KeyboardInput/KeyboardAccessoryView.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ class KeyboardAccessoryView extends Component {
185185
const {onKeyboardResigned} = this.props;
186186
let eventEmitter = null;
187187
if (IsIOS) {
188-
if (NativeModules.CustomInputController) {
189-
eventEmitter = new NativeEventEmitter(NativeModules.CustomInputController);
188+
if (NativeModules.CustomInputControllerTemp) {
189+
eventEmitter = new NativeEventEmitter(NativeModules.CustomInputControllerTemp);
190190
}
191191
} else {
192192
eventEmitter = DeviceEventEmitter;

lib/components/Keyboard/KeyboardInput/TextInputKeyboardManager.ios.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
import ReactNative, {NativeModules, LayoutAnimation} from 'react-native';
22

3-
const CustomInputController = NativeModules.CustomInputController;
3+
const CustomInputControllerTemp = NativeModules.CustomInputControllerTemp;
44

55
export default class TextInputKeyboardManager {
66
static setInputComponent = (textInputRef, {component, initialProps}) => {
7-
if (!textInputRef || !CustomInputController) {
7+
if (!textInputRef || !CustomInputControllerTemp) {
88
return;
99
}
1010
const reactTag = findNodeHandle(textInputRef);
1111
if (reactTag) {
12-
CustomInputController.presentCustomInputComponent(reactTag, {component, initialProps});
12+
CustomInputControllerTemp.presentCustomInputComponent(reactTag, {component, initialProps});
1313
}
1414
};
1515

1616
static removeInputComponent = textInputRef => {
17-
if (!textInputRef || !CustomInputController) {
17+
if (!textInputRef || !CustomInputControllerTemp) {
1818
return;
1919
}
2020
const reactTag = findNodeHandle(textInputRef);
2121
if (reactTag) {
22-
CustomInputController.resetInput(reactTag);
22+
CustomInputControllerTemp.resetInput(reactTag);
2323
}
2424
};
2525

2626
static dismissKeyboard = () => {
27-
CustomInputController.dismissKeyboard();
27+
CustomInputControllerTemp.dismissKeyboard();
2828
};
2929

3030
static toggleExpandKeyboard = (textInputRef, expand, performLayoutAnimation = false) => {
@@ -34,9 +34,9 @@ export default class TextInputKeyboardManager {
3434
}
3535
const reactTag = findNodeHandle(textInputRef);
3636
if (expand) {
37-
CustomInputController.expandFullScreenForInput(reactTag);
37+
CustomInputControllerTemp.expandFullScreenForInput(reactTag);
3838
} else {
39-
CustomInputController.resetSizeForInput(reactTag);
39+
CustomInputControllerTemp.resetSizeForInput(reactTag);
4040
}
4141
}
4242
};

lib/ios/reactnativeuilib.xcodeproj/project.pbxproj

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
1054385923BBA27900D04E48 /* UIResponder+FirstResponderTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1054385823BBA27900D04E48 /* UIResponder+FirstResponderTemp.m */; };
1212
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 */; };
14-
10823FC023B0BE5600429E9A /* LNAnimator.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FBF23B0BE5600429E9A /* LNAnimator.m */; };
1514
10823FC223B0BE9100429E9A /* LNInterpolable.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FC123B0BE9100429E9A /* LNInterpolable.m */; };
1615
10823FC623B0BF0C00429E9A /* NSValue+Interpolation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 10823FC523B0BF0C00429E9A /* NSValue+Interpolation.mm */; };
17-
10823FCA23B0BF8400429E9A /* RCTCustomInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FC923B0BF8400429E9A /* RCTCustomInputController.m */; };
1816
10823FCD23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FCC23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m */; };
17+
1098BE4B246034EB0020440A /* LNAnimatorTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1098BE4A246034EB0020440A /* LNAnimatorTemp.m */; };
18+
1098BE4E246035090020440A /* RCTCustomInputControllerTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1098BE4D246035090020440A /* RCTCustomInputControllerTemp.m */; };
1919
D8AFAC9F204E004D00D28FED /* SafeAreaSpacerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D8AFAC99204E004C00D28FED /* SafeAreaSpacerViewManager.m */; };
2020
D8AFACA0204E004D00D28FED /* SafeAreaSpacerShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = D8AFAC9A204E004C00D28FED /* SafeAreaSpacerShadowView.m */; };
2121
D8AFACA1204E004D00D28FED /* SafeAreaSpacerViewLocalData.m in Sources */ = {isa = PBXBuildFile; fileRef = D8AFAC9D204E004C00D28FED /* SafeAreaSpacerViewLocalData.m */; };
@@ -45,18 +45,18 @@
4545
1054385A23BC748700D04E48 /* KeyboardTrackingViewTempManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KeyboardTrackingViewTempManager.m; sourceTree = "<group>"; };
4646
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>"; };
48-
10823FB923B0B9DC00429E9A /* LNAnimator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNAnimator.h; sourceTree = "<group>"; };
4948
10823FBA23B0B9ED00429E9A /* LNInterpolable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNInterpolable.h; sourceTree = "<group>"; };
5049
10823FBB23B0B9FA00429E9A /* LNInterpolation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNInterpolation.h; sourceTree = "<group>"; };
5150
10823FBC23B0BA0900429E9A /* NSValue+Interpolation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSValue+Interpolation.h"; sourceTree = "<group>"; };
5251
10823FBD23B0BAA200429E9A /* Color+Interpolation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Color+Interpolation.m"; sourceTree = "<group>"; };
53-
10823FBF23B0BE5600429E9A /* LNAnimator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LNAnimator.m; sourceTree = "<group>"; };
5452
10823FC123B0BE9100429E9A /* LNInterpolable.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LNInterpolable.m; sourceTree = "<group>"; };
5553
10823FC523B0BF0C00429E9A /* NSValue+Interpolation.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSValue+Interpolation.mm"; sourceTree = "<group>"; };
56-
10823FC823B0BF6B00429E9A /* RCTCustomInputController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTCustomInputController.h; sourceTree = "<group>"; };
57-
10823FC923B0BF8400429E9A /* RCTCustomInputController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTCustomInputController.m; sourceTree = "<group>"; };
5854
10823FCB23B0BF9600429E9A /* RCTCustomKeyboardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTCustomKeyboardViewController.h; sourceTree = "<group>"; };
5955
10823FCC23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTCustomKeyboardViewController.m; sourceTree = "<group>"; };
56+
1098BE49246034EB0020440A /* LNAnimatorTemp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNAnimatorTemp.h; sourceTree = "<group>"; };
57+
1098BE4A246034EB0020440A /* LNAnimatorTemp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNAnimatorTemp.m; sourceTree = "<group>"; };
58+
1098BE4C246035090020440A /* RCTCustomInputControllerTemp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTCustomInputControllerTemp.h; sourceTree = "<group>"; };
59+
1098BE4D246035090020440A /* RCTCustomInputControllerTemp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTCustomInputControllerTemp.m; sourceTree = "<group>"; };
6060
D8AFAC97204E004C00D28FED /* SafeAreaSpacerShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafeAreaSpacerShadowView.h; sourceTree = "<group>"; };
6161
D8AFAC98204E004C00D28FED /* SafeAreaSpacerViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SafeAreaSpacerViewManager.h; sourceTree = "<group>"; };
6262
D8AFAC99204E004C00D28FED /* SafeAreaSpacerViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SafeAreaSpacerViewManager.m; sourceTree = "<group>"; };
@@ -110,13 +110,13 @@
110110
10823FB723B0B9AC00429E9A /* lninterpolation */ = {
111111
isa = PBXGroup;
112112
children = (
113+
1098BE49246034EB0020440A /* LNAnimatorTemp.h */,
114+
1098BE4A246034EB0020440A /* LNAnimatorTemp.m */,
113115
10823FB823B0B9D000429E9A /* Color+Interpolation.h */,
114-
10823FB923B0B9DC00429E9A /* LNAnimator.h */,
115116
10823FBA23B0B9ED00429E9A /* LNInterpolable.h */,
116117
10823FBB23B0B9FA00429E9A /* LNInterpolation.h */,
117118
10823FBC23B0BA0900429E9A /* NSValue+Interpolation.h */,
118119
10823FBD23B0BAA200429E9A /* Color+Interpolation.m */,
119-
10823FBF23B0BE5600429E9A /* LNAnimator.m */,
120120
10823FC123B0BE9100429E9A /* LNInterpolable.m */,
121121
10823FC523B0BF0C00429E9A /* NSValue+Interpolation.mm */,
122122
);
@@ -126,8 +126,8 @@
126126
10823FC723B0BF5100429E9A /* rctcustomInputcontroller */ = {
127127
isa = PBXGroup;
128128
children = (
129-
10823FC823B0BF6B00429E9A /* RCTCustomInputController.h */,
130-
10823FC923B0BF8400429E9A /* RCTCustomInputController.m */,
129+
1098BE4C246035090020440A /* RCTCustomInputControllerTemp.h */,
130+
1098BE4D246035090020440A /* RCTCustomInputControllerTemp.m */,
131131
10823FCB23B0BF9600429E9A /* RCTCustomKeyboardViewController.h */,
132132
10823FCC23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m */,
133133
);
@@ -248,20 +248,18 @@
248248
files = (
249249
10823FCD23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m in Sources */,
250250
1054385923BBA27900D04E48 /* UIResponder+FirstResponderTemp.m in Sources */,
251-
10823FC023B0BE5600429E9A /* LNAnimator.m in Sources */,
251+
1098BE4B246034EB0020440A /* LNAnimatorTemp.m in Sources */,
252252
D8AFACA2204E004D00D28FED /* SafeAreaSpacerView.m in Sources */,
253253
1054385C23BC748700D04E48 /* KeyboardTrackingViewTempManager.m in Sources */,
254254
D8AFACA0204E004D00D28FED /* SafeAreaSpacerShadowView.m in Sources */,
255255
10823FC623B0BF0C00429E9A /* NSValue+Interpolation.mm in Sources */,
256+
1098BE4E246035090020440A /* RCTCustomInputControllerTemp.m in Sources */,
256257
10823FC223B0BE9100429E9A /* LNInterpolable.m in Sources */,
257-
10823FB123AFB14700429E9A /* ObservingInputAccessoryView.m in Sources */,
258-
10823FAF23AFB12900429E9A /* KeyboardTrackingViewManager.m in Sources */,
259258
D8D93E7620161B1F00A39331 /* HighlighterViewManager.m in Sources */,
260259
1054385623BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m in Sources */,
261260
D8E5A538204C4F170000DA01 /* SafeAreaManager.m in Sources */,
262261
D8AFAC9F204E004D00D28FED /* SafeAreaSpacerViewManager.m in Sources */,
263262
D8AFACA1204E004D00D28FED /* SafeAreaSpacerViewLocalData.m in Sources */,
264-
10823FCA23B0BF8400429E9A /* RCTCustomInputController.m in Sources */,
265263
10823FBE23B0BAA200429E9A /* Color+Interpolation.m in Sources */,
266264
D8D93E7520161B1F00A39331 /* HighlighterView.m in Sources */,
267265
);

lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimator.h renamed to lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
@end
2626

27-
@interface LNAnimator : NSObject
27+
@interface LNAnimatorTemp : NSObject
2828

2929
@property (nonatomic, readonly) NSTimeInterval duration;
3030
@property (nonatomic, strong, readonly) NSArray<id<LNAnimation>>* animations;

lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimator.m renamed to lib/ios/reactnativeuilib/keyboardinput/lninterpolation/LNAnimatorTemp.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2017 Wix. All rights reserved.
77
//
88

9-
#import "LNAnimator.h"
9+
#import "LNAnimatorTemp.h"
1010

1111
#import "LNInterpolation.h"
1212

@@ -52,7 +52,7 @@ - (void)setProgress:(CGFloat)progress
5252

5353
@end
5454

55-
@implementation LNAnimator
55+
@implementation LNAnimatorTemp
5656
{
5757
void (^_completionHandler)(BOOL);
5858
CADisplayLink* _displayLink;
@@ -73,7 +73,7 @@ - (instancetype)_init
7373

7474
+ (instancetype)animatorWithDuration:(NSTimeInterval)duration animations:(NSArray<id<LNAnimation>>*)animations completionHandler:(void(^)(BOOL completed))completionHandler
7575
{
76-
LNAnimator* rv = [[LNAnimator alloc] _init];
76+
LNAnimatorTemp* rv = [[LNAnimatorTemp alloc] _init];
7777
if(rv)
7878
{
7979
rv->_duration = duration;

lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputController.h renamed to lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// RCTCustomInputController.h
2+
// RCTCustomInputControllerTemp.h
33
//
44
// Created by Leo Natan (Wix) on 13/12/2016.
55
// Copyright © 2016 Leo Natan. All rights reserved.
@@ -11,6 +11,6 @@
1111
#import "RCTEventEmitter.h"
1212
#endif
1313

14-
@interface RCTCustomInputController : RCTEventEmitter
14+
@interface RCTCustomInputControllerTemp : RCTEventEmitter
1515

1616
@end

lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputController.m renamed to lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
//
2-
// RCTCustomInputController.m
2+
// RCTCustomInputControllerTemp.m
33
//
44
// Created by Leo Natan (Wix) on 13/12/2016.
55
// Copyright © 2016 Leo Natan. All rights reserved.
66
//
77

8-
#import "RCTCustomInputController.h"
8+
#import "RCTCustomInputControllerTemp.h"
99
#import "RCTCustomKeyboardViewController.h"
1010

1111
#import <React/RCTUIManager.h>
1212
#import <objc/runtime.h>
1313

14-
#import "LNAnimator.h"
14+
#import "LNAnimatorTemp.h"
1515

1616
#define kHlperViewTag 0x1f1f1f
1717

@@ -58,7 +58,7 @@ - (BOOL)resignFirstResponder
5858
@end
5959

6060

61-
@interface RCTCustomInputController () <_WXInputHelperViewDelegate> {
61+
@interface RCTCustomInputControllerTemp () <_WXInputHelperViewDelegate> {
6262
UIWindow *_fullScreenWindow;
6363
BOOL _performingExpandTransition;
6464
}
@@ -67,7 +67,7 @@ @interface RCTCustomInputController () <_WXInputHelperViewDelegate> {
6767

6868
@end
6969

70-
@implementation RCTCustomInputController
70+
@implementation RCTCustomInputControllerTemp
7171

7272
+ (BOOL)requiresMainQueueSetup
7373
{
@@ -84,7 +84,7 @@ - (dispatch_queue_t)methodQueue
8484
return @[RCTCustomInputControllerKeyboardResigendEvent];
8585
}
8686

87-
RCT_EXPORT_MODULE(CustomInputController)
87+
RCT_EXPORT_MODULE(CustomInputControllerTemp)
8888

8989
- (instancetype)init
9090
{
@@ -312,7 +312,7 @@ -(UIColor*)reactViewAvgColor:(RCTRootView*)rootView
312312
[_fullScreenWindow layoutIfNeeded];
313313
}];
314314

315-
[[LNAnimator animatorWithDuration:0.5
315+
[[LNAnimatorTemp animatorWithDuration:0.5
316316
animations:@[[LNViewAnimation animationWithView:_fullScreenWindow keyPath:@"frame" toValue:[NSValue valueWithCGRect:[UIScreen mainScreen].bounds]]]
317317
completionHandler:^(BOOL completed)
318318
{
@@ -360,7 +360,7 @@ -(UIColor*)reactViewAvgColor:(RCTRootView*)rootView
360360
[_fullScreenWindow layoutIfNeeded];
361361
[_fullScreenWindow endEditing:YES];
362362

363-
[[LNAnimator animatorWithDuration:0.5
363+
[[LNAnimatorTemp animatorWithDuration:0.5
364364
animations:@[[LNViewAnimation animationWithView:_fullScreenWindow keyPath:@"frame" toValue:[NSValue valueWithCGRect:keyboardTargetFrame]]]
365365
completionHandler:^(BOOL completed)
366366
{

0 commit comments

Comments
 (0)