@granite-js/react-native 0.1.23-next.8 → 0.1.23-next.9

package/CHANGELOG.md

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

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

@@ -1,7 +1,6 @@
 import { ReactNode } from 'react';
-export declare function CanGoBackGuard({ children, canGoBack, onBack, isInitialScreen, setIosSwipeGestureEnabled, }: {
+export declare function CanGoBackGuard({ children, canGoBack, onBack, 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.8",
+  "version": "0.1.23-next.9",
   "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.8",
+    "@granite-js/native": "0.1.23-next.9",
     "@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.8",
+    "@granite-js/native": "0.1.23-next.9",
     "@types/react": "*",
     "brick-module": "*",
     "react": "*",
     "react-native": "*"
   },
   "dependencies": {
-    "@granite-js/cli": "0.1.23-next.8",
-    "@granite-js/image": "0.1.23-next.8",
-    "@granite-js/jest": "0.1.23-next.8",
-    "@granite-js/lottie": "0.1.23-next.8",
-    "@granite-js/mpack": "0.1.23-next.8",
-    "@granite-js/plugin-core": "0.1.23-next.8",
-    "@granite-js/style-utils": "0.1.23-next.8",
+    "@granite-js/cli": "0.1.23-next.9",
+    "@granite-js/image": "0.1.23-next.9",
+    "@granite-js/jest": "0.1.23-next.9",
+    "@granite-js/lottie": "0.1.23-next.9",
+    "@granite-js/mpack": "0.1.23-next.9",
+    "@granite-js/plugin-core": "0.1.23-next.9",
+    "@granite-js/style-utils": "0.1.23-next.9",
     "es-toolkit": "^1.39.8",
     "react-native-url-polyfill": "1.3.0"
   }

package/src/router/Router.tsx

@@ -7,16 +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,
-  useMemo,
-  useState,
-} from 'react';
+import { ComponentProps, ComponentType, Fragment, PropsWithChildren, ReactElement, useCallback, useMemo } from 'react';
 import { InitialProps } from '..';
 import { closeView } from '../native-modules';
 import { BackButton } from './components/BackButton';
@@ -172,23 +163,9 @@ export function Router({
     [canGoBack, defaultScreenOption, headerLeft]
   );
 
-  const [isInitialScreen, setIsInitialScreen] = useState(true);
-
   return (
-    <NavigationContainer
-      onStateChange={(state) => {
-        setIsInitialScreen(state ? state?.index === 0 : true);
-      }}
-      ref={ref}
-      {...navigationContainerProps}
-      linking={linkingOptions}
-    >
-      <CanGoBackGuard
-        canGoBack={canGoBack}
-        isInitialScreen={isInitialScreen}
-        onBack={onBack}
-        setIosSwipeGestureEnabled={setIosSwipeGestureEnabled}
-      >
+    <NavigationContainer ref={ref} {...navigationContainerProps} linking={linkingOptions}>
+      <CanGoBackGuard canGoBack={canGoBack} onBack={onBack} setIosSwipeGestureEnabled={setIosSwipeGestureEnabled}>
         <Container {...initialProps}>
           <StackNavigator.Navigator initialRouteName={initialRouteName} screenOptions={screenOptions}>
             {Screens}

package/src/router/components/CanGoBackGuard.tsx

@@ -1,19 +1,20 @@
 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(() => {