react-toolkits 2.9.4 → 2.9.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.9.6
+
+### Patch Changes
+
+- 17dcf26: feat: add theme prop
+
+## 2.9.5
+
+### Patch Changes
+
+- 9509968: feat: change game_id type
+
 ## 2.9.4
 
 ### Patch Changes

package/lib/index.d.ts

@@ -3,7 +3,7 @@ import * as react from 'react';
 import { FC, PropsWithChildren, Key, ReactNode, ReactElement, Ref } from 'react';
 import { ParagraphProps } from 'antd/es/typography/Paragraph';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { FormInstance, ButtonProps, ModalProps, FormProps } from 'antd';
+import { FormInstance, MenuProps, ButtonProps, ModalProps, FormProps } from 'antd';
 import { TableProps } from 'antd/es/table';
 import { MenuDividerType, MenuItemType, SubMenuType, MenuItemGroupType } from 'antd/es/menu/interface';
 import { Merge } from 'ts-essentials';
@@ -201,6 +201,7 @@ type NavMenuItem = MenuItemType2 | SubMenuType2 | MenuItemGroupType2 | MenuDivid
 
 interface NavMenuProps {
     items?: NavMenuItem[];
+    theme?: MenuProps['theme'];
 }
 declare const NavMenu: react.NamedExoticComponent<NavMenuProps>;
 
@@ -208,7 +209,7 @@ type Area = 'all' | 'cn' | 'global';
 type ScreenLayoutType = 0 | 1;
 interface Game {
     id: number;
-    game_id: number;
+    game_id: string | number;
     game_group: string;
     name: string;
     screen_type: ScreenLayoutType;
@@ -226,10 +227,8 @@ interface GameState {
     game: Game | null;
     games: Game[];
     isLoading: boolean;
-    switching: boolean;
-    setGame: (id: number) => Promise<void>;
+    setGame: (id: string | number) => Promise<void>;
     refetchGames: () => Promise<void>;
-    setSwitching: (switching: boolean) => void;
 }
 
 interface GameSelectProps {

package/lib/index.js

@@ -61,7 +61,7 @@ var init_en_GB = __esm({
       SignIn: {
         title: "Sign In Method",
         thirdParty: "Third party sign in",
-        signInWithIDass: "Sign in width IDass",
+        signInWithIDass: "Sign in with IDass",
         unregistered: "You are not yet registered on the platform, please contact the administrator",
         welcome: "Welcome"
       },
@@ -385,7 +385,7 @@ var init_NavMenu = __esm({
     init_stores();
     init_utils();
     NavMenu = memo(function NavMenu2(props) {
-      const { items } = props;
+      const { items, theme: theme4 } = props;
       const location = useLocation();
       const flattenItems = useMemo(() => flatItems(items ?? []), [items]);
       const codes = useMemo(() => flattenItems.map((item) => item.code).filter(Boolean), [flattenItems]);
@@ -415,6 +415,7 @@ var init_NavMenu = __esm({
       return /* @__PURE__ */ jsx(
         Menu,
         {
+          theme: theme4,
           style: { borderRight: "none" },
           items: internalItems,
           mode: "inline",
@@ -583,16 +584,17 @@ var init_stores2 = __esm({
         (set, get2) => ({
           initialized: false,
           isLoading: false,
-          switching: false,
           game: null,
           games: [],
           async setGame(id2) {
-            const { initialized, refetchGames } = get2();
-            if (!initialized) {
-              await refetchGames();
+            if (id2 === get2().game?.game_id) {
+              return;
             }
-            const matchedGame = (get2().games ?? []).find((item) => item.game_id === id2);
-            set({ game: matchedGame ?? null });
+            if (!get2().initialized) {
+              await get2().refetchGames();
+            }
+            const game = (get2().games ?? []).find((item) => item.game_id === id2) ?? null;
+            set({ game });
           },
           async refetchGames() {
             if (!get2().isLoading) {
@@ -607,8 +609,7 @@ var init_stores2 = __esm({
                 });
               }
             }
-          },
-          setSwitching: (switching) => set({ switching })
+          }
         }),
         {
           name: "game",
@@ -638,7 +639,7 @@ var init_GameSelect = __esm({
       }));
       const onChange = async (id2) => {
         setGame(id2);
-        onGameChange?.(games.find((item) => item.game_id === id2));
+        onGameChange?.(games.find((item) => String(item.game_id) === String(id2)));
       };
       return /* @__PURE__ */ jsxs(Space, { children: [
         /* @__PURE__ */ jsx(Text, { children: t("GameSelect.label") }),