@granite-js/react-native 0.1.23-next.0 → 0.1.23-next.10

package/CHANGELOG.md

@@ -1,5 +1,125 @@
 # @granite-js/react-native
 
+## 0.1.23-next.10
+
+### Patch Changes
+
+- fix
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.10
+  - @granite-js/style-utils@0.1.23-next.10
+  - @granite-js/lottie@0.1.23-next.10
+  - @granite-js/native@0.1.23-next.10
+  - @granite-js/image@0.1.23-next.10
+  - @granite-js/mpack@0.1.23-next.10
+  - @granite-js/jest@0.1.23-next.10
+  - @granite-js/cli@0.1.23-next.10
+
+## 0.1.23-next.9
+
+### Patch Changes
+
+- tollback
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.9
+  - @granite-js/style-utils@0.1.23-next.9
+  - @granite-js/lottie@0.1.23-next.9
+  - @granite-js/native@0.1.23-next.9
+  - @granite-js/image@0.1.23-next.9
+  - @granite-js/mpack@0.1.23-next.9
+  - @granite-js/jest@0.1.23-next.9
+  - @granite-js/cli@0.1.23-next.9
+
+## 0.1.23-next.8
+
+### Patch Changes
+
+- router
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.8
+  - @granite-js/style-utils@0.1.23-next.8
+  - @granite-js/lottie@0.1.23-next.8
+  - @granite-js/native@0.1.23-next.8
+  - @granite-js/image@0.1.23-next.8
+  - @granite-js/mpack@0.1.23-next.8
+  - @granite-js/jest@0.1.23-next.8
+  - @granite-js/cli@0.1.23-next.8
+
+## 0.1.23-next.7
+
+### Patch Changes
+
+- fix
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.7
+  - @granite-js/style-utils@0.1.23-next.7
+  - @granite-js/lottie@0.1.23-next.7
+  - @granite-js/native@0.1.23-next.7
+  - @granite-js/image@0.1.23-next.7
+  - @granite-js/mpack@0.1.23-next.7
+  - @granite-js/jest@0.1.23-next.7
+  - @granite-js/cli@0.1.23-next.7
+
+## 0.1.23-next.6
+
+### Patch Changes
+
+- test
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.6
+  - @granite-js/style-utils@0.1.23-next.6
+  - @granite-js/lottie@0.1.23-next.6
+  - @granite-js/native@0.1.23-next.6
+  - @granite-js/image@0.1.23-next.6
+  - @granite-js/mpack@0.1.23-next.6
+  - @granite-js/jest@0.1.23-next.6
+  - @granite-js/cli@0.1.23-next.6
+
+## 0.1.23-next.5
+
+### Patch Changes
+
+- temp
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.5
+  - @granite-js/style-utils@0.1.23-next.5
+  - @granite-js/lottie@0.1.23-next.5
+  - @granite-js/native@0.1.23-next.5
+  - @granite-js/image@0.1.23-next.5
+  - @granite-js/mpack@0.1.23-next.5
+  - @granite-js/jest@0.1.23-next.5
+  - @granite-js/cli@0.1.23-next.5
+
+## 0.1.23-next.4
+
+### Patch Changes
+
+- test
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.4
+  - @granite-js/style-utils@0.1.23-next.4
+  - @granite-js/lottie@0.1.23-next.4
+  - @granite-js/native@0.1.23-next.4
+  - @granite-js/image@0.1.23-next.4
+  - @granite-js/mpack@0.1.23-next.4
+  - @granite-js/jest@0.1.23-next.4
+  - @granite-js/cli@0.1.23-next.4
+
+## 0.1.23-next.3
+
+### Patch Changes
+
+- test
+- Updated dependencies
+  - @granite-js/plugin-core@0.1.23-next.3
+  - @granite-js/style-utils@0.1.23-next.3
+  - @granite-js/lottie@0.1.23-next.3
+  - @granite-js/native@0.1.23-next.3
+  - @granite-js/image@0.1.23-next.3
+  - @granite-js/mpack@0.1.23-next.3
+  - @granite-js/jest@0.1.23-next.3
+  - @granite-js/cli@0.1.23-next.3
+
 ## 0.1.23-next.0
 
 ### Patch Changes

