@blocklet/discuss-kit 2.3.28 → 2.3.30

package/lib/cjs/comments.js

@@ -16,10 +16,6 @@ const locales = require("./locales");
 const utils = require("./lib/utils");
 const api = require("./api");
 const topicInfoSync = require("./hooks/topic-info-sync");
-const useAsyncRetry = (fn, deps = []) => {
-  const state = ahooks.useRequest(fn, { refreshDeps: deps });
-  return { ...state, value: state == null ? void 0 : state.data, retry: state == null ? void 0 : state.run };
-};
 const getCurrentBlockletComponentName = () => {
   var _a, _b;
   const ensureTrailingSlash = (str) => str.endsWith("/") ? str : `${str}/`;
@@ -137,7 +133,6 @@ const DiscussKitComments = react.forwardRef(
     const { state, sort, add, updateCommentState, interactive, findById, renderInnerFooter } = discussKitUx.useCommentsContext();
     const { total, order, initialized } = state;
     const { t } = context.useLocaleContext();
-    const objectRatingState = useAsyncRetry(() => api.fetchRatings(object.id));
     topicInfoSync.useTopicInfoSync(object);
     const handlers = {
       ADD_COMMENT: (data) => {
@@ -155,7 +150,6 @@ const DiscussKitComments = react.forwardRef(
           });
         }
       },
-      RATING: () => objectRatingState.retry(),
       RATING_COMMENT: async ({ commentId }) => {
         const rating = await api.fetchRatings(commentId);
         updateCommentState(commentId, (current) => ({
@@ -186,20 +180,6 @@ const DiscussKitComments = react.forwardRef(
       add(formatComment(data));
       onSendComment == null ? void 0 : onSendComment(data);
     };
-    const handleOnRate = async ({ ratingType, value }) => {
-      if (!session.user) {
-        session.login();
-        throw new Error("Unauthenticated.");
-      }
-      await api.post(`/topics/${object.id}/ratings`, { ratingType, value });
-    };
-    const handleOnUnrate = async () => {
-      if (!session.user) {
-        session.login();
-        throw new Error("Unauthenticated.");
-      }
-      await api.delete(`/topics/${object.id}/ratings`);
-    };
     const renderCommentInput = () => {
       return /* @__PURE__ */ jsxRuntime.jsx(
         discussKitUx.CommentInput,
@@ -222,16 +202,10 @@ const DiscussKitComments = react.forwardRef(
     return /* @__PURE__ */ jsxRuntime.jsxs(Container, { ref, children: [
       /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         /* @__PURE__ */ jsxRuntime.jsxs(material.Box, { display: "flex", justifyContent: "space-between", alignItems: "end", children: [
-          displayReaction && objectRatingState.value && /* @__PURE__ */ jsxRuntime.jsx(material.Box, { children: /* @__PURE__ */ jsxRuntime.jsx(
-            discussKitUx.GithubReaction,
-            {
-              data: objectRatingState.value,
-              onRate: handleOnRate,
-              onUnrate: handleOnUnrate,
-              interactive,
-              append: reactionAppend
-            }
-          ) }),
+          displayReaction && /* @__PURE__ */ jsxRuntime.jsxs(discussKitUx.IconButtonGroup, { sx: { alignItems: "flex-end" }, children: [
+            /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.GithubReactionContainer, { id: object.id, request: api, interactive }),
+            reactionAppend
+          ] }),
           displayConnectButton && (session.user ? /* @__PURE__ */ jsxRuntime.jsx(SessionManager, { style: { padding: 0 }, showText: true, showRole: true, session }) : /* @__PURE__ */ jsxRuntime.jsx(Button, { size: "medium", variant: "contained", color: "primary", onClick: () => session.login(), children: t("connect") }))
         ] }),
         displayConnectButton && !session.user && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "input-no-connect", children: /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "connect-tip", children: [

package/lib/es/comments.js

@@ -8,17 +8,13 @@ import Button from "@arcblock/ux/lib/Button";
 import { Alert, AlertTitle, Box, CircularProgress } from "@mui/material";
 import { useLocaleContext, LocaleProvider } from "@arcblock/ux/lib/Locale/context";
 import { ErrorBoundary } from "react-error-boundary";
-import { useDefaultApiErrorHandler, useCommentsContext, useSubscription, GithubReaction, SegmentedControl, CommentList, getWsClient, UploaderProvider, InternalThemeProvider, ConfirmProvider, DefaultEditorConfigProvider, CommentsProvider, CommentInput } from "@blocklet/discuss-kit-ux";
+import { useDefaultApiErrorHandler, useCommentsContext, useSubscription, IconButtonGroup, GithubReactionContainer, SegmentedControl, CommentList, getWsClient, UploaderProvider, InternalThemeProvider, ConfirmProvider, DefaultEditorConfigProvider, CommentsProvider, CommentInput } from "@blocklet/discuss-kit-ux";
 import { useRequest } from "ahooks";
 import ErrorFallback from "./components/error-fallback";
 import { translations } from "./locales";
 import { discussKitPrefix } from "./lib/utils";
 import api, { fetchRatings } from "./api";
 import { useTopicInfoSync } from "./hooks/topic-info-sync";
-const useAsyncRetry = (fn, deps = []) => {
-  const state = useRequest(fn, { refreshDeps: deps });
-  return { ...state, value: state == null ? void 0 : state.data, retry: state == null ? void 0 : state.run };
-};
 const getCurrentBlockletComponentName = () => {
   var _a, _b;
   const ensureTrailingSlash = (str) => str.endsWith("/") ? str : `${str}/`;
@@ -136,7 +132,6 @@ const DiscussKitComments = forwardRef(
     const { state, sort, add, updateCommentState, interactive, findById, renderInnerFooter } = useCommentsContext();
     const { total, order, initialized } = state;
     const { t } = useLocaleContext();
-    const objectRatingState = useAsyncRetry(() => fetchRatings(object.id));
     useTopicInfoSync(object);
     const handlers = {
       ADD_COMMENT: (data) => {
@@ -154,7 +149,6 @@ const DiscussKitComments = forwardRef(
           });
         }
       },
-      RATING: () => objectRatingState.retry(),
       RATING_COMMENT: async ({ commentId }) => {
         const rating = await fetchRatings(commentId);
         updateCommentState(commentId, (current) => ({
@@ -185,20 +179,6 @@ const DiscussKitComments = forwardRef(
       add(formatComment(data));
       onSendComment == null ? void 0 : onSendComment(data);
     };
-    const handleOnRate = async ({ ratingType, value }) => {
-      if (!session.user) {
-        session.login();
-        throw new Error("Unauthenticated.");
-      }
-      await api.post(`/topics/${object.id}/ratings`, { ratingType, value });
-    };
-    const handleOnUnrate = async () => {
-      if (!session.user) {
-        session.login();
-        throw new Error("Unauthenticated.");
-      }
-      await api.delete(`/topics/${object.id}/ratings`);
-    };
     const renderCommentInput = () => {
       return /* @__PURE__ */ jsx(
         CommentInput,
@@ -221,16 +201,10 @@ const DiscussKitComments = forwardRef(
     return /* @__PURE__ */ jsxs(Container, { ref, children: [
       /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsxs(Box, { display: "flex", justifyContent: "space-between", alignItems: "end", children: [
-          displayReaction && objectRatingState.value && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(
-            GithubReaction,
-            {
-              data: objectRatingState.value,
-              onRate: handleOnRate,
-              onUnrate: handleOnUnrate,
-              interactive,
-              append: reactionAppend
-            }
-          ) }),
+          displayReaction && /* @__PURE__ */ jsxs(IconButtonGroup, { sx: { alignItems: "flex-end" }, children: [
+            /* @__PURE__ */ jsx(GithubReactionContainer, { id: object.id, request: api, interactive }),
+            reactionAppend
+          ] }),
           displayConnectButton && (session.user ? /* @__PURE__ */ jsx(SessionManager, { style: { padding: 0 }, showText: true, showRole: true, session }) : /* @__PURE__ */ jsx(Button, { size: "medium", variant: "contained", color: "primary", onClick: () => session.login(), children: t("connect") }))
         ] }),
         displayConnectButton && !session.user && /* @__PURE__ */ jsx("div", { className: "input-no-connect", children: /* @__PURE__ */ jsxs("span", { className: "connect-tip", children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit",
-  "version": "2.3.28",
+  "version": "2.3.30",
   "description": "A react component for Discuss Kit blocklet.",
   "main": "./lib/cjs/index.js",
   "module": "./lib/es/index.js",
@@ -49,8 +49,8 @@
     "rehype-sanitize": "^5.0.1",
     "timeago.js": "^4.0.2",
     "url-join": "^4.0.1",
-    "@blocklet/discuss-kit-ux": "^2.3.28",
-    "@blocklet/editor": "^2.3.28"
+    "@blocklet/discuss-kit-ux": "^2.3.30",
+    "@blocklet/editor": "^2.3.30"
   },
   "peerDependencies": {
     "@arcblock/did-connect": "^2.10.36",