@react-navigation/core 7.0.0-rc.7 → 7.0.0-rc.8

package/lib/commonjs/useIsFocused.cjs

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useIsFocused = useIsFocused;
-var _react = _interopRequireWildcard(require("react"));
-var React = _react;
+var React = _interopRequireWildcard(require("react"));
 var _useNavigation = require("./useNavigation.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -15,25 +14,15 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 function useIsFocused() {
   const navigation = (0, _useNavigation.useNavigation)();
-  const [isFocused, setIsFocused] = (0, _react.useState)(navigation.isFocused);
-  const valueToReturn = navigation.isFocused();
-  if (isFocused !== valueToReturn) {
-    // If the value has changed since the last render, we need to update it.
-    // This could happen if we missed an update from the event listeners during re-render.
-    // React will process this update immediately, so the old subscription value won't be committed.
-    // It is still nice to avoid returning a mismatched value though, so let's override the return value.
-    // This is the same logic as in https://github.com/facebook/react/tree/master/packages/use-subscription
-    setIsFocused(valueToReturn);
-  }
-  React.useEffect(() => {
-    const unsubscribeFocus = navigation.addListener('focus', () => setIsFocused(true));
-    const unsubscribeBlur = navigation.addListener('blur', () => setIsFocused(false));
+  const subscribe = React.useCallback(callback => {
+    const unsubscribeFocus = navigation.addListener('focus', callback);
+    const unsubscribeBlur = navigation.addListener('blur', callback);
     return () => {
       unsubscribeFocus();
       unsubscribeBlur();
     };
   }, [navigation]);
-  React.useDebugValue(valueToReturn);
-  return valueToReturn;
+  const value = React.useSyncExternalStore(subscribe, navigation.isFocused, navigation.isFocused);
+  return value;
 }
 //# sourceMappingURL=useIsFocused.cjs.map

package/lib/commonjs/useIsFocused.cjs.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","React","_useNavigation","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useIsFocused","navigation","useNavigation","isFocused","setIsFocused","useState","valueToReturn","useEffect","unsubscribeFocus","addListener","unsubscribeBlur","useDebugValue"],"sourceRoot":"../../src","sources":["useIsFocused.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAA+B,IAAAC,KAAA,GAAAH,MAAA;AAG/B,IAAAI,cAAA,GAAAF,OAAA;AAAgD,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAEhD;AACA;AACA;AACA;AACO,SAASW,YAAYA,CAAA,EAAY;EACtC,MAAMC,UAAU,GAAG,IAAAC,4BAAa,EAAC,CAAC;EAClC,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAACJ,UAAU,CAACE,SAAS,CAAC;EAEhE,MAAMG,aAAa,GAAGL,UAAU,CAACE,SAAS,CAAC,CAAC;EAE5C,IAAIA,SAAS,KAAKG,aAAa,EAAE;IAC/B;IACA;IACA;IACA;IACA;IACAF,YAAY,CAACE,aAAa,CAAC;EAC7B;EAEA5B,KAAK,CAAC6B,SAAS,CAAC,MAAM;IACpB,MAAMC,gBAAgB,GAAGP,UAAU,CAACQ,WAAW,CAAC,OAAO,EAAE,MACvDL,YAAY,CAAC,IAAI,CACnB,CAAC;IAED,MAAMM,eAAe,GAAGT,UAAU,CAACQ,WAAW,CAAC,MAAM,EAAE,MACrDL,YAAY,CAAC,KAAK,CACpB,CAAC;IAED,OAAO,MAAM;MACXI,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EAAE,CAACT,UAAU,CAAC,CAAC;EAEhBvB,KAAK,CAACiC,aAAa,CAACL,aAAa,CAAC;EAElC,OAAOA,aAAa;AACtB","ignoreList":[]}
+{"version":3,"names":["React","_interopRequireWildcard","require","_useNavigation","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useIsFocused","navigation","useNavigation","subscribe","useCallback","callback","unsubscribeFocus","addListener","unsubscribeBlur","value","useSyncExternalStore","isFocused"],"sourceRoot":"../../src","sources":["useIsFocused.tsx"],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AAAgD,SAAAE,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAEhD;AACA;AACA;AACA;AACO,SAASW,YAAYA,CAAA,EAAY;EACtC,MAAMC,UAAU,GAAG,IAAAC,4BAAa,EAAC,CAAC;EAElC,MAAMC,SAAS,GAAG3B,KAAK,CAAC4B,WAAW,CAChCC,QAAoB,IAAK;IACxB,MAAMC,gBAAgB,GAAGL,UAAU,CAACM,WAAW,CAAC,OAAO,EAAEF,QAAQ,CAAC;IAClE,MAAMG,eAAe,GAAGP,UAAU,CAACM,WAAW,CAAC,MAAM,EAAEF,QAAQ,CAAC;IAEhE,OAAO,MAAM;MACXC,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EACD,CAACP,UAAU,CACb,CAAC;EAED,MAAMQ,KAAK,GAAGjC,KAAK,CAACkC,oBAAoB,CACtCP,SAAS,EACTF,UAAU,CAACU,SAAS,EACpBV,UAAU,CAACU,SACb,CAAC;EAED,OAAOF,KAAK;AACd","ignoreList":[]}

package/lib/commonjs/useNavigationState.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useNavigationState = useNavigationState;
 var React = _interopRequireWildcard(require("react"));
+var _withSelector = require("use-sync-external-store/with-selector");
 var _useNavigation = require("./useNavigation.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -15,22 +16,11 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 function useNavigationState(selector) {
   const navigation = (0, _useNavigation.useNavigation)();
-
-  // We don't care about the state value, we run the selector again at the end
-  // The state is only to make sure that there's a re-render when we have a new value
-  const [, setResult] = React.useState(() => selector(navigation.getState()));
-
-  // We store the selector in a ref to avoid re-subscribing listeners every render
-  const selectorRef = React.useRef(selector);
-  React.useEffect(() => {
-    selectorRef.current = selector;
-  });
-  React.useEffect(() => {
-    const unsubscribe = navigation.addListener('state', e => {
-      setResult(selectorRef.current(e.data.state));
-    });
+  const subscribe = React.useCallback(callback => {
+    const unsubscribe = navigation.addListener('state', callback);
     return unsubscribe;
   }, [navigation]);
-  return selector(navigation.getState());
+  const value = (0, _withSelector.useSyncExternalStoreWithSelector)(subscribe, navigation.getState, navigation.getState, selector);
+  return value;
 }
 //# sourceMappingURL=useNavigationState.cjs.map

package/lib/commonjs/useNavigationState.cjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","_interopRequireWildcard","require","_useNavigation","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useNavigationState","selector","navigation","useNavigation","setResult","useState","getState","selectorRef","useRef","useEffect","current","unsubscribe","addListener","data","state"],"sourceRoot":"../../src","sources":["useNavigationState.tsx"],"mappings":";;;;;;AACA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,cAAA,GAAAD,OAAA;AAAgD,SAAAE,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAMhD;AACA;AACA;AACA;AACA;AACO,SAASW,kBAAkBA,CAChCC,QAAgC,EAC7B;EACH,MAAMC,UAAU,GAAG,IAAAC,4BAAa,EAA4B,CAAC;;EAE7D;EACA;EACA,MAAM,GAAGC,SAAS,CAAC,GAAG5B,KAAK,CAAC6B,QAAQ,CAAC,MAAMJ,QAAQ,CAACC,UAAU,CAACI,QAAQ,CAAC,CAAC,CAAC,CAAC;;EAE3E;EACA,MAAMC,WAAW,GAAG/B,KAAK,CAACgC,MAAM,CAACP,QAAQ,CAAC;EAE1CzB,KAAK,CAACiC,SAAS,CAAC,MAAM;IACpBF,WAAW,CAACG,OAAO,GAAGT,QAAQ;EAChC,CAAC,CAAC;EAEFzB,KAAK,CAACiC,SAAS,CAAC,MAAM;IACpB,MAAME,WAAW,GAAGT,UAAU,CAACU,WAAW,CAAC,OAAO,EAAG/B,CAAC,IAAK;MACzDuB,SAAS,CAACG,WAAW,CAACG,OAAO,CAAC7B,CAAC,CAACgC,IAAI,CAACC,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,OAAOH,WAAW;EACpB,CAAC,EAAE,CAACT,UAAU,CAAC,CAAC;EAEhB,OAAOD,QAAQ,CAACC,UAAU,CAACI,QAAQ,CAAC,CAAC,CAAC;AACxC","ignoreList":[]}
+{"version":3,"names":["React","_interopRequireWildcard","require","_withSelector","_useNavigation","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useNavigationState","selector","navigation","useNavigation","subscribe","useCallback","callback","unsubscribe","addListener","value","useSyncExternalStoreWithSelector","getState"],"sourceRoot":"../../src","sources":["useNavigationState.tsx"],"mappings":";;;;;;AACA,IAAAA,KAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AAGA,IAAAE,cAAA,GAAAF,OAAA;AAAgD,SAAAG,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAMhD;AACA;AACA;AACA;AACA;AACO,SAASW,kBAAkBA,CAChCC,QAAgC,EAC7B;EACH,MAAMC,UAAU,GAAG,IAAAC,4BAAa,EAA4B,CAAC;EAE7D,MAAMC,SAAS,GAAG7B,KAAK,CAAC8B,WAAW,CAChCC,QAAoB,IAAK;IACxB,MAAMC,WAAW,GAAGL,UAAU,CAACM,WAAW,CAAC,OAAO,EAAEF,QAAQ,CAAC;IAE7D,OAAOC,WAAW;EACpB,CAAC,EACD,CAACL,UAAU,CACb,CAAC;EAED,MAAMO,KAAK,GAAG,IAAAC,8CAAgC,EAC5CN,SAAS,EACTF,UAAU,CAACS,QAAQ,EACnBT,UAAU,CAACS,QAAQ,EACnBV,QACF,CAAC;EAED,OAAOQ,KAAK;AACd","ignoreList":[]}

package/lib/module/useIsFocused.mjs

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { useState } from 'react';
 import { useNavigation } from "./useNavigation.mjs";
 
 /**
@@ -8,25 +7,15 @@ import { useNavigation } from "./useNavigation.mjs";
  */
 export function useIsFocused() {
   const navigation = useNavigation();
-  const [isFocused, setIsFocused] = useState(navigation.isFocused);
-  const valueToReturn = navigation.isFocused();
-  if (isFocused !== valueToReturn) {
-    // If the value has changed since the last render, we need to update it.
-    // This could happen if we missed an update from the event listeners during re-render.
-    // React will process this update immediately, so the old subscription value won't be committed.
-    // It is still nice to avoid returning a mismatched value though, so let's override the return value.
-    // This is the same logic as in https://github.com/facebook/react/tree/master/packages/use-subscription
-    setIsFocused(valueToReturn);
-  }
-  React.useEffect(() => {
-    const unsubscribeFocus = navigation.addListener('focus', () => setIsFocused(true));
-    const unsubscribeBlur = navigation.addListener('blur', () => setIsFocused(false));
+  const subscribe = React.useCallback(callback => {
+    const unsubscribeFocus = navigation.addListener('focus', callback);
+    const unsubscribeBlur = navigation.addListener('blur', callback);
     return () => {
       unsubscribeFocus();
       unsubscribeBlur();
     };
   }, [navigation]);
-  React.useDebugValue(valueToReturn);
-  return valueToReturn;
+  const value = React.useSyncExternalStore(subscribe, navigation.isFocused, navigation.isFocused);
+  return value;
 }
 //# sourceMappingURL=useIsFocused.mjs.map

package/lib/module/useIsFocused.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","useState","useNavigation","useIsFocused","navigation","isFocused","setIsFocused","valueToReturn","useEffect","unsubscribeFocus","addListener","unsubscribeBlur","useDebugValue"],"sourceRoot":"../../src","sources":["useIsFocused.tsx"],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,QAAQ,QAAQ,OAAO;AAEhC,SAASC,aAAa,QAAQ,qBAAiB;;AAE/C;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAA,EAAY;EACtC,MAAMC,UAAU,GAAGF,aAAa,CAAC,CAAC;EAClC,MAAM,CAACG,SAAS,EAAEC,YAAY,CAAC,GAAGL,QAAQ,CAACG,UAAU,CAACC,SAAS,CAAC;EAEhE,MAAME,aAAa,GAAGH,UAAU,CAACC,SAAS,CAAC,CAAC;EAE5C,IAAIA,SAAS,KAAKE,aAAa,EAAE;IAC/B;IACA;IACA;IACA;IACA;IACAD,YAAY,CAACC,aAAa,CAAC;EAC7B;EAEAP,KAAK,CAACQ,SAAS,CAAC,MAAM;IACpB,MAAMC,gBAAgB,GAAGL,UAAU,CAACM,WAAW,CAAC,OAAO,EAAE,MACvDJ,YAAY,CAAC,IAAI,CACnB,CAAC;IAED,MAAMK,eAAe,GAAGP,UAAU,CAACM,WAAW,CAAC,MAAM,EAAE,MACrDJ,YAAY,CAAC,KAAK,CACpB,CAAC;IAED,OAAO,MAAM;MACXG,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EAAE,CAACP,UAAU,CAAC,CAAC;EAEhBJ,KAAK,CAACY,aAAa,CAACL,aAAa,CAAC;EAElC,OAAOA,aAAa;AACtB","ignoreList":[]}
+{"version":3,"names":["React","useNavigation","useIsFocused","navigation","subscribe","useCallback","callback","unsubscribeFocus","addListener","unsubscribeBlur","value","useSyncExternalStore","isFocused"],"sourceRoot":"../../src","sources":["useIsFocused.tsx"],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAE9B,SAASC,aAAa,QAAQ,qBAAiB;;AAE/C;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAA,EAAY;EACtC,MAAMC,UAAU,GAAGF,aAAa,CAAC,CAAC;EAElC,MAAMG,SAAS,GAAGJ,KAAK,CAACK,WAAW,CAChCC,QAAoB,IAAK;IACxB,MAAMC,gBAAgB,GAAGJ,UAAU,CAACK,WAAW,CAAC,OAAO,EAAEF,QAAQ,CAAC;IAClE,MAAMG,eAAe,GAAGN,UAAU,CAACK,WAAW,CAAC,MAAM,EAAEF,QAAQ,CAAC;IAEhE,OAAO,MAAM;MACXC,gBAAgB,CAAC,CAAC;MAClBE,eAAe,CAAC,CAAC;IACnB,CAAC;EACH,CAAC,EACD,CAACN,UAAU,CACb,CAAC;EAED,MAAMO,KAAK,GAAGV,KAAK,CAACW,oBAAoB,CACtCP,SAAS,EACTD,UAAU,CAACS,SAAS,EACpBT,UAAU,CAACS,SACb,CAAC;EAED,OAAOF,KAAK;AACd","ignoreList":[]}

package/lib/module/useNavigationState.mjs

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector';
 import { useNavigation } from "./useNavigation.mjs";
 /**
  * Hook to get a value from the current navigation state using a selector.
@@ -7,22 +8,11 @@ import { useNavigation } from "./useNavigation.mjs";
  */
 export function useNavigationState(selector) {
   const navigation = useNavigation();
-
-  // We don't care about the state value, we run the selector again at the end
-  // The state is only to make sure that there's a re-render when we have a new value
-  const [, setResult] = React.useState(() => selector(navigation.getState()));
-
-  // We store the selector in a ref to avoid re-subscribing listeners every render
-  const selectorRef = React.useRef(selector);
-  React.useEffect(() => {
-    selectorRef.current = selector;
-  });
-  React.useEffect(() => {
-    const unsubscribe = navigation.addListener('state', e => {
-      setResult(selectorRef.current(e.data.state));
-    });
+  const subscribe = React.useCallback(callback => {
+    const unsubscribe = navigation.addListener('state', callback);
     return unsubscribe;
   }, [navigation]);
-  return selector(navigation.getState());
+  const value = useSyncExternalStoreWithSelector(subscribe, navigation.getState, navigation.getState, selector);
+  return value;
 }
 //# sourceMappingURL=useNavigationState.mjs.map

package/lib/module/useNavigationState.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["React","useNavigation","useNavigationState","selector","navigation","setResult","useState","getState","selectorRef","useRef","useEffect","current","unsubscribe","addListener","e","data","state"],"sourceRoot":"../../src","sources":["useNavigationState.tsx"],"mappings":"AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAG9B,SAASC,aAAa,QAAQ,qBAAiB;AAM/C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAChCC,QAAgC,EAC7B;EACH,MAAMC,UAAU,GAAGH,aAAa,CAA4B,CAAC;;EAE7D;EACA;EACA,MAAM,GAAGI,SAAS,CAAC,GAAGL,KAAK,CAACM,QAAQ,CAAC,MAAMH,QAAQ,CAACC,UAAU,CAACG,QAAQ,CAAC,CAAC,CAAC,CAAC;;EAE3E;EACA,MAAMC,WAAW,GAAGR,KAAK,CAACS,MAAM,CAACN,QAAQ,CAAC;EAE1CH,KAAK,CAACU,SAAS,CAAC,MAAM;IACpBF,WAAW,CAACG,OAAO,GAAGR,QAAQ;EAChC,CAAC,CAAC;EAEFH,KAAK,CAACU,SAAS,CAAC,MAAM;IACpB,MAAME,WAAW,GAAGR,UAAU,CAACS,WAAW,CAAC,OAAO,EAAGC,CAAC,IAAK;MACzDT,SAAS,CAACG,WAAW,CAACG,OAAO,CAACG,CAAC,CAACC,IAAI,CAACC,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,OAAOJ,WAAW;EACpB,CAAC,EAAE,CAACR,UAAU,CAAC,CAAC;EAEhB,OAAOD,QAAQ,CAACC,UAAU,CAACG,QAAQ,CAAC,CAAC,CAAC;AACxC","ignoreList":[]}
+{"version":3,"names":["React","useSyncExternalStoreWithSelector","useNavigation","useNavigationState","selector","navigation","subscribe","useCallback","callback","unsubscribe","addListener","value","getState"],"sourceRoot":"../../src","sources":["useNavigationState.tsx"],"mappings":"AACA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,gCAAgC,QAAQ,uCAAuC;AAGxF,SAASC,aAAa,QAAQ,qBAAiB;AAM/C;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,kBAAkBA,CAChCC,QAAgC,EAC7B;EACH,MAAMC,UAAU,GAAGH,aAAa,CAA4B,CAAC;EAE7D,MAAMI,SAAS,GAAGN,KAAK,CAACO,WAAW,CAChCC,QAAoB,IAAK;IACxB,MAAMC,WAAW,GAAGJ,UAAU,CAACK,WAAW,CAAC,OAAO,EAAEF,QAAQ,CAAC;IAE7D,OAAOC,WAAW;EACpB,CAAC,EACD,CAACJ,UAAU,CACb,CAAC;EAED,MAAMM,KAAK,GAAGV,gCAAgC,CAC5CK,SAAS,EACTD,UAAU,CAACO,QAAQ,EACnBP,UAAU,CAACO,QAAQ,EACnBR,QACF,CAAC;EAED,OAAOO,KAAK;AACd","ignoreList":[]}

package/lib/typescript/src/useIsFocused.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useIsFocused.d.ts","sourceRoot":"","sources":["../../../src/useIsFocused.tsx"],"names":[],"mappings":"AAKA;;;GAGG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAiCtC"}
+{"version":3,"file":"useIsFocused.d.ts","sourceRoot":"","sources":["../../../src/useIsFocused.tsx"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAuBtC"}

package/lib/typescript/src/useNavigationState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNavigationState.d.ts","sourceRoot":"","sources":["../../../src/useNavigationState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAMhF,KAAK,QAAQ,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,IAAI,CAClD,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,KAC9B,CAAC,CAAC;AAEP;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,EACnE,QAAQ,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,GAC/B,CAAC,CAuBH"}
+{"version":3,"file":"useNavigationState.d.ts","sourceRoot":"","sources":["../../../src/useNavigationState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAOhF,KAAK,QAAQ,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,IAAI,CAClD,KAAK,EAAE,eAAe,CAAC,SAAS,CAAC,KAC9B,CAAC,CAAC;AAEP;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,SAAS,aAAa,EAAE,CAAC,EACnE,QAAQ,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,GAC/B,CAAC,CAoBH"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/core",
   "description": "Core utilities for building navigators",
-  "version": "7.0.0-rc.7",
+  "version": "7.0.0-rc.8",
   "keywords": [
     "react",
     "react-native",
@@ -46,12 +46,14 @@
     "nanoid": "3.3.7",
     "query-string": "^7.1.3",
     "react-is": "^18.2.0",
-    "use-latest-callback": "^0.1.11"
+    "use-latest-callback": "^0.2.1",
+    "use-sync-external-store": "^1.2.2"
   },
   "devDependencies": {
     "@testing-library/react-native": "^12.4.3",
     "@types/react": "~18.2.79",
     "@types/react-is": "^18.2.3",
+    "@types/use-sync-external-store": "^0.0.6",
     "del-cli": "^5.1.0",
     "immer": "^10.0.3",
     "react": "18.2.0",
@@ -86,5 +88,5 @@
       ]
     ]
   },
-  "gitHead": "a5dcadcdd72520c47ef4946b507017abd519ce9c"
+  "gitHead": "1f63ce5b62055a439f43bfcbd6dd5ca5c64af603"
 }

package/src/useIsFocused.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { useState } from 'react';
 
 import { useNavigation } from './useNavigation';
 
@@ -9,35 +8,25 @@ import { useNavigation } from './useNavigation';
  */
 export function useIsFocused(): boolean {
   const navigation = useNavigation();
-  const [isFocused, setIsFocused] = useState(navigation.isFocused);
 
-  const valueToReturn = navigation.isFocused();
-
-  if (isFocused !== valueToReturn) {
-    // If the value has changed since the last render, we need to update it.
-    // This could happen if we missed an update from the event listeners during re-render.
-    // React will process this update immediately, so the old subscription value won't be committed.
-    // It is still nice to avoid returning a mismatched value though, so let's override the return value.
-    // This is the same logic as in https://github.com/facebook/react/tree/master/packages/use-subscription
-    setIsFocused(valueToReturn);
-  }
-
-  React.useEffect(() => {
-    const unsubscribeFocus = navigation.addListener('focus', () =>
-      setIsFocused(true)
-    );
-
-    const unsubscribeBlur = navigation.addListener('blur', () =>
-      setIsFocused(false)
-    );
-
-    return () => {
-      unsubscribeFocus();
-      unsubscribeBlur();
-    };
-  }, [navigation]);
-
-  React.useDebugValue(valueToReturn);
-
-  return valueToReturn;
+  const subscribe = React.useCallback(
+    (callback: () => void) => {
+      const unsubscribeFocus = navigation.addListener('focus', callback);
+      const unsubscribeBlur = navigation.addListener('blur', callback);
+
+      return () => {
+        unsubscribeFocus();
+        unsubscribeBlur();
+      };
+    },
+    [navigation]
+  );
+
+  const value = React.useSyncExternalStore(
+    subscribe,
+    navigation.isFocused,
+    navigation.isFocused
+  );
+
+  return value;
 }

package/src/useNavigationState.tsx

@@ -1,5 +1,6 @@
 import type { NavigationState, ParamListBase } from '@react-navigation/routers';
 import * as React from 'react';
+import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector';
 
 import type { NavigationProp } from './types';
 import { useNavigation } from './useNavigation';
@@ -18,24 +19,21 @@ export function useNavigationState<ParamList extends ParamListBase, T>(
 ): T {
   const navigation = useNavigation<NavigationProp<ParamList>>();
 
-  // We don't care about the state value, we run the selector again at the end
-  // The state is only to make sure that there's a re-render when we have a new value
-  const [, setResult] = React.useState(() => selector(navigation.getState()));
+  const subscribe = React.useCallback(
+    (callback: () => void) => {
+      const unsubscribe = navigation.addListener('state', callback);
 
-  // We store the selector in a ref to avoid re-subscribing listeners every render
-  const selectorRef = React.useRef(selector);
+      return unsubscribe;
+    },
+    [navigation]
+  );
 
-  React.useEffect(() => {
-    selectorRef.current = selector;
-  });
+  const value = useSyncExternalStoreWithSelector(
+    subscribe,
+    navigation.getState,
+    navigation.getState,
+    selector
+  );
 
-  React.useEffect(() => {
-    const unsubscribe = navigation.addListener('state', (e) => {
-      setResult(selectorRef.current(e.data.state));
-    });
-
-    return unsubscribe;
-  }, [navigation]);
-
-  return selector(navigation.getState());
+  return value;
 }