fix(react-router-navigation): correct navigation state initialization

packages/react-router-navigation-core/src/RouteUtils.js

@@ -7,7 +7,7 @@ let uniqueBaseId = `id-${Date.now()}`
 let uuidCount = 0
 
 export default {
-  create(item: RouteProps, location?: ?Location, staleRoute?: Route): ?Route {
+  create(item: RouteProps, location?: ?Location, staleRoute?: ?Route): ?Route {
     if (!item || !item.path) return null
     const routeName = item.path
     const routeMatch = location ? matchPath(location.pathname, item) : null

packages/react-router-navigation-core/src/StackUtils.js

@@ -25,17 +25,31 @@ export default {
     stack: RouteProps[],
     entries: Location[],
     location: Location,
+    historyIndex?: number,
   ): Location[] {
     const startHistoryIndex = entries.reduce((acc, entry, index) => {
       if (stack.find(item => matchPath(entry.pathname, item))) {
-        if (acc === -1) return index
+        if (acc === -1) {
+          return index
+        }
+        return acc
+      }
+      if (typeof historyIndex === 'number' && index > historyIndex) {
         return acc
       }
       return -1
     }, -1)
     const lastHistoryIndex = entries.reduce((acc, entry, index) => {
-      if (index < startHistoryIndex) return -1
-      if (location.pathname === entry.pathname) return index
+      if (
+        index < startHistoryIndex &&
+        typeof historyIndex === 'number' &&
+        index <= historyIndex
+      ) {
+        return -1
+      }
+      if (location.pathname === entry.pathname) {
+        return index
+      }
       return acc
     }, -1)
     return entries.slice(startHistoryIndex, lastHistoryIndex + 1)

packages/react-router-navigation-core/src/StateUtils.js

@@ -12,12 +12,14 @@ export default {
     location: Location,
     entries: Location[],
     buildFrom: 'history' | 'nodes',
-    staleNavigationState?: NavigationState<>,
+    staleNavigationState?: ?NavigationState<>,
+    index?: number,
   ): NavigationState<> {
     const historyEntries = StackUtils.getHistoryEntries(
       nodes,
       entries,
       location,
+      index,
     )
     const staleRoutes = staleNavigationState && staleNavigationState.routes
     if (buildFrom === 'nodes') {

packages/react-router-navigation-core/src/TabStack.js

@@ -57,6 +57,8 @@ export default class TabStack extends React.Component<Props, State> {
       location,
       entries,
       'nodes',
+      undefined,
+      index,
     )
     invariant(
       navigationState.index !== -1,
@@ -91,6 +93,7 @@ export default class TabStack extends React.Component<Props, State> {
         entries,
         'nodes',
         navigationState,
+        history.index,
       )
       invariant(
         nextNavigationState.index !== -1,

packages/react-router-navigation-core/src/__tests__/StackUtils.spec.js

@@ -155,5 +155,45 @@ describe('StackUtils', () => {
         { pathname: '/a' },
       ])
     })
+
+    it('should return history entries with history index (1)', () => {
+      const stack = [{ path: '/a' }, { path: '/b' }]
+      const location = { pathname: '/a' }
+      const entries = [
+        { pathname: '/c' },
+        { pathname: '/a' },
+        { pathname: '/d' },
+        { pathname: '/a' },
+        { pathname: '/b' },
+        { pathname: '/a' },
+        { pathname: '/c' },
+      ]
+      const index = 5
+      expect(
+        StackUtils.getHistoryEntries(stack, entries, location, index),
+      ).toMatchObject([
+        { pathname: '/a' },
+        { pathname: '/b' },
+        { pathname: '/a' },
+      ])
+    })
+
+    it('should return history entries with history index (2)', () => {
+      const stack = [{ path: '/a' }, { path: '/b' }]
+      const location = { pathname: '/a' }
+      const entries = [
+        { pathname: '/c' },
+        { pathname: '/a' },
+        { pathname: '/d' },
+        { pathname: '/a' },
+        { pathname: '/b' },
+        { pathname: '/a' },
+        { pathname: '/c' },
+      ]
+      const index = 6
+      expect(
+        StackUtils.getHistoryEntries(stack, entries, location, index),
+      ).toMatchObject([])
+    })
   })
 })

packages/react-router-navigation-core/src/__tests__/TabStack.spec.js

@@ -79,7 +79,7 @@ describe('<TabStack />', () => {
   it('should render correctly with initialIndex and initialEntries props ', () => {
     const history = createHistory({
       initialIndex: 3,
-      initialEntries: ['/', '/yolo', '/goodbye', '/hello', '/'],
+      initialEntries: ['/', '/yolo', '/goodbye', '/hello', '/aa'],
     })
     const TabViewComponent = jest.fn(props => {
       return renderTabView(props)