Skip to content

Commit 7fad1ea

Browse files
committed
support both arch
1 parent dc40eec commit 7fad1ea

2 files changed

Lines changed: 26 additions & 24 deletions

File tree

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -814,35 +814,35 @@ static BOOL findMismatch(NSString *first, NSString *second, NSRange *firstRange,
814814
return YES;
815815
}
816816

817-
BOOL _isFirstRender = YES;
818-
NSArray<UIBarButtonItemGroup *> *_initialValueLeadingBarButtonGroups;
819-
NSArray<UIBarButtonItemGroup *> *_initialValueTrailingBarButtonGroups;
820-
821817
- (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
822818
{
819+
static BOOL isFirstRender = YES;
820+
static NSArray<UIBarButtonItemGroup *> *initialValueLeadingBarButtonGroups;
821+
static NSArray<UIBarButtonItemGroup *> *initialValueTrailingBarButtonGroups;
822+
823823
// Log the call to this method
824824
NSLog(@"RCTBaseTextInputView setDisableKeyboardShortcuts called with value: %d", disableKeyboardShortcuts);
825-
NSLog(@"RCTBaseTextInputView isFirstRender: %d", _isFirstRender);
825+
NSLog(@"RCTBaseTextInputView isFirstRender: %d", isFirstRender);
826826

827827
// Initialize the initial values only once
828-
if (_isFirstRender) {
829-
_isFirstRender = NO;
828+
if (isFirstRender) {
829+
isFirstRender = NO;
830830
// Capture initial values of leading and trailing button groups
831-
_initialValueLeadingBarButtonGroups = self.backedTextInputView.inputView.inputAssistantItem.leadingBarButtonGroups;
832-
_initialValueTrailingBarButtonGroups = self.backedTextInputView.inputView.inputAssistantItem.trailingBarButtonGroups;
831+
initialValueLeadingBarButtonGroups = self.backedTextInputView.inputAssistantItem.leadingBarButtonGroups;
832+
initialValueTrailingBarButtonGroups = self.backedTextInputView.inputAssistantItem.trailingBarButtonGroups;
833+
834+
// Optionally, log the initial values for verification
835+
NSLog(@"Initial Leading Bar Button Groups: %@", initialValueLeadingBarButtonGroups);
836+
NSLog(@"Initial Trailing Bar Button Groups: %@", initialValueTrailingBarButtonGroups);
833837
}
834838

835-
// Optionally, log the initial values for verification
836-
NSLog(@"Initial Leading Bar Button Groups: %@", _initialValueLeadingBarButtonGroups);
837-
NSLog(@"Initial Trailing Bar Button Groups: %@", _initialValueTrailingBarButtonGroups);
838-
839839
if (disableKeyboardShortcuts) {
840-
self.backedTextInputView.inputView.inputAssistantItem.leadingBarButtonGroups = @[];
841-
self.backedTextInputView.inputView.inputAssistantItem.trailingBarButtonGroups = @[];
842-
} else {
840+
self.backedTextInputView.inputAssistantItem.leadingBarButtonGroups = @[];
841+
self.backedTextInputView.inputAssistantItem.trailingBarButtonGroups = @[];
842+
}else {
843843
// Restore the initial values
844-
self.backedTextInputView.inputView.inputAssistantItem.leadingBarButtonGroups = _initialValueLeadingBarButtonGroups;
845-
self.backedTextInputView.inputView.inputAssistantItem.trailingBarButtonGroups = _initialValueTrailingBarButtonGroups;
844+
self.backedTextInputView.inputAssistantItem.leadingBarButtonGroups = initialValueLeadingBarButtonGroups;
845+
self.backedTextInputView.inputAssistantItem.trailingBarButtonGroups = initialValueTrailingBarButtonGroups;
846846
}
847847
}
848848

packages/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ - (BOOL)disableKeyboardShortcuts
123123
return self.disableKeyboardShortcuts;
124124
}
125125

126-
BOOL isFirstRender = YES;
127-
NSArray<UIBarButtonItemGroup *> *initialValueLeadingBarButtonGroups;
128-
NSArray<UIBarButtonItemGroup *> *initialValueTrailingBarButtonGroups;
126+
129127

130128
- (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
131129
{
130+
static BOOL isFirstRender = YES;
131+
static NSArray<UIBarButtonItemGroup *> *initialValueLeadingBarButtonGroups;
132+
static NSArray<UIBarButtonItemGroup *> *initialValueTrailingBarButtonGroups;
133+
132134
// Log the call to this method
133135
NSLog(@"RCTUITextField setDisableKeyboardShortcuts called with value: %d", disableKeyboardShortcuts);
134136
NSLog(@"RCTBaseTextInputView isFirstRender: %d", isFirstRender);;
@@ -139,10 +141,10 @@ - (void)setDisableKeyboardShortcuts:(BOOL)disableKeyboardShortcuts
139141
// Capture initial values of leading and trailing button groups
140142
initialValueLeadingBarButtonGroups = self.inputAssistantItem.leadingBarButtonGroups;
141143
initialValueTrailingBarButtonGroups = self.inputAssistantItem.trailingBarButtonGroups;
144+
145+
NSLog(@"Initial Leading Bar Button Groups: %@", initialValueLeadingBarButtonGroups);
146+
NSLog(@"Initial Trailing Bar Button Groups: %@", initialValueTrailingBarButtonGroups);
142147
}
143-
144-
NSLog(@"Initial Leading Bar Button Groups: %@", initialValueLeadingBarButtonGroups);
145-
NSLog(@"Initial Trailing Bar Button Groups: %@", initialValueTrailingBarButtonGroups);
146148

147149
if (disableKeyboardShortcuts) {
148150
self.inputAssistantItem.leadingBarButtonGroups = @[];

0 commit comments

Comments
 (0)