package/dist/async-bridges.d.mts

@@ -18,7 +18,7 @@
  * }
  * ```
  */
-declare function closeView(): Promise<void | undefined>;
+declare function closeView(): Promise<void>;
 
 /**
  * @public

package/dist/async-bridges.js

@@ -25,12 +25,9 @@ __export(async_bridges_exports, {
 });
 module.exports = __toCommonJS(async_bridges_exports);
 
-// src/native-modules/natives/GraniteModule.ts
-var import_react_native = require("react-native");
-var GraniteModule = import_react_native.TurboModuleRegistry.get("GraniteModule");
-if (!GraniteModule) {
-  console.warn("[GraniteModule] is not registered");
-}
+// src/native-modules/natives/GraniteModule.brick.ts
+var import_brick_module = require("brick-module");
+var GraniteModule = import_brick_module.BrickModule.get("GraniteModule");
 
 // src/native-modules/natives/closeView.ts
 async function closeView() {
@@ -38,9 +35,9 @@ async function closeView() {
 }
 
 // src/native-modules/natives/openURL.ts
-var import_react_native2 = require("react-native");
+var import_react_native = require("react-native");
 function openURL(url) {
-  return import_react_native2.Linking.openURL(url);
+  return import_react_native.Linking.openURL(url);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/async-bridges.mjs

@@ -1,6 +1,6 @@
 import {
   GraniteModule
-} from "./chunk-2PYPIQMA.mjs";
+} from "./chunk-OWDLSIVX.mjs";
 
 // src/native-modules/natives/closeView.ts
 async function closeView() {

package/dist/chunk-A3JGM5OI.mjs

@@ -0,0 +1,7 @@
+// src/native-modules/natives/GraniteModule.ts
+import { TurboModuleRegistry } from "react-native";
+var GraniteModule = TurboModuleRegistry.getEnforcing("GraniteModule");
+
+export {
+  GraniteModule
+};

package/dist/chunk-OWDLSIVX.mjs

@@ -0,0 +1,7 @@
+// src/native-modules/natives/GraniteModule.brick.ts
+import { BrickModule } from "brick-module";
+var GraniteModule = BrickModule.get("GraniteModule");
+
+export {
+  GraniteModule
+};

package/dist/constant-bridges.js

@@ -24,16 +24,13 @@ __export(constant_bridges_exports, {
 });
 module.exports = __toCommonJS(constant_bridges_exports);
 
-// src/native-modules/natives/GraniteModule.ts
-var import_react_native = require("react-native");
-var GraniteModule = import_react_native.TurboModuleRegistry.get("GraniteModule");
-if (!GraniteModule) {
-  console.warn("[GraniteModule] is not registered");
-}
+// src/native-modules/natives/GraniteModule.brick.ts
+var import_brick_module = require("brick-module");
+var GraniteModule = import_brick_module.BrickModule.get("GraniteModule");
 
 // src/native-modules/natives/getSchemeUri.ts
 function getSchemeUri() {
-  return GraniteModule?.schemeUri ?? "unknown";
+  return GraniteModule.schemeUri;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/constant-bridges.mjs

@@ -1,10 +1,10 @@
 import {
   GraniteModule
-} from "./chunk-2PYPIQMA.mjs";
+} from "./chunk-OWDLSIVX.mjs";
 
 // src/native-modules/natives/getSchemeUri.ts
 function getSchemeUri() {
-  return GraniteModule?.schemeUri ?? "unknown";
+  return GraniteModule.schemeUri;
 }
 export {
   getSchemeUri

package/dist/native-modules/index.d.ts

@@ -1,3 +1,2 @@
 /** Bridges API */
 export * from './natives';
-export { GraniteCoreModule } from './core/GraniteCoreModule';

package/dist/native-modules/natives/GraniteModule.brick.d.ts

@@ -0,0 +1,11 @@
+import { BrickModuleSpec } from 'brick-module';
+interface GraniteModuleSpec extends BrickModuleSpec {
+    readonly moduleName: 'GraniteModule';
+    readonly supportedEvents: ['visibilityChanged'];
+    closeView(): Promise<void>;
+    schemeUri: string;
+}
+export declare const GraniteModule: GraniteModuleSpec & {
+    addEventListener<TEvent = unknown>(eventName: "visibilityChanged", listener: (event: TEvent) => void): () => void;
+};
+export {};

package/dist/native-modules/natives/closeView.d.ts

@@ -18,4 +18,4 @@
  * }
  * ```
  */
