@granite-js/react-native 0.1.23-next.6 → 0.1.23-next.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @granite-js/react-native
 
+## 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

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

@@ -1,7 +1,7 @@
 import { BrickModuleSpec } from 'brick-module';
 interface GraniteModuleSpec extends BrickModuleSpec {
     readonly moduleName: 'GraniteModule';
-    closeView(): void;
+    closeView(): Promise<void>;
     schemeUri: string;
 }
 export declare const GraniteModule: GraniteModuleSpec & {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/react-native",
-  "version": "0.1.23-next.6",
+  "version": "0.1.23-next.7",
   "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.6",
+    "@granite-js/native": "0.1.23-next.7",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.1.0",
     "@types/babel__core": "^7",
@@ -105,20 +105,20 @@
     "vitest": "^2.1.8"
   },
   "peerDependencies": {
-    "@granite-js/native": "0.1.23-next.6",
+    "@granite-js/native": "0.1.23-next.7",
     "@types/react": "*",
     "brick-module": "*",
     "react": "*",
     "react-native": "*"
   },
   "dependencies": {
-    "@granite-js/cli": "0.1.23-next.6",
-    "@granite-js/image": "0.1.23-next.6",
-    "@granite-js/jest": "0.1.23-next.6",
-    "@granite-js/lottie": "0.1.23-next.6",
-    "@granite-js/mpack": "0.1.23-next.6",
-    "@granite-js/plugin-core": "0.1.23-next.6",
-    "@granite-js/style-utils": "0.1.23-next.6",
+    "@granite-js/cli": "0.1.23-next.7",
+    "@granite-js/image": "0.1.23-next.7",
+    "@granite-js/jest": "0.1.23-next.7",
+    "@granite-js/lottie": "0.1.23-next.7",
+    "@granite-js/mpack": "0.1.23-next.7",
+    "@granite-js/plugin-core": "0.1.23-next.7",
+    "@granite-js/style-utils": "0.1.23-next.7",
     "es-toolkit": "^1.39.8",
     "react-native-url-polyfill": "1.3.0"
   }

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

@@ -3,7 +3,7 @@ import { BrickModule, BrickModuleSpec } from 'brick-module';
 interface GraniteModuleSpec extends BrickModuleSpec {
   readonly moduleName: 'GraniteModule';
 
-  closeView(): void;
+  closeView(): Promise<void>;
   schemeUri: string;
 }
 

package/src/router/Router.tsx

@@ -7,7 +7,7 @@ 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, useState } from 'react';
 import { InitialProps } from '..';
 import { closeView } from '../native-modules';
 import { BackButton } from './components/BackButton';
@@ -163,9 +163,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={navigationRef}
+      {...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(() => {