expo-modules-core 56.0.8 → 56.0.9
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/CHANGELOG.md +7 -0
- package/android/build.gradle +2 -2
- package/android/src/main/cpp/decorators/JSPropertiesDecorator.h +2 -0
- package/android/src/main/cpp/fabric/AndroidExpoViewState.h +2 -0
- package/android/src/main/cpp/fabric/ExpoComponentDescriptorFactory.cpp +31 -0
- package/android/src/main/cpp/fabric/ExpoComponentDescriptorFactory.h +23 -0
- package/android/src/main/cpp/fabric/FabricComponentsRegistry.cpp +3 -25
- package/android/src/main/cpp/fabric/FabricComponentsRegistry.h +0 -17
- package/android/src/main/java/expo/modules/kotlin/sharedobjects/SharedObject.kt +26 -4
- package/ios/Core/ExpoModulesMacros.swift +64 -5
- package/ios/Core/ModuleHolder.swift +19 -1
- package/ios/Core/Modules/ModuleDefinition.swift +7 -0
- package/ios/Core/Protocols/AnyModule.swift +12 -0
- package/ios/Core/SharedObjects/SharedObject.swift +64 -43
- package/package.json +4 -4
- package/prebuilds/output/debug/xcframeworks/ExpoModulesCore.tar.gz +0 -0
- package/prebuilds/output/debug/xcframeworks/ExpoModulesWorklets.tar.gz +0 -0
- package/prebuilds/output/release/xcframeworks/ExpoModulesCore.tar.gz +0 -0
- package/prebuilds/output/release/xcframeworks/ExpoModulesWorklets.tar.gz +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -10,6 +10,12 @@
|
|
|
10
10
|
|
|
11
11
|
### 💡 Others
|
|
12
12
|
|
|
13
|
+
## 56.0.9 — 2026-05-15
|
|
14
|
+
|
|
15
|
+
### 🎉 New features
|
|
16
|
+
|
|
17
|
+
- Added single-payload overloads for `SharedObject.emit` on iOS and Android. The iOS API also accepts an already-converted `JavaScriptValue` payload to skip the native-to-JS conversion step. ([#45596](https://github.com/expo/expo/pull/45596) by [@tsapeta](https://github.com/tsapeta))
|
|
18
|
+
|
|
13
19
|
## 56.0.8 — 2026-05-13
|
|
14
20
|
|
|
15
21
|
### 🐛 Bug fixes
|
|
@@ -28,6 +34,7 @@
|
|
|
28
34
|
### 💡 Others
|
|
29
35
|
|
|
30
36
|
- [iOS] `AppContext.setRuntime` now takes the native React `RuntimeScheduler` pointer and a dispatch trampoline alongside the runtime pointer. ([#45636](https://github.com/expo/expo/pull/45636) by [@tsapeta](https://github.com/tsapeta))
|
|
37
|
+
- Deprecated `SharedObject.emit(event:arguments:)` (iOS) and the `vararg` `emit` (Android) in favor of the new single-payload overloads. Existing single-argument call sites keep working unchanged. ([#45596](https://github.com/expo/expo/pull/45596) by [@tsapeta](https://github.com/tsapeta))
|
|
31
38
|
|
|
32
39
|
## 56.0.5 — 2026-05-08
|
|
33
40
|
|
package/android/build.gradle
CHANGED
|
@@ -27,7 +27,7 @@ if (shouldIncludeCompose) {
|
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
group = 'host.exp.exponent'
|
|
30
|
-
version = '56.0.
|
|
30
|
+
version = '56.0.9'
|
|
31
31
|
|
|
32
32
|
def isExpoModulesCoreTests = {
|
|
33
33
|
Gradle gradle = getGradle()
|
|
@@ -94,7 +94,7 @@ android {
|
|
|
94
94
|
defaultConfig {
|
|
95
95
|
consumerProguardFiles 'proguard-rules.pro'
|
|
96
96
|
versionCode 1
|
|
97
|
-
versionName "56.0.
|
|
97
|
+
versionName "56.0.9"
|
|
98
98
|
buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
|
|
99
99
|
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
|
|
100
100
|
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
// Copyright 2018-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
#include "ExpoComponentDescriptorFactory.h"
|
|
4
|
+
#include "AndroidExpoViewComponentDescriptor.h"
|
|
5
|
+
|
|
6
|
+
namespace react = facebook::react;
|
|
7
|
+
|
|
8
|
+
namespace expo {
|
|
9
|
+
|
|
10
|
+
StatePropMapType statePropMap = {};
|
|
11
|
+
|
|
12
|
+
react::ComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
|
|
13
|
+
const react::ComponentDescriptorParameters ¶meters
|
|
14
|
+
) {
|
|
15
|
+
auto descriptor = std::make_unique<AndroidExpoViewComponentDescriptor>(
|
|
16
|
+
parameters,
|
|
17
|
+
react::RawPropsParser(/*useRawPropsJsiValue=*/true)
|
|
18
|
+
);
|
|
19
|
+
|
|
20
|
+
if (statePropMap.contains(std::static_pointer_cast<std::string const>(parameters.flavor))) {
|
|
21
|
+
descriptor->setStateProps(
|
|
22
|
+
statePropMap.at(
|
|
23
|
+
std::static_pointer_cast<std::string const>(parameters.flavor)
|
|
24
|
+
)
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return descriptor;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
} // namespace expo
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
// Copyright 2018-present 650 Industries. All rights reserved.
|
|
2
|
+
|
|
3
|
+
#pragma once
|
|
4
|
+
|
|
5
|
+
#include <react/renderer/core/ComponentDescriptor.h>
|
|
6
|
+
#include "../types/FrontendConverter.h"
|
|
7
|
+
|
|
8
|
+
namespace react = facebook::react;
|
|
9
|
+
|
|
10
|
+
namespace expo {
|
|
11
|
+
|
|
12
|
+
using StatePropMapType = std::unordered_map<
|
|
13
|
+
react::ComponentDescriptor::Flavor,
|
|
14
|
+
std::unordered_map<std::string, std::shared_ptr<FrontendConverter>>
|
|
15
|
+
>;
|
|
16
|
+
|
|
17
|
+
extern StatePropMapType statePropMap;
|
|
18
|
+
|
|
19
|
+
react::ComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
|
|
20
|
+
const react::ComponentDescriptorParameters ¶meters
|
|
21
|
+
);
|
|
22
|
+
|
|
23
|
+
} // namespace expo
|
|
@@ -1,38 +1,16 @@
|
|
|
1
1
|
// Copyright 2018-present 650 Industries. All rights reserved.
|
|
2
2
|
|
|
3
3
|
#include "FabricComponentsRegistry.h"
|
|
4
|
+
#include "ExpoComponentDescriptorFactory.h"
|
|
4
5
|
#include "../types/FrontendConverterProvider.h"
|
|
6
|
+
#include <CoreComponentsRegistry.h>
|
|
7
|
+
#include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
|
|
5
8
|
|
|
6
9
|
namespace jni = facebook::jni;
|
|
7
10
|
namespace react = facebook::react;
|
|
8
11
|
|
|
9
12
|
namespace expo {
|
|
10
13
|
|
|
11
|
-
#pragma clang diagnostic push
|
|
12
|
-
#pragma clang diagnostic ignored "-Wextern-initializer"
|
|
13
|
-
// Clang think that we don't need to initialize the extern variable here, but we do.
|
|
14
|
-
extern StatePropMapType statePropMap = {};
|
|
15
|
-
#pragma clang diagnostic pop
|
|
16
|
-
|
|
17
|
-
AndroidExpoViewComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
|
|
18
|
-
const react::ComponentDescriptorParameters ¶meters
|
|
19
|
-
) {
|
|
20
|
-
auto descriptor = std::make_unique<AndroidExpoViewComponentDescriptor>(
|
|
21
|
-
parameters,
|
|
22
|
-
react::RawPropsParser(/*useRawPropsJsiValue=*/true)
|
|
23
|
-
);
|
|
24
|
-
|
|
25
|
-
if (statePropMap.contains(std::static_pointer_cast<std::string const>(parameters.flavor))) {
|
|
26
|
-
descriptor->setStateProps(
|
|
27
|
-
statePropMap.at(
|
|
28
|
-
std::static_pointer_cast<std::string const>(parameters.flavor)
|
|
29
|
-
)
|
|
30
|
-
);
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
return descriptor;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
14
|
// static
|
|
37
15
|
void FabricComponentsRegistry::registerNatives() {
|
|
38
16
|
registerHybrid({
|
|
@@ -3,29 +3,12 @@
|
|
|
3
3
|
#pragma once
|
|
4
4
|
|
|
5
5
|
#include "../ExpoHeader.pch"
|
|
6
|
-
#include <CoreComponentsRegistry.h>
|
|
7
|
-
#include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
|
|
8
|
-
|
|
9
6
|
#include "../types/ExpectedType.h"
|
|
10
|
-
#include "../types/FrontendConverter.h"
|
|
11
|
-
#include "AndroidExpoViewComponentDescriptor.h"
|
|
12
7
|
|
|
13
8
|
namespace jni = facebook::jni;
|
|
14
|
-
namespace react = facebook::react;
|
|
15
9
|
|
|
16
10
|
namespace expo {
|
|
17
11
|
|
|
18
|
-
typedef std::unordered_map<
|
|
19
|
-
AndroidExpoViewComponentDescriptor::Flavor,
|
|
20
|
-
std::unordered_map<std::string, std::shared_ptr<FrontendConverter>>
|
|
21
|
-
> StatePropMapType;
|
|
22
|
-
|
|
23
|
-
extern StatePropMapType statePropMap;
|
|
24
|
-
|
|
25
|
-
AndroidExpoViewComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
|
|
26
|
-
const react::ComponentDescriptorParameters ¶meters
|
|
27
|
-
);
|
|
28
|
-
|
|
29
12
|
class FabricComponentsRegistry : public jni::HybridClass<FabricComponentsRegistry> {
|
|
30
13
|
public:
|
|
31
14
|
static auto constexpr
|
|
@@ -41,20 +41,42 @@ open class SharedObject(runtime: Runtime? = null) {
|
|
|
41
41
|
)
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
|
|
44
|
+
/**
|
|
45
|
+
* Emits an event with no payload to the associated JavaScript object.
|
|
46
|
+
*/
|
|
47
|
+
fun emit(event: String) {
|
|
48
|
+
emitInternal(event, emptyArray())
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Emits an event with a single payload to the associated JavaScript object.
|
|
53
|
+
*/
|
|
54
|
+
fun emit(event: String, payload: Any?) {
|
|
55
|
+
emitInternal(event, arrayOf(payload))
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
@Deprecated(
|
|
59
|
+
"Multi-argument event emission is deprecated. Use `emit(event)` or `emit(event, payload)` and pass a single payload (typically a Map/Bundle) instead.",
|
|
60
|
+
ReplaceWith("emit(event, args)")
|
|
61
|
+
)
|
|
62
|
+
fun emit(event: String, vararg args: Any?) {
|
|
63
|
+
emitInternal(event, args)
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
private fun emitInternal(event: String, payload: Array<out Any?>) {
|
|
45
67
|
val jsObject = getJavaScriptObject() ?: return
|
|
46
68
|
val jniInterop = runtime?.jsiContext ?: return
|
|
47
69
|
try {
|
|
48
70
|
JNIUtils.emitEvent(
|
|
49
71
|
jsObject,
|
|
50
72
|
jniInterop,
|
|
51
|
-
|
|
52
|
-
|
|
73
|
+
event,
|
|
74
|
+
payload
|
|
53
75
|
.map { JSTypeConverterProvider.convertToJSValue(it, useExperimentalConverter = true) }
|
|
54
76
|
.toTypedArray()
|
|
55
77
|
)
|
|
56
78
|
} catch (e: Throwable) {
|
|
57
|
-
logger.error("Unable to send event '$
|
|
79
|
+
logger.error("Unable to send event '$event' by shared object of type ${this::class.java.simpleName}", e)
|
|
58
80
|
}
|
|
59
81
|
}
|
|
60
82
|
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
Keep in sync with `@expo/expo-modules-macros-plugin/apple/Sources/ExpoModulesOptimized/ExpoModulesOptimized.swift`.
|
|
5
|
-
*/
|
|
1
|
+
// Declares macro signatures whose implementations are provided by the `ExpoModulesMacros` compiler
|
|
2
|
+
// plugin shipped in the `@expo/expo-modules-macros-plugin` package. Keep the `#externalMacro`
|
|
3
|
+
// module/type names below in sync with the macro implementations in that package.
|
|
6
4
|
|
|
7
5
|
// MARK: - Macro declarations
|
|
8
6
|
|
|
@@ -25,3 +23,64 @@
|
|
|
25
23
|
@attached(peer, names: arbitrary)
|
|
26
24
|
public macro OptimizedFunction() =
|
|
27
25
|
#externalMacro(module: "ExpoModulesMacros", type: "OptimizedFunctionAttachedMacro")
|
|
26
|
+
|
|
27
|
+
/// Marker macro applied to module / shared-object members that should be exposed to JavaScript.
|
|
28
|
+
/// The accompanying `@ExpoModule` and `@SharedObject` macros discover `@JS`-marked declarations
|
|
29
|
+
/// and generate the matching `Function` / `AsyncFunction` / `Property` / `Constructor` registrations.
|
|
30
|
+
///
|
|
31
|
+
/// Usage:
|
|
32
|
+
///
|
|
33
|
+
/// @JS
|
|
34
|
+
/// func greet(name: String) -> String { ... }
|
|
35
|
+
///
|
|
36
|
+
/// @JS("doWork")
|
|
37
|
+
/// func performWork() async throws { ... }
|
|
38
|
+
///
|
|
39
|
+
/// @JS
|
|
40
|
+
/// var status: String { "ok" }
|
|
41
|
+
@attached(peer)
|
|
42
|
+
public macro JS(_ jsName: String? = nil) =
|
|
43
|
+
#externalMacro(module: "ExpoModulesMacros", type: "JSMacro")
|
|
44
|
+
|
|
45
|
+
/// Member macro applied to a `Module` subclass. Scans the class body for declarations
|
|
46
|
+
/// marked with `@JS` and synthesizes a framework-internal `_exposedDefinition()` method.
|
|
47
|
+
/// `expo-modules-core` calls it automatically and merges the result into the module's
|
|
48
|
+
/// definition, so the user doesn't have to reference it from `definition()`.
|
|
49
|
+
///
|
|
50
|
+
/// Usage:
|
|
51
|
+
///
|
|
52
|
+
/// @ExpoModule
|
|
53
|
+
/// public final class MyModule: Module {
|
|
54
|
+
/// public func definition() -> ModuleDefinition {
|
|
55
|
+
/// Name("MyModule")
|
|
56
|
+
/// }
|
|
57
|
+
///
|
|
58
|
+
/// @JS
|
|
59
|
+
/// func greet(name: String) -> String { "Hi, \(name)" }
|
|
60
|
+
/// }
|
|
61
|
+
@attached(member, names: named(_exposedDefinition), named(appContext), named(init))
|
|
62
|
+
public macro ExpoModule(_ name: String? = nil, classes: [Any.Type] = []) =
|
|
63
|
+
#externalMacro(module: "ExpoModulesMacros", type: "ExpoModuleMacro")
|
|
64
|
+
|
|
65
|
+
/// Member macro applied to a `SharedObject` subclass. Scans the class body for declarations
|
|
66
|
+
/// marked with `@JS` (including a single `@JS init(...)` for the JS constructor) and
|
|
67
|
+
/// synthesizes a `_exposedClassDefinition()` static method returning a `ClassDefinition`.
|
|
68
|
+
/// The companion `@ExpoModule(classes: [Foo.self])` wires the class into the module's
|
|
69
|
+
/// exposed surface.
|
|
70
|
+
///
|
|
71
|
+
/// Usage:
|
|
72
|
+
///
|
|
73
|
+
/// @SharedObject
|
|
74
|
+
/// final class Cache: SharedObject {
|
|
75
|
+
/// @JS
|
|
76
|
+
/// init(name: String) { self.name = name }
|
|
77
|
+
///
|
|
78
|
+
/// @JS
|
|
79
|
+
/// func get(_ key: String) -> String? { ... }
|
|
80
|
+
///
|
|
81
|
+
/// @JS
|
|
82
|
+
/// var size: Int { 42 }
|
|
83
|
+
/// }
|
|
84
|
+
@attached(member, names: named(_exposedClassDefinition))
|
|
85
|
+
public macro SharedObject(_ name: String? = nil) =
|
|
86
|
+
#externalMacro(module: "ExpoModulesMacros", type: "SharedObjectMacro")
|
|
@@ -46,10 +46,28 @@ public final class ModuleHolder {
|
|
|
46
46
|
self.appContext = appContext
|
|
47
47
|
self._name = name
|
|
48
48
|
self.module = module
|
|
49
|
-
self.definition =
|
|
49
|
+
self.definition = ModuleHolder.buildDefinition(for: module)
|
|
50
50
|
post(event: .moduleCreate)
|
|
51
51
|
}
|
|
52
52
|
|
|
53
|
+
/// Combines the user-authored definition with the entries synthesized by the
|
|
54
|
+
/// `@ExpoModule` macro on this module's class (if any). The macro emits a
|
|
55
|
+
/// `_exposedDefinition()` method returning an `[AnyDefinition]` array of the
|
|
56
|
+
/// `Function` / `Property` / `Constructor` entries it generated from `@JS`
|
|
57
|
+
/// members. Those entries are prepended to the user's definitions and the
|
|
58
|
+
/// whole list is fed back through `ModuleDefinition.init` so the merged
|
|
59
|
+
/// result is rebucketed (into `functions`, `properties`, etc.) just like a
|
|
60
|
+
/// hand-written definition. Modules that don't use the macro fall through
|
|
61
|
+
/// the empty-exposed fast path and return the user's definition unchanged.
|
|
62
|
+
private static func buildDefinition(for module: AnyModule) -> ModuleDefinition {
|
|
63
|
+
let userDefinition = module.definition()
|
|
64
|
+
let exposed = module._exposedDefinition()
|
|
65
|
+
if exposed.isEmpty {
|
|
66
|
+
return userDefinition
|
|
67
|
+
}
|
|
68
|
+
return ModuleDefinition(definitions: exposed + userDefinition.rawDefinitions)
|
|
69
|
+
}
|
|
70
|
+
|
|
53
71
|
// MARK: Constants
|
|
54
72
|
|
|
55
73
|
/**
|
|
@@ -29,10 +29,17 @@ public final class ModuleDefinition: ObjectDefinition {
|
|
|
29
29
|
|
|
30
30
|
let eventObservers: [AnyEventObservingDefinition]
|
|
31
31
|
|
|
32
|
+
/// The raw list of definitions used to construct this module. Retained so
|
|
33
|
+
/// that `ModuleHolder` can merge in the entries synthesized by the
|
|
34
|
+
/// `@ExpoModule` macro without losing the user-authored ones.
|
|
35
|
+
let rawDefinitions: [AnyDefinition]
|
|
36
|
+
|
|
32
37
|
/**
|
|
33
38
|
Initializer that is called by the `ModuleDefinitionBuilder` results builder.
|
|
34
39
|
*/
|
|
35
40
|
override init(definitions: [AnyDefinition]) {
|
|
41
|
+
self.rawDefinitions = definitions
|
|
42
|
+
|
|
36
43
|
self.name = definitions
|
|
37
44
|
.compactMap { $0 as? ModuleNameDefinition }
|
|
38
45
|
.last?
|
|
@@ -14,4 +14,16 @@ public protocol AnyModule: AnyObject, AnyArgument {
|
|
|
14
14
|
*/
|
|
15
15
|
@ModuleDefinitionBuilder
|
|
16
16
|
func definition() -> ModuleDefinition
|
|
17
|
+
|
|
18
|
+
/// Returns definitions synthesized from `@JS`-annotated members by the `@ExpoModule` macro.
|
|
19
|
+
/// Framework-internal: the leading underscore signals this is not part of the public API and
|
|
20
|
+
/// should only be called by `expo-modules-core` itself. Modules that don't use the macro fall
|
|
21
|
+
/// back to the default empty implementation.
|
|
22
|
+
func _exposedDefinition() -> [AnyDefinition]
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
public extension AnyModule {
|
|
26
|
+
func _exposedDefinition() -> [AnyDefinition] {
|
|
27
|
+
return []
|
|
28
|
+
}
|
|
17
29
|
}
|
|
@@ -66,66 +66,87 @@ open class SharedObject: AnySharedObject {
|
|
|
66
66
|
public func getJavaScriptObject() -> JavaScriptObject? {
|
|
67
67
|
return appContext?.sharedObjectRegistry.toJavaScriptObject(self)
|
|
68
68
|
}
|
|
69
|
-
}
|
|
70
69
|
|
|
71
|
-
// Unfortunately the `emit` function needs to be defined in the extension.
|
|
72
|
-
// When put in the class, pack expansion is crashing with `EXC_BAD_ACCESS` code.
|
|
73
|
-
// See https://github.com/apple/swift/issues/72381 for more details.
|
|
74
|
-
public extension SharedObject { // swiftlint:disable:this no_grouping_extension
|
|
75
|
-
// Parameter packs feature requires Swift 5.9 (Xcode 15.0), but some CIs and EAS images may still use older versions.
|
|
76
|
-
// As of April 29, all submissions must be made with Xcode 15, so hopefully we can remove this condition soon.
|
|
77
|
-
// No one should use <15.0 these days.
|
|
78
|
-
#if swift(>=5.9)
|
|
79
70
|
/**
|
|
80
|
-
Schedules an event with the given name and
|
|
71
|
+
Schedules an event with the given name and a pre-converted JavaScript payload to be emitted
|
|
72
|
+
to the associated JavaScript object. This is the lowest-level emit overload — use it when the
|
|
73
|
+
value is already a `JavaScriptValue` to skip the native-to-JS conversion step.
|
|
81
74
|
*/
|
|
82
|
-
func emit
|
|
75
|
+
public func emit(event: String, payload: JavaScriptValue) {
|
|
83
76
|
guard let appContext, let runtime = try? appContext.runtime else {
|
|
84
77
|
log.warn("Trying to send event '\(event)' to \(type(of: self)), but the JS runtime has been lost")
|
|
85
78
|
return
|
|
86
79
|
}
|
|
80
|
+
guard let jsValue = getJavaScriptValue() else {
|
|
81
|
+
log.warn("Trying to send event '\(event)' to JS, but the JS object is no longer associated with the native instance")
|
|
82
|
+
return
|
|
83
|
+
}
|
|
84
|
+
runtime.schedule {
|
|
85
|
+
dispatch(event: event, payload: payload, to: jsValue, in: runtime)
|
|
86
|
+
}
|
|
87
|
+
}
|
|
87
88
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
/**
|
|
90
|
+
Schedules an event with the given name to be emitted to the associated JavaScript object.
|
|
91
|
+
*/
|
|
92
|
+
public func emit(event: String) {
|
|
93
|
+
emit(event: event, payload: .undefined)
|
|
94
|
+
}
|
|
91
95
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
+
/**
|
|
97
|
+
Schedules an event with the given name and payload to be emitted to the associated JavaScript object.
|
|
98
|
+
*/
|
|
99
|
+
public func emit<P: AnyArgument>(event: String, payload: sending P) {
|
|
100
|
+
guard let appContext, let runtime = try? appContext.runtime else {
|
|
101
|
+
log.warn("Trying to send event '\(event)' to \(type(of: self)), but the JS runtime has been lost")
|
|
102
|
+
return
|
|
103
|
+
}
|
|
104
|
+
guard let jsValue = getJavaScriptValue() else {
|
|
105
|
+
log.warn("Trying to send event '\(event)' to JS, but the JS object is no longer associated with the native instance")
|
|
106
|
+
return
|
|
107
|
+
}
|
|
108
|
+
runtime.schedule { [weak appContext] in
|
|
109
|
+
guard let appContext else {
|
|
96
110
|
return
|
|
97
111
|
}
|
|
98
|
-
|
|
99
|
-
// Convert native arguments to JS, just like function results
|
|
100
|
-
let jsArguments: [JavaScriptValue]
|
|
101
112
|
do {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
}
|
|
113
|
+
let jsPayload = try (~P.self).castToJS(payload, appContext: appContext, in: runtime)
|
|
114
|
+
dispatch(event: event, payload: jsPayload, to: jsValue, in: runtime)
|
|
105
115
|
} catch {
|
|
106
|
-
log.warn("Failed to convert
|
|
116
|
+
log.warn("Failed to convert payload for event '\(event)' on \(P.self); the event will not be emitted: \(error)")
|
|
107
117
|
return
|
|
108
118
|
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
109
121
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
+
/**
|
|
123
|
+
Backwards-compatible overload that forwards to `emit(event:payload:)`. Existing single-argument
|
|
124
|
+
call sites keep working unchanged; the parameter has been renamed to `payload` to make the
|
|
125
|
+
single-payload semantics explicit, so callers should migrate the label.
|
|
126
|
+
*/
|
|
127
|
+
@available(*, deprecated, renamed: "emit(event:payload:)", message: "Use `emit(event:payload:)` and pass a single value (typically a dictionary). Multi-argument event emission is no longer supported.")
|
|
128
|
+
public func emit<P: AnyArgument>(event: String, arguments: sending P) {
|
|
129
|
+
emit(event: event, payload: arguments)
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/**
|
|
134
|
+
Sends a pre-converted event payload to the given JavaScript object via the JSI emitter helper.
|
|
135
|
+
Must run on the JS thread; the public `emit` overloads schedule onto the runtime before calling in.
|
|
136
|
+
*/
|
|
137
|
+
@JavaScriptActor
|
|
138
|
+
private func dispatch(event: String, payload: JavaScriptValue, to value: JavaScriptValue, in runtime: JavaScriptRuntime) {
|
|
139
|
+
runtime.withUnsafePointee { runtimePtr in
|
|
140
|
+
value.withUnsafePointee { objectPtr in
|
|
141
|
+
payload.withUnsafePointee { payloadPtr in
|
|
142
|
+
JSUtils.emitEvent(
|
|
143
|
+
event,
|
|
144
|
+
runtimePointer: runtimePtr,
|
|
145
|
+
objectPointer: objectPtr,
|
|
146
|
+
argumentsPointer: payloadPtr,
|
|
147
|
+
argumentCount: 1
|
|
148
|
+
)
|
|
122
149
|
}
|
|
123
150
|
}
|
|
124
151
|
}
|
|
125
|
-
#else // swift(>=5.9)
|
|
126
|
-
@available(*, unavailable, message: "Unavailable in Xcode <15.0")
|
|
127
|
-
public func emit(event: String, arguments: AnyArgument...) {
|
|
128
|
-
fatalError("Emitting events to JS requires at least Xcode 15.0")
|
|
129
|
-
}
|
|
130
|
-
#endif // swift(<5.9)
|
|
131
152
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "expo-modules-core",
|
|
3
|
-
"version": "56.0.
|
|
3
|
+
"version": "56.0.9",
|
|
4
4
|
"description": "The core of Expo Modules architecture",
|
|
5
5
|
"main": "src/index.ts",
|
|
6
6
|
"types": "build/index.d.ts",
|
|
@@ -46,8 +46,8 @@
|
|
|
46
46
|
"preset": "expo-module-scripts"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@expo/expo-modules-macros-plugin": "~0.0.
|
|
50
|
-
"expo-modules-jsi": "~56.0.
|
|
49
|
+
"@expo/expo-modules-macros-plugin": "~0.0.9",
|
|
50
|
+
"expo-modules-jsi": "~56.0.5",
|
|
51
51
|
"invariant": "^2.2.4"
|
|
52
52
|
},
|
|
53
53
|
"peerDependencies": {
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@types/invariant": "^2.2.33",
|
|
67
67
|
"expo-module-scripts": "56.0.2"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "f26be3dd9396bf7c399a1d607865d0fabdbc0d64",
|
|
70
70
|
"scripts": {
|
|
71
71
|
"build": "expo-module build",
|
|
72
72
|
"clean": "expo-module clean",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|