-export declare function closeView(): Promise<void | undefined>;
+export declare function closeView(): Promise<void>;

package/dist/react/index.d.ts

@@ -0,0 +1 @@
+export { useWaitForReturnNavigator } from './useWaitForReturnNavigator';

package/dist/react/useWaitForReturnNavigator.d.ts

@@ -0,0 +1,39 @@
+/**
+ * @public
+ * @category Screen Control
+ * @name useWaitForReturnNavigator
+ * @description
+ * A Hook that helps execute the next code synchronously when returning from a screen transition.
+ * Screen navigation uses [@react-navigation/native `useNavigation`'s `navigate`](https://reactnavigation.org/docs/6.x/navigation-prop#navigate).
+ *
+ * For example, it can be used when you want to log that a user has navigated to another screen and returned.
+ *
+ * @example
+ * ### Example of code execution when returning from screen navigation
+ *
+ * When the **"Navigate"** button is pressed, it navigates to another screen, and logs are created when returning.
+ *
+ * ```tsx
+ * import { Button } from 'react-native';
+ * import { useWaitForReturnNavigator } from '@granite-js/react-native';
+ *
+ * export function UseWaitForReturnNavigator() {
+ *   const navigate = useWaitForReturnNavigator();
+ *
+ *   return (
+ *     <>
+ *       <Button
+ *         title="Navigate"
+ *         onPress={async () => {
+ *           console.log(1);
+ *           await navigate('/examples/use-visibility');
+ *           // This code executes when returning to the screen
+ *           console.log(2);
+ *         }}
+ *       />
+ *     </>
+ *   );
+ * }
+ * ```
+ */
+export declare function useWaitForReturnNavigator<T extends Record<string, object | undefined>>(): <RouteName extends keyof T>(route: RouteName, params?: T[RouteName]) => Promise<void>;

package/dist/router/Router.d.ts

@@ -8,7 +8,7 @@ interface StackNavigatorProps {
      * @description
      * You can create and pass a NavigationContainerRef from @react-navigation/native externally. This allows external control of the router.
      */
-    navigationContainerRef?: NavigationContainerRefWithCurrent<any>;
+    navigationContainerRef?: NavigationContainerRefWithCurrent<never>;
     /**
      * @name defaultScreenOption
      * @description
@@ -26,7 +26,6 @@ interface StackNavigatorProps {
     screenContainer?: ComponentType<PropsWithChildren<any>>;
 }
 type NavigationContainerProps = Pick<ComponentProps<typeof NavigationContainer>, 'ref' | 'documentTitle' | 'fallback' | 'onReady' | 'onUnhandledAction' | 'onStateChange'>;
-export declare const navigationRef: NavigationContainerRefWithCurrent<never>;
 /**
  * @category Components
  * @kind function
@@ -38,7 +37,7 @@ export declare const navigationRef: NavigationContainerRefWithCurrent<never>;
  *
  * @param {string} prefix Prefix to use when the scheme is executed. For example, to enter 'scheme://my-service/intro', you need to set 'scheme://my-service' as the prefix.
  * @param {RequireContext} context Object containing information about screens for file-based routing.
- * @param {NavigationContainerRefWithCurrent<any>} [navigationContainerRef] You can create and pass a NavigationContainerRef from @react-navigation/native externally. This allows external control of the router.
+ * @param {NavigationContainerRefWithCurrent<never>} [navigationContainerRef] You can create and pass a NavigationContainerRef from @react-navigation/native externally. This allows external control of the router.
  * @param {NativeStackNavigationOptions | ((props: { route: RouteProp<ParamListBase>; navigation: any }) => NativeStackNavigationOptions)} [defaultScreenOption] Default options for screens. You can set options to be applied commonly to screens, such as title or headerStyle.
  * @param {boolean} [canGoBack=true] Whether navigation back is possible. Default is true, and when set to true, you can use the back gesture or back button from @react-navigation/native.
  * @param {() => void} [onBack] Callback function called when the user presses the back button or uses the back gesture. For example, you can set it to log when the user presses the back button.

package/dist/router/components/CanGoBackGuard.d.ts

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
-export declare function CanGoBackGuard({ children, canGoBack, onBack, setIosSwipeGestureEnabled, }: {
+export declare function CanGoBackGuard({ children, canGoBack, onBack, isInitialScreen, setIosSwipeGestureEnabled, }: {
     canGoBack: boolean;
+    isInitialScreen: boolean;
     children: ReactNode;
     onBack?: () => void;
     setIosSwipeGestureEnabled?: ({ isEnabled }: {

package/dist/router/components/useRouterBackHandler.d.ts

@@ -6,7 +6,7 @@ import { NavigationContainerRefWithCurrent } from '@granite-js/native/@react-nav
  * @description
  * A hook that provides a handler for handling back navigation actions. This can be used when you need to close a view directly when the back button is pressed in modals or independent screens where there's no navigation stack. This hook uses `NavigationContainerRef` from `@react-navigation/native` to navigate to the previous screen if there's a remaining navigation stack, or executes the user-defined `onClose` function if the stack is empty.
  *
- * @param {NavigationContainerRefWithCurrent<any>} navigationContainerRef - A `NavigationContainerRef` that can reference the current navigation state. Used when executing back navigation actions.
+ * @param {NavigationContainerRefWithCurrent<never>} navigationContainerRef - A `NavigationContainerRef` that can reference the current navigation state. Used when executing back navigation actions.
  * @param {() => void} [onClose] - A function to execute when the navigation stack is empty. For example, you can pass a function that closes a React Native View.
  *
  * @returns {{ handler: () => void }} A handler function that can be used in back buttons or similar components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/react-native",
-  "version": "0.1.23-next.0",
+  "version": "0.1.23-next.10",
   "description": "The Granite Framework",
   "bin": {
     "granite": "./bin/cli.js"
@@ -86,7 +86,7 @@
     "@babel/core": "^7.24.9",
     "@babel/preset-env": "^7.24.8",
     "@babel/preset-typescript": "^7.24.7",
-    "@granite-js/native": "0.1.23-next.0",
+    "@granite-js/native": "0.1.23-next.10",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.1.0",
     "@types/babel__core": "^7",
@@ -94,29 +94,31 @@
     "@types/node": "^22.10.2",
     "@types/react": "npm:19.1.0",
     "@vitest/coverage-v8": "^2.1.8",
+    "brick-module": "^0.1.19",
     "esbuild": "0.25.9",
     "eslint": "^9.7.0",
     "jsdom": "^25.0.1",
     "react": "npm:19.1.0",
-    "react-native": "npm:0.81.0",
+    "react-native": "npm:0.81.3",
     "tsup": "^8.5.0",
     "typescript": "5.8.3",
     "vitest": "^2.1.8"
   },
   "peerDependencies": {
-    "@granite-js/native": "0.1.23-next.0",
+    "@granite-js/native": "0.1.23-next.10",
     "@types/react": "*",
+    "brick-module": "*",
     "react": "*",
     "react-native": "*"
   },
   "dependencies": {
-    "@granite-js/cli": "0.1.23-next.0",
-    "@granite-js/image": "0.1.23-next.0",
-    "@granite-js/jest": "0.1.23-next.0",
-    "@granite-js/lottie": "0.1.23-next.0",
-    "@granite-js/mpack": "0.1.23-next.0",
-    "@granite-js/plugin-core": "0.1.23-next.0",
-    "@granite-js/style-utils": "0.1.23-next.0",
+    "@granite-js/cli": "0.1.23-next.10",
+    "@granite-js/image": "0.1.23-next.10",
+    "@granite-js/jest": "0.1.23-next.10",
+    "@granite-js/lottie": "0.1.23-next.10",
+    "@granite-js/mpack": "0.1.23-next.10",
+    "@granite-js/plugin-core": "0.1.23-next.10",
+    "@granite-js/style-utils": "0.1.23-next.10",
     "es-toolkit": "^1.39.8",
     "react-native-url-polyfill": "1.3.0"
   }

package/src/native-modules/index.ts

@@ -1,3 +1,2 @@
 /** Bridges API */
 export * from './natives';
-export { GraniteCoreModule } from './core/GraniteCoreModule';

package/src/native-modules/natives/GraniteModule.brick.ts

@@ -0,0 +1,12 @@
+import { BrickModule, BrickModuleSpec } from 'brick-module';
+
+interface GraniteModuleSpec extends BrickModuleSpec {
+  readonly moduleName: 'GraniteModule';
+
+  readonly supportedEvents: ['visibilityChanged'];
+
+  closeView(): Promise<void>;
+  schemeUri: string;
+}
+
+export const GraniteModule = BrickModule.get<GraniteModuleSpec>('GraniteModule');

package/src/native-modules/natives/closeView.ts

@@ -1,4 +1,4 @@
-import { GraniteModule } from './GraniteModule';
+import { GraniteModule } from './GraniteModule.brick';
 
 /**
  * @public

package/src/native-modules/natives/getSchemeUri.ts

@@ -1,4 +1,4 @@
-import { GraniteModule } from './GraniteModule';
+import { GraniteModule } from './GraniteModule.brick';
 
 /**
  * @public
@@ -23,5 +23,5 @@ import { GraniteModule } from './GraniteModule';
  * ```
  */
 export function getSchemeUri() {
-  return GraniteModule?.schemeUri ?? 'unknown';
+  return GraniteModule.schemeUri;
 }

package/src/router/Router.tsx

@@ -7,7 +7,16 @@ import {
   RouteProp,
 } from '@granite-js/native/@react-navigation/native';
 import { NativeStackNavigationOptions } from '@granite-js/native/@react-navigation/native-stack';
-import { ComponentProps, ComponentType, Fragment, PropsWithChildren, ReactElement, useCallback } from 'react';
+import {
+  ComponentProps,
+  ComponentType,
+  Fragment,
+  PropsWithChildren,
+  ReactElement,
+  useCallback,
+  useMemo,
+  useState,
+} from 'react';
 import { InitialProps } from '..';
 import { closeView } from '../native-modules';
 import { BackButton } from './components/BackButton';
@@ -67,7 +76,7 @@ interface StackNavigatorProps {
    * @description
    * You can create and pass a NavigationContainerRef from @react-navigation/native externally. This allows external control of the router.
    */
-  navigationContainerRef?: NavigationContainerRefWithCurrent<any>;
+  navigationContainerRef?: NavigationContainerRefWithCurrent<never>;
   /**
    * @name defaultScreenOption
    * @description
@@ -89,8 +98,6 @@ type NavigationContainerProps = Pick<
   'ref' | 'documentTitle' | 'fallback' | 'onReady' | 'onUnhandledAction' | 'onStateChange'
 >;
 
-export const navigationRef = createNavigationContainerRef<never>();
-
 /**
  * @category Components
  * @kind function
@@ -102,7 +109,7 @@ export const navigationRef = createNavigationContainerRef<never>();
  *
  * @param {string} prefix Prefix to use when the scheme is executed. For example, to enter 'scheme://my-service/intro', you need to set 'scheme://my-service' as the prefix.
  * @param {RequireContext} context Object containing information about screens for file-based routing.
- * @param {NavigationContainerRefWithCurrent<any>} [navigationContainerRef] You can create and pass a NavigationContainerRef from @react-navigation/native externally. This allows external control of the router.
+ * @param {NavigationContainerRefWithCurrent<never>} [navigationContainerRef] You can create and pass a NavigationContainerRef from @react-navigation/native externally. This allows external control of the router.
  * @param {NativeStackNavigationOptions | ((props: { route: RouteProp<ParamListBase>; navigation: any }) => NativeStackNavigationOptions)} [defaultScreenOption] Default options for screens. You can set options to be applied commonly to screens, such as title or headerStyle.
  * @param {boolean} [canGoBack=true] Whether navigation back is possible. Default is true, and when set to true, you can use the back gesture or back button from @react-navigation/native.
  * @param {() => void} [onBack] Callback function called when the user presses the back button or uses the back gesture. For example, you can set it to log when the user presses the back button.
@@ -143,8 +150,10 @@ export function Router({
     initialScheme,
   });
 
+  const ref = useMemo(() => navigationContainerRef ?? createNavigationContainerRef<never>(), [navigationContainerRef]);
+
   const { handler, canGoBack, onBack } = useInternalRouterBackHandler({
-    navigationContainerRef: navigationRef,
+    navigationContainerRef: ref,
     onClose: closeView,
   });
 
@@ -163,9 +172,23 @@ export function Router({
     [canGoBack, defaultScreenOption, headerLeft]
   );
 
+  const [isInitialScreen, setIsInitialScreen] = useState(true);
+
   return (
-    <NavigationContainer ref={navigationRef} {...navigationContainerProps} linking={linkingOptions}>
-      <CanGoBackGuard canGoBack={canGoBack} onBack={onBack} setIosSwipeGestureEnabled={setIosSwipeGestureEnabled}>
+    <NavigationContainer
+      onStateChange={(state) => {
+        setIsInitialScreen(state ? state?.index === 0 : true);
+      }}
+      ref={ref}
+      {...navigationContainerProps}
+      linking={linkingOptions}
+    >
+      <CanGoBackGuard
+        canGoBack={canGoBack}
+        isInitialScreen={isInitialScreen}
+        onBack={onBack}
+        setIosSwipeGestureEnabled={setIosSwipeGestureEnabled}
+      >
         <Container {...initialProps}>
           <StackNavigator.Navigator initialRouteName={initialRouteName} screenOptions={screenOptions}>
             {Screens}

package/src/router/components/CanGoBackGuard.tsx

@@ -1,20 +1,19 @@
 import { ReactNode, useEffect } from 'react';
 import { BackHandler } from 'react-native';
-import { useIsInitialScreen } from '../hooks/useIsInitialScreen';
 
 export function CanGoBackGuard({
   children,
   canGoBack,
   onBack,
+  isInitialScreen,
   setIosSwipeGestureEnabled,
 }: {
   canGoBack: boolean;
+  isInitialScreen: boolean;
   children: ReactNode;
   onBack?: () => void;
   setIosSwipeGestureEnabled?: ({ isEnabled }: { isEnabled: boolean }) => void;
 }) {
-  const isInitialScreen = useIsInitialScreen();
-
   const shouldBlockGoingBack = !canGoBack;
 
   useEffect(() => {

package/src/router/components/useRouterBackHandler.tsx

@@ -9,7 +9,7 @@ import { useBackEventContext } from '../../use-back-event';
  * @description
  * A hook that provides a handler for handling back navigation actions. This can be used when you need to close a view directly when the back button is pressed in modals or independent screens where there's no navigation stack. This hook uses `NavigationContainerRef` from `@react-navigation/native` to navigate to the previous screen if there's a remaining navigation stack, or executes the user-defined `onClose` function if the stack is empty.
  *
- * @param {NavigationContainerRefWithCurrent<any>} navigationContainerRef - A `NavigationContainerRef` that can reference the current navigation state. Used when executing back navigation actions.
+ * @param {NavigationContainerRefWithCurrent<never>} navigationContainerRef - A `NavigationContainerRef` that can reference the current navigation state. Used when executing back navigation actions.
  * @param {() => void} [onClose] - A function to execute when the navigation stack is empty. For example, you can pass a function that closes a React Native View.
  *
  * @returns {{ handler: () => void }} A handler function that can be used in back buttons or similar components.

package/src/visibility/useVisibilityChanged.tsx

@@ -1,5 +1,5 @@
 import { createContext, PropsWithChildren, ReactElement, useContext, useEffect, useState } from 'react';
-import { nativeEventEmitter } from '../native-event-emitter';
+import { GraniteModule } from '../native-modules/natives/GraniteModule.brick';
 
 const VisibilityChangedContext = createContext<boolean | undefined>(undefined);
 
@@ -31,13 +31,9 @@ export function VisibilityChangedProvider({
   const [visible, setVisible] = useState(isVisible);
 
   useEffect(() => {
-    const subscription = nativeEventEmitter.addListener('visibilityChanged', (nextVisible) => {
+    return GraniteModule.addEventListener('visibilityChanged', (nextVisible: boolean) => {
       setVisible(nextVisible);
     });
-
-    return () => {
-      subscription.remove();
-    };
   }, []);
 
   return <VisibilityChangedContext.Provider value={visible}>{children}</VisibilityChangedContext.Provider>;

package/src/native-event-emitter/eventEmitters/index.ts

@@ -1,3 +0,0 @@
-import { VisibilityChangedEventEmitter } from './visibilityChanged';
-
-export type EventEmitters = VisibilityChangedEventEmitter;

package/src/native-event-emitter/eventEmitters/types.ts

@@ -1,4 +0,0 @@
-export interface EventEmitterSchema<K extends string, P extends unknown[]> {
-  name: K;
-  params: P;
-}

package/src/native-event-emitter/eventEmitters/visibilityChanged.ts

@@ -1,11 +0,0 @@
-import { EventEmitterSchema } from './types';
-
-/**
- * @name VisibilityChangedEventEmitter
- * @kind typedef
- * @platform iOS
- * @description
- * Emits an event when the visibility state of the app changes.
- * Only available on iOS.
- */
-export type VisibilityChangedEventEmitter = EventEmitterSchema<'visibilityChanged', [boolean]>;

package/src/native-event-emitter/index.ts

@@ -1 +0,0 @@
-export * from './nativeEventEmitter';

package/src/native-event-emitter/nativeEventEmitter.ts

@@ -1,29 +0,0 @@
-import { EmitterSubscription, NativeEventEmitter } from 'react-native';
-import { EventEmitters } from './eventEmitters';
-import { GraniteCoreModule } from '../native-modules';
-import { EventEmitterSchema } from './eventEmitters/types';
-
-type MapOf<T> = T extends EventEmitterSchema<infer K, any> ? { [key in K]: T } : never;
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-type EventEmittersMap = UnionToIntersection<MapOf<EventEmitters>>;
-type EventKeys = keyof EventEmittersMap;
-type ParamOf<K extends EventKeys> = EventEmittersMap[K]['params'];
-interface EventEmitter {
-  addListener<Event extends EventKeys>(
-    event: Event,
-    callback: (...params: ParamOf<Event>) => void
-  ): EmitterSubscription;
-}
-
-export const nativeEventEmitter = GraniteCoreModule
-  ? (new NativeEventEmitter(GraniteCoreModule) as unknown as EventEmitter)
-  : {
-      addListener: () => {
-        console.warn('[GraniteCoreModule] is not registered');
-        return {
-          remove: () => {
-            console.warn('[GraniteCoreModule] is not registered');
-          },
-        };
-      },
-    };

package/src/native-modules/core/GraniteCoreModule.ts

@@ -1,9 +0,0 @@
-import { TurboModule, TurboModuleRegistry } from 'react-native';
-
-interface GraniteCoreModule extends TurboModule {
-  addListener: (eventType: string) => void;
-  removeListeners: (count: number) => void;
-  importLazy: () => Promise<void>;
-}
-
-export const GraniteCoreModule = TurboModuleRegistry.get<GraniteCoreModule>('GraniteCoreModule');

package/src/native-modules/natives/GraniteModule.ts

@@ -1,11 +0,0 @@
-import { TurboModule, TurboModuleRegistry } from 'react-native';
-
-interface GraniteModuleSpec extends TurboModule {
-  closeView: () => void;
-  schemeUri: string;
-}
-
-export const GraniteModule = TurboModuleRegistry.get<GraniteModuleSpec>('GraniteModule');
-if (!GraniteModule) {
-  console.warn('[GraniteModule] is not registered');
-}