mirror of
https://github.com/zoriya/react-native-svg.git
synced 2025-12-05 22:56:11 +00:00
3350ab442a
# Summary Closes #2233 in iOS and old Arch, a callback on `toDataURL` method will only be called the second time of asking. Based on that [PR](https://github.com/software-mansion/react-native-svg/pull/2234) format `RNSVGSvgViewModule` file. ## Test Plan We can easily test that fix by running the `Test2233`, we have an example of the problem. ### What are the steps to reproduce (after prerequisites)? ## Compatibility | OS | Implemented | | ------- | :---------: | | iOS | ✅ |
97 lines
2.9 KiB
Plaintext
97 lines
2.9 KiB
Plaintext
/**
|
|
* Copyright (c) 2015-present, Horcrux.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under the MIT-style license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import "RNSVGSvgViewModule.h"
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTUIManager.h>
|
|
#import <React/RCTUIManagerUtils.h>
|
|
#import "RNSVGSvgView.h"
|
|
|
|
@implementation RNSVGSvgViewModule
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
|
|
#endif // RCT_NEW_ARCH_ENABLED
|
|
@synthesize bridge = _bridge;
|
|
|
|
- (void)toDataURL:(nonnull NSNumber *)reactTag
|
|
options:(NSDictionary *)options
|
|
callback:(RCTResponseSenderBlock)callback
|
|
attempt:(int)attempt
|
|
{
|
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
[self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
|
|
__kindof RNSVGPlatformView *view = [viewRegistry viewForReactTag:reactTag];
|
|
#else
|
|
[self.bridge.uiManager
|
|
addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, RNSVGPlatformView *> *viewRegistry) {
|
|
__kindof RNSVGPlatformView *view = [uiManager viewForReactTag:reactTag];
|
|
#endif // RCT_NEW_ARCH_ENABLED
|
|
NSString *b64;
|
|
if ([view isKindOfClass:[RNSVGSvgView class]]) {
|
|
RNSVGSvgView *svg = view;
|
|
if (options == nil) {
|
|
b64 = [svg getDataURLWithBounds:svg.boundingBox];
|
|
} else {
|
|
id width = [options objectForKey:@"width"];
|
|
id height = [options objectForKey:@"height"];
|
|
if (![width isKindOfClass:NSNumber.class] || ![height isKindOfClass:NSNumber.class]) {
|
|
RCTLogError(@"Invalid width or height given to toDataURL");
|
|
return;
|
|
}
|
|
NSNumber *w = width;
|
|
NSInteger wi = (NSInteger)[w intValue];
|
|
NSNumber *h = height;
|
|
NSInteger hi = (NSInteger)[h intValue];
|
|
|
|
CGRect bounds = CGRectMake(0, 0, wi, hi);
|
|
b64 = [svg getDataURLWithBounds:bounds];
|
|
}
|
|
} else {
|
|
RCTLogError(@"Invalid svg returned from registry, expecting RNSVGSvgView, got: %@", view);
|
|
return;
|
|
}
|
|
if (b64) {
|
|
callback(@[ b64 ]);
|
|
} else if (attempt < 1) {
|
|
[self toDataURL:reactTag options:options callback:callback attempt:(attempt + 1)];
|
|
} else {
|
|
callback(@[]);
|
|
}
|
|
}];
|
|
};
|
|
|
|
RCT_EXPORT_METHOD(toDataURL
|
|
: (nonnull NSNumber *)reactTag options
|
|
: (NSDictionary *)options callback
|
|
: (RCTResponseSenderBlock)callback)
|
|
{
|
|
[self toDataURL:reactTag options:options callback:callback attempt:0];
|
|
}
|
|
|
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
|
|
(const facebook::react::ObjCTurboModule::InitParams &)params
|
|
{
|
|
return std::make_shared<facebook::react::NativeSvgViewModuleSpecJSI>(params);
|
|
}
|
|
#endif
|
|
|
|
- (dispatch_queue_t)methodQueue
|
|
{
|
|
if (self.bridge) {
|
|
return RCTGetUIManagerQueue();
|
|
} else {
|
|
return dispatch_get_main_queue();
|
|
}
|
|
}
|
|
|
|
@end
|