@blocklet/discuss-kit 1.0.17 → 1.0.19

package/lib/cjs/comments.js

@@ -37,12 +37,20 @@ const getPrefix = () => {
   const service = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find((x) => x.name === "did-comments");
   return service ? joinUrl__default.default(service.mountPoint, "/") : "";
 };
+const getCurrentBlockletComponentName = () => {
+  var _a, _b;
+  const ensureTrailingSlash = (str) => str.endsWith("/") ? str : `${str}/`;
+  const matched = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find((x) => {
+    var _a2;
+    return ensureTrailingSlash(x.mountPoint) === ensureTrailingSlash((_a2 = window.blocklet) == null ? void 0 : _a2.prefix);
+  });
+  return matched == null ? void 0 : matched.title;
+};
 const formatComment = (comment) => {
   var _a;
   return {
     ...comment,
-    rootId: comment.commentId,
-    author: comment.commenter,
+    rootId: comment.rootCommentId,
     createdAt: comment.createdAt ? new Date(comment.createdAt) : null,
     updatedAt: comment.updatedAt ? new Date(comment.updatedAt) : null,
     deletedAt: comment.deletedAt ? new Date(comment.deletedAt) : null,
@@ -110,13 +118,13 @@ const commentAPI = {
     return formatComment(data);
   },
   rate: async (comment, value, ratingType) => {
-    await api__default.default.post(`/objects/${comment.objectId}/comments/${comment.id}/ratings`, {
+    await api__default.default.post(`/topics/${comment.topicId}/comments/${comment.id}/ratings`, {
       ratingType,
       value
     });
   },
   unrate: async (comment) => {
-    await api__default.default.delete(`/objects/${comment.objectId}/comments/${comment.id}/ratings`);
+    await api__default.default.delete(`/topics/${comment.topicId}/comments/${comment.id}/ratings`);
   },
   fetchRatings: async (id) => {
     const {
@@ -128,7 +136,8 @@ const commentAPI = {
 function DiscussKitComments({
   showConnectBtn,
   object,
-  onChange
+  onChange,
+  commentInputPosition
 }) {
   const {
     session
@@ -189,7 +198,7 @@ function DiscussKitComments({
       session.login();
       throw new Error("Unauthenticated.");
     }
-    await api__default.default.post(`/objects/${object.id}/ratings`, {
+    await api__default.default.post(`/topics/${object.id}/ratings`, {
       ratingType,
       value
     });
@@ -199,7 +208,7 @@ function DiscussKitComments({
       session.login();
       throw new Error("Unauthenticated.");
     }
-    await api__default.default.delete(`/objects/${object.id}/ratings`);
+    await api__default.default.delete(`/topics/${object.id}/ratings`);
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(Container, {
     children: [/* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
@@ -250,8 +259,8 @@ function DiscussKitComments({
             children: t("installDIDWallet")
           })]
         })
-      }), session.user && /* @__PURE__ */ jsxRuntime.jsx(Box__default.default, {
-        mt: 2.5,
+      }), session.user && commentInputPosition === "top" && /* @__PURE__ */ jsxRuntime.jsx(Box__default.default, {
+        mt: 2,
         children: /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.CommentInput, {
           send: sendComment,
           draftKey: `object-${object.id}`
@@ -260,7 +269,7 @@ function DiscussKitComments({
     }), !!total && /* @__PURE__ */ jsxRuntime.jsxs(Box__default.default, {
       display: "flex",
       justifyContent: "space-between",
-      mt: 4,
+      mt: 3,
       children: [/* @__PURE__ */ jsxRuntime.jsxs("span", {
         children: [total > 0 ? `${total} ${t("comments")}` : t("comment"), " "]
       }), /* @__PURE__ */ jsxRuntime.jsxs(ButtonGroup__default.default, {
@@ -278,18 +287,26 @@ function DiscussKitComments({
           children: t("newest")
         })]
       })]
-    }), /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.CommentList, {})]
+    }), /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.CommentList, {}), session.user && commentInputPosition === "bottom" && /* @__PURE__ */ jsxRuntime.jsx(Box__default.default, {
+      mt: 6,
+      children: /* @__PURE__ */ jsxRuntime.jsx(discussKitUx.CommentInput, {
+        send: sendComment,
+        draftKey: `object-${object.id}`
+      })
+    })]
   });
 }
 DiscussKitComments.propTypes = {
   showConnectBtn: PropTypes__default.default.bool,
   object: PropTypes__default.default.object.isRequired,
-  onChange: PropTypes__default.default.func
+  onChange: PropTypes__default.default.func,
+  commentInputPosition: PropTypes__default.default.oneOf(["top", "bottom"])
 };
 DiscussKitComments.defaultProps = {
   showConnectBtn: false,
   onChange: () => {
-  }
+  },
+  commentInputPosition: "top"
 };
 function Wrapper({
   target,
@@ -302,8 +319,8 @@ function Wrapper({
     throw new Error("target is required.");
   }
   const {
-    locale
-  } = context.useLocaleContext();
+    locale = "en"
+  } = context.useLocaleContext() || {};
   const [, setSettings] = discussKitUx.useCommentSettings();
   react.useEffect(() => {
     setSettings((prev) => ({
@@ -314,7 +331,8 @@ function Wrapper({
   const object = react.useMemo(
     () => ({
       ...target,
-      link: window.location.href
+      link: window.location.href,
+      blockletName: getCurrentBlockletComponentName()
     }),
     [target]
   );

package/lib/es/comments.js

@@ -23,12 +23,20 @@ const getPrefix = () => {
   const service = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find((x) => x.name === "did-comments");
   return service ? joinUrl(service.mountPoint, "/") : "";
 };
+const getCurrentBlockletComponentName = () => {
+  var _a, _b;
+  const ensureTrailingSlash = (str) => str.endsWith("/") ? str : `${str}/`;
+  const matched = (_b = (_a = window.blocklet) == null ? void 0 : _a.componentMountPoints) == null ? void 0 : _b.find((x) => {
+    var _a2;
+    return ensureTrailingSlash(x.mountPoint) === ensureTrailingSlash((_a2 = window.blocklet) == null ? void 0 : _a2.prefix);
+  });
+  return matched == null ? void 0 : matched.title;
+};
 const formatComment = (comment) => {
   var _a;
   return {
     ...comment,
-    rootId: comment.commentId,
-    author: comment.commenter,
+    rootId: comment.rootCommentId,
     createdAt: comment.createdAt ? new Date(comment.createdAt) : null,
     updatedAt: comment.updatedAt ? new Date(comment.updatedAt) : null,
     deletedAt: comment.deletedAt ? new Date(comment.deletedAt) : null,
@@ -96,13 +104,13 @@ const commentAPI = {
     return formatComment(data);
   },
   rate: async (comment, value, ratingType) => {
-    await api.post(`/objects/${comment.objectId}/comments/${comment.id}/ratings`, {
+    await api.post(`/topics/${comment.topicId}/comments/${comment.id}/ratings`, {
       ratingType,
       value
     });
   },
   unrate: async (comment) => {
-    await api.delete(`/objects/${comment.objectId}/comments/${comment.id}/ratings`);
+    await api.delete(`/topics/${comment.topicId}/comments/${comment.id}/ratings`);
   },
   fetchRatings: async (id) => {
     const {
@@ -114,7 +122,8 @@ const commentAPI = {
 function DiscussKitComments({
   showConnectBtn,
   object,
-  onChange
+  onChange,
+  commentInputPosition
 }) {
   const {
     session
@@ -175,7 +184,7 @@ function DiscussKitComments({
       session.login();
       throw new Error("Unauthenticated.");
     }
-    await api.post(`/objects/${object.id}/ratings`, {
+    await api.post(`/topics/${object.id}/ratings`, {
       ratingType,
       value
     });
@@ -185,7 +194,7 @@ function DiscussKitComments({
       session.login();
       throw new Error("Unauthenticated.");
     }
-    await api.delete(`/objects/${object.id}/ratings`);
+    await api.delete(`/topics/${object.id}/ratings`);
   };
   return /* @__PURE__ */ jsxs(Container, {
     children: [/* @__PURE__ */ jsxs(Fragment, {
@@ -236,8 +245,8 @@ function DiscussKitComments({
             children: t("installDIDWallet")
           })]
         })
-      }), session.user && /* @__PURE__ */ jsx(Box, {
-        mt: 2.5,
+      }), session.user && commentInputPosition === "top" && /* @__PURE__ */ jsx(Box, {
+        mt: 2,
         children: /* @__PURE__ */ jsx(CommentInput, {
           send: sendComment,
           draftKey: `object-${object.id}`
@@ -246,7 +255,7 @@ function DiscussKitComments({
     }), !!total && /* @__PURE__ */ jsxs(Box, {
       display: "flex",
       justifyContent: "space-between",
-      mt: 4,
+      mt: 3,
       children: [/* @__PURE__ */ jsxs("span", {
         children: [total > 0 ? `${total} ${t("comments")}` : t("comment"), " "]
       }), /* @__PURE__ */ jsxs(ButtonGroup, {
@@ -264,18 +273,26 @@ function DiscussKitComments({
           children: t("newest")
         })]
       })]
-    }), /* @__PURE__ */ jsx(CommentList, {})]
+    }), /* @__PURE__ */ jsx(CommentList, {}), session.user && commentInputPosition === "bottom" && /* @__PURE__ */ jsx(Box, {
+      mt: 6,
+      children: /* @__PURE__ */ jsx(CommentInput, {
+        send: sendComment,
+        draftKey: `object-${object.id}`
+      })
+    })]
   });
 }
 DiscussKitComments.propTypes = {
   showConnectBtn: PropTypes.bool,
   object: PropTypes.object.isRequired,
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
+  commentInputPosition: PropTypes.oneOf(["top", "bottom"])
 };
 DiscussKitComments.defaultProps = {
   showConnectBtn: false,
   onChange: () => {
-  }
+  },
+  commentInputPosition: "top"
 };
 function Wrapper({
   target,
@@ -288,8 +305,8 @@ function Wrapper({
     throw new Error("target is required.");
   }
   const {
-    locale
-  } = useLocaleContext();
+    locale = "en"
+  } = useLocaleContext() || {};
   const [, setSettings] = useCommentSettings();
   useEffect(() => {
     setSettings((prev) => ({
@@ -300,7 +317,8 @@ function Wrapper({
   const object = useMemo(
     () => ({
       ...target,
-      link: window.location.href
+      link: window.location.href,
+      blockletName: getCurrentBlockletComponentName()
     }),
     [target]
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "A react component for Discuss Kit blocklet.",
   "main": "./lib/cjs/index.js",
   "module": "./lib/es/index.js",
@@ -37,7 +37,7 @@
     "@arcblock/did-connect": "^2.4.58",
     "@arcblock/ux": "^2.4.58",
     "@arcblock/ws": "^1.18.31",
-    "@blocklet/discuss-kit-ux": "1.0.17",
+    "@blocklet/discuss-kit-ux": "1.0.19",
     "@blocklet/editor": "0.0.10",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
@@ -77,5 +77,5 @@
     "vite-plugin-build": "^0.6.0",
     "vite-plugin-svgr": "^2.2.2"
   },
-  "gitHead": "355c682168bbc1aaef152240b3107eee90dfec74"
+  "gitHead": "9e639c77209dabc2ecdb115545e36936f42f75cd"
 }