From 19a9c5e41da0aa6ee28a54772edcb92daa498561 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Tue, 19 Dec 2017 19:48:22 -0800 Subject: [PATCH] The Great File Renaming in RCTText Summary: The previous file/class name convention seemed cool... but now it drives me BANANAS! It makes all this code really hard to maintain. So, evething were renamed following common modern RN convention. Reviewed By: mmmulani Differential Revision: D6605090 fbshipit-source-id: 88ca13d793a5d2adaac2b7922ec6bd4654aacec5 --- Libraries/Components/ScrollResponder.js | 4 +- Libraries/Components/TextInput/TextInput.js | 12 +- ...ShadowRawText.h => RCTRawTextShadowView.h} | 2 +- ...ShadowRawText.m => RCTRawTextShadowView.m} | 4 +- ...wTextManager.h => RCTRawTextViewManager.h} | 2 +- ...wTextManager.m => RCTRawTextViewManager.m} | 10 +- .../Text/RCTText.xcodeproj/project.pbxproj | 386 +++++++++++------- .../RCTTextShadowView.h} | 2 +- .../RCTTextShadowView.m} | 42 +- .../Text/{RCTText.h => Text/RCTTextView.h} | 2 +- .../Text/{RCTText.m => Text/RCTTextView.m} | 12 +- .../Text/{ => Text}/RCTTextViewManager.h | 0 .../RCTTextViewManager.m} | 44 +- .../RCTMultilineTextInputShadowView.h} | 2 +- .../RCTMultilineTextInputShadowView.m} | 4 +- .../Multiline/RCTMultilineTextInputView.h} | 4 +- .../Multiline/RCTMultilineTextInputView.m} | 16 +- .../RCTMultilineTextInputViewManager.h} | 2 +- .../RCTMultilineTextInputViewManager.m} | 16 +- .../{ => TextInput/Multiline}/RCTUITextView.h | 0 .../{ => TextInput/Multiline}/RCTUITextView.m | 0 .../RCTBackedTextInputDelegate.h | 0 .../RCTBackedTextInputDelegateAdapter.h | 0 .../RCTBackedTextInputDelegateAdapter.m | 0 .../RCTBackedTextInputViewProtocol.h | 0 .../RCTBaseTextInputView.h} | 2 +- .../RCTBaseTextInputView.m} | 6 +- .../Text/{ => TextInput}/RCTTextSelection.h | 0 .../Text/{ => TextInput}/RCTTextSelection.m | 0 .../RCTSinglelineTextInputShadowView.h} | 2 +- .../RCTSinglelineTextInputShadowView.m} | 4 +- .../Singleline/RCTSinglelineTextInputView.h} | 4 +- .../Singleline/RCTSinglelineTextInputView.m} | 6 +- .../RCTSinglelineTextInputViewManager.h} | 2 +- .../RCTSinglelineTextInputViewManager.m} | 16 +- .../Singleline}/RCTUITextField.h | 0 .../Singleline}/RCTUITextField.m | 0 React/React.xcodeproj/project.pbxproj | 24 ++ React/Views/RCTShadowView.h | 2 +- React/Views/RCTShadowView.m | 2 +- 40 files changed, 385 insertions(+), 251 deletions(-) rename Libraries/Text/{RCTShadowRawText.h => RCTRawTextShadowView.h} (89%) rename Libraries/Text/{RCTShadowRawText.m => RCTRawTextShadowView.m} (94%) rename Libraries/Text/{RCTRawTextManager.h => RCTRawTextViewManager.h} (87%) rename Libraries/Text/{RCTRawTextManager.m => RCTRawTextViewManager.m} (69%) rename Libraries/Text/{RCTShadowText.h => Text/RCTTextShadowView.h} (97%) rename Libraries/Text/{RCTShadowText.m => Text/RCTTextShadowView.m} (95%) rename Libraries/Text/{RCTText.h => Text/RCTTextView.h} (94%) rename Libraries/Text/{RCTText.m => Text/RCTTextView.m} (96%) rename Libraries/Text/{ => Text}/RCTTextViewManager.h (100%) rename Libraries/Text/{RCTTextManager.m => Text/RCTTextViewManager.m} (73%) rename Libraries/Text/{RCTShadowTextView.h => TextInput/Multiline/RCTMultilineTextInputShadowView.h} (85%) rename Libraries/Text/{RCTShadowTextView.m => TextInput/Multiline/RCTMultilineTextInputShadowView.m} (79%) rename Libraries/Text/{RCTTextView.h => TextInput/Multiline/RCTMultilineTextInputView.h} (92%) rename Libraries/Text/{RCTTextView.m => TextInput/Multiline/RCTMultilineTextInputView.m} (97%) rename Libraries/Text/{RCTTextFieldManager.h => TextInput/Multiline/RCTMultilineTextInputViewManager.h} (85%) rename Libraries/Text/{RCTTextViewManager.m => TextInput/Multiline/RCTMultilineTextInputViewManager.m} (90%) rename Libraries/Text/{ => TextInput/Multiline}/RCTUITextView.h (100%) rename Libraries/Text/{ => TextInput/Multiline}/RCTUITextView.m (100%) rename Libraries/Text/{ => TextInput}/RCTBackedTextInputDelegate.h (100%) rename Libraries/Text/{ => TextInput}/RCTBackedTextInputDelegateAdapter.h (100%) rename Libraries/Text/{ => TextInput}/RCTBackedTextInputDelegateAdapter.m (100%) rename Libraries/Text/{ => TextInput}/RCTBackedTextInputViewProtocol.h (100%) rename Libraries/Text/{RCTTextInput.h => TextInput/RCTBaseTextInputView.h} (96%) rename Libraries/Text/{RCTTextInput.m => TextInput/RCTBaseTextInputView.m} (98%) rename Libraries/Text/{ => TextInput}/RCTTextSelection.h (100%) rename Libraries/Text/{ => TextInput}/RCTTextSelection.m (100%) rename Libraries/Text/{RCTShadowTextField.h => TextInput/Singleline/RCTSinglelineTextInputShadowView.h} (85%) rename Libraries/Text/{RCTShadowTextField.m => TextInput/Singleline/RCTSinglelineTextInputShadowView.m} (79%) rename Libraries/Text/{RCTTextField.h => TextInput/Singleline/RCTSinglelineTextInputView.h} (84%) rename Libraries/Text/{RCTTextField.m => TextInput/Singleline/RCTSinglelineTextInputView.m} (97%) rename Libraries/Text/{RCTTextManager.h => TextInput/Singleline/RCTSinglelineTextInputViewManager.h} (84%) rename Libraries/Text/{RCTTextFieldManager.m => TextInput/Singleline/RCTSinglelineTextInputViewManager.m} (89%) rename Libraries/Text/{ => TextInput/Singleline}/RCTUITextField.h (100%) rename Libraries/Text/{ => TextInput/Singleline}/RCTUITextField.m (100%) diff --git a/Libraries/Components/ScrollResponder.js b/Libraries/Components/ScrollResponder.js index ef145a0d313a56..6a3cbf2d05d2fb 100644 --- a/Libraries/Components/ScrollResponder.js +++ b/Libraries/Components/ScrollResponder.js @@ -126,8 +126,8 @@ function isTagInstanceOfTextInput(tag) { var instance = getInstanceFromNode(tag); return instance && instance.viewConfig && ( instance.viewConfig.uiViewClassName === 'AndroidTextInput' || - instance.viewConfig.uiViewClassName === 'RCTTextView' || - instance.viewConfig.uiViewClassName === 'RCTTextField' + instance.viewConfig.uiViewClassName === 'RCTMultilineTextInputView' || + instance.viewConfig.uiViewClassName === 'RCTSinglelineTextInputView' ); } diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js index 1efa580ac4312a..67f3e8d19a6552 100644 --- a/Libraries/Components/TextInput/TextInput.js +++ b/Libraries/Components/TextInput/TextInput.js @@ -50,8 +50,8 @@ const onlyMultiline = { if (Platform.OS === 'android') { var AndroidTextInput = requireNativeComponent('AndroidTextInput', null); } else if (Platform.OS === 'ios') { - var RCTTextView = requireNativeComponent('RCTTextView', null); - var RCTTextField = requireNativeComponent('RCTTextField', null); + var RCTMultilineTextInputView = requireNativeComponent('RCTMultilineTextInputView', null); + var RCTSinglelineTextInputView = requireNativeComponent('RCTSinglelineTextInputView', null); } type Event = Object; @@ -707,7 +707,7 @@ const TextInput = createReactClass({ } } textContainer = - -@interface RCTShadowRawText : RCTShadowView +@interface RCTRawTextShadowView : RCTShadowView @property (nonatomic, copy) NSString *text; diff --git a/Libraries/Text/RCTShadowRawText.m b/Libraries/Text/RCTRawTextShadowView.m similarity index 94% rename from Libraries/Text/RCTShadowRawText.m rename to Libraries/Text/RCTRawTextShadowView.m index f163c799b9858a..17f8b4163bfbcc 100644 --- a/Libraries/Text/RCTShadowRawText.m +++ b/Libraries/Text/RCTRawTextShadowView.m @@ -7,11 +7,11 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowRawText.h" +#import "RCTRawTextShadowView.h" #import -@implementation RCTShadowRawText +@implementation RCTRawTextShadowView - (instancetype)init { diff --git a/Libraries/Text/RCTRawTextManager.h b/Libraries/Text/RCTRawTextViewManager.h similarity index 87% rename from Libraries/Text/RCTRawTextManager.h rename to Libraries/Text/RCTRawTextViewManager.h index ebf6bca7432a79..cd376005e641af 100644 --- a/Libraries/Text/RCTRawTextManager.h +++ b/Libraries/Text/RCTRawTextViewManager.h @@ -9,6 +9,6 @@ #import -@interface RCTRawTextManager : RCTViewManager +@interface RCTRawTextViewManager : RCTViewManager @end diff --git a/Libraries/Text/RCTRawTextManager.m b/Libraries/Text/RCTRawTextViewManager.m similarity index 69% rename from Libraries/Text/RCTRawTextManager.m rename to Libraries/Text/RCTRawTextViewManager.m index 460b127ba73d85..8eccfd5c600d0c 100644 --- a/Libraries/Text/RCTRawTextManager.m +++ b/Libraries/Text/RCTRawTextViewManager.m @@ -7,17 +7,17 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTRawTextManager.h" +#import "RCTRawTextViewManager.h" -#import "RCTShadowRawText.h" +#import "RCTRawTextShadowView.h" -@implementation RCTRawTextManager +@implementation RCTRawTextViewManager -RCT_EXPORT_MODULE() +RCT_EXPORT_MODULE(RCTRawText) - (RCTShadowView *)shadowView { - return [RCTShadowRawText new]; + return [RCTRawTextShadowView new]; } RCT_EXPORT_SHADOW_PROPERTY(text, NSString) diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index a9ab7d13ac91ab..226a81d4f2e235 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -7,42 +7,81 @@ objects = { /* Begin PBXBuildFile section */ - 131B6AC01AF0CD0600FFC3E0 /* RCTTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */; }; - 131B6AC11AF0CD0600FFC3E0 /* RCTTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */; }; - 1362F1001B4D51F400E06D8C /* RCTTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 1362F0FD1B4D51F400E06D8C /* RCTTextField.m */; }; - 1362F1011B4D51F400E06D8C /* RCTTextFieldManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1362F0FF1B4D51F400E06D8C /* RCTTextFieldManager.m */; }; - 19FC5C851D41A4120090108F /* RCTTextSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 19FC5C841D41A4120090108F /* RCTTextSelection.m */; }; - 2D3B5F331D9B102D00451313 /* RCTTextSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 19FC5C841D41A4120090108F /* RCTTextSelection.m */; }; - 2D3B5F341D9B103100451313 /* RCTRawTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */; }; - 2D3B5F351D9B103300451313 /* RCTShadowRawText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */; }; - 2D3B5F371D9B106F00451313 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; }; - 2D3B5F381D9B106F00451313 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; }; - 2D3B5F391D9B106F00451313 /* RCTTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 1362F0FD1B4D51F400E06D8C /* RCTTextField.m */; }; - 2D3B5F3A1D9B106F00451313 /* RCTTextFieldManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1362F0FF1B4D51F400E06D8C /* RCTTextFieldManager.m */; }; - 2D3B5F3B1D9B106F00451313 /* RCTTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */; }; - 2D3B5F3C1D9B106F00451313 /* RCTTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */; }; - 5335D53F1FE8196200883D58 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 5335D53E1FE8196100883D58 /* RCTShadowText.m */; }; - 58B511CE1A9E6C5C00147676 /* RCTRawTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */; }; - 58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */; }; - 58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; }; - 58B512161A9E6EFF00147676 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; }; - 598F41261F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 598F41251F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m */; }; - 598F41271F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 598F41251F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m */; }; - 599DF25F1F0306660079B53E /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 599DF25D1F0304B30079B53E /* RCTBackedTextInputViewProtocol.h */; }; - 599DF2611F0306C30079B53E /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 599DF25D1F0304B30079B53E /* RCTBackedTextInputViewProtocol.h */; }; - 599DF2641F03076D0079B53E /* RCTTextInput.m in Sources */ = {isa = PBXBuildFile; fileRef = 599DF2631F03076D0079B53E /* RCTTextInput.m */; }; - 599DF2651F03076D0079B53E /* RCTTextInput.m in Sources */ = {isa = PBXBuildFile; fileRef = 599DF2631F03076D0079B53E /* RCTTextInput.m */; }; - 599DF2661F0307D10079B53E /* RCTTextInput.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 599DF2621F03076D0079B53E /* RCTTextInput.h */; }; - 599DF2671F0307D90079B53E /* RCTTextInput.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 599DF2621F03076D0079B53E /* RCTTextInput.h */; }; - 59AF89AA1EDCBCC700F004B1 /* RCTUITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59AF89A91EDCBCC700F004B1 /* RCTUITextField.m */; }; - 59AF89AB1EDCBCC700F004B1 /* RCTUITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59AF89A91EDCBCC700F004B1 /* RCTUITextField.m */; }; - 59B125C91E6E4E15004E2A67 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */; }; - 59B125CA1E6E4E15004E2A67 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */; }; + 59E604521FE9CAF100BD90C5 /* RCTTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6042F1FE9CAF100BD90C5 /* RCTTextShadowView.m */; }; + 59E604531FE9CAF100BD90C5 /* RCTTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6042F1FE9CAF100BD90C5 /* RCTTextShadowView.m */; }; + 59E604541FE9CAF100BD90C5 /* RCTTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604311FE9CAF100BD90C5 /* RCTTextView.m */; }; + 59E604551FE9CAF100BD90C5 /* RCTTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604311FE9CAF100BD90C5 /* RCTTextView.m */; }; + 59E604561FE9CAF100BD90C5 /* RCTTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604331FE9CAF100BD90C5 /* RCTTextViewManager.m */; }; + 59E604571FE9CAF100BD90C5 /* RCTTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604331FE9CAF100BD90C5 /* RCTTextViewManager.m */; }; + 59E604581FE9CAF100BD90C5 /* RCTRawTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604341FE9CAF100BD90C5 /* RCTRawTextShadowView.m */; }; + 59E604591FE9CAF100BD90C5 /* RCTRawTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604341FE9CAF100BD90C5 /* RCTRawTextShadowView.m */; }; + 59E6045A1FE9CAF100BD90C5 /* RCTRawTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604361FE9CAF100BD90C5 /* RCTRawTextViewManager.m */; }; + 59E6045B1FE9CAF100BD90C5 /* RCTRawTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604361FE9CAF100BD90C5 /* RCTRawTextViewManager.m */; }; + 59E6045C1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6043A1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m */; }; + 59E6045D1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6043A1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m */; }; + 59E6045E1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6043C1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m */; }; + 59E6045F1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6043C1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m */; }; + 59E604601FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6043E1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m */; }; + 59E604611FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6043E1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m */; }; + 59E604621FE9CAF100BD90C5 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604401FE9CAF100BD90C5 /* RCTUITextView.m */; }; + 59E604631FE9CAF100BD90C5 /* RCTUITextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604401FE9CAF100BD90C5 /* RCTUITextView.m */; }; + 59E604641FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604431FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m */; }; + 59E604651FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604431FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m */; }; + 59E604661FE9CAF100BD90C5 /* RCTBaseTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604461FE9CAF100BD90C5 /* RCTBaseTextInputView.m */; }; + 59E604671FE9CAF100BD90C5 /* RCTBaseTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604461FE9CAF100BD90C5 /* RCTBaseTextInputView.m */; }; + 59E604681FE9CAF100BD90C5 /* RCTTextSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604481FE9CAF100BD90C5 /* RCTTextSelection.m */; }; + 59E604691FE9CAF100BD90C5 /* RCTTextSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604481FE9CAF100BD90C5 /* RCTTextSelection.m */; }; + 59E6046A1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6044B1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m */; }; + 59E6046B1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6044B1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m */; }; + 59E6046C1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6044D1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m */; }; + 59E6046D1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6044D1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m */; }; + 59E6046E1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6044F1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m */; }; + 59E6046F1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6044F1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m */; }; + 59E604701FE9CAF100BD90C5 /* RCTUITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604511FE9CAF100BD90C5 /* RCTUITextField.m */; }; + 59E604711FE9CAF100BD90C5 /* RCTUITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E604511FE9CAF100BD90C5 /* RCTUITextField.m */; }; + 59E604721FE9CB3F00BD90C5 /* RCTConvert+Text.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = AF3225F71DE5574F00D3E7E7 /* RCTConvert+Text.h */; }; + 59E604731FE9CB3F00BD90C5 /* RCTFontAttributes.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = A85C82981F742AA20036C019 /* RCTFontAttributes.h */; }; + 59E604741FE9CB3F00BD90C5 /* RCTFontAttributesDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = A85C82BA1F742D8F0036C019 /* RCTFontAttributesDelegate.h */; }; + 59E604751FE9CB3F00BD90C5 /* RCTRawTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6042C1FE9CAF100BD90C5 /* RCTRawTextShadowView.h */; }; + 59E604761FE9CB3F00BD90C5 /* RCTRawTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604351FE9CAF100BD90C5 /* RCTRawTextViewManager.h */; }; + 59E604771FE9CB3F00BD90C5 /* RCTTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6042E1FE9CAF100BD90C5 /* RCTTextShadowView.h */; }; + 59E604781FE9CB3F00BD90C5 /* RCTTextView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604301FE9CAF100BD90C5 /* RCTTextView.h */; }; + 59E604791FE9CB3F00BD90C5 /* RCTTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604321FE9CAF100BD90C5 /* RCTTextViewManager.h */; }; + 59E6047A1FE9CB3F00BD90C5 /* RCTMultilineTextInputShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604391FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.h */; }; + 59E6047B1FE9CB3F00BD90C5 /* RCTMultilineTextInputView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6043B1FE9CAF100BD90C5 /* RCTMultilineTextInputView.h */; }; + 59E6047C1FE9CB3F00BD90C5 /* RCTMultilineTextInputViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6043D1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.h */; }; + 59E6047D1FE9CB3F00BD90C5 /* RCTUITextView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6043F1FE9CAF100BD90C5 /* RCTUITextView.h */; }; + 59E6047E1FE9CB3F00BD90C5 /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604411FE9CAF100BD90C5 /* RCTBackedTextInputDelegate.h */; }; + 59E6047F1FE9CB3F00BD90C5 /* RCTBackedTextInputDelegateAdapter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604421FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.h */; }; + 59E604801FE9CB3F00BD90C5 /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604441FE9CAF100BD90C5 /* RCTBackedTextInputViewProtocol.h */; }; + 59E604811FE9CB3F00BD90C5 /* RCTBaseTextInputView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604451FE9CAF100BD90C5 /* RCTBaseTextInputView.h */; }; + 59E604821FE9CB3F00BD90C5 /* RCTTextSelection.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604471FE9CAF100BD90C5 /* RCTTextSelection.h */; }; + 59E604831FE9CB3F00BD90C5 /* RCTSinglelineTextInputShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6044A1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.h */; }; + 59E604841FE9CB3F00BD90C5 /* RCTSinglelineTextInputView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6044C1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.h */; }; + 59E604851FE9CB3F00BD90C5 /* RCTSinglelineTextInputViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6044E1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.h */; }; + 59E604861FE9CB3F00BD90C5 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604501FE9CAF100BD90C5 /* RCTUITextField.h */; }; + 59E604871FE9CB4A00BD90C5 /* RCTConvert+Text.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = AF3225F71DE5574F00D3E7E7 /* RCTConvert+Text.h */; }; + 59E604881FE9CB4A00BD90C5 /* RCTFontAttributes.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = A85C82981F742AA20036C019 /* RCTFontAttributes.h */; }; + 59E604891FE9CB4A00BD90C5 /* RCTFontAttributesDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = A85C82BA1F742D8F0036C019 /* RCTFontAttributesDelegate.h */; }; + 59E6048A1FE9CB4A00BD90C5 /* RCTRawTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6042C1FE9CAF100BD90C5 /* RCTRawTextShadowView.h */; }; + 59E6048B1FE9CB4A00BD90C5 /* RCTRawTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604351FE9CAF100BD90C5 /* RCTRawTextViewManager.h */; }; + 59E6048C1FE9CB4A00BD90C5 /* RCTTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6042E1FE9CAF100BD90C5 /* RCTTextShadowView.h */; }; + 59E6048D1FE9CB4A00BD90C5 /* RCTTextView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604301FE9CAF100BD90C5 /* RCTTextView.h */; }; + 59E6048E1FE9CB4A00BD90C5 /* RCTTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604321FE9CAF100BD90C5 /* RCTTextViewManager.h */; }; + 59E6048F1FE9CB4A00BD90C5 /* RCTMultilineTextInputShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604391FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.h */; }; + 59E604901FE9CB4A00BD90C5 /* RCTMultilineTextInputView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6043B1FE9CAF100BD90C5 /* RCTMultilineTextInputView.h */; }; + 59E604911FE9CB4A00BD90C5 /* RCTMultilineTextInputViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6043D1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.h */; }; + 59E604921FE9CB4A00BD90C5 /* RCTUITextView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6043F1FE9CAF100BD90C5 /* RCTUITextView.h */; }; + 59E604931FE9CB4A00BD90C5 /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604411FE9CAF100BD90C5 /* RCTBackedTextInputDelegate.h */; }; + 59E604941FE9CB4A00BD90C5 /* RCTBackedTextInputDelegateAdapter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604421FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.h */; }; + 59E604951FE9CB4A00BD90C5 /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604441FE9CAF100BD90C5 /* RCTBackedTextInputViewProtocol.h */; }; + 59E604961FE9CB4A00BD90C5 /* RCTBaseTextInputView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604451FE9CAF100BD90C5 /* RCTBaseTextInputView.h */; }; + 59E604971FE9CB4A00BD90C5 /* RCTTextSelection.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604471FE9CAF100BD90C5 /* RCTTextSelection.h */; }; + 59E604981FE9CB4A00BD90C5 /* RCTSinglelineTextInputShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6044A1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.h */; }; + 59E604991FE9CB4A00BD90C5 /* RCTSinglelineTextInputView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6044C1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.h */; }; + 59E6049A1FE9CB4A00BD90C5 /* RCTSinglelineTextInputViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E6044E1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.h */; }; + 59E6049B1FE9CB4A00BD90C5 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 59E604501FE9CAF100BD90C5 /* RCTUITextField.h */; }; 59E8C5CC1F8833D100204F5E /* RCTFontAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = A85C82991F742AA20036C019 /* RCTFontAttributes.m */; }; - 59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; }; - 59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */; }; - 59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E901E661BDD0081153B /* RCTShadowTextView.m */; }; - 59F60E941E661BDD0081153B /* RCTShadowTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59F60E901E661BDD0081153B /* RCTShadowTextView.m */; }; A85C829A1F742AA20036C019 /* RCTFontAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = A85C82991F742AA20036C019 /* RCTFontAttributes.m */; }; AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; }; AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; }; @@ -55,8 +94,27 @@ dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( - 599DF2671F0307D90079B53E /* RCTTextInput.h in Copy Headers */, - 599DF25F1F0306660079B53E /* RCTBackedTextInputViewProtocol.h in Copy Headers */, + 59E604871FE9CB4A00BD90C5 /* RCTConvert+Text.h in Copy Headers */, + 59E604881FE9CB4A00BD90C5 /* RCTFontAttributes.h in Copy Headers */, + 59E604891FE9CB4A00BD90C5 /* RCTFontAttributesDelegate.h in Copy Headers */, + 59E6048A1FE9CB4A00BD90C5 /* RCTRawTextShadowView.h in Copy Headers */, + 59E6048B1FE9CB4A00BD90C5 /* RCTRawTextViewManager.h in Copy Headers */, + 59E6048C1FE9CB4A00BD90C5 /* RCTTextShadowView.h in Copy Headers */, + 59E6048D1FE9CB4A00BD90C5 /* RCTTextView.h in Copy Headers */, + 59E6048E1FE9CB4A00BD90C5 /* RCTTextViewManager.h in Copy Headers */, + 59E6048F1FE9CB4A00BD90C5 /* RCTMultilineTextInputShadowView.h in Copy Headers */, + 59E604901FE9CB4A00BD90C5 /* RCTMultilineTextInputView.h in Copy Headers */, + 59E604911FE9CB4A00BD90C5 /* RCTMultilineTextInputViewManager.h in Copy Headers */, + 59E604921FE9CB4A00BD90C5 /* RCTUITextView.h in Copy Headers */, + 59E604931FE9CB4A00BD90C5 /* RCTBackedTextInputDelegate.h in Copy Headers */, + 59E604941FE9CB4A00BD90C5 /* RCTBackedTextInputDelegateAdapter.h in Copy Headers */, + 59E604951FE9CB4A00BD90C5 /* RCTBackedTextInputViewProtocol.h in Copy Headers */, + 59E604961FE9CB4A00BD90C5 /* RCTBaseTextInputView.h in Copy Headers */, + 59E604971FE9CB4A00BD90C5 /* RCTTextSelection.h in Copy Headers */, + 59E604981FE9CB4A00BD90C5 /* RCTSinglelineTextInputShadowView.h in Copy Headers */, + 59E604991FE9CB4A00BD90C5 /* RCTSinglelineTextInputView.h in Copy Headers */, + 59E6049A1FE9CB4A00BD90C5 /* RCTSinglelineTextInputViewManager.h in Copy Headers */, + 59E6049B1FE9CB4A00BD90C5 /* RCTUITextField.h in Copy Headers */, ); name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; @@ -67,8 +125,27 @@ dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( - 599DF2661F0307D10079B53E /* RCTTextInput.h in Copy Headers */, - 599DF2611F0306C30079B53E /* RCTBackedTextInputViewProtocol.h in Copy Headers */, + 59E604721FE9CB3F00BD90C5 /* RCTConvert+Text.h in Copy Headers */, + 59E604731FE9CB3F00BD90C5 /* RCTFontAttributes.h in Copy Headers */, + 59E604741FE9CB3F00BD90C5 /* RCTFontAttributesDelegate.h in Copy Headers */, + 59E604751FE9CB3F00BD90C5 /* RCTRawTextShadowView.h in Copy Headers */, + 59E604761FE9CB3F00BD90C5 /* RCTRawTextViewManager.h in Copy Headers */, + 59E604771FE9CB3F00BD90C5 /* RCTTextShadowView.h in Copy Headers */, + 59E604781FE9CB3F00BD90C5 /* RCTTextView.h in Copy Headers */, + 59E604791FE9CB3F00BD90C5 /* RCTTextViewManager.h in Copy Headers */, + 59E6047A1FE9CB3F00BD90C5 /* RCTMultilineTextInputShadowView.h in Copy Headers */, + 59E6047B1FE9CB3F00BD90C5 /* RCTMultilineTextInputView.h in Copy Headers */, + 59E6047C1FE9CB3F00BD90C5 /* RCTMultilineTextInputViewManager.h in Copy Headers */, + 59E6047D1FE9CB3F00BD90C5 /* RCTUITextView.h in Copy Headers */, + 59E6047E1FE9CB3F00BD90C5 /* RCTBackedTextInputDelegate.h in Copy Headers */, + 59E6047F1FE9CB3F00BD90C5 /* RCTBackedTextInputDelegateAdapter.h in Copy Headers */, + 59E604801FE9CB3F00BD90C5 /* RCTBackedTextInputViewProtocol.h in Copy Headers */, + 59E604811FE9CB3F00BD90C5 /* RCTBaseTextInputView.h in Copy Headers */, + 59E604821FE9CB3F00BD90C5 /* RCTTextSelection.h in Copy Headers */, + 59E604831FE9CB3F00BD90C5 /* RCTSinglelineTextInputShadowView.h in Copy Headers */, + 59E604841FE9CB3F00BD90C5 /* RCTSinglelineTextInputView.h in Copy Headers */, + 59E604851FE9CB3F00BD90C5 /* RCTSinglelineTextInputViewManager.h in Copy Headers */, + 59E604861FE9CB3F00BD90C5 /* RCTUITextField.h in Copy Headers */, ); name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; @@ -76,42 +153,42 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 131B6ABC1AF0CD0600FFC3E0 /* RCTTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextView.h; sourceTree = ""; }; - 131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextView.m; sourceTree = ""; }; - 131B6ABE1AF0CD0600FFC3E0 /* RCTTextViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextViewManager.h; sourceTree = ""; }; - 131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextViewManager.m; sourceTree = ""; }; - 1362F0FC1B4D51F400E06D8C /* RCTTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextField.h; sourceTree = ""; }; - 1362F0FD1B4D51F400E06D8C /* RCTTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextField.m; sourceTree = ""; }; - 1362F0FE1B4D51F400E06D8C /* RCTTextFieldManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextFieldManager.h; sourceTree = ""; }; - 1362F0FF1B4D51F400E06D8C /* RCTTextFieldManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextFieldManager.m; sourceTree = ""; }; - 19FC5C841D41A4120090108F /* RCTTextSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextSelection.m; sourceTree = ""; }; - 19FC5C861D41A4220090108F /* RCTTextSelection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextSelection.h; sourceTree = ""; }; 2D2A287B1D9B048500D4039D /* libRCTText-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTText-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5335D53E1FE8196100883D58 /* RCTShadowText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowText.m; sourceTree = ""; }; 58B5119B1A9E6C1200147676 /* libRCTText.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTText.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 58B511C61A9E6C5C00147676 /* RCTRawTextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRawTextManager.h; sourceTree = ""; }; - 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRawTextManager.m; sourceTree = ""; }; - 58B511C81A9E6C5C00147676 /* RCTShadowRawText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowRawText.h; sourceTree = ""; }; - 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowRawText.m; sourceTree = ""; }; - 58B511CA1A9E6C5C00147676 /* RCTShadowText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowText.h; sourceTree = ""; }; - 58B511CC1A9E6C5C00147676 /* RCTTextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextManager.h; sourceTree = ""; }; - 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextManager.m; sourceTree = ""; }; - 58B512141A9E6EFF00147676 /* RCTText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTText.m; sourceTree = ""; }; - 58B512151A9E6EFF00147676 /* RCTText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTText.h; sourceTree = ""; }; - 598F41231F145D4900B8495B /* RCTBackedTextInputDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBackedTextInputDelegate.h; sourceTree = ""; }; - 598F41241F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBackedTextInputDelegateAdapter.h; sourceTree = ""; }; - 598F41251F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBackedTextInputDelegateAdapter.m; sourceTree = ""; }; - 599DF25D1F0304B30079B53E /* RCTBackedTextInputViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBackedTextInputViewProtocol.h; sourceTree = ""; }; - 599DF2621F03076D0079B53E /* RCTTextInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextInput.h; sourceTree = ""; }; - 599DF2631F03076D0079B53E /* RCTTextInput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextInput.m; sourceTree = ""; }; - 59AF89A81EDCBCC700F004B1 /* RCTUITextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUITextField.h; sourceTree = ""; }; - 59AF89A91EDCBCC700F004B1 /* RCTUITextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUITextField.m; sourceTree = ""; }; - 59B125C71E6E4E15004E2A67 /* RCTUITextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUITextView.h; sourceTree = ""; }; - 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUITextView.m; sourceTree = ""; }; - 59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextField.h; sourceTree = ""; }; - 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowTextField.m; sourceTree = ""; }; - 59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowTextView.h; sourceTree = ""; }; - 59F60E901E661BDD0081153B /* RCTShadowTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowTextView.m; sourceTree = ""; }; + 59E6042C1FE9CAF100BD90C5 /* RCTRawTextShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRawTextShadowView.h; sourceTree = ""; }; + 59E6042E1FE9CAF100BD90C5 /* RCTTextShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextShadowView.h; sourceTree = ""; }; + 59E6042F1FE9CAF100BD90C5 /* RCTTextShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextShadowView.m; sourceTree = ""; }; + 59E604301FE9CAF100BD90C5 /* RCTTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextView.h; sourceTree = ""; }; + 59E604311FE9CAF100BD90C5 /* RCTTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextView.m; sourceTree = ""; }; + 59E604321FE9CAF100BD90C5 /* RCTTextViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextViewManager.h; sourceTree = ""; }; + 59E604331FE9CAF100BD90C5 /* RCTTextViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextViewManager.m; sourceTree = ""; }; + 59E604341FE9CAF100BD90C5 /* RCTRawTextShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRawTextShadowView.m; sourceTree = ""; }; + 59E604351FE9CAF100BD90C5 /* RCTRawTextViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRawTextViewManager.h; sourceTree = ""; }; + 59E604361FE9CAF100BD90C5 /* RCTRawTextViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRawTextViewManager.m; sourceTree = ""; }; + 59E604391FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMultilineTextInputShadowView.h; sourceTree = ""; }; + 59E6043A1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultilineTextInputShadowView.m; sourceTree = ""; }; + 59E6043B1FE9CAF100BD90C5 /* RCTMultilineTextInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMultilineTextInputView.h; sourceTree = ""; }; + 59E6043C1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultilineTextInputView.m; sourceTree = ""; }; + 59E6043D1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMultilineTextInputViewManager.h; sourceTree = ""; }; + 59E6043E1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultilineTextInputViewManager.m; sourceTree = ""; }; + 59E6043F1FE9CAF100BD90C5 /* RCTUITextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUITextView.h; sourceTree = ""; }; + 59E604401FE9CAF100BD90C5 /* RCTUITextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUITextView.m; sourceTree = ""; }; + 59E604411FE9CAF100BD90C5 /* RCTBackedTextInputDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBackedTextInputDelegate.h; sourceTree = ""; }; + 59E604421FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBackedTextInputDelegateAdapter.h; sourceTree = ""; }; + 59E604431FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBackedTextInputDelegateAdapter.m; sourceTree = ""; }; + 59E604441FE9CAF100BD90C5 /* RCTBackedTextInputViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBackedTextInputViewProtocol.h; sourceTree = ""; }; + 59E604451FE9CAF100BD90C5 /* RCTBaseTextInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBaseTextInputView.h; sourceTree = ""; }; + 59E604461FE9CAF100BD90C5 /* RCTBaseTextInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBaseTextInputView.m; sourceTree = ""; }; + 59E604471FE9CAF100BD90C5 /* RCTTextSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextSelection.h; sourceTree = ""; }; + 59E604481FE9CAF100BD90C5 /* RCTTextSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextSelection.m; sourceTree = ""; }; + 59E6044A1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSinglelineTextInputShadowView.h; sourceTree = ""; }; + 59E6044B1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSinglelineTextInputShadowView.m; sourceTree = ""; }; + 59E6044C1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSinglelineTextInputView.h; sourceTree = ""; }; + 59E6044D1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSinglelineTextInputView.m; sourceTree = ""; }; + 59E6044E1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSinglelineTextInputViewManager.h; sourceTree = ""; }; + 59E6044F1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSinglelineTextInputViewManager.m; sourceTree = ""; }; + 59E604501FE9CAF100BD90C5 /* RCTUITextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUITextField.h; sourceTree = ""; }; + 59E604511FE9CAF100BD90C5 /* RCTUITextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUITextField.m; sourceTree = ""; }; A85C82981F742AA20036C019 /* RCTFontAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTFontAttributes.h; sourceTree = ""; }; A85C82991F742AA20036C019 /* RCTFontAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTFontAttributes.m; sourceTree = ""; }; A85C82BA1F742D8F0036C019 /* RCTFontAttributesDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTFontAttributesDelegate.h; sourceTree = ""; }; @@ -123,46 +200,18 @@ 58B511921A9E6C1200147676 = { isa = PBXGroup; children = ( - 5335D53E1FE8196100883D58 /* RCTShadowText.m */, 58B5119C1A9E6C1200147676 /* Products */, - 598F41231F145D4900B8495B /* RCTBackedTextInputDelegate.h */, - 598F41241F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.h */, - 598F41251F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m */, - 599DF25D1F0304B30079B53E /* RCTBackedTextInputViewProtocol.h */, AF3225F71DE5574F00D3E7E7 /* RCTConvert+Text.h */, AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */, A85C82981F742AA20036C019 /* RCTFontAttributes.h */, A85C82991F742AA20036C019 /* RCTFontAttributes.m */, A85C82BA1F742D8F0036C019 /* RCTFontAttributesDelegate.h */, - 58B511C61A9E6C5C00147676 /* RCTRawTextManager.h */, - 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */, - 58B511C81A9E6C5C00147676 /* RCTShadowRawText.h */, - 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */, - 58B511CA1A9E6C5C00147676 /* RCTShadowText.h */, - 59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */, - 59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */, - 59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */, - 59F60E901E661BDD0081153B /* RCTShadowTextView.m */, - 58B512151A9E6EFF00147676 /* RCTText.h */, - 58B512141A9E6EFF00147676 /* RCTText.m */, - 1362F0FC1B4D51F400E06D8C /* RCTTextField.h */, - 1362F0FD1B4D51F400E06D8C /* RCTTextField.m */, - 1362F0FE1B4D51F400E06D8C /* RCTTextFieldManager.h */, - 1362F0FF1B4D51F400E06D8C /* RCTTextFieldManager.m */, - 599DF2621F03076D0079B53E /* RCTTextInput.h */, - 599DF2631F03076D0079B53E /* RCTTextInput.m */, - 58B511CC1A9E6C5C00147676 /* RCTTextManager.h */, - 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */, - 19FC5C861D41A4220090108F /* RCTTextSelection.h */, - 19FC5C841D41A4120090108F /* RCTTextSelection.m */, - 131B6ABC1AF0CD0600FFC3E0 /* RCTTextView.h */, - 131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */, - 131B6ABE1AF0CD0600FFC3E0 /* RCTTextViewManager.h */, - 131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */, - 59AF89A81EDCBCC700F004B1 /* RCTUITextField.h */, - 59AF89A91EDCBCC700F004B1 /* RCTUITextField.m */, - 59B125C71E6E4E15004E2A67 /* RCTUITextView.h */, - 59B125C81E6E4E15004E2A67 /* RCTUITextView.m */, + 59E6042C1FE9CAF100BD90C5 /* RCTRawTextShadowView.h */, + 59E604341FE9CAF100BD90C5 /* RCTRawTextShadowView.m */, + 59E604351FE9CAF100BD90C5 /* RCTRawTextViewManager.h */, + 59E604361FE9CAF100BD90C5 /* RCTRawTextViewManager.m */, + 59E6042D1FE9CAF100BD90C5 /* Text */, + 59E604371FE9CAF100BD90C5 /* TextInput */, ); indentWidth = 2; sourceTree = ""; @@ -178,6 +227,66 @@ name = Products; sourceTree = ""; }; + 59E6042D1FE9CAF100BD90C5 /* Text */ = { + isa = PBXGroup; + children = ( + 59E6042E1FE9CAF100BD90C5 /* RCTTextShadowView.h */, + 59E6042F1FE9CAF100BD90C5 /* RCTTextShadowView.m */, + 59E604301FE9CAF100BD90C5 /* RCTTextView.h */, + 59E604311FE9CAF100BD90C5 /* RCTTextView.m */, + 59E604321FE9CAF100BD90C5 /* RCTTextViewManager.h */, + 59E604331FE9CAF100BD90C5 /* RCTTextViewManager.m */, + ); + path = Text; + sourceTree = ""; + }; + 59E604371FE9CAF100BD90C5 /* TextInput */ = { + isa = PBXGroup; + children = ( + 59E604381FE9CAF100BD90C5 /* Multiline */, + 59E604411FE9CAF100BD90C5 /* RCTBackedTextInputDelegate.h */, + 59E604421FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.h */, + 59E604431FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m */, + 59E604441FE9CAF100BD90C5 /* RCTBackedTextInputViewProtocol.h */, + 59E604451FE9CAF100BD90C5 /* RCTBaseTextInputView.h */, + 59E604461FE9CAF100BD90C5 /* RCTBaseTextInputView.m */, + 59E604471FE9CAF100BD90C5 /* RCTTextSelection.h */, + 59E604481FE9CAF100BD90C5 /* RCTTextSelection.m */, + 59E604491FE9CAF100BD90C5 /* Singleline */, + ); + path = TextInput; + sourceTree = ""; + }; + 59E604381FE9CAF100BD90C5 /* Multiline */ = { + isa = PBXGroup; + children = ( + 59E604391FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.h */, + 59E6043A1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m */, + 59E6043B1FE9CAF100BD90C5 /* RCTMultilineTextInputView.h */, + 59E6043C1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m */, + 59E6043D1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.h */, + 59E6043E1FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m */, + 59E6043F1FE9CAF100BD90C5 /* RCTUITextView.h */, + 59E604401FE9CAF100BD90C5 /* RCTUITextView.m */, + ); + path = Multiline; + sourceTree = ""; + }; + 59E604491FE9CAF100BD90C5 /* Singleline */ = { + isa = PBXGroup; + children = ( + 59E6044A1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.h */, + 59E6044B1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m */, + 59E6044C1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.h */, + 59E6044D1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m */, + 59E6044E1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.h */, + 59E6044F1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m */, + 59E604501FE9CAF100BD90C5 /* RCTUITextField.h */, + 59E604511FE9CAF100BD90C5 /* RCTUITextField.m */, + ); + path = Singleline; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -254,23 +363,24 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2D3B5F371D9B106F00451313 /* RCTText.m in Sources */, - 2D3B5F381D9B106F00451313 /* RCTTextManager.m in Sources */, - 2D3B5F391D9B106F00451313 /* RCTTextField.m in Sources */, - 2D3B5F3B1D9B106F00451313 /* RCTTextView.m in Sources */, - 59AF89AB1EDCBCC700F004B1 /* RCTUITextField.m in Sources */, - 598F41271F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m in Sources */, + 59E6046F1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m in Sources */, + 59E604671FE9CAF100BD90C5 /* RCTBaseTextInputView.m in Sources */, + 59E604631FE9CAF100BD90C5 /* RCTUITextView.m in Sources */, + 59E604571FE9CAF100BD90C5 /* RCTTextViewManager.m in Sources */, + 59E604531FE9CAF100BD90C5 /* RCTTextShadowView.m in Sources */, + 59E6045D1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m in Sources */, + 59E604591FE9CAF100BD90C5 /* RCTRawTextShadowView.m in Sources */, + 59E604551FE9CAF100BD90C5 /* RCTTextView.m in Sources */, + 59E604691FE9CAF100BD90C5 /* RCTTextSelection.m in Sources */, + 59E6045F1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m in Sources */, + 59E604611FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m in Sources */, + 59E604711FE9CAF100BD90C5 /* RCTUITextField.m in Sources */, + 59E6046D1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m in Sources */, 59E8C5CC1F8833D100204F5E /* RCTFontAttributes.m in Sources */, - 2D3B5F3A1D9B106F00451313 /* RCTTextFieldManager.m in Sources */, - 599DF2651F03076D0079B53E /* RCTTextInput.m in Sources */, - 2D3B5F341D9B103100451313 /* RCTRawTextManager.m in Sources */, - 59F60E921E661BDD0081153B /* RCTShadowTextField.m in Sources */, + 59E6045B1FE9CAF100BD90C5 /* RCTRawTextViewManager.m in Sources */, + 59E604651FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m in Sources */, AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */, - 59B125CA1E6E4E15004E2A67 /* RCTUITextView.m in Sources */, - 2D3B5F3C1D9B106F00451313 /* RCTTextViewManager.m in Sources */, - 59F60E941E661BDD0081153B /* RCTShadowTextView.m in Sources */, - 2D3B5F331D9B102D00451313 /* RCTTextSelection.m in Sources */, - 2D3B5F351D9B103300451313 /* RCTShadowRawText.m in Sources */, + 59E6046B1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -278,24 +388,24 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */, - 131B6AC01AF0CD0600FFC3E0 /* RCTTextView.m in Sources */, - 5335D53F1FE8196200883D58 /* RCTShadowText.m in Sources */, - 58B511CE1A9E6C5C00147676 /* RCTRawTextManager.m in Sources */, - 19FC5C851D41A4120090108F /* RCTTextSelection.m in Sources */, - 1362F1001B4D51F400E06D8C /* RCTTextField.m in Sources */, - 59AF89AA1EDCBCC700F004B1 /* RCTUITextField.m in Sources */, - 598F41261F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m in Sources */, + 59E6046E1FE9CAF100BD90C5 /* RCTSinglelineTextInputViewManager.m in Sources */, + 59E604661FE9CAF100BD90C5 /* RCTBaseTextInputView.m in Sources */, + 59E604621FE9CAF100BD90C5 /* RCTUITextView.m in Sources */, + 59E604561FE9CAF100BD90C5 /* RCTTextViewManager.m in Sources */, + 59E604521FE9CAF100BD90C5 /* RCTTextShadowView.m in Sources */, + 59E6045C1FE9CAF100BD90C5 /* RCTMultilineTextInputShadowView.m in Sources */, + 59E604581FE9CAF100BD90C5 /* RCTRawTextShadowView.m in Sources */, + 59E604541FE9CAF100BD90C5 /* RCTTextView.m in Sources */, + 59E604681FE9CAF100BD90C5 /* RCTTextSelection.m in Sources */, + 59E6045E1FE9CAF100BD90C5 /* RCTMultilineTextInputView.m in Sources */, + 59E604601FE9CAF100BD90C5 /* RCTMultilineTextInputViewManager.m in Sources */, + 59E604701FE9CAF100BD90C5 /* RCTUITextField.m in Sources */, + 59E6046C1FE9CAF100BD90C5 /* RCTSinglelineTextInputView.m in Sources */, A85C829A1F742AA20036C019 /* RCTFontAttributes.m in Sources */, - 58B512161A9E6EFF00147676 /* RCTText.m in Sources */, - 599DF2641F03076D0079B53E /* RCTTextInput.m in Sources */, - 1362F1011B4D51F400E06D8C /* RCTTextFieldManager.m in Sources */, - 59F60E911E661BDD0081153B /* RCTShadowTextField.m in Sources */, + 59E6045A1FE9CAF100BD90C5 /* RCTRawTextViewManager.m in Sources */, + 59E604641FE9CAF100BD90C5 /* RCTBackedTextInputDelegateAdapter.m in Sources */, AF3225F91DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */, - 59B125C91E6E4E15004E2A67 /* RCTUITextView.m in Sources */, - 131B6AC11AF0CD0600FFC3E0 /* RCTTextViewManager.m in Sources */, - 59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */, - 58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */, + 59E6046A1FE9CAF100BD90C5 /* RCTSinglelineTextInputShadowView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Libraries/Text/RCTShadowText.h b/Libraries/Text/Text/RCTTextShadowView.h similarity index 97% rename from Libraries/Text/RCTShadowText.h rename to Libraries/Text/Text/RCTTextShadowView.h index 5fece77fabbf7b..920f68bf7b510c 100644 --- a/Libraries/Text/RCTShadowText.h +++ b/Libraries/Text/Text/RCTTextShadowView.h @@ -21,7 +21,7 @@ typedef NS_ENUM(NSInteger, RCTSizeComparison) extern NSString *const RCTIsHighlightedAttributeName; extern NSString *const RCTReactTagAttributeName; -@interface RCTShadowText : RCTShadowView +@interface RCTTextShadowView : RCTShadowView @property (nonatomic, strong) UIColor *color; @property (nonatomic, strong) UIColor *backgroundColor; diff --git a/Libraries/Text/RCTShadowText.m b/Libraries/Text/Text/RCTTextShadowView.m similarity index 95% rename from Libraries/Text/RCTShadowText.m rename to Libraries/Text/Text/RCTTextShadowView.m index 426f043fb34ab9..db9ef04239db88 100644 --- a/Libraries/Text/RCTShadowText.m +++ b/Libraries/Text/Text/RCTTextShadowView.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowText.h" +#import "RCTTextShadowView.h" #import #import @@ -18,9 +18,9 @@ #import #import -#import "RCTShadowRawText.h" -#import "RCTText.h" +#import "RCTRawTextShadowView.h" #import "RCTTextView.h" +#import "RCTMultilineTextInputView.h" NSString *const RCTIsHighlightedAttributeName = @"IsHighlightedAttributeName"; NSString *const RCTReactTagAttributeName = @"ReactTagAttributeName"; @@ -31,7 +31,7 @@ static CGFloat const kAutoSizeHeightErrorMargin = 0.025f; static CGFloat const kAutoSizeGranularity = 0.001f; -@implementation RCTShadowText +@implementation RCTTextShadowView { NSTextStorage *_cachedTextStorage; CGFloat _cachedTextStorageWidth; @@ -43,7 +43,7 @@ @implementation RCTShadowText static YGSize RCTMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode) { - RCTShadowText *shadowText = (__bridge RCTShadowText *)YGNodeGetContext(node); + RCTTextShadowView *shadowText = (__bridge RCTTextShadowView *)YGNodeGetContext(node); NSTextStorage *textStorage = [shadowText buildTextStorageForWidth:width widthMode:widthMode]; [shadowText calculateTextFrame:textStorage]; NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject; @@ -109,7 +109,7 @@ - (void)contentSizeMultiplierDidChange:(NSNotification *)note - (NSDictionary *)processUpdatedProperties:(NSMutableSet *)applierBlocks parentProperties:(NSDictionary *)parentProperties { - if ([[self reactSuperview] isKindOfClass:[RCTShadowText class]]) { + if ([[self reactSuperview] isKindOfClass:[RCTTextShadowView class]]) { return parentProperties; } @@ -122,7 +122,7 @@ - (void)contentSizeMultiplierDidChange:(NSNotification *)note CGRect textFrame = [self calculateTextFrame:textStorage]; BOOL selectable = _selectable; [applierBlocks addObject:^(NSDictionary *viewRegistry) { - RCTText *view = (RCTText *)viewRegistry[self.reactTag]; + RCTTextView *view = (RCTTextView *)viewRegistry[self.reactTag]; view.textFrame = textFrame; view.textStorage = textStorage; view.selectable = selectable; @@ -130,14 +130,14 @@ - (void)contentSizeMultiplierDidChange:(NSNotification *)note /** * NOTE: this logic is included to support rich text editing inside multiline * `` controls. It is required in order to ensure that the - * textStorage (aka attributed string) is copied over from the RCTShadowText - * to the RCTText view in time to be used to update the editable text content. - * TODO: we should establish a delegate relationship betweeen RCTTextView - * and its contaned RCTText element when they get inserted and get rid of this + * textStorage (aka attributed string) is copied over from the RCTTextShadowView + * to the RCTTextView view in time to be used to update the editable text content. + * TODO: we should establish a delegate relationship betweeen RCTMultilineTextInputView + * and its contaned RCTTextView element when they get inserted and get rid of this */ UIView *parentView = viewRegistry[parentTag]; if ([parentView respondsToSelector:@selector(performTextUpdate)]) { - [(RCTTextView *)parentView performTextUpdate]; + [(RCTMultilineTextInputView *)parentView performTextUpdate]; } }]; @@ -308,8 +308,8 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily CGFloat heightOfTallestSubview = 0.0; NSMutableAttributedString *attributedString = [NSMutableAttributedString new]; for (RCTShadowView *child in [self reactSubviews]) { - if ([child isKindOfClass:[RCTShadowText class]]) { - RCTShadowText *shadowText = (RCTShadowText *)child; + if ([child isKindOfClass:[RCTTextShadowView class]]) { + RCTTextShadowView *shadowText = (RCTTextShadowView *)child; [attributedString appendAttributedString: [shadowText _attributedStringWithFontFamily:fontFamily fontSize:fontSize @@ -321,8 +321,8 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily backgroundColor:shadowText.backgroundColor ?: backgroundColor opacity:opacity * shadowText.opacity]]; [child setTextComputed]; - } else if ([child isKindOfClass:[RCTShadowRawText class]]) { - RCTShadowRawText *shadowRawText = (RCTShadowRawText *)child; + } else if ([child isKindOfClass:[RCTRawTextShadowView class]]) { + RCTRawTextShadowView *shadowRawText = (RCTRawTextShadowView *)child; [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:shadowRawText.text ?: @""]]; [child setTextComputed]; } else { @@ -340,7 +340,7 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily if (height > heightOfTallestSubview) { heightOfTallestSubview = height; } - // Don't call setTextComputed on this child. RCTTextManager takes care of + // Don't call setTextComputed on this child. RCTTextViewManager takes care of // processing inline UIViews. } } @@ -653,8 +653,8 @@ - (void)setAllowFontScaling:(BOOL)allowFontScaling { _allowFontScaling = allowFontScaling; for (RCTShadowView *child in [self reactSubviews]) { - if ([child isKindOfClass:[RCTShadowText class]]) { - ((RCTShadowText *)child).allowFontScaling = allowFontScaling; + if ([child isKindOfClass:[RCTTextShadowView class]]) { + ((RCTTextShadowView *)child).allowFontScaling = allowFontScaling; } } [self dirtyText]; @@ -668,8 +668,8 @@ - (void)setFontSizeMultiplier:(CGFloat)fontSizeMultiplier _fontSizeMultiplier = 1.0; } for (RCTShadowView *child in [self reactSubviews]) { - if ([child isKindOfClass:[RCTShadowText class]]) { - ((RCTShadowText *)child).fontSizeMultiplier = fontSizeMultiplier; + if ([child isKindOfClass:[RCTTextShadowView class]]) { + ((RCTTextShadowView *)child).fontSizeMultiplier = fontSizeMultiplier; } } [self dirtyText]; diff --git a/Libraries/Text/RCTText.h b/Libraries/Text/Text/RCTTextView.h similarity index 94% rename from Libraries/Text/RCTText.h rename to Libraries/Text/Text/RCTTextView.h index cff9c5c52dbb88..b1843cad235c52 100644 --- a/Libraries/Text/RCTText.h +++ b/Libraries/Text/Text/RCTTextView.h @@ -9,7 +9,7 @@ #import -@interface RCTText : UIView +@interface RCTTextView : UIView @property (nonatomic, assign) UIEdgeInsets contentInset; @property (nonatomic, strong) NSTextStorage *textStorage; diff --git a/Libraries/Text/RCTText.m b/Libraries/Text/Text/RCTTextView.m similarity index 96% rename from Libraries/Text/RCTText.m rename to Libraries/Text/Text/RCTTextView.m index c8a65ef2a93461..20554e17d881b2 100644 --- a/Libraries/Text/RCTText.m +++ b/Libraries/Text/Text/RCTTextView.m @@ -7,27 +7,27 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTText.h" +#import "RCTTextView.h" #import #import #import -#import "RCTShadowText.h" +#import "RCTTextShadowView.h" -static void collectNonTextDescendants(RCTText *view, NSMutableArray *nonTextDescendants) +static void collectNonTextDescendants(RCTTextView *view, NSMutableArray *nonTextDescendants) { for (UIView *child in view.reactSubviews) { - if ([child isKindOfClass:[RCTText class]]) { - collectNonTextDescendants((RCTText *)child, nonTextDescendants); + if ([child isKindOfClass:[RCTTextView class]]) { + collectNonTextDescendants((RCTTextView *)child, nonTextDescendants); } else if (!CGRectEqualToRect(child.frame, CGRectZero)) { [nonTextDescendants addObject:child]; } } } -@implementation RCTText +@implementation RCTTextView { NSTextStorage *_textStorage; CAShapeLayer *_highlightLayer; diff --git a/Libraries/Text/RCTTextViewManager.h b/Libraries/Text/Text/RCTTextViewManager.h similarity index 100% rename from Libraries/Text/RCTTextViewManager.h rename to Libraries/Text/Text/RCTTextViewManager.h diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/Text/RCTTextViewManager.m similarity index 73% rename from Libraries/Text/RCTTextManager.m rename to Libraries/Text/Text/RCTTextViewManager.m index fd0b08d2def970..83dcedfb7f1eb6 100644 --- a/Libraries/Text/RCTTextManager.m +++ b/Libraries/Text/Text/RCTTextViewManager.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTTextManager.h" +#import "RCTTextViewManager.h" #import #import @@ -17,16 +17,16 @@ #import #import -#import "RCTShadowRawText.h" -#import "RCTShadowText.h" -#import "RCTText.h" +#import "RCTRawTextShadowView.h" +#import "RCTTextShadowView.h" #import "RCTTextView.h" +#import "RCTMultilineTextInputView.h" -static void collectDirtyNonTextDescendants(RCTShadowText *shadowView, NSMutableArray *nonTextDescendants) { +static void collectDirtyNonTextDescendants(RCTTextShadowView *shadowView, NSMutableArray *nonTextDescendants) { for (RCTShadowView *child in shadowView.reactSubviews) { - if ([child isKindOfClass:[RCTShadowText class]]) { - collectDirtyNonTextDescendants((RCTShadowText *)child, nonTextDescendants); - } else if ([child isKindOfClass:[RCTShadowRawText class]]) { + if ([child isKindOfClass:[RCTTextShadowView class]]) { + collectDirtyNonTextDescendants((RCTTextShadowView *)child, nonTextDescendants); + } else if ([child isKindOfClass:[RCTRawTextShadowView class]]) { // no-op } else if ([child isTextDirty]) { [nonTextDescendants addObject:child]; @@ -34,25 +34,25 @@ static void collectDirtyNonTextDescendants(RCTShadowText *shadowView, NSMutableA } } -@interface RCTShadowText (Private) +@interface RCTTextShadowView (Private) - (NSTextStorage *)buildTextStorageForWidth:(CGFloat)width widthMode:(YGMeasureMode)widthMode; @end -@implementation RCTTextManager +@implementation RCTTextViewManager -RCT_EXPORT_MODULE() +RCT_EXPORT_MODULE(RCTText) - (UIView *)view { - return [RCTText new]; + return [RCTTextView new]; } - (RCTShadowView *)shadowView { - return [RCTShadowText new]; + return [RCTTextShadowView new]; } #pragma mark - Shadow properties @@ -101,13 +101,13 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(NSDictionary tag. Not rendering string: '%@'", - [(RCTShadowRawText *)shadowView text]); + [(RCTRawTextShadowView *)shadowView text]); } else { for (RCTShadowView *child in [shadowView reactSubviews]) { if ([child isTextDirty]) { @@ -123,13 +123,13 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(NSDictionary *viewRegistry) { - RCTText *text = viewRegistry[reactTag]; + return ^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTTextView *text = viewRegistry[reactTag]; text.contentInset = padding; }; } diff --git a/Libraries/Text/RCTShadowTextView.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.h similarity index 85% rename from Libraries/Text/RCTShadowTextView.h rename to Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.h index e2c6f1e7ed45db..27198d9dbff864 100644 --- a/Libraries/Text/RCTShadowTextView.h +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.h @@ -9,6 +9,6 @@ #import -@interface RCTShadowTextView : RCTShadowView +@interface RCTMultilineTextInputShadowView : RCTShadowView @end diff --git a/Libraries/Text/RCTShadowTextView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.m similarity index 79% rename from Libraries/Text/RCTShadowTextView.m rename to Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.m index d3e3602edc4073..875f9bb1c02824 100644 --- a/Libraries/Text/RCTShadowTextView.m +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputShadowView.m @@ -7,9 +7,9 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowTextView.h" +#import "RCTMultilineTextInputShadowView.h" -@implementation RCTShadowTextView +@implementation RCTMultilineTextInputShadowView - (BOOL)isYogaLeafNode { diff --git a/Libraries/Text/RCTTextView.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h similarity index 92% rename from Libraries/Text/RCTTextView.h rename to Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h index 09c67faba6adaf..8a55a7a7c99211 100644 --- a/Libraries/Text/RCTTextView.h +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.h @@ -12,11 +12,11 @@ #import #import -#import "RCTTextInput.h" +#import "RCTBaseTextInputView.h" @class RCTBridge; -@interface RCTTextView : RCTTextInput +@interface RCTMultilineTextInputView : RCTBaseTextInputView @property (nonatomic, assign) UITextAutocorrectionType autocorrectionType; @property (nonatomic, assign) UITextSpellCheckingType spellCheckingType; diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m similarity index 97% rename from Libraries/Text/RCTTextView.m rename to Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m index f3f19067c0bc49..a37738bade1df2 100644 --- a/Libraries/Text/RCTTextView.m +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTTextView.h" +#import "RCTMultilineTextInputView.h" #import #import @@ -16,19 +16,19 @@ #import #import -#import "RCTShadowText.h" -#import "RCTText.h" +#import "RCTTextShadowView.h" +#import "RCTTextView.h" #import "RCTTextSelection.h" #import "RCTUITextView.h" -@interface RCTTextView () +@interface RCTMultilineTextInputView () @end -@implementation RCTTextView +@implementation RCTMultilineTextInputView { RCTUITextView *_backedTextInput; - RCTText *_richTextView; + RCTTextView *_richTextView; NSAttributedString *_pendingAttributedText; NSString *_predictedText; @@ -77,11 +77,11 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)index { [super insertReactSubview:subview atIndex:index]; - if ([subview isKindOfClass:[RCTText class]]) { + if ([subview isKindOfClass:[RCTTextView class]]) { if (_richTextView) { RCTLogError(@"Tried to insert a second into - there can only be one."); } - _richTextView = (RCTText *)subview; + _richTextView = (RCTTextView *)subview; // If this is in rich text editing mode, and the child node providing rich text // styling has a backgroundColor, then the attributedText produced by the child node will have an diff --git a/Libraries/Text/RCTTextFieldManager.h b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h similarity index 85% rename from Libraries/Text/RCTTextFieldManager.h rename to Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h index f4778122a2e94e..df3617d537f753 100644 --- a/Libraries/Text/RCTTextFieldManager.h +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.h @@ -9,6 +9,6 @@ #import -@interface RCTTextFieldManager : RCTViewManager +@interface RCTMultilineTextInputViewManager : RCTViewManager @end diff --git a/Libraries/Text/RCTTextViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m similarity index 90% rename from Libraries/Text/RCTTextViewManager.m rename to Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m index 814f2070f7b4b6..328b2e77ead4b4 100644 --- a/Libraries/Text/RCTTextViewManager.m +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTTextViewManager.h" +#import "RCTMultilineTextInputViewManager.h" #import #import @@ -16,21 +16,21 @@ #import #import "RCTConvert+Text.h" -#import "RCTShadowTextView.h" -#import "RCTTextView.h" +#import "RCTMultilineTextInputShadowView.h" +#import "RCTMultilineTextInputView.h" -@implementation RCTTextViewManager +@implementation RCTMultilineTextInputViewManager RCT_EXPORT_MODULE() - (RCTShadowView *)shadowView { - return [RCTShadowTextView new]; + return [RCTMultilineTextInputShadowView new]; } - (UIView *)view { - return [[RCTTextView alloc] initWithBridge:self.bridge]; + return [[RCTMultilineTextInputView alloc] initWithBridge:self.bridge]; } #pragma mark - Unified properties @@ -80,8 +80,8 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowView:(RCTShadowView *)shadowVie NSNumber *reactTag = shadowView.reactTag; UIEdgeInsets borderAsInsets = shadowView.borderAsInsets; UIEdgeInsets paddingAsInsets = shadowView.paddingAsInsets; - return ^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTTextInput *view = viewRegistry[reactTag]; + return ^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTBaseTextInputView *view = viewRegistry[reactTag]; view.reactBorderInsets = borderAsInsets; view.reactPaddingInsets = paddingAsInsets; }; diff --git a/Libraries/Text/RCTUITextView.h b/Libraries/Text/TextInput/Multiline/RCTUITextView.h similarity index 100% rename from Libraries/Text/RCTUITextView.h rename to Libraries/Text/TextInput/Multiline/RCTUITextView.h diff --git a/Libraries/Text/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m similarity index 100% rename from Libraries/Text/RCTUITextView.m rename to Libraries/Text/TextInput/Multiline/RCTUITextView.m diff --git a/Libraries/Text/RCTBackedTextInputDelegate.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h similarity index 100% rename from Libraries/Text/RCTBackedTextInputDelegate.h rename to Libraries/Text/TextInput/RCTBackedTextInputDelegate.h diff --git a/Libraries/Text/RCTBackedTextInputDelegateAdapter.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h similarity index 100% rename from Libraries/Text/RCTBackedTextInputDelegateAdapter.h rename to Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h diff --git a/Libraries/Text/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m similarity index 100% rename from Libraries/Text/RCTBackedTextInputDelegateAdapter.m rename to Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m diff --git a/Libraries/Text/RCTBackedTextInputViewProtocol.h b/Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h similarity index 100% rename from Libraries/Text/RCTBackedTextInputViewProtocol.h rename to Libraries/Text/TextInput/RCTBackedTextInputViewProtocol.h diff --git a/Libraries/Text/RCTTextInput.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h similarity index 96% rename from Libraries/Text/RCTTextInput.h rename to Libraries/Text/TextInput/RCTBaseTextInputView.h index 505379d3754ca6..3176c6e30bd749 100644 --- a/Libraries/Text/RCTTextInput.h +++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h @@ -19,7 +19,7 @@ @class RCTEventDispatcher; @class RCTTextSelection; -@interface RCTTextInput : RCTView { +@interface RCTBaseTextInputView : RCTView { @protected __weak RCTBridge *_bridge; RCTEventDispatcher *_eventDispatcher; diff --git a/Libraries/Text/RCTTextInput.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m similarity index 98% rename from Libraries/Text/RCTTextInput.m rename to Libraries/Text/TextInput/RCTBaseTextInputView.m index 8cf7ff60895cd5..855f3b7ecb704e 100644 --- a/Libraries/Text/RCTTextInput.m +++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTTextInput.h" +#import "RCTBaseTextInputView.h" #import #import @@ -19,7 +19,7 @@ #import "RCTTextSelection.h" -@implementation RCTTextInput { +@implementation RCTBaseTextInputView { CGSize _previousContentSize; BOOL _hasInputAccesoryView; } @@ -44,7 +44,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge - (id)backedTextInputView { - RCTAssert(NO, @"-[RCTTextInput backedTextInputView] must be implemented in subclass."); + RCTAssert(NO, @"-[RCTBaseTextInputView backedTextInputView] must be implemented in subclass."); return nil; } diff --git a/Libraries/Text/RCTTextSelection.h b/Libraries/Text/TextInput/RCTTextSelection.h similarity index 100% rename from Libraries/Text/RCTTextSelection.h rename to Libraries/Text/TextInput/RCTTextSelection.h diff --git a/Libraries/Text/RCTTextSelection.m b/Libraries/Text/TextInput/RCTTextSelection.m similarity index 100% rename from Libraries/Text/RCTTextSelection.m rename to Libraries/Text/TextInput/RCTTextSelection.m diff --git a/Libraries/Text/RCTShadowTextField.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputShadowView.h similarity index 85% rename from Libraries/Text/RCTShadowTextField.h rename to Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputShadowView.h index 543f7fb349a0ef..bcea71eeee7f64 100644 --- a/Libraries/Text/RCTShadowTextField.h +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputShadowView.h @@ -9,6 +9,6 @@ #import -@interface RCTShadowTextField : RCTShadowView +@interface RCTSinglelineTextInputShadowView : RCTShadowView @end diff --git a/Libraries/Text/RCTShadowTextField.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputShadowView.m similarity index 79% rename from Libraries/Text/RCTShadowTextField.m rename to Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputShadowView.m index 3bc5929dc49c37..fc50fc9bb3c0d4 100644 --- a/Libraries/Text/RCTShadowTextField.m +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputShadowView.m @@ -7,9 +7,9 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowTextField.h" +#import "RCTSinglelineTextInputShadowView.h" -@implementation RCTShadowTextField +@implementation RCTSinglelineTextInputShadowView - (BOOL)isYogaLeafNode { diff --git a/Libraries/Text/RCTTextField.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h similarity index 84% rename from Libraries/Text/RCTTextField.h rename to Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h index 975c926b2ab00b..5054ffbfc4ded6 100644 --- a/Libraries/Text/RCTTextField.h +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.h @@ -12,11 +12,11 @@ #import #import -#import "RCTTextInput.h" +#import "RCTBaseTextInputView.h" @class RCTUITextField; -@interface RCTTextField : RCTTextInput +@interface RCTSinglelineTextInputView : RCTBaseTextInputView @property (nonatomic, assign) BOOL caretHidden; @property (nonatomic, strong) NSNumber *maxLength; diff --git a/Libraries/Text/RCTTextField.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m similarity index 97% rename from Libraries/Text/RCTTextField.m rename to Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m index e6addcaf155708..1c51fe07000518 100644 --- a/Libraries/Text/RCTTextField.m +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTTextField.h" +#import "RCTSinglelineTextInputView.h" #import #import @@ -21,11 +21,11 @@ #import "RCTTextSelection.h" #import "RCTUITextField.h" -@interface RCTTextField () +@interface RCTSinglelineTextInputView () @end -@implementation RCTTextField +@implementation RCTSinglelineTextInputView { RCTUITextField *_backedTextInput; BOOL _submitted; diff --git a/Libraries/Text/RCTTextManager.h b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h similarity index 84% rename from Libraries/Text/RCTTextManager.h rename to Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h index 0d286d53885ec8..3cd86bab289fbf 100644 --- a/Libraries/Text/RCTTextManager.h +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.h @@ -9,6 +9,6 @@ #import -@interface RCTTextManager : RCTViewManager +@interface RCTSinglelineTextInputViewManager : RCTViewManager @end diff --git a/Libraries/Text/RCTTextFieldManager.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m similarity index 89% rename from Libraries/Text/RCTTextFieldManager.m rename to Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m index 7e0d1dc2492927..ff7511884a4970 100644 --- a/Libraries/Text/RCTTextFieldManager.m +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTTextFieldManager.h" +#import "RCTSinglelineTextInputViewManager.h" #import #import @@ -15,22 +15,22 @@ #import #import "RCTConvert+Text.h" -#import "RCTShadowTextField.h" -#import "RCTTextField.h" +#import "RCTSinglelineTextInputShadowView.h" +#import "RCTSinglelineTextInputView.h" #import "RCTUITextField.h" -@implementation RCTTextFieldManager +@implementation RCTSinglelineTextInputViewManager RCT_EXPORT_MODULE() - (RCTShadowView *)shadowView { - return [RCTShadowTextField new]; + return [RCTSinglelineTextInputShadowView new]; } - (UIView *)view { - return [[RCTTextField alloc] initWithBridge:self.bridge]; + return [[RCTSinglelineTextInputView alloc] initWithBridge:self.bridge]; } #pragma mark - Unified properties @@ -74,8 +74,8 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowView:(RCTShadowView *)shadowVie NSNumber *reactTag = shadowView.reactTag; UIEdgeInsets borderAsInsets = shadowView.borderAsInsets; UIEdgeInsets paddingAsInsets = shadowView.paddingAsInsets; - return ^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTTextInput *view = viewRegistry[reactTag]; + return ^(RCTUIManager *uiManager, NSDictionary *viewRegistry) { + RCTBaseTextInputView *view = viewRegistry[reactTag]; view.reactBorderInsets = borderAsInsets; view.reactPaddingInsets = paddingAsInsets; }; diff --git a/Libraries/Text/RCTUITextField.h b/Libraries/Text/TextInput/Singleline/RCTUITextField.h similarity index 100% rename from Libraries/Text/RCTUITextField.h rename to Libraries/Text/TextInput/Singleline/RCTUITextField.h diff --git a/Libraries/Text/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m similarity index 100% rename from Libraries/Text/RCTUITextField.m rename to Libraries/Text/TextInput/Singleline/RCTUITextField.m diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 74817a90a5550d..78dce677280e6b 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -1082,6 +1082,14 @@ 59D031FA1F8353D3008361F0 /* RCTSafeAreaViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59D031EB1F8353D3008361F0 /* RCTSafeAreaViewManager.h */; }; 59D031FB1F8353D3008361F0 /* RCTSafeAreaViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59D031EC1F8353D3008361F0 /* RCTSafeAreaViewManager.m */; }; 59D031FC1F8353D3008361F0 /* RCTSafeAreaViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59D031EC1F8353D3008361F0 /* RCTSafeAreaViewManager.m */; }; + 59E604A01FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */; }; + 59E604A11FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */; }; + 59E604A21FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */; }; + 59E604A31FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */; }; + 59E604A41FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */; }; + 59E604A51FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */; }; + 59E604A61FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */; }; + 59E604A71FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */; }; 59EB6DBB1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */; }; 59EB6DBC1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = 59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */; }; 59EB6DBD1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 59EB6DBA1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm */; }; @@ -2192,6 +2200,10 @@ 59D031EA1F8353D3008361F0 /* RCTSafeAreaViewLocalData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSafeAreaViewLocalData.m; sourceTree = ""; }; 59D031EB1F8353D3008361F0 /* RCTSafeAreaViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSafeAreaViewManager.h; sourceTree = ""; }; 59D031EC1F8353D3008361F0 /* RCTSafeAreaViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSafeAreaViewManager.m; sourceTree = ""; }; + 59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollContentShadowView.h; sourceTree = ""; }; + 59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTScrollContentViewManager.m; sourceTree = ""; }; + 59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTScrollContentShadowView.m; sourceTree = ""; }; + 59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollContentViewManager.h; sourceTree = ""; }; 59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUIManagerObserverCoordinator.h; sourceTree = ""; }; 59EB6DBA1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTUIManagerObserverCoordinator.mm; sourceTree = ""; }; 59EDBC9C1FDF4E0C003573DE /* RCTScrollableProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTScrollableProtocol.h; sourceTree = ""; }; @@ -2805,8 +2817,12 @@ isa = PBXGroup; children = ( 59EDBC9C1FDF4E0C003573DE /* RCTScrollableProtocol.h */, + 59E6049C1FE9CCE100BD90C5 /* RCTScrollContentShadowView.h */, + 59E6049E1FE9CCE200BD90C5 /* RCTScrollContentShadowView.m */, 59EDBC9F1FDF4E0C003573DE /* RCTScrollContentView.h */, 59EDBCA01FDF4E0C003573DE /* RCTScrollContentView.m */, + 59E6049F1FE9CCE200BD90C5 /* RCTScrollContentViewManager.h */, + 59E6049D1FE9CCE200BD90C5 /* RCTScrollContentViewManager.m */, 59EDBCA31FDF4E0C003573DE /* RCTScrollView.h */, 59EDBCA41FDF4E0C003573DE /* RCTScrollView.m */, 59EDBCA51FDF4E0C003573DE /* RCTScrollViewManager.h */, @@ -3210,6 +3226,7 @@ 66CD94B21F1045E700CB3C7C /* RCTMaskedView.h in Headers */, 3D302F8D1DF828F800D6DDAE /* RCTSegmentedControlManager.h in Headers */, 3D302F8E1DF828F800D6DDAE /* RCTShadowView.h in Headers */, + 59E604A11FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */, 3D302F8F1DF828F800D6DDAE /* RCTSlider.h in Headers */, 3D302F901DF828F800D6DDAE /* RCTSliderManager.h in Headers */, 3D302F911DF828F800D6DDAE /* RCTSwitch.h in Headers */, @@ -3219,6 +3236,7 @@ 3D302F951DF828F800D6DDAE /* RCTTabBarItemManager.h in Headers */, 59EDBCAE1FDF4E0C003573DE /* RCTScrollContentView.h in Headers */, 3D302F961DF828F800D6DDAE /* RCTTabBarManager.h in Headers */, + 59E604A71FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */, 3D302F971DF828F800D6DDAE /* RCTTextDecorationLineType.h in Headers */, 3D302F981DF828F800D6DDAE /* RCTView.h in Headers */, 3D302F991DF828F800D6DDAE /* RCTViewControllerProtocol.h in Headers */, @@ -3445,6 +3463,7 @@ 3D80DA3F1DF820620028D040 /* RCTRootViewInternal.h in Headers */, 3D80DA401DF820620028D040 /* RCTTouchEvent.h in Headers */, 3D80DA411DF820620028D040 /* RCTTouchHandler.h in Headers */, + 59E604A61FE9CCE300BD90C5 /* RCTScrollContentViewManager.h in Headers */, 13134C8C1E296B2A00B9F3CB /* RCTMessageThread.h in Headers */, 59EB6DBB1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h in Headers */, 3D80DA421DF820620028D040 /* RCTURLRequestDelegate.h in Headers */, @@ -3475,6 +3494,7 @@ 3D80DA5A1DF820620028D040 /* RCTUIManager.h in Headers */, 3D80DA5B1DF820620028D040 /* RCTFPSGraph.h in Headers */, FEFAAC9F1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.h in Headers */, + 59E604A01FE9CCE300BD90C5 /* RCTScrollContentShadowView.h in Headers */, 3D80DA5D1DF820620028D040 /* RCTMacros.h in Headers */, 3D80DA5E1DF820620028D040 /* RCTProfile.h in Headers */, 3D80DA5F1DF820620028D040 /* RCTActivityIndicatorView.h in Headers */, @@ -4108,6 +4128,7 @@ 2D3B5EE31D9B09B700451313 /* RCTSegmentedControl.m in Sources */, 130443A41E3FEAC600D93A67 /* RCTFollyConvert.mm in Sources */, 3D7BFD201EA8E351008DFB7A /* RCTPackagerConnection.mm in Sources */, + 59E604A51FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */, 5960C1B81F0804A00066FD5B /* RCTLayoutAnimation.m in Sources */, 2D3B5EB71D9B091800451313 /* RCTRedBox.m in Sources */, 3D7AA9C61E548CDD001955CF /* NSDataBigString.mm in Sources */, @@ -4142,6 +4163,7 @@ EBF21C001FC499A80052F4D5 /* InspectorInterfaces.cpp in Sources */, 597633371F4E021D005BE8A4 /* RCTShadowView+Internal.m in Sources */, 2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */, + 59E604A31FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */, 1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */, 2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */, 2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */, @@ -4374,6 +4396,7 @@ C60128AD1F3D1258009DF9FF /* RCTCxxConvert.m in Sources */, 83CBBA511A601E3B00E9B192 /* RCTAssert.m in Sources */, 59EB6DBD1EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.mm in Sources */, + 59E604A21FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */, 13AF20451AE707F9005F5298 /* RCTSlider.m in Sources */, 130443A21E3FEAA900D93A67 /* RCTFollyConvert.mm in Sources */, 58114A501AAE93D500E7D092 /* RCTAsyncLocalStorage.m in Sources */, @@ -4402,6 +4425,7 @@ 14F7A0EC1BDA3B3C003C6C10 /* RCTPerfMonitor.m in Sources */, 5960C1B71F0804A00066FD5B /* RCTLayoutAnimation.m in Sources */, 13134C9E1E296B2A00B9F3CB /* RCTCxxModule.mm in Sources */, + 59E604A41FE9CCE300BD90C5 /* RCTScrollContentShadowView.m in Sources */, 1450FF881BCFF28A00208362 /* RCTProfileTrampoline-arm64.S in Sources */, 13E41EEB1C05CA0B00CD8DAC /* RCTProfileTrampoline-i386.S in Sources */, 3D37B5821D522B190042D5B5 /* RCTFont.mm in Sources */, diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h index 0e2c2771dc7b15..db05a85a512fba 100644 --- a/React/Views/RCTShadowView.h +++ b/React/Views/RCTShadowView.h @@ -246,7 +246,7 @@ typedef void (^RCTApplierBlock)(NSDictionary *viewRegistry /** * Returns whether or not this node acts as a leaf node in the eyes of Yoga. - * For example `RCTShadowText` has children which it does not want Yoga + * For example `RCTTextShadowView` has children which it does not want Yoga * to lay out so in the eyes of Yoga it is a leaf node. * Defaults to `NO`. Can be overridden in subclasses. * Don't confuse this with `canHaveSubviews`. diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m index b86bf176f56f18..404dddd3a6a864 100644 --- a/React/Views/RCTShadowView.m +++ b/React/Views/RCTShadowView.m @@ -298,7 +298,7 @@ - (void)collectUpdatedFrames:(NSMutableSet *)viewsWithNewFrame hidden:(BOOL)hidden absolutePosition:(CGPoint)absolutePosition { - // This is not the core layout method. It is only used by RCTShadowText to layout + // This is not the core layout method. It is only used by RCTTextShadowView to layout // nested views. if (_hidden != hidden) {