@gz-fronted/gz-pc 0.1.1-beta.3 → 0.1.1-beta.4

package/dist/fetch/index.cjs

@@ -325,51 +325,56 @@ var GzFetchUnauthorizedModal = () => {
   const hostIdRef = react.useRef(void 0);
   (_a = hostIdRef.current) != null ? _a : hostIdRef.current = /* @__PURE__ */ Symbol("gz-fetch-unauthorized-modal-host");
   const hostId = hostIdRef.current;
-  const [messageApi, messageContextHolder] = ggUi.message.useMessage();
-  const showErrorMessage = react.useCallback(
-    (content) => {
-      void messageApi.error(content);
-    },
-    [messageApi]
-  );
   const snapshot2 = react.useSyncExternalStore(
     subscribeUnauthorized,
     getUnauthorizedSnapshot,
     getUnauthorizedServerSnapshot
   );
   react.useEffect(() => registerUnauthorizedModalHost(hostId), [hostId]);
-  react.useEffect(
-    () => registerFeedbackHost(hostId, { showErrorMessage }),
-    [hostId, showErrorMessage]
-  );
+  if (snapshot2.activeHostId !== hostId) {
+    return null;
+  }
   const handleConfirm = () => {
     const options = confirmUnauthorizedModal();
     if (options) {
       executeUnauthorizedAction(options);
     }
   };
-  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-    messageContextHolder,
-    snapshot2.activeHostId === hostId && /* @__PURE__ */ jsxRuntime.jsx(
-      ggUi.Modal,
-      {
-        afterClose: completeUnauthorizedModal,
-        cancelText: "取消",
-        closable: true,
-        okText: "重新登录",
-        open: snapshot2.phase === "open",
-        title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
-        onCancel: cancelUnauthorizedModal,
-        onOk: handleConfirm,
-        children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
-      }
-    )
-  ] });
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    ggUi.Modal,
+    {
+      afterClose: completeUnauthorizedModal,
+      cancelText: "取消",
+      closable: true,
+      okText: "重新登录",
+      open: snapshot2.phase === "open",
+      title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
+      onCancel: cancelUnauthorizedModal,
+      onOk: handleConfirm,
+      children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
+    }
+  );
 };
 GzFetchUnauthorizedModal.displayName = "GzFetchUnauthorizedModal";
 var GzFetchUnauthorizedModal_default = GzFetchUnauthorizedModal;
 var GzFetchFeedbackProvider = ({ children }) => {
+  var _a;
+  const hostIdRef = react.useRef(void 0);
+  (_a = hostIdRef.current) != null ? _a : hostIdRef.current = /* @__PURE__ */ Symbol("gz-fetch-feedback-host");
+  const hostId = hostIdRef.current;
+  const [messageApi, messageContextHolder] = ggUi.message.useMessage();
+  const showErrorMessage = react.useCallback(
+    (content) => {
+      void messageApi.error(content);
+    },
+    [messageApi]
+  );
+  react.useEffect(
+    () => registerFeedbackHost(hostId, { showErrorMessage }),
+    [hostId, showErrorMessage]
+  );
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    messageContextHolder,
     /* @__PURE__ */ jsxRuntime.jsx(GzFetchUnauthorizedModal_default, {}),
     children
   ] });

package/dist/fetch/index.d.cts

@@ -88,6 +88,7 @@ declare function gzFetch<TResponse, TRequestParams = unknown>(config: GzRequestC
 
 declare const GzFetchFeedbackProvider: FC<PropsWithChildren>;
 
+/** @deprecated 请使用 GzFetchFeedbackProvider 统一接入请求反馈。 */
 declare const GzFetchUnauthorizedModal: FC;
 
 export { type CreateGzFetchOptions, type GzErrorContext, type GzFetch, type GzFetchAuthOptions, type GzFetchClient, GzFetchError, type GzFetchErrorOptions, type GzFetchErrorType, GzFetchFeedbackProvider, type GzFetchMiddleware, GzFetchUnauthorizedModal, type GzFetchUnauthorizedOptions, type GzInternalRequestConfig, type GzRequestConfig, type GzRequestHeaders, type GzRequestMethod, type GzRequestOptions, type GzRequestParams, type GzResponseContext, type GzResponseType, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };

package/dist/fetch/index.d.ts

@@ -88,6 +88,7 @@ declare function gzFetch<TResponse, TRequestParams = unknown>(config: GzRequestC
 
 declare const GzFetchFeedbackProvider: FC<PropsWithChildren>;
 
+/** @deprecated 请使用 GzFetchFeedbackProvider 统一接入请求反馈。 */
 declare const GzFetchUnauthorizedModal: FC;
 
 export { type CreateGzFetchOptions, type GzErrorContext, type GzFetch, type GzFetchAuthOptions, type GzFetchClient, GzFetchError, type GzFetchErrorOptions, type GzFetchErrorType, GzFetchFeedbackProvider, type GzFetchMiddleware, GzFetchUnauthorizedModal, type GzFetchUnauthorizedOptions, type GzInternalRequestConfig, type GzRequestConfig, type GzRequestHeaders, type GzRequestMethod, type GzRequestOptions, type GzRequestParams, type GzResponseContext, type GzResponseType, configureGzFetch, createGzFetch, getResponseMessage, gzFetch, toGzFetchError };

package/dist/fetch/index.js

@@ -1,7 +1,7 @@
 import axios, { AxiosError, AxiosHeaders } from 'axios';
-import { message, Modal } from '@chenhui996/gg-ui';
-import { useRef, useCallback, useSyncExternalStore, useEffect } from 'react';
-import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { Modal, message } from '@chenhui996/gg-ui';
+import { useRef, useSyncExternalStore, useEffect, useCallback } from 'react';
+import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
 // src/fetch/client.ts
 var GzFetchError = class extends Error {
@@ -319,51 +319,56 @@ var GzFetchUnauthorizedModal = () => {
   const hostIdRef = useRef(void 0);
   (_a = hostIdRef.current) != null ? _a : hostIdRef.current = /* @__PURE__ */ Symbol("gz-fetch-unauthorized-modal-host");
   const hostId = hostIdRef.current;
-  const [messageApi, messageContextHolder] = message.useMessage();
-  const showErrorMessage = useCallback(
-    (content) => {
-      void messageApi.error(content);
-    },
-    [messageApi]
-  );
   const snapshot2 = useSyncExternalStore(
     subscribeUnauthorized,
     getUnauthorizedSnapshot,
     getUnauthorizedServerSnapshot
   );
   useEffect(() => registerUnauthorizedModalHost(hostId), [hostId]);
-  useEffect(
-    () => registerFeedbackHost(hostId, { showErrorMessage }),
-    [hostId, showErrorMessage]
-  );
+  if (snapshot2.activeHostId !== hostId) {
+    return null;
+  }
   const handleConfirm = () => {
     const options = confirmUnauthorizedModal();
     if (options) {
       executeUnauthorizedAction(options);
     }
   };
-  return /* @__PURE__ */ jsxs(Fragment, { children: [
-    messageContextHolder,
-    snapshot2.activeHostId === hostId && /* @__PURE__ */ jsx(
-      Modal,
-      {
-        afterClose: completeUnauthorizedModal,
-        cancelText: "取消",
-        closable: true,
-        okText: "重新登录",
-        open: snapshot2.phase === "open",
-        title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
-        onCancel: cancelUnauthorizedModal,
-        onOk: handleConfirm,
-        children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
-      }
-    )
-  ] });
+  return /* @__PURE__ */ jsx(
+    Modal,
+    {
+      afterClose: completeUnauthorizedModal,
+      cancelText: "取消",
+      closable: true,
+      okText: "重新登录",
+      open: snapshot2.phase === "open",
+      title: (_b = snapshot2.options) == null ? void 0 : _b.modalTitle,
+      onCancel: cancelUnauthorizedModal,
+      onOk: handleConfirm,
+      children: (_c = snapshot2.options) == null ? void 0 : _c.modalMessage
+    }
+  );
 };
 GzFetchUnauthorizedModal.displayName = "GzFetchUnauthorizedModal";
 var GzFetchUnauthorizedModal_default = GzFetchUnauthorizedModal;
 var GzFetchFeedbackProvider = ({ children }) => {
+  var _a;
+  const hostIdRef = useRef(void 0);
+  (_a = hostIdRef.current) != null ? _a : hostIdRef.current = /* @__PURE__ */ Symbol("gz-fetch-feedback-host");
+  const hostId = hostIdRef.current;
+  const [messageApi, messageContextHolder] = message.useMessage();
+  const showErrorMessage = useCallback(
+    (content) => {
+      void messageApi.error(content);
+    },
+    [messageApi]
+  );
+  useEffect(
+    () => registerFeedbackHost(hostId, { showErrorMessage }),
+    [hostId, showErrorMessage]
+  );
   return /* @__PURE__ */ jsxs(Fragment, { children: [
+    messageContextHolder,
     /* @__PURE__ */ jsx(GzFetchUnauthorizedModal_default, {}),
     children
   ] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gz-fronted/gz-pc",
-  "version": "0.1.1-beta.3",
+  "version": "0.1.1-beta.4",
   "description": "Shared fetch, hooks and utility primitives for GZ frontend applications.",
   "license": "MIT",
   "type": "module",
@@ -42,16 +42,6 @@
     },
     "./package.json": "./package.json"
   },
-  "scripts": {
-    "build": "node scripts/build.mjs",
-    "lint": "eslint .",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "verify:exports": "node tests/exports/smoke.mjs",
-    "prepublishOnly": "npm run build",
-    "prepare": "husky"
-  },
   "dependencies": {
     "ahooks": "^3.9.7",
     "axios": "^1.13.6"
@@ -95,5 +85,13 @@
     "*.{json,md,yml,yaml,css,less}": [
       "prettier --write"
     ]
+  },
+  "scripts": {
+    "build": "node scripts/build.mjs",
+    "lint": "eslint .",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "verify:exports": "node tests/exports/smoke.mjs"
   }
-}
+}