react-toolkits 2.13.32 → 2.13.34

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.13.34
+
+### Patch Changes
+
+- ca6e5e1: feat: add skipRequestInterceptor and skipResponseInterceptor in AxiosRequestConfig
+
+## 2.13.33
+
+### Patch Changes
+
+- ca6cb9d: feat: some changes
+
 ## 2.13.32
 
 ### Patch Changes

package/lib/index.d.ts

@@ -120,7 +120,7 @@ declare const NavMenu: react.NamedExoticComponent<NavMenuProps>;
 
 interface GameSelectProps {
     filter?: (game: Game) => boolean;
-    getOptions?: (data?: Game[]) => SelectProps['options'];
+    options?: (data?: Game[]) => SelectProps['options'];
 }
 
 type HeaderExtra = {
@@ -133,7 +133,7 @@ interface LayoutProps extends Pick<GameSelectProps, 'filter'> {
     items?: NavMenuItem[];
     hideGameSelect?: boolean;
     navWidth?: string | number;
-    getGameSelectOptions?: GameSelectProps['getOptions'];
+    gameSelectOptions?: GameSelectProps['options'];
     headerExtra?: {
         left?: HeaderExtra[];
         right?: HeaderExtra[];

package/lib/index.js

@@ -389,6 +389,9 @@ var init_Interceptors = __esm({
         requestInterceptorId = axios2.interceptors.request.use(...interceptors.request);
       } else {
         requestInterceptorId = axios2.interceptors.request.use((config) => {
+          if (config.skipRequestInterceptor) {
+            return config;
+          }
           const headers = new AxiosHeaders(config.headers);
           config.responseType = config.responseType || "json";
           if (token) {
@@ -411,6 +414,9 @@ var init_Interceptors = __esm({
       } else {
         responseInterceptorId = axios2.interceptors.response.use(
           (response) => {
+            if (response.config.skipResponseInterceptor) {
+              return response;
+            }
             const responseType = response.request.responseType || "json";
             if (responseType === "json") {
               const data = response.data;
@@ -909,13 +915,13 @@ var init_GameSelect = __esm({
     init_hooks3();
     ({ Text } = Typography);
     GameSelect = (props) => {
-      const { filter, getOptions } = props;
+      const { filter, options } = props;
       const { t } = useTranslation();
       const { gameApiV2, gameId, setGameId } = useToolkitsStore((s) => s);
       const { data, isLoading } = useGames();
       const { mutate: mutate2 } = useSWRConfig();
       const filteredData = data?.filter((item) => filter?.(item) ?? true);
-      const options = typeof getOptions === "function" ? getOptions(filteredData) : filteredData?.map((item) => ({
+      const _options = typeof options === "function" ? options(filteredData) : filteredData?.map((item) => ({
         label: item.name,
         value: gameApiV2 ? item.game_id : item.id
       }));
@@ -924,14 +930,13 @@ var init_GameSelect = __esm({
         setGameId(value);
       };
       useEffect(() => {
-        let id2 = gameId;
-        if (data?.every((item) => String(gameApiV2 ? item.game_id : item.id) !== String(id2))) {
-          id2 = gameApiV2 ? data?.[0]?.game_id : data?.[0]?.id;
-        }
-        if (id2 !== gameId) {
-          setGameId(id2);
+        if (data && data.length > 0) {
+          const firstId = gameApiV2 ? data[0].game_id : data[0].id;
+          if (data.every((item) => String(item.game_id || item.id) !== String(gameId))) {
+            setGameId(firstId);
+          }
         }
-      }, [gameId, data, gameApiV2]);
+      }, [data]);
       return /* @__PURE__ */ jsxs(Space, { children: [
         /* @__PURE__ */ jsx(Text, { children: t("GameSelect.label") }),
         /* @__PURE__ */ jsx(
@@ -943,7 +948,7 @@ var init_GameSelect = __esm({
             placeholder: t("GameSelect.placeholder"),
             loading: isLoading,
             style: { width: "200px" },
-            options,
+            options: _options,
             onChange
           }
         )
@@ -973,7 +978,7 @@ var init_Layout = __esm({
         navWidth,
         hideGameSelect,
         filter,
-        getGameSelectOptions
+        gameSelectOptions
       } = props;
       const {
         token: { colorBgContainer, colorBorder }
@@ -1045,7 +1050,7 @@ var init_Layout = __esm({
                       onClick: onCollapse
                     }
                   ),
-                  permissionVersion !== "v1" /* V1 */ && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { filter, getOptions: getGameSelectOptions }),
+                  permissionVersion !== "v1" /* V1 */ && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { filter, options: gameSelectOptions }),
                   headerExtra?.left?.map((extra) => /* @__PURE__ */ jsx("span", { children: extra.children }, extra.key))
                 ] }),
                 /* @__PURE__ */ jsxs(Space, { size: "small", split: /* @__PURE__ */ jsx(Divider, { type: "vertical" }), children: [