@asaleh37/ui-base 25.8.1-5.4 → 25.8.1-5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "25.8.15.4",
+  "version": "25.8.15.7",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/App.tsx

@@ -112,7 +112,7 @@ const App: React.FC<AppInfo> = (props: AppInfo) => {
       };
     }
     dispatch(setStoresMetaData(commonStores));
-  }, []);
+  }, [props]);
   return (
     <ThemeProvider theme={theme}>
       <Layout />

package/src/components/BaseApp.tsx

@@ -18,16 +18,28 @@ import i18n from "../locales/i18n";
 import { initReactI18next } from "react-i18next";
 import { ENGLISH_TRANS } from "../locales/english";
 import { ARABIC_TRANS } from "../locales/arabic";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 
 library.add(fab);
 library.add(far);
 library.add(fas);
 
 export const BaseApp: React.FC<AppInfo> = (props) => {
-  let store = null;
+  // let store = null;
+  const [systemReducers, setSystemReducers] = useState<any>({
+    AppLayout: AppLayoutReducer,
+    UserSession: UserSessionReducer,
+    loadingMask: LoadingMaskReducer,
+    commonStores: CommonStoreReducer,
+    SideBar: SideBarReducer,
+    AppInfo: AppInfoReducer,
+  });
+  const store = configureStore({
+    reducer: systemReducers,
+  });
+  const [isAppInitialized, setIsAppInitialized] = useState<boolean>(false);
   const initializeApp = () => {
-    const systemReducers = {
+    const reducers = {
       AppLayout: AppLayoutReducer,
       UserSession: UserSessionReducer,
       loadingMask: LoadingMaskReducer,
@@ -36,8 +48,8 @@ export const BaseApp: React.FC<AppInfo> = (props) => {
       AppInfo: AppInfoReducer,
       ...props?.businessReduxReducers,
     };
-    store = configureStore({
-      reducer: systemReducers,
+    setSystemReducers((state) => {
+      return { ...reducers };
     });
     const resources = {
       en: { translation: { ...ENGLISH_TRANS, ...props?.businessLocals?.en } },
@@ -48,15 +60,16 @@ export const BaseApp: React.FC<AppInfo> = (props) => {
       lng: localStorage.getItem("language") || "en", // Set the initial language of the App
       fallbackLng: "en",
     });
+    setIsAppInitialized(true);
   };
   useEffect(() => {
     initializeApp();
   }, [props]);
-  return store === null ? (
-    <></>
-  ) : (
+  return isAppInitialized ? (
     <Provider store={store}>
       <App {...props} />
     </Provider>
+  ) : (
+    <></>
   );
 };