Merge pull request #4172 from aryaemami59/fix-4171

Fix wrong state for injected slices when not declared via `withLazyLoadedSlices`

Author: EskiMojo14

packages/toolkit/src/combineSlices.ts

@@ -121,7 +121,7 @@ export interface CombinedSliceReducer<
     config?: InjectConfig,
   ): CombinedSliceReducer<
     InitialState,
-    Id<DeclaredState & WithSlice<SliceLike<ReducerPath, String>>>
+    Id<DeclaredState & WithSlice<SliceLike<ReducerPath, State>>>
   >
 
   /**

packages/toolkit/src/tests/combineSlices.test-d.ts

@@ -186,4 +186,21 @@ describe('type tests', () => {
       (rootState: RootState, num: number) => rootState.inner,
     )
   })
+
+  test('correct type of state is inferred when not declared via `withLazyLoadedSlices`', () => {
+    // Related to https://github.com/reduxjs/redux-toolkit/issues/4171
+
+    const combinedReducer = combineSlices(stringSlice)
+
+    const withNumber = combinedReducer.inject(numberSlice)
+
+    expectTypeOf(withNumber).returns.toEqualTypeOf<{
+      string: string
+      number: number
+    }>()
+
+    expectTypeOf(withNumber(undefined, { type: '' }).number).toMatchTypeOf<
+      number
+    >()
+  })
 })