brick-module 0.1.17 → 0.1.18

package/android/brick_modules.gradle

@@ -228,42 +228,14 @@ ext.applyBrickModules = { settings, args ->
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-# Header for BrickModuleSpec. When included by RN autolinking (no BRICKMODULESPEC_DUMMY_IMPL),
-# include RN headers and provide an inline nullptr-returning implementation. When building the
-# dummy static library (with BRICKMODULESPEC_DUMMY_IMPL), avoid depending on RN headers.
-file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/BrickModuleSpec.h [[
-/** Auto-generated dummy header for BrickModuleSpec */
-#pragma once
-#include <memory>
-#include <string>
-namespace facebook { namespace react {
-
-#ifndef BRICKMODULESPEC_DUMMY_IMPL
-#include <ReactCommon/JavaTurboModule.h>
-inline std::shared_ptr<TurboModule> BrickModuleSpec_ModuleProvider(
-  const std::string & /*moduleName*/, const JavaTurboModule::InitParams & /*params*/) {
-  return nullptr;
-}
-#else
-class TurboModule;     // forward declaration
-class JavaTurboModule; // forward declaration
-#endif
-
-}} // namespace facebook::react
-]])
-
-# Create a trivial compilation unit for the static library
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp [[
-// Dummy TU for react_codegen_BrickModuleSpec
-int brick_codegen_BrickModuleSpec_dummy = 0;
-]])
+# Create a dummy source file
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "// Dummy file for BrickModuleSpec\n")
 
 # Create an empty static library to satisfy React Native's build system
 add_library(react_codegen_BrickModuleSpec STATIC ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp)
 
 # Set necessary properties
 target_include_directories(react_codegen_BrickModuleSpec PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_definitions(react_codegen_BrickModuleSpec PRIVATE BRICKMODULESPEC_DUMMY_IMPL=1)
 '''
 
                         def prepareTask = subproj.tasks.findByName('prepareBrickModuleAutolinkCMake') ?: subproj.tasks.create('prepareBrickModuleAutolinkCMake') {

package/dist/BrickModule.js

@@ -33,9 +33,21 @@ function get(moduleName) {
 		get: (_target, property) => {
 			if (typeof property !== "string") return;
 			if (property === "addEventListener") return (eventName, listener) => {
-				const subscription = getEventEmitter().addListener(`${moduleName}_${eventName}`, listener);
+				const emitter = getEventEmitter();
+				try {
+					const native = getNativeModule();
+					const moduleAddName = `${moduleName}_onEventListenerAdded`;
+					if (typeof native[moduleAddName] === "function") native[moduleAddName](eventName);
+				} catch {}
+				const subscription = emitter.addListener(`${moduleName}_${eventName}`, listener);
 				return () => {
-					subscription.remove();
+					const native = getNativeModule();
+					const moduleRemoveName = `${moduleName}_onEventListenerRemoved`;
+					try {
+						if (typeof native[moduleRemoveName] === "function") native[moduleRemoveName](eventName);
+					} catch {} finally {
+						subscription.remove();
+					}
 				};
 			};
 			const allConstants = nativeModuleInstance?.getConstants?.() ?? {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brick-module",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Better React Native native module development",
   "type": "module",
   "main": "dist/index.js",
@@ -62,7 +62,7 @@
     "brick-codegen": "./bin/brick-codegen.js"
   },
   "dependencies": {
-    "brick-codegen": "0.1.17"
+    "brick-codegen": "0.1.18"
   },
   "peerDependencies": {
     "react": ">=18.2.0",

package/src/BrickModule.ts

@@ -94,13 +94,35 @@ function get<T extends BrickModuleInterface>(
       if (property === "addEventListener") {
         return (eventName: string, listener: (event: unknown) => void) => {
           const emitter = getEventEmitter();
+          // Inform native module about listener addition (module-specific)
+          try {
+            const native = getNativeModule();
+            const moduleAddName = `${moduleName}_onEventListenerAdded`;
+            if (typeof native[moduleAddName] === "function") {
+              native[moduleAddName](eventName);
+            }
+          } catch {
+            // ignore
+          }
+
           const subscription = emitter.addListener(
             `${moduleName}_${eventName}`,
             listener
           );
 
           return () => {
-            subscription.remove();
+            const native = getNativeModule();
+            const moduleRemoveName = `${moduleName}_onEventListenerRemoved`;
+            try {
+              // Prefer module-specific native removal for precise cleanup
+              if (typeof native[moduleRemoveName] === "function") {
+                native[moduleRemoveName](eventName);
+              }
+            } catch {
+              // ignore
+            } finally {
+              subscription.remove();
+            }
           };
         };
       }