@onekeyfe/react-native-chart-webview 3.0.81-alpha.8 → 3.0.82
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/nitrogen/generated/android/c++/JFunc_void.hpp +3 -3
- package/lib/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +3 -3
- package/lib/nitrogen/generated/android/c++/JHybridChartWebviewSpec.cpp +49 -48
- package/lib/nitrogen/generated/android/c++/JHybridChartWebviewSpec.hpp +20 -22
- package/lib/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.cpp +53 -53
- package/lib/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.hpp +4 -4
- package/lib/nitrogen/generated/android/chartwebview+autolinking.cmake +1 -1
- package/lib/nitrogen/generated/android/chartwebview+autolinking.gradle +1 -1
- package/lib/nitrogen/generated/android/chartwebviewOnLoad.cpp +30 -20
- package/lib/nitrogen/generated/android/chartwebviewOnLoad.hpp +14 -5
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void.kt +1 -1
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void_std__string.kt +1 -1
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/HybridChartWebviewSpec.kt +17 -19
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/chartwebviewOnLoad.kt +1 -1
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewManager.kt +40 -10
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater.kt +1 -1
- package/lib/nitrogen/generated/ios/ChartWebview+autolinking.rb +2 -2
- package/lib/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.cpp +1 -1
- package/lib/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.hpp +5 -5
- package/lib/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Umbrella.hpp +1 -1
- package/lib/nitrogen/generated/ios/ChartWebviewAutolinking.mm +1 -1
- package/lib/nitrogen/generated/ios/ChartWebviewAutolinking.swift +9 -8
- package/lib/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.cpp +1 -1
- package/lib/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.hpp +7 -1
- package/lib/nitrogen/generated/ios/c++/views/HybridChartWebviewComponent.mm +27 -1
- package/lib/nitrogen/generated/ios/swift/Func_void.swift +1 -2
- package/lib/nitrogen/generated/ios/swift/Func_void_std__string.swift +1 -2
- package/lib/nitrogen/generated/ios/swift/HybridChartWebviewSpec.swift +3 -4
- package/lib/nitrogen/generated/ios/swift/HybridChartWebviewSpec_cxx.swift +18 -2
- package/lib/nitrogen/generated/shared/c++/HybridChartWebviewSpec.cpp +1 -1
- package/lib/nitrogen/generated/shared/c++/HybridChartWebviewSpec.hpp +1 -1
- package/lib/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.cpp +10 -26
- package/lib/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.hpp +9 -6
- package/lib/nitrogen/nitrogen/generated/android/c++/JFunc_void.hpp +3 -3
- package/lib/nitrogen/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +3 -3
- package/lib/nitrogen/nitrogen/generated/android/c++/JHybridChartWebviewSpec.cpp +49 -48
- package/lib/nitrogen/nitrogen/generated/android/c++/JHybridChartWebviewSpec.hpp +20 -22
- package/lib/nitrogen/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.cpp +53 -53
- package/lib/nitrogen/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.hpp +4 -4
- package/lib/nitrogen/nitrogen/generated/android/chartwebview+autolinking.cmake +1 -1
- package/lib/nitrogen/nitrogen/generated/android/chartwebview+autolinking.gradle +1 -1
- package/lib/nitrogen/nitrogen/generated/android/chartwebviewOnLoad.cpp +30 -20
- package/lib/nitrogen/nitrogen/generated/android/chartwebviewOnLoad.hpp +14 -5
- package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void.kt +1 -1
- package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void_std__string.kt +1 -1
- package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/HybridChartWebviewSpec.kt +17 -19
- package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/chartwebviewOnLoad.kt +1 -1
- package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewManager.kt +40 -10
- package/lib/nitrogen/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater.kt +1 -1
- package/lib/nitrogen/nitrogen/generated/ios/ChartWebview+autolinking.rb +2 -2
- package/lib/nitrogen/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.cpp +1 -1
- package/lib/nitrogen/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.hpp +5 -5
- package/lib/nitrogen/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Umbrella.hpp +1 -1
- package/lib/nitrogen/nitrogen/generated/ios/ChartWebviewAutolinking.mm +1 -1
- package/lib/nitrogen/nitrogen/generated/ios/ChartWebviewAutolinking.swift +9 -8
- package/lib/nitrogen/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.cpp +1 -1
- package/lib/nitrogen/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.hpp +7 -1
- package/lib/nitrogen/nitrogen/generated/ios/c++/views/HybridChartWebviewComponent.mm +27 -1
- package/lib/nitrogen/nitrogen/generated/ios/swift/Func_void.swift +1 -2
- package/lib/nitrogen/nitrogen/generated/ios/swift/Func_void_std__string.swift +1 -2
- package/lib/nitrogen/nitrogen/generated/ios/swift/HybridChartWebviewSpec.swift +3 -4
- package/lib/nitrogen/nitrogen/generated/ios/swift/HybridChartWebviewSpec_cxx.swift +18 -2
- package/lib/nitrogen/nitrogen/generated/shared/c++/HybridChartWebviewSpec.cpp +1 -1
- package/lib/nitrogen/nitrogen/generated/shared/c++/HybridChartWebviewSpec.hpp +1 -1
- package/lib/nitrogen/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.cpp +10 -26
- package/lib/nitrogen/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.hpp +9 -6
- package/nitrogen/generated/android/c++/JFunc_void.hpp +3 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +3 -3
- package/nitrogen/generated/android/c++/JHybridChartWebviewSpec.cpp +49 -48
- package/nitrogen/generated/android/c++/JHybridChartWebviewSpec.hpp +20 -22
- package/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.cpp +53 -53
- package/nitrogen/generated/android/c++/views/JHybridChartWebviewStateUpdater.hpp +4 -4
- package/nitrogen/generated/android/chartwebview+autolinking.cmake +1 -1
- package/nitrogen/generated/android/chartwebview+autolinking.gradle +1 -1
- package/nitrogen/generated/android/chartwebviewOnLoad.cpp +30 -20
- package/nitrogen/generated/android/chartwebviewOnLoad.hpp +14 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void_std__string.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/HybridChartWebviewSpec.kt +17 -19
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/chartwebviewOnLoad.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewManager.kt +40 -10
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater.kt +1 -1
- package/nitrogen/generated/ios/ChartWebview+autolinking.rb +2 -2
- package/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.cpp +1 -1
- package/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Bridge.hpp +5 -5
- package/nitrogen/generated/ios/ChartWebview-Swift-Cxx-Umbrella.hpp +1 -1
- package/nitrogen/generated/ios/ChartWebviewAutolinking.mm +1 -1
- package/nitrogen/generated/ios/ChartWebviewAutolinking.swift +9 -8
- package/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.cpp +1 -1
- package/nitrogen/generated/ios/c++/HybridChartWebviewSpecSwift.hpp +7 -1
- package/nitrogen/generated/ios/c++/views/HybridChartWebviewComponent.mm +27 -1
- package/nitrogen/generated/ios/swift/Func_void.swift +1 -2
- package/nitrogen/generated/ios/swift/Func_void_std__string.swift +1 -2
- package/nitrogen/generated/ios/swift/HybridChartWebviewSpec.swift +3 -4
- package/nitrogen/generated/ios/swift/HybridChartWebviewSpec_cxx.swift +18 -2
- package/nitrogen/generated/shared/c++/HybridChartWebviewSpec.cpp +1 -1
- package/nitrogen/generated/shared/c++/HybridChartWebviewSpec.hpp +1 -1
- package/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.cpp +10 -26
- package/nitrogen/generated/shared/c++/views/HybridChartWebviewComponent.hpp +9 -6
- package/package.json +6 -7
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
/// JHybridChartWebviewStateUpdater.cpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#include "JHybridChartWebviewStateUpdater.hpp"
|
|
9
9
|
#include "views/HybridChartWebviewComponent.hpp"
|
|
10
10
|
#include <NitroModules/NitroDefines.hpp>
|
|
11
|
+
#include <react/fabric/StateWrapperImpl.h>
|
|
11
12
|
|
|
12
13
|
namespace margelo::nitro::chartwebview::views {
|
|
13
14
|
|
|
@@ -15,89 +16,88 @@ using namespace facebook;
|
|
|
15
16
|
using ConcreteStateData = react::ConcreteState<HybridChartWebviewState>;
|
|
16
17
|
|
|
17
18
|
void JHybridChartWebviewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
|
|
18
|
-
jni::alias_ref<JHybridChartWebviewSpec::
|
|
19
|
+
jni::alias_ref<JHybridChartWebviewSpec::JavaPart> javaView,
|
|
19
20
|
jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
|
|
20
|
-
JHybridChartWebviewSpec
|
|
21
|
+
std::shared_ptr<JHybridChartWebviewSpec> hybridView = javaView->getJHybridChartWebviewSpec();
|
|
21
22
|
|
|
22
23
|
// Get concrete StateWrapperImpl from passed StateWrapper interface object
|
|
23
24
|
jobject rawStateWrapper = stateWrapperInterface.get();
|
|
24
|
-
if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) {
|
|
25
|
+
if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
|
|
25
26
|
throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
|
|
26
27
|
}
|
|
27
28
|
auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
|
|
28
29
|
static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
|
|
29
|
-
|
|
30
30
|
std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
|
|
31
|
-
auto concreteState = std::
|
|
31
|
+
auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
|
|
32
32
|
const HybridChartWebviewState& data = concreteState->getData();
|
|
33
|
-
const std::
|
|
34
|
-
if (
|
|
33
|
+
const std::shared_ptr<HybridChartWebviewProps>& props = data.getProps();
|
|
34
|
+
if (props == nullptr) [[unlikely]] {
|
|
35
35
|
// Props aren't set yet!
|
|
36
36
|
throw std::runtime_error("HybridChartWebviewState's data doesn't contain any props!");
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
|
|
39
|
+
// Update all props if they are dirty
|
|
40
|
+
if (props->uri.isDirty) {
|
|
41
|
+
hybridView->setUri(props->uri.value);
|
|
42
|
+
props->uri.isDirty = false;
|
|
42
43
|
}
|
|
43
|
-
if (props
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
if (props->localBundle.isDirty) {
|
|
45
|
+
hybridView->setLocalBundle(props->localBundle.value);
|
|
46
|
+
props->localBundle.isDirty = false;
|
|
46
47
|
}
|
|
47
|
-
if (props
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
if (props->entry.isDirty) {
|
|
49
|
+
hybridView->setEntry(props->entry.value);
|
|
50
|
+
props->entry.isDirty = false;
|
|
50
51
|
}
|
|
51
|
-
if (props
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
if (props->paramsJson.isDirty) {
|
|
53
|
+
hybridView->setParamsJson(props->paramsJson.value);
|
|
54
|
+
props->paramsJson.isDirty = false;
|
|
54
55
|
}
|
|
55
|
-
if (props
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
if (props->assetHost.isDirty) {
|
|
57
|
+
hybridView->setAssetHost(props->assetHost.value);
|
|
58
|
+
props->assetHost.isDirty = false;
|
|
58
59
|
}
|
|
59
|
-
if (props
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
if (props->bridgeScript.isDirty) {
|
|
61
|
+
hybridView->setBridgeScript(props->bridgeScript.value);
|
|
62
|
+
props->bridgeScript.isDirty = false;
|
|
62
63
|
}
|
|
63
|
-
if (props
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
if (props->reuseKey.isDirty) {
|
|
65
|
+
hybridView->setReuseKey(props->reuseKey.value);
|
|
66
|
+
props->reuseKey.isDirty = false;
|
|
66
67
|
}
|
|
67
|
-
if (props
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
if (props->pooled.isDirty) {
|
|
69
|
+
hybridView->setPooled(props->pooled.value);
|
|
70
|
+
props->pooled.isDirty = false;
|
|
70
71
|
}
|
|
71
|
-
if (props
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
if (props->active.isDirty) {
|
|
73
|
+
hybridView->setActive(props->active.value);
|
|
74
|
+
props->active.isDirty = false;
|
|
74
75
|
}
|
|
75
|
-
if (props
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
if (props->webviewDebuggingEnabled.isDirty) {
|
|
77
|
+
hybridView->setWebviewDebuggingEnabled(props->webviewDebuggingEnabled.value);
|
|
78
|
+
props->webviewDebuggingEnabled.isDirty = false;
|
|
78
79
|
}
|
|
79
|
-
if (props
|
|
80
|
-
|
|
81
|
-
|
|
80
|
+
if (props->onMessage.isDirty) {
|
|
81
|
+
hybridView->setOnMessage(props->onMessage.value);
|
|
82
|
+
props->onMessage.isDirty = false;
|
|
82
83
|
}
|
|
83
|
-
if (props
|
|
84
|
-
|
|
85
|
-
|
|
84
|
+
if (props->onLoadEnd.isDirty) {
|
|
85
|
+
hybridView->setOnLoadEnd(props->onLoadEnd.value);
|
|
86
|
+
props->onLoadEnd.isDirty = false;
|
|
86
87
|
}
|
|
87
|
-
if (props
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
if (props->onError.isDirty) {
|
|
89
|
+
hybridView->setOnError(props->onError.value);
|
|
90
|
+
props->onError.isDirty = false;
|
|
90
91
|
}
|
|
91
92
|
|
|
92
93
|
// Update hybridRef if it changed
|
|
93
|
-
if (props
|
|
94
|
+
if (props->hybridRef.isDirty) {
|
|
94
95
|
// hybridRef changed - call it with new this
|
|
95
|
-
const auto& maybeFunc = props
|
|
96
|
+
const auto& maybeFunc = props->hybridRef.value;
|
|
96
97
|
if (maybeFunc.has_value()) {
|
|
97
|
-
|
|
98
|
-
maybeFunc.value()(shared);
|
|
98
|
+
maybeFunc.value()(hybridView);
|
|
99
99
|
}
|
|
100
|
-
|
|
100
|
+
props->hybridRef.isDirty = false;
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// JHybridChartWebviewStateUpdater.hpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#pragma once
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
#endif
|
|
13
13
|
|
|
14
14
|
#include <fbjni/fbjni.h>
|
|
15
|
-
#include <react/fabric/StateWrapperImpl.h>
|
|
16
15
|
#include <react/fabric/CoreComponentsRegistry.h>
|
|
16
|
+
#include <react/fabric/StateWrapperImpl.h>
|
|
17
17
|
#include <react/renderer/core/ConcreteComponentDescriptor.h>
|
|
18
18
|
#include <NitroModules/NitroDefines.hpp>
|
|
19
19
|
#include <NitroModules/JStateWrapper.hpp>
|
|
@@ -24,13 +24,13 @@ namespace margelo::nitro::chartwebview::views {
|
|
|
24
24
|
|
|
25
25
|
using namespace facebook;
|
|
26
26
|
|
|
27
|
-
class JHybridChartWebviewStateUpdater: public jni::JavaClass<JHybridChartWebviewStateUpdater> {
|
|
27
|
+
class JHybridChartWebviewStateUpdater final: public jni::JavaClass<JHybridChartWebviewStateUpdater> {
|
|
28
28
|
public:
|
|
29
29
|
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/views/HybridChartWebviewStateUpdater;";
|
|
30
30
|
|
|
31
31
|
public:
|
|
32
32
|
static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
|
|
33
|
-
jni::alias_ref<JHybridChartWebviewSpec::
|
|
33
|
+
jni::alias_ref<JHybridChartWebviewSpec::JavaPart> view,
|
|
34
34
|
jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
|
|
35
35
|
|
|
36
36
|
public:
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
# chartwebview+autolinking.cmake
|
|
3
3
|
# This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
# https://github.com/mrousavy/nitro
|
|
5
|
-
# Copyright ©
|
|
5
|
+
# Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
#
|
|
7
7
|
|
|
8
8
|
# This is a CMake file that adds all files generated by Nitrogen
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// chartwebview+autolinking.gradle
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
/// This is a Gradle file that adds all files generated by Nitrogen
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// chartwebviewOnLoad.cpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#ifndef BUILDING_CHARTWEBVIEW_WITH_GENERATED_CMAKE_PROJECT
|
|
@@ -24,27 +24,37 @@
|
|
|
24
24
|
namespace margelo::nitro::chartwebview {
|
|
25
25
|
|
|
26
26
|
int initialize(JavaVM* vm) {
|
|
27
|
+
return facebook::jni::initialize(vm, []() {
|
|
28
|
+
::margelo::nitro::chartwebview::registerAllNatives();
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
struct JHybridChartWebviewSpecImpl: public jni::JavaClass<JHybridChartWebviewSpecImpl, JHybridChartWebviewSpec::JavaPart> {
|
|
33
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/chartwebview/HybridChartWebview;";
|
|
34
|
+
static std::shared_ptr<JHybridChartWebviewSpec> create() {
|
|
35
|
+
static const auto constructorFn = javaClassStatic()->getConstructor<JHybridChartWebviewSpecImpl::javaobject()>();
|
|
36
|
+
jni::local_ref<JHybridChartWebviewSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
|
|
37
|
+
return javaPart->getJHybridChartWebviewSpec();
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
void registerAllNatives() {
|
|
27
42
|
using namespace margelo::nitro;
|
|
28
43
|
using namespace margelo::nitro::chartwebview;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
auto instance = object.create();
|
|
44
|
-
return instance->cthis()->shared();
|
|
45
|
-
}
|
|
46
|
-
);
|
|
47
|
-
});
|
|
44
|
+
|
|
45
|
+
// Register native JNI methods
|
|
46
|
+
margelo::nitro::chartwebview::JHybridChartWebviewSpec::CxxPart::registerNatives();
|
|
47
|
+
margelo::nitro::chartwebview::JFunc_void_std__string_cxx::registerNatives();
|
|
48
|
+
margelo::nitro::chartwebview::JFunc_void_cxx::registerNatives();
|
|
49
|
+
margelo::nitro::chartwebview::views::JHybridChartWebviewStateUpdater::registerNatives();
|
|
50
|
+
|
|
51
|
+
// Register Nitro Hybrid Objects
|
|
52
|
+
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
53
|
+
"ChartWebview",
|
|
54
|
+
[]() -> std::shared_ptr<HybridObject> {
|
|
55
|
+
return JHybridChartWebviewSpecImpl::create();
|
|
56
|
+
}
|
|
57
|
+
);
|
|
48
58
|
}
|
|
49
59
|
|
|
50
60
|
} // namespace margelo::nitro::chartwebview
|
|
@@ -2,24 +2,33 @@
|
|
|
2
2
|
/// chartwebviewOnLoad.hpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#include <jni.h>
|
|
9
|
+
#include <functional>
|
|
9
10
|
#include <NitroModules/NitroDefines.hpp>
|
|
10
11
|
|
|
11
12
|
namespace margelo::nitro::chartwebview {
|
|
12
13
|
|
|
14
|
+
[[deprecated("Use registerNatives() instead.")]]
|
|
15
|
+
int initialize(JavaVM* vm);
|
|
16
|
+
|
|
13
17
|
/**
|
|
14
|
-
*
|
|
15
|
-
* Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`)
|
|
18
|
+
* Register the native (C++) part of chartwebview, and autolinks all Hybrid Objects.
|
|
19
|
+
* Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
|
|
20
|
+
* inside a `facebook::jni::initialize(vm, ...)` call.
|
|
16
21
|
* Example:
|
|
17
22
|
* ```cpp (cpp-adapter.cpp)
|
|
18
23
|
* JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
|
|
19
|
-
* return
|
|
24
|
+
* return facebook::jni::initialize(vm, []() {
|
|
25
|
+
* // register all chartwebview HybridObjects
|
|
26
|
+
* margelo::nitro::chartwebview::registerNatives();
|
|
27
|
+
* // any other custom registrations go here.
|
|
28
|
+
* });
|
|
20
29
|
* }
|
|
21
30
|
* ```
|
|
22
31
|
*/
|
|
23
|
-
|
|
32
|
+
void registerAllNatives();
|
|
24
33
|
|
|
25
34
|
} // namespace margelo::nitro::chartwebview
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/Func_void_std__string.kt
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// Func_void_std__string.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.chartwebview
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/HybridChartWebviewSpec.kt
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridChartWebviewSpec.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.chartwebview
|
|
@@ -10,6 +10,7 @@ package com.margelo.nitro.chartwebview
|
|
|
10
10
|
import androidx.annotation.Keep
|
|
11
11
|
import com.facebook.jni.HybridData
|
|
12
12
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
13
|
+
import com.margelo.nitro.core.HybridObject
|
|
13
14
|
import com.margelo.nitro.views.HybridView
|
|
14
15
|
|
|
15
16
|
/**
|
|
@@ -24,23 +25,6 @@ import com.margelo.nitro.views.HybridView
|
|
|
24
25
|
"LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
|
|
25
26
|
)
|
|
26
27
|
abstract class HybridChartWebviewSpec: HybridView() {
|
|
27
|
-
@DoNotStrip
|
|
28
|
-
private var mHybridData: HybridData = initHybrid()
|
|
29
|
-
|
|
30
|
-
init {
|
|
31
|
-
super.updateNative(mHybridData)
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
override fun updateNative(hybridData: HybridData) {
|
|
35
|
-
mHybridData = hybridData
|
|
36
|
-
super.updateNative(hybridData)
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
// Default implementation of `HybridObject.toString()`
|
|
40
|
-
override fun toString(): String {
|
|
41
|
-
return "[HybridObject ChartWebview]"
|
|
42
|
-
}
|
|
43
|
-
|
|
44
28
|
// Properties
|
|
45
29
|
@get:DoNotStrip
|
|
46
30
|
@get:Keep
|
|
@@ -157,7 +141,21 @@ abstract class HybridChartWebviewSpec: HybridView() {
|
|
|
157
141
|
@Keep
|
|
158
142
|
abstract fun clearSnapshot(): Unit
|
|
159
143
|
|
|
160
|
-
|
|
144
|
+
// Default implementation of `HybridObject.toString()`
|
|
145
|
+
override fun toString(): String {
|
|
146
|
+
return "[HybridObject ChartWebview]"
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
// C++ backing class
|
|
150
|
+
@DoNotStrip
|
|
151
|
+
@Keep
|
|
152
|
+
protected open class CxxPart(javaPart: HybridChartWebviewSpec): HybridObject.CxxPart(javaPart) {
|
|
153
|
+
// C++ JHybridChartWebviewSpec::CxxPart::initHybrid(...)
|
|
154
|
+
external override fun initHybrid(): HybridData
|
|
155
|
+
}
|
|
156
|
+
override fun createCxxPart(): CxxPart {
|
|
157
|
+
return CxxPart(this)
|
|
158
|
+
}
|
|
161
159
|
|
|
162
160
|
companion object {
|
|
163
161
|
protected const val TAG = "HybridChartWebviewSpec"
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/chartwebview/chartwebviewOnLoad.kt
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// chartwebviewOnLoad.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.chartwebview
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridChartWebviewManager.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.chartwebview.views
|
|
@@ -12,13 +12,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
|
|
|
12
12
|
import com.facebook.react.uimanager.SimpleViewManager
|
|
13
13
|
import com.facebook.react.uimanager.StateWrapper
|
|
14
14
|
import com.facebook.react.uimanager.ThemedReactContext
|
|
15
|
+
import com.margelo.nitro.R.id.associated_hybrid_view_tag
|
|
16
|
+
import com.margelo.nitro.views.RecyclableView
|
|
15
17
|
import com.margelo.nitro.chartwebview.*
|
|
16
18
|
|
|
17
19
|
/**
|
|
18
20
|
* Represents the React Native `ViewManager` for the "ChartWebview" Nitro HybridView.
|
|
19
21
|
*/
|
|
20
|
-
open class HybridChartWebviewManager: SimpleViewManager<View>() {
|
|
21
|
-
|
|
22
|
+
public open class HybridChartWebviewManager: SimpleViewManager<View>() {
|
|
23
|
+
init {
|
|
24
|
+
if (RecyclableView::class.java.isAssignableFrom(HybridChartWebview::class.java)) {
|
|
25
|
+
// Enable view recycling
|
|
26
|
+
super.setupViewRecycling()
|
|
27
|
+
}
|
|
28
|
+
}
|
|
22
29
|
|
|
23
30
|
override fun getName(): String {
|
|
24
31
|
return "ChartWebview"
|
|
@@ -27,17 +34,13 @@ open class HybridChartWebviewManager: SimpleViewManager<View>() {
|
|
|
27
34
|
override fun createViewInstance(reactContext: ThemedReactContext): View {
|
|
28
35
|
val hybridView = HybridChartWebview(reactContext)
|
|
29
36
|
val view = hybridView.view
|
|
30
|
-
|
|
37
|
+
view.setTag(associated_hybrid_view_tag, hybridView)
|
|
31
38
|
return view
|
|
32
39
|
}
|
|
33
40
|
|
|
34
|
-
override fun onDropViewInstance(view: View) {
|
|
35
|
-
super.onDropViewInstance(view)
|
|
36
|
-
views.remove(view)
|
|
37
|
-
}
|
|
38
|
-
|
|
39
41
|
override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
|
|
40
|
-
val hybridView =
|
|
42
|
+
val hybridView = getHybridView(view)
|
|
43
|
+
?: throw Error("Couldn't find view $view in local views table!")
|
|
41
44
|
|
|
42
45
|
// 1. Update each prop individually
|
|
43
46
|
hybridView.beforeUpdate()
|
|
@@ -47,4 +50,31 @@ open class HybridChartWebviewManager: SimpleViewManager<View>() {
|
|
|
47
50
|
// 2. Continue in base View props
|
|
48
51
|
return super.updateState(view, props, stateWrapper)
|
|
49
52
|
}
|
|
53
|
+
|
|
54
|
+
override fun onDropViewInstance(view: View) {
|
|
55
|
+
val hybridView = getHybridView(view)
|
|
56
|
+
hybridView?.onDropView()
|
|
57
|
+
return super.onDropViewInstance(view)
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
|
|
61
|
+
super.prepareToRecycleView(reactContext, view)
|
|
62
|
+
val hybridView = getHybridView(view)
|
|
63
|
+
?: return null
|
|
64
|
+
|
|
65
|
+
@Suppress("USELESS_IS_CHECK")
|
|
66
|
+
if (hybridView is RecyclableView) {
|
|
67
|
+
// Recycle in it's implementation
|
|
68
|
+
hybridView.prepareForRecycle()
|
|
69
|
+
|
|
70
|
+
// Maybe update the view if it changed
|
|
71
|
+
return hybridView.view
|
|
72
|
+
} else {
|
|
73
|
+
return null
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
private fun getHybridView(view: View): HybridChartWebview? {
|
|
78
|
+
return view.getTag(associated_hybrid_view_tag) as? HybridChartWebview
|
|
79
|
+
}
|
|
50
80
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridChartWebviewStateUpdater.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.chartwebview.views
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
# ChartWebview+autolinking.rb
|
|
3
3
|
# This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
# https://github.com/mrousavy/nitro
|
|
5
|
-
# Copyright ©
|
|
5
|
+
# Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
#
|
|
7
7
|
|
|
8
8
|
# This is a Ruby script that adds all files generated by Nitrogen
|
|
@@ -52,7 +52,7 @@ def add_nitrogen_files(spec)
|
|
|
52
52
|
spec.pod_target_xcconfig = current_pod_target_xcconfig.merge({
|
|
53
53
|
# Use C++ 20
|
|
54
54
|
"CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
|
|
55
|
-
# Enables C++ <-> Swift interop (by default it's only
|
|
55
|
+
# Enables C++ <-> Swift interop (by default it's only ObjC)
|
|
56
56
|
"SWIFT_OBJC_INTEROP_MODE" => "objcxx",
|
|
57
57
|
# Enables stricter modular headers
|
|
58
58
|
"DEFINES_MODULE" => "YES",
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// ChartWebview-Swift-Cxx-Bridge.cpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#include "ChartWebview-Swift-Cxx-Bridge.hpp"
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// ChartWebview-Swift-Cxx-Bridge.hpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#pragma once
|
|
@@ -42,7 +42,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
|
|
|
42
42
|
return optional.has_value();
|
|
43
43
|
}
|
|
44
44
|
inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
|
|
45
|
-
return
|
|
45
|
+
return optional.value();
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
// pragma MARK: std::optional<bool>
|
|
@@ -57,7 +57,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
|
|
|
57
57
|
return optional.has_value();
|
|
58
58
|
}
|
|
59
59
|
inline bool get_std__optional_bool_(const std::optional<bool>& optional) noexcept {
|
|
60
|
-
return
|
|
60
|
+
return optional.value();
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
// pragma MARK: std::function<void(const std::string& /* message */)>
|
|
@@ -94,7 +94,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
|
|
|
94
94
|
return optional.has_value();
|
|
95
95
|
}
|
|
96
96
|
inline std::function<void(const std::string& /* message */)> get_std__optional_std__function_void_const_std__string_____message______(const std::optional<std::function<void(const std::string& /* message */)>>& optional) noexcept {
|
|
97
|
-
return
|
|
97
|
+
return optional.value();
|
|
98
98
|
}
|
|
99
99
|
|
|
100
100
|
// pragma MARK: std::function<void()>
|
|
@@ -131,7 +131,7 @@ namespace margelo::nitro::chartwebview::bridge::swift {
|
|
|
131
131
|
return optional.has_value();
|
|
132
132
|
}
|
|
133
133
|
inline std::function<void()> get_std__optional_std__function_void____(const std::optional<std::function<void()>>& optional) noexcept {
|
|
134
|
-
return
|
|
134
|
+
return optional.value();
|
|
135
135
|
}
|
|
136
136
|
|
|
137
137
|
// pragma MARK: std::shared_ptr<HybridChartWebviewSpec>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// ChartWebviewAutolinking.mm
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#import <Foundation/Foundation.h>
|
|
@@ -2,19 +2,16 @@
|
|
|
2
2
|
/// ChartWebviewAutolinking.swift
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
|
+
import NitroModules
|
|
9
|
+
|
|
10
|
+
// TODO: Use empty enums once Swift supports exporting them as namespaces
|
|
11
|
+
// See: https://github.com/swiftlang/swift/pull/83616
|
|
8
12
|
public final class ChartWebviewAutolinking {
|
|
9
13
|
public typealias bridge = margelo.nitro.chartwebview.bridge.swift
|
|
10
14
|
|
|
11
|
-
/**
|
|
12
|
-
* Creates an instance of a Swift class that implements `HybridChartWebviewSpec`,
|
|
13
|
-
* and wraps it in a Swift class that can directly interop with C++ (`HybridChartWebviewSpec_cxx`)
|
|
14
|
-
*
|
|
15
|
-
* This is generated by Nitrogen and will initialize the class specified
|
|
16
|
-
* in the `"autolinking"` property of `nitro.json` (in this case, `HybridChartWebview`).
|
|
17
|
-
*/
|
|
18
15
|
public static func createChartWebview() -> bridge.std__shared_ptr_HybridChartWebviewSpec_ {
|
|
19
16
|
let hybridObject = HybridChartWebview()
|
|
20
17
|
return { () -> bridge.std__shared_ptr_HybridChartWebviewSpec_ in
|
|
@@ -22,4 +19,8 @@ public final class ChartWebviewAutolinking {
|
|
|
22
19
|
return __cxxWrapped.getCxxPart()
|
|
23
20
|
}()
|
|
24
21
|
}
|
|
22
|
+
|
|
23
|
+
public static func isChartWebviewRecyclable() -> Bool {
|
|
24
|
+
return HybridChartWebview.self is any RecyclableView.Type
|
|
25
|
+
}
|
|
25
26
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridChartWebviewSpecSwift.cpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#include "HybridChartWebviewSpecSwift.hpp"
|