jamespot-react-core 1.1.12 → 1.1.13

package/src/redux/store.tsx

@@ -8,12 +8,14 @@ import { applicationActions, applicationSelector, applicationSlice } from './sli
 import { modelActions, modelSelector, modelSlice } from './slice/Model.slice';
 import { toastSlice } from './slice/Toast.slice';
 import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import { appStateActions, appStateSelector, appStateSlice } from './slice/AppState.slice';
 
 export interface JInjectStore extends ReturnType<typeof createStore> {
     asyncReducers: AsyncReducers;
     add: (key: string, asyncReducer: Reducer) => void;
     selectors: any;
     actions: any;
+    useAppDispatch: any;
 }
 
 export interface AsyncReducers {
@@ -28,10 +30,32 @@ const staticReducers = {
         users: userSlice.reducer,
         articles: articleSlice.reducer,
     }),
+    appState: appStateSlice.reducer,
     form: formReducer,
     toasts: toastSlice.reducer,
 };
 
+function createReducer(asyncReducers: AsyncReducers) {
+    return combineReducers({
+        ...staticReducers,
+        ...asyncReducers,
+    });
+}
+
+function createStore(initialAsyncReducers: {}, initialState: any) {
+    return configureStore({
+        reducer: createReducer(initialAsyncReducers),
+        preloadedState: initialState,
+        middleware: [thunk, logger],
+    });
+}
+
+export type AppDispatch = ReturnType<typeof createStore>['dispatch'];
+export type RootState = ReturnType<ReturnType<typeof createStore>['getState']>;
+
+export const useAppDispatch = () => useDispatch<AppDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+
 // Configure the store
 export function makeStore(initialState: any) {
     const initialAsyncReducers = {};
@@ -60,36 +84,18 @@ export function makeStore(initialState: any) {
             application: applicationSelector,
             model: modelSelector,
             user: usersSelector,
+            appState: appStateSelector,
         },
         actions: {
+            appState: appStateActions,
             article: articleActions,
             application: applicationActions,
             model: modelActions,
             user: userActions,
             generic: genericActions,
         },
+        useAppDispatch: useAppDispatch,
     };
 
     return jStore;
 }
-
-function createReducer(asyncReducers: AsyncReducers) {
-    return combineReducers({
-        ...staticReducers,
-        ...asyncReducers,
-    });
-}
-
-function createStore(initialAsyncReducers: {}, initialState: any) {
-    return configureStore({
-        reducer: createReducer(initialAsyncReducers),
-        preloadedState: initialState,
-        middleware: [thunk, logger],
-    });
-}
-
-export type AppDispatch = ReturnType<typeof createStore>['dispatch'];
-export type RootState = ReturnType<ReturnType<typeof createStore>['getState']>;
-
-export const useAppDispatch = () => useDispatch<AppDispatch>();
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;

package/src/utils/types.ts

@@ -1,13 +1,15 @@
 import * as React from 'react';
 import { ReactRegistry } from './registry';
 import { ReactTranslation, SupportedLanguages, TranslationKeys } from './translation';
-export { Configuration, DisplayAttributesProps } from '../displayer/types';
+export { Configuration, DisplayAttributesProps, DisplayFormProps } from '../displayer/types';
 export * from '../components/types';
 import { useDisplay } from '../displayer/useDisplay';
 import { Configuration } from '../displayer/types';
+import { useDebounce, useDidMountEffect, useTimeout } from 'jamespot-react-components';
 import { toasts } from '../redux/slice/Toast.slice';
+import { JInjectStore } from '../redux/store';
 
-export type gabarit =
+export type Gabarit =
     | 'core-1-cols'
     | 'core-2-cols'
     | 'core-3-cols'
@@ -20,7 +22,7 @@ export type gabarit =
 
 export interface ReactCore {
     extensions: ReactExtensions;
-    store: any;
+    store: JInjectStore;
     actions: object;
     registry: ReactRegistry;
     locale?: SupportedLanguages;
@@ -31,7 +33,7 @@ export interface ReactCore {
     extensionAdd: (extensionName: string, load: () => void) => void;
     toasts: typeof toasts;
 
-    routeAdd: (route: string, extensionName: string, idDiv: string, gabarit?: gabarit, gabaritOptions?: object) => void;
+    routeAdd: (route: string, extensionName: string, idDiv: string, gabarit?: Gabarit, gabaritOptions?: object) => void;
     transitionTo: (
         stateName: string,
         args: {},
@@ -118,6 +120,11 @@ export interface WindowJ {
     jamespotReactTheme: any;
     applications: Application[];
     models: Model<string>[];
+    hook: {
+        useTimeout: typeof useTimeout;
+        useDebounce: typeof useDebounce;
+        useDidMountEffect: typeof useDidMountEffect;
+    };
 }
 
 export interface Application {
@@ -166,11 +173,14 @@ export type IsAppActivateProps = {
 
 export type ReactExtensionProps = {
     extensionName: string;
+    moduleName?: string;
     route?: string;
     idAnchor?: string;
     reducerName?: string;
-    gabarit?: gabarit;
+    gabarit?: Gabarit;
     apiDependency?: string;
 };
 
+export * from '../displayer/types';
+
 export { RootState } from '../redux/store';