status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fabric: Conversion functions between NSString and std::string 

Summary:
@public
Trivial. It's also nice this we have a default encoding now.

Reviewed By: fkgozali

Differential Revision: D8528919

fbshipit-source-id: 0853eca828f22ead1a337fea3d7a2fc9a48e84c8
This commit is contained in:
Valentin Shergin 2018-06-22 11:53:44 -07:00 committed by Facebook Github Bot
parent 93b568cc51
commit 3ea4a3309f
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View File

@ -129,8 +129,8 @@ using namespace facebook::react;
// `nativeId` // `nativeId`
if (oldViewProps.nativeId != newViewProps.nativeId) { if (oldViewProps.nativeId != newViewProps.nativeId) {
self.nativeId = [NSString stringWithCString:newViewProps.nativeId.c_str() self.nativeId = RCTNSStringFromString(newViewProps.nativeId);
encoding:NSASCIIStringEncoding]; }
} }
} }
@ -165,7 +165,7 @@ using namespace facebook::react;
- (BOOL)didActivateAccessibilityCustomAction:(UIAccessibilityCustomAction *)action - (BOOL)didActivateAccessibilityCustomAction:(UIAccessibilityCustomAction *)action
{ {
_eventEmitter->onAccessibilityAction([action.name cStringUsingEncoding:NSASCIIStringEncoding]); _eventEmitter->onAccessibilityAction(RCTStringFromNSString(action.name));
return YES; return YES;
} }

7
React/Fabric/Mounting/RCTMountingManager.mm
View File

@ -16,6 +16,7 @@
#import "RCTMountItemProtocol.h" #import "RCTMountItemProtocol.h"
#import "RCTCreateMountItem.h" #import "RCTCreateMountItem.h"
#import "RCTConversions.h"
#import "RCTDeleteMountItem.h" #import "RCTDeleteMountItem.h"
#import "RCTInsertMountItem.h" #import "RCTInsertMountItem.h"
#import "RCTRemoveMountItem.h" #import "RCTRemoveMountItem.h"
@ -46,8 +47,7 @@ using namespace facebook::react;
for (auto instruction : instructions) { for (auto instruction : instructions) {
switch (instruction.getType()) { switch (instruction.getType()) {
case TreeMutationInstruction::Creation: { case TreeMutationInstruction::Creation: {
NSString *componentName = [NSString stringWithCString:instruction.getNewChildNode()->getComponentName().c_str() NSString *componentName = RCTNSStringFromString(instruction.getNewChildNode()->getComponentName(), NSASCIIStringEncoding);
encoding:NSASCIIStringEncoding];
RCTCreateMountItem *mountItem = RCTCreateMountItem *mountItem =
[[RCTCreateMountItem alloc] initWithComponentName:componentName [[RCTCreateMountItem alloc] initWithComponentName:componentName
tag:instruction.getNewChildNode()->getTag()]; tag:instruction.getNewChildNode()->getTag()];
@ -56,8 +56,7 @@ using namespace facebook::react;
} }
case TreeMutationInstruction::Deletion: { case TreeMutationInstruction::Deletion: {
NSString *componentName = [NSString stringWithCString:instruction.getOldChildNode()->getComponentName().c_str() NSString *componentName = RCTNSStringFromString(instruction.getOldChildNode()->getComponentName(), NSASCIIStringEncoding);
encoding:NSASCIIStringEncoding];
RCTDeleteMountItem *mountItem = RCTDeleteMountItem *mountItem =
[[RCTDeleteMountItem alloc] initWithComponentName:componentName [[RCTDeleteMountItem alloc] initWithComponentName:componentName
tag:instruction.getOldChildNode()->getTag()]; tag:instruction.getOldChildNode()->getTag()];

8
React/Fabric/RCTConversions.h
View File

@ -11,6 +11,14 @@
#import <fabric/graphics/Geometry.h> #import <fabric/graphics/Geometry.h>
#import <fabric/view/primitives.h> #import <fabric/view/primitives.h>
inline NSString *_Nullable RCTNSStringFromString(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
return [NSString stringWithCString:string.c_str() encoding:encoding];
}
inline std::string RCTStringFromNSString(NSString *string, const NSStringEncoding &encoding = NSUTF8StringEncoding) {
return [string cStringUsingEncoding:encoding];
}
inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor) { inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor) {
return sharedColor ? [UIColor colorWithCGColor:sharedColor.get()] : nil; return sharedColor ? [UIColor colorWithCGColor:sharedColor.get()] : nil;
} }

2
React/Fabric/RCTScheduler.mm
View File

@ -29,7 +29,7 @@ public:
void schedulerDidRequestPreliminaryViewAllocation(ComponentName componentName) override { void schedulerDidRequestPreliminaryViewAllocation(ComponentName componentName) override {
RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_; RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
[scheduler.delegate schedulerDidRequestPreliminaryViewAllocationWithComponentName:[NSString stringWithCString:componentName.c_str() encoding:NSASCIIStringEncoding]]; [scheduler.delegate schedulerDidRequestPreliminaryViewAllocationWithComponentName:RCTNSStringFromString(componentName, NSASCIIStringEncoding)];
} }
private: private: