Improve handling of rehydration of state - now available in action pa…

…yload.

.eslintrc.json

@@ -17,7 +17,8 @@
     "demo-web/**",
     "dist/**",
     "lib/**",
-    "es/**"
+    "es/**",
+    "rollup.config.mjs"
   ],
   "rules": {
     "comma-dangle": 0,

LEGACY-USAGE.md

@@ -7,20 +7,20 @@ Legacy usage - web
 import { createStore, combineReducers, applyMiddleware, compose } from 'redux';
 import { rememberReducer, rememberEnhancer } from 'redux-remember';
 
-const myStateIsRemembered = (state = '', { type, payload }) => {
-  switch (type) {
+const myStateIsRemembered = (state = '', action) => {
+  switch (action.type) {
     case 'SET_TEXT1':
-      return payload;
+      return action.payload;
 
     default:
       return state;
   }
 };
 
-const myStateIsForgotten = (state = '', { type, payload }) => {
-  switch (type) {
+const myStateIsForgotten = (state = '', action) => {
+  switch (action.type) {
     case 'SET_TEXT2':
-      return payload;
+      return action.payload;
 
     default:
       return state;
@@ -62,20 +62,20 @@ import AsyncStorage from '@react-native-community/async-storage';
 import { createStore, combineReducers, applyMiddleware, compose } from 'redux';
 import { rememberReducer, rememberEnhancer } from 'redux-remember';
 
-const myStateIsRemembered = (state = '', { type, payload }) => {
-  switch (type) {
+const myStateIsRemembered = (state = '', action) => {
+  switch (action.type) {
     case 'SET_TEXT1':
-      return payload;
+      return action.payload;
 
     default:
       return state;
   }
 };
 
-const myStateIsForgotten = (state = '', { type, payload }) => {
-  switch (type) {
+const myStateIsForgotten = (state = '', action) => {
+  switch (action.type) {
     case 'SET_TEXT2':
-      return payload;
+      return action.payload;
 
     default:
       return state;
@@ -122,13 +122,13 @@ const defaultState = {
   persisted: false
 };
 
-export default (state = defaultState, { type, payload }) => {
-  switch (type) {
+const changeMeReducer = (state = defaultState, action) => {
+  switch (action.type) {
     case REMEMBER_REHYDRATED:
       // state gets rehydrated from storage
-      // state == { changeMe: 123 }
+      // payload is Rehydrated Root State
       return {
-        ...state,
+        ...changeMe: action.payload.changeMeReducer?.changeMe || null,
         rehydrated: true
       };
 
@@ -148,11 +148,13 @@ export default (state = defaultState, { type, payload }) => {
 
       return {
         ...state,
-        changeMe: payload
+        changeMe: action.payload
       };
 
     default:
       return state;
   }
-};
+}
+
+export default changeMeReducer;
 ```

README.md

@@ -147,7 +147,7 @@ Usage - inside a reducer
 ------------------------
 
 ```ts
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { createSlice, createAction, PayloadAction } from '@reduxjs/toolkit';
 import { REMEMBER_REHYDRATED, REMEMBER_PERSISTED } from 'redux-remember';
 
 type InitialState = {
@@ -162,8 +162,8 @@ const initialState: InitialState = {
   persisted: false
 };
 
-const usageInsideReducer = createSlice({
-  name: 'usage-inside-reducer-slice',
+const myReducer = createSlice({
+  name: 'my-reducer',
   initialState,
   reducers: {
     someAction(state, action: PayloadAction<{ changeMe: any }>) {
@@ -175,11 +175,13 @@ const usageInsideReducer = createSlice({
     }
   },
   extraReducers: (builder) => builder
-    .addCase(REMEMBER_REHYDRATED, (state, action) => {
-      state.changeMe = (action as PayloadAction<InitialState>).payload.changeMe;
+    .addCase(createAction<{ myReducer?: InitialState }>(REMEMBER_REHYDRATED), (state, action) => {
+      // @INFO: action.payload.myReducer => rehydrated state of this reducer or "undefined" during the first run
+      state.changeMe = action.payload.myReducer?.changeMe || null;
       state.rehydrated = true;
     })
-    .addCase(REMEMBER_PERSISTED, (state) => {
+    .addCase(createAction<{ myReducer?: InitialState }>(REMEMBER_PERSISTED), (state, action) => {
+      // @INFO: action.payload.myReducer => persisted state of this reducer or "undefined" in case this reducer is not persisted
       state.rehydrated = false;
       state.persisted = true;
     })