@blocklet/discuss-kit-ux 2.0.29 → 2.0.30

package/dist/components/blog/blog-link.d.ts

@@ -1,5 +1,5 @@
 import { BlogPost } from './types';
 
 type PartialBlog = Pick<BlogPost, 'id' | 'slug' | 'createdAt' | 'locale'>;
-export declare const getBlogLink: (post: PartialBlog) => any;
+export declare const getBlogLink: (post: PartialBlog, locale?: string) => any;
 export {};

package/dist/components/posts/comment-list/context.d.ts

@@ -2,6 +2,11 @@ import { Post, Target, CommentAPI } from '../../../types';
 import { default as React } from 'react';
 
 type Order = 'asc' | 'desc';
+export type CommentsRender = (value: {
+    comments: Post[];
+    renderComment: (comment: Post) => React.ReactNode;
+    order: Order;
+}) => React.ReactNode;
 interface CommentsProviderProps {
     target: Target;
     api: CommentAPI;
@@ -14,6 +19,7 @@ interface CommentsProviderProps {
     showProfileCard?: boolean;
     interactive?: boolean;
     containerRef: React.RefObject<HTMLDivElement>;
+    renderComments?: CommentsRender;
 }
 interface State {
     comments: Post[];
@@ -50,8 +56,9 @@ interface CommentsContextValue {
     deleteComment: CommentAPI['deleteComment'];
     reply: CommentAPI['reply'];
     findById: (id: string) => Post | undefined;
+    renderComments?: CommentsRender;
 }
 export declare const CommentsContext: React.Context<CommentsContextValue>;
 export declare const useCommentsContext: () => CommentsContextValue;
-export declare function CommentsProvider({ target, api, flatView, children, order, autoLoadComments, autoCollapse, allowCopyLink, showProfileCard, interactive, containerRef, }: CommentsProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function CommentsProvider({ target, api, flatView, children, order, autoLoadComments, autoCollapse, allowCopyLink, showProfileCard, interactive, containerRef, renderComments, }: CommentsProviderProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/{editor-BPtozKU9.mjs → editor-CUgQ0SdF.mjs}

@@ -4,7 +4,7 @@ import { OnContentChangePlugin } from "@blocklet/editor/lib/ext/OnContentChangeP
 import { CtrlsShortcutPlugin } from "@blocklet/editor/lib/ext/ShortcutPlugin";
 import { SafeAreaPlugin } from "@blocklet/editor/lib/ext/SafeAreaPlugin";
 import { lazy } from "react";
-import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-D6DplcsK.mjs";
+import { i as inferInitialEditorState, I as ImagePathFixerPlugin, V as VideoPathFixerPlugin, a as isEmptyContent, s as stringify, g as getExcerptSync } from "./index-DpeAMRFO.mjs";
 const BlockletEditor = lazy(() => import("@blocklet/editor"));
 const Root = styled(Box)`
   .be-editable,

package/dist/{index-D6DplcsK.mjs → index-DpeAMRFO.mjs}

@@ -2498,7 +2498,8 @@ function CommentsProvider({
   allowCopyLink,
   showProfileCard,
   interactive,
-  containerRef
+  containerRef,
+  renderComments
 }) {
   var _a2;
   const [state, setState] = useSetState(getInitialState(order ? { order } : {}));
@@ -2698,7 +2699,8 @@ function CommentsProvider({
       deleteComment,
       reply,
       loadMoreReplies,
-      findById
+      findById,
+      renderComments
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [target, state]
@@ -2793,7 +2795,7 @@ function SegmentalList({ ...rest }) {
 function CommentList(props) {
   const { t } = useLocaleContext();
   const {
-    state: { comments, nextCursor, highlighted },
+    state: { comments, order, nextCursor, highlighted },
     autoCollapse,
     allowCopyLink,
     showProfileCard,
@@ -2803,29 +2805,31 @@ function CommentList(props) {
     deleteComment,
     reply,
     loadMoreReplies,
-    api
+    api,
+    renderComments
   } = useCommentsContext();
   if (highlighted) {
     return /* @__PURE__ */ jsx(SegmentalList, { ...props });
   }
+  const renderComment = (comment) => /* @__PURE__ */ jsx(
+    Comment,
+    {
+      post: comment,
+      onDelete: deleteComment,
+      onContentUpdate: updateComment,
+      onRate: api.rate,
+      onUnrate: api.unrate,
+      onReply: reply,
+      onLoadMoreReplies: loadMoreReplies,
+      autoCollapse,
+      allowCopyLink,
+      showProfileCard,
+      interactive
+    },
+    comment.id
+  );
   return /* @__PURE__ */ jsxs("div", { ...props, children: [
-    comments == null ? void 0 : comments.map((comment) => /* @__PURE__ */ jsx(
-      Comment,
-      {
-        post: comment,
-        onDelete: deleteComment,
-        onContentUpdate: updateComment,
-        onRate: api.rate,
-        onUnrate: api.unrate,
-        onReply: reply,
-        onLoadMoreReplies: loadMoreReplies,
-        autoCollapse,
-        allowCopyLink,
-        showProfileCard,
-        interactive
-      },
-      comment.id
-    )),
+    renderComments ? renderComments({ order, comments, renderComment }) : comments == null ? void 0 : comments.map(renderComment),
     nextCursor && /* @__PURE__ */ jsx(Box$1, { sx: { my: 2, textAlign: "center" }, children: /* @__PURE__ */ jsx(
       Button,
       {
@@ -3098,16 +3102,17 @@ const routes = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   docPrefix,
   pageGroup
 }, Symbol.toStringTag, { value: "Module" }));
-const getBlogLink = (post) => {
+const getBlogLink = (post, locale) => {
+  const mergedLocale = locale || post.locale || "en";
   const slug = post.slug || post.id;
   const datePrefix = `${dayjs(post.createdAt).format("YYYY-MM-DD")}-`;
   if (slug.startsWith(datePrefix)) {
     return blogPath(
-      `/${post.locale || "en"}/post/${dayjs(post.createdAt).format("YYYY/MM/DD")}/${slug.replace(datePrefix, "")}`
+      `/${mergedLocale || "en"}/post/${dayjs(post.createdAt).format("YYYY/MM/DD")}/${slug.replace(datePrefix, "")}`
     );
   }
-  if (post.locale) {
-    return blogPath(`/${post.locale}/${slug}`);
+  if (mergedLocale) {
+    return blogPath(`/${mergedLocale}/${slug}`);
   }
   return blogPath(`/${slug}`);
 };
@@ -4701,7 +4706,7 @@ function Back({ url, fallbackUrl, iconOnly, sx, ...rest }) {
 }
 const tablerSend = (props) => /* @__PURE__ */ jsx("svg", { viewBox: "0 0 24 24", "data-iconify": "tabler", width: "1.2em", height: "1.2em", ...props, children: /* @__PURE__ */ jsx("path", { fill: "none", stroke: "currentColor", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M10 14L21 3m0 0l-6.5 18a.55.55 0 0 1-1 0L10 14l-7-3.5a.55.55 0 0 1 0-1z" }) });
 const tablerLetterCase = (props) => /* @__PURE__ */ jsx("svg", { viewBox: "0 0 24 24", "data-iconify": "tabler", width: "1.2em", height: "1.2em", ...props, children: /* @__PURE__ */ jsx("path", { fill: "none", stroke: "currentColor", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M14 15.5a3.5 3.5 0 1 0 7 0a3.5 3.5 0 1 0-7 0M3 19V8.5a3.5 3.5 0 0 1 7 0V19m-7-6h7m11-1v7" }) });
-const Editor = lazy(() => import("./editor-BPtozKU9.mjs"));
+const Editor = lazy(() => import("./editor-CUgQ0SdF.mjs"));
 function LazyEditor(props) {
   const fallback2 = /* @__PURE__ */ jsxs(Box, { sx: { px: 3 }, children: [
     /* @__PURE__ */ jsx(Skeleton, {}),

package/dist/index.es.js

@@ -1,5 +1,5 @@
 export * from "@blocklet/labels";
-import { T, n, W, A, m, ad, B, F, K, J, L, ap, Y, X, $, Z, _, a1, w, C, x, y, E, a5, a6, ah, a8, O, Q, ac, D, ag, af, H, G, b, k, ae, M, P, ao, v, q, R, S, a9, aq, o, a2, a4, ai, al, ak, am, ar, N, as, l, f, p, r, j, t, h, aa, U, c, a0, z, a7, ab, u, an, d, at, a3, aj, e } from "./index-D6DplcsK.mjs";
+import { T, n, W, A, m, ad, B, F, K, J, L, ap, Y, X, $, Z, _, a1, w, C, x, y, E, a5, a6, ah, a8, O, Q, ac, D, ag, af, H, G, b, k, ae, M, P, ao, v, q, R, S, a9, aq, o, a2, a4, ai, al, ak, am, ar, N, as, l, f, p, r, j, t, h, aa, U, c, a0, z, a7, ab, u, an, d, at, a3, aj, e } from "./index-DpeAMRFO.mjs";
 import "react/jsx-runtime";
 import "react";
 import "@mui/material/Box";

package/dist/index.umd.js

@@ -2424,7 +2424,8 @@ var __publicField = (obj, key, value) => {
     allowCopyLink,
     showProfileCard,
     interactive,
-    containerRef
+    containerRef,
+    renderComments
   }) {
     var _a2;
     const [state, setState] = ahooks.useSetState(getInitialState(order ? { order } : {}));
@@ -2624,7 +2625,8 @@ var __publicField = (obj, key, value) => {
         deleteComment,
         reply,
         loadMoreReplies,
-        findById
+        findById,
+        renderComments
       }),
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [target, state]
@@ -2719,7 +2721,7 @@ var __publicField = (obj, key, value) => {
   function CommentList(props) {
     const { t } = context.useLocaleContext();
     const {
-      state: { comments, nextCursor, highlighted },
+      state: { comments, order, nextCursor, highlighted },
       autoCollapse,
       allowCopyLink,
       showProfileCard,
@@ -2729,29 +2731,31 @@ var __publicField = (obj, key, value) => {
       deleteComment,
       reply,
       loadMoreReplies,
-      api
+      api,
+      renderComments
     } = useCommentsContext();
     if (highlighted) {
       return /* @__PURE__ */ jsxRuntime.jsx(SegmentalList, { ...props });
     }
+    const renderComment = (comment) => /* @__PURE__ */ jsxRuntime.jsx(
+      Comment,
+      {
+        post: comment,
+        onDelete: deleteComment,
+        onContentUpdate: updateComment,
+        onRate: api.rate,
+        onUnrate: api.unrate,
+        onReply: reply,
+        onLoadMoreReplies: loadMoreReplies,
+        autoCollapse,
+        allowCopyLink,
+        showProfileCard,
+        interactive
+      },
+      comment.id
+    );
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { ...props, children: [
-      comments == null ? void 0 : comments.map((comment) => /* @__PURE__ */ jsxRuntime.jsx(
-        Comment,
-        {
-          post: comment,
-          onDelete: deleteComment,
-          onContentUpdate: updateComment,
-          onRate: api.rate,
-          onUnrate: api.unrate,
-          onReply: reply,
-          onLoadMoreReplies: loadMoreReplies,
-          autoCollapse,
-          allowCopyLink,
-          showProfileCard,
-          interactive
-        },
-        comment.id
-      )),
+      renderComments ? renderComments({ order, comments, renderComment }) : comments == null ? void 0 : comments.map(renderComment),
       nextCursor && /* @__PURE__ */ jsxRuntime.jsx(Box, { sx: { my: 2, textAlign: "center" }, children: /* @__PURE__ */ jsxRuntime.jsx(
         Button,
         {
@@ -3024,16 +3028,17 @@ var __publicField = (obj, key, value) => {
     docPrefix,
     pageGroup
   }, Symbol.toStringTag, { value: "Module" }));
-  const getBlogLink = (post) => {
+  const getBlogLink = (post, locale) => {
+    const mergedLocale = locale || post.locale || "en";
     const slug = post.slug || post.id;
     const datePrefix = `${dayjs(post.createdAt).format("YYYY-MM-DD")}-`;
     if (slug.startsWith(datePrefix)) {
       return blogPath(
-        `/${post.locale || "en"}/post/${dayjs(post.createdAt).format("YYYY/MM/DD")}/${slug.replace(datePrefix, "")}`
+        `/${mergedLocale || "en"}/post/${dayjs(post.createdAt).format("YYYY/MM/DD")}/${slug.replace(datePrefix, "")}`
       );
     }
-    if (post.locale) {
-      return blogPath(`/${post.locale}/${slug}`);
+    if (mergedLocale) {
+      return blogPath(`/${mergedLocale}/${slug}`);
     }
     return blogPath(`/${slug}`);
   };

package/dist/preferences.d.ts

@@ -25,7 +25,12 @@ declare const preferences: {
     displayReactionOnBlog: boolean;
     displayReplyButtonForAnonymousUsers: boolean;
     disableNotificationBadge: boolean;
-    disableActionLog: boolean;
+    enableDiscussLog: boolean;
+    discussLogPosition: "top" | "standard";
+    enableBlogLog: boolean;
+    blogLogPosition: "top" | "standard";
+    enableDocsLog: boolean;
+    docsLogPosition: "top" | "standard";
     badgeList: any[];
     socialShareButtonsDiscussion: boolean;
     socialShareButtonsBlog: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "files": [
     "dist"
   ],
@@ -31,8 +31,8 @@
     "@arcblock/bridge": "^2.10.1",
     "@arcblock/react-hooks": "^2.10.1",
     "@arcblock/ws": "^1.18.123",
-    "@blocklet/editor": "2.0.29",
-    "@blocklet/labels": "2.0.29",
+    "@blocklet/editor": "2.0.30",
+    "@blocklet/labels": "2.0.30",
     "@blocklet/uploader": "^0.1.15",
     "@emotion/css": "^11.10.5",
     "@emotion/react": "^11.10.5",
@@ -100,5 +100,5 @@
   "resolutions": {
     "react": "^18.2.0"
   },
-  "gitHead": "29a8c245893184dc46702087c472a4e1cdf1b829"
+  "gitHead": "af5244086d8945315aa554858ad12dcdde6bf102"
 }