Skip to content

Commit 12a8674

Browse files
M-i-k-e-lM-i-k-e-l
authored
KeyboardInput - rename RCTCustomKeyboardViewController --> RCTCustomKeyboardViewControllerTemp (#845)
* KeyboardInput - rename RCTCustomKeyboardViewController --> RCTCustomKeyboardViewControllerTemp * Bump uilib-native version to 3.0.1
1 parent 9676308 commit 12a8674

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
1054385623BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1054385523BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m */; };
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 */; };
13+
1054776424B47EA800D2026D /* RCTCustomKeyboardViewControllerTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1054776324B47EA800D2026D /* RCTCustomKeyboardViewControllerTemp.m */; };
1314
10823FBE23B0BAA200429E9A /* Color+Interpolation.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FBD23B0BAA200429E9A /* Color+Interpolation.m */; };
1415
10823FC223B0BE9100429E9A /* LNInterpolable.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FC123B0BE9100429E9A /* LNInterpolable.m */; };
1516
10823FC623B0BF0C00429E9A /* NSValue+Interpolation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 10823FC523B0BF0C00429E9A /* NSValue+Interpolation.mm */; };
16-
10823FCD23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 10823FCC23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m */; };
1717
1098BE4B246034EB0020440A /* LNAnimatorTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1098BE4A246034EB0020440A /* LNAnimatorTemp.m */; };
1818
1098BE4E246035090020440A /* RCTCustomInputControllerTemp.m in Sources */ = {isa = PBXBuildFile; fileRef = 1098BE4D246035090020440A /* RCTCustomInputControllerTemp.m */; };
1919
D8AFAC9F204E004D00D28FED /* SafeAreaSpacerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D8AFAC99204E004C00D28FED /* SafeAreaSpacerViewManager.m */; };
@@ -44,15 +44,15 @@
4444
1054385823BBA27900D04E48 /* UIResponder+FirstResponderTemp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIResponder+FirstResponderTemp.m"; sourceTree = "<group>"; };
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>"; };
47+
1054776324B47EA800D2026D /* RCTCustomKeyboardViewControllerTemp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTCustomKeyboardViewControllerTemp.m; sourceTree = "<group>"; };
48+
1054776524B47EB800D2026D /* RCTCustomKeyboardViewControllerTemp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTCustomKeyboardViewControllerTemp.h; sourceTree = "<group>"; };
4749
10823FB823B0B9D000429E9A /* Color+Interpolation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Color+Interpolation.h"; sourceTree = "<group>"; };
4850
10823FBA23B0B9ED00429E9A /* LNInterpolable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNInterpolable.h; sourceTree = "<group>"; };
4951
10823FBB23B0B9FA00429E9A /* LNInterpolation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LNInterpolation.h; sourceTree = "<group>"; };
5052
10823FBC23B0BA0900429E9A /* NSValue+Interpolation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSValue+Interpolation.h"; sourceTree = "<group>"; };
5153
10823FBD23B0BAA200429E9A /* Color+Interpolation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Color+Interpolation.m"; sourceTree = "<group>"; };
5254
10823FC123B0BE9100429E9A /* LNInterpolable.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LNInterpolable.m; sourceTree = "<group>"; };
5355
10823FC523B0BF0C00429E9A /* NSValue+Interpolation.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSValue+Interpolation.mm"; sourceTree = "<group>"; };
54-
10823FCB23B0BF9600429E9A /* RCTCustomKeyboardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTCustomKeyboardViewController.h; sourceTree = "<group>"; };
55-
10823FCC23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTCustomKeyboardViewController.m; sourceTree = "<group>"; };
5656
1098BE49246034EB0020440A /* LNAnimatorTemp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNAnimatorTemp.h; sourceTree = "<group>"; };
5757
1098BE4A246034EB0020440A /* LNAnimatorTemp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNAnimatorTemp.m; sourceTree = "<group>"; };
5858
1098BE4C246035090020440A /* RCTCustomInputControllerTemp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTCustomInputControllerTemp.h; sourceTree = "<group>"; };
@@ -128,8 +128,8 @@
128128
children = (
129129
1098BE4C246035090020440A /* RCTCustomInputControllerTemp.h */,
130130
1098BE4D246035090020440A /* RCTCustomInputControllerTemp.m */,
131-
10823FCB23B0BF9600429E9A /* RCTCustomKeyboardViewController.h */,
132-
10823FCC23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m */,
131+
1054776324B47EA800D2026D /* RCTCustomKeyboardViewControllerTemp.m */,
132+
1054776524B47EB800D2026D /* RCTCustomKeyboardViewControllerTemp.h */,
133133
);
134134
path = rctcustomInputcontroller;
135135
sourceTree = "<group>";
@@ -246,7 +246,6 @@
246246
isa = PBXSourcesBuildPhase;
247247
buildActionMask = 2147483647;
248248
files = (
249-
10823FCD23B0BFAC00429E9A /* RCTCustomKeyboardViewController.m in Sources */,
250249
1054385923BBA27900D04E48 /* UIResponder+FirstResponderTemp.m in Sources */,
251250
1098BE4B246034EB0020440A /* LNAnimatorTemp.m in Sources */,
252251
D8AFACA2204E004D00D28FED /* SafeAreaSpacerView.m in Sources */,
@@ -258,6 +257,7 @@
258257
D8D93E7620161B1F00A39331 /* HighlighterViewManager.m in Sources */,
259258
1054385623BBA1C200D04E48 /* ObservingInputAccessoryViewTemp.m in Sources */,
260259
D8E5A538204C4F170000DA01 /* SafeAreaManager.m in Sources */,
260+
1054776424B47EA800D2026D /* RCTCustomKeyboardViewControllerTemp.m in Sources */,
261261
D8AFAC9F204E004D00D28FED /* SafeAreaSpacerViewManager.m in Sources */,
262262
D8AFACA1204E004D00D28FED /* SafeAreaSpacerViewLocalData.m in Sources */,
263263
10823FBE23B0BAA200429E9A /* Color+Interpolation.m in Sources */,

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

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

88
#import "RCTCustomInputControllerTemp.h"
9-
#import "RCTCustomKeyboardViewController.h"
9+
#import "RCTCustomKeyboardViewControllerTemp.h"
1010

1111
#import <React/RCTUIManager.h>
1212
#import <objc/runtime.h>
@@ -141,7 +141,7 @@ - (BOOL)shouldUseSafeAreaFrom:(NSDictionary *)params {
141141
self.customInputComponentPresented = NO;
142142

143143
BOOL useSafeArea = [self shouldUseSafeAreaFrom:params];
144-
RCTCustomKeyboardViewController* customKeyboardController = [[RCTCustomKeyboardViewController alloc] initWithUsingSafeArea:useSafeArea];
144+
RCTCustomKeyboardViewControllerTemp* customKeyboardController = [[RCTCustomKeyboardViewControllerTemp alloc] initWithUsingSafeArea:useSafeArea];
145145
customKeyboardController.rootView = rv;
146146

147147
_WXInputHelperView* helperView = [[_WXInputHelperView alloc] initWithFrame:CGRectZero];
@@ -235,8 +235,8 @@ -(void)changeKeyboardHeightForInput:(nonnull NSNumber*)inputFieldTag newHeight:(
235235
_WXInputHelperView* helperView = [inputField.superview viewWithTag:kHlperViewTag];
236236
if(helperView != nil)
237237
{
238-
[((RCTCustomKeyboardViewController*)helperView.inputViewController) setAllowsSelfSizing:YES];
239-
((RCTCustomKeyboardViewController*)helperView.inputViewController).heightConstraint.constant = newHeight;
238+
[((RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController) setAllowsSelfSizing:YES];
239+
((RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController).heightConstraint.constant = newHeight;
240240

241241
UIInputView *inputView = helperView.inputViewController.inputView;
242242
[inputView setNeedsUpdateConstraints];
@@ -295,7 +295,7 @@ -(UIColor*)reactViewAvgColor:(RCTRootView*)rootView
295295

296296
helperView.keepInSuperviewOnResign = YES;
297297

298-
RCTCustomKeyboardViewController *customKeyboardViewController = (RCTCustomKeyboardViewController*)helperView.inputViewController;
298+
RCTCustomKeyboardViewControllerTemp *customKeyboardViewController = (RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController;
299299
RCTRootView *rv = customKeyboardViewController.rootView;
300300
UIInputView *inputView = helperView.inputViewController.inputView;
301301

@@ -369,7 +369,7 @@ -(UIColor*)reactViewAvgColor:(RCTRootView*)rootView
369369
animations:@[[LNViewAnimation animationWithView:_fullScreenWindow keyPath:@"frame" toValue:[NSValue valueWithCGRect:keyboardTargetFrame]]]
370370
completionHandler:^(BOOL completed)
371371
{
372-
RCTCustomKeyboardViewController *customKeyboardViewController = (RCTCustomKeyboardViewController*)helperView.inputViewController;
372+
RCTCustomKeyboardViewControllerTemp *customKeyboardViewController = (RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController;
373373
RCTRootView *rv = (RCTRootView*)_fullScreenWindow.rootViewController.view;
374374

375375
[UIView performWithoutAnimation:^{

‎lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewController.h renamed to ‎lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// RCTCustomKeyboardViewController.h
2+
// RCTCustomKeyboardViewControllerTemp.h
33
//
44
// Created by Leo Natan (Wix) on 12/12/2016.
55
// Copyright © 2016 Leo Natan. All rights reserved.
@@ -13,7 +13,7 @@
1313
#import "RCTRootView.h"
1414
#endif
1515

16-
@interface RCTCustomKeyboardViewController : UIInputViewController
16+
@interface RCTCustomKeyboardViewControllerTemp : UIInputViewController
1717

1818
- (void) setAllowsSelfSizing:(BOOL)allowsSelfSizing;
1919
- (instancetype)initWithUsingSafeArea:(BOOL)useSafeArea;

‎lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewController.m renamed to ‎lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.m

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

8-
#import "RCTCustomKeyboardViewController.h"
8+
#import "RCTCustomKeyboardViewControllerTemp.h"
99

1010
#if __has_include(<KeyboardTrackingView/ObservingInputAccessoryViewTemp.h>)
1111
#import <KeyboardTrackingView/ObservingInputAccessoryViewTemp.h>
1212
#define ObservingInputAccessoryViewTemp_IsAvailable true
1313
#endif
1414

15-
@interface RCTCustomKeyboardViewController ()
15+
@interface RCTCustomKeyboardViewControllerTemp ()
1616
@property (nonatomic, assign, getter=isUsingSafeArea) BOOL useSafeArea;
1717
@end
1818

19-
@implementation RCTCustomKeyboardViewController
19+
@implementation RCTCustomKeyboardViewControllerTemp
2020

2121
- (instancetype)initWithUsingSafeArea:(BOOL)useSafeArea
2222
{

‎lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uilib-native",
3-
"version": "3.0.0",
3+
"version": "3.0.1",
44
"homepage": "https://github.com/wix/react-native-ui-lib",
55
"description": "uilib native components (separated from js components)",
66
"main": "components/index.js",

0 commit comments

Comments
 (0)