@edifice.io/react 2.1.2-develop-pedago.20250320142932 → 2.1.2-develop-pedago.20250320195838

package/dist/modules/comments/components/CommentList.js

@@ -6,10 +6,10 @@ function CommentList() {
   const {
     user
   } = useEdificeClient(), {
-    limitedSortedParentComments,
+    displayedComments,
     profiles
   } = useCommentsContext();
-  return limitedSortedParentComments == null ? void 0 : limitedSortedParentComments.map((comment) => {
+  return displayedComments == null ? void 0 : displayedComments.map((comment) => {
     var _a;
     const {
       authorId

package/dist/modules/comments/context/Context.d.ts

@@ -1,7 +1,7 @@
 import { RightRole } from '@edifice.io/client';
 import { CommentOptions, CommentProps, CommentType, UserProfileResult } from '../types';
 export declare const CommentContext: import('react').Context<{
-    limitedSortedParentComments: CommentProps[] | undefined;
+    displayedComments: CommentProps[] | undefined;
     defaultComments: CommentProps[] | undefined;
     editCommentId: string | null;
     replyToCommentId: string | null;

package/dist/modules/comments/hooks/useComments.d.ts

@@ -5,6 +5,7 @@ export declare const useComments: ({ defaultComments, options, type, callbacks,
     type: CommentType;
     callbacks: CommentCallbacks | null;
 }) => {
+    t: import('i18next').TFunction<"translation", undefined>;
     profilesQueries: {
         data: ({
             userId: string;
@@ -15,14 +16,12 @@ export declare const useComments: ({ defaultComments, options, type, callbacks,
     title: string;
     user: import('@edifice.io/client').IUserInfo | undefined;
     emptyscreenPath: string;
-    defaultParentCommentsCount: number;
-    limitedSortedParentComments: CommentProps[];
+    displayedComments: CommentProps[];
+    showMoreComments: boolean;
     editCommentId: string | null;
     setEditCommentId: import('react').Dispatch<import('react').SetStateAction<string | null>>;
     replyToCommentId: string | null;
     setReplyToCommentId: import('react').Dispatch<import('react').SetStateAction<string | null>>;
-    limitedSortedParentCommentsCount: number;
-    t: import('i18next').TFunction<"translation", undefined>;
     handleMoreComments: () => void;
     handleDeleteComment: (id: string) => void;
     handleCreateComment: (content: string, replyTo?: string) => void;

package/dist/modules/comments/hooks/useComments.js

@@ -9,40 +9,39 @@ const useComments = ({
   type,
   callbacks
 }) => {
-  var _a;
+  var _a, _b;
   const [editCommentId, setEditCommentId] = useState(null), [replyToCommentId, setReplyToCommentId] = useState(null), [commentLimit, setCommentLimit] = useState(options.maxComments), {
     t
   } = useTranslation(), {
     user
-  } = useEdificeClient(), usersIds = Array.from(new Set(defaultComments == null ? void 0 : defaultComments.map((comment) => comment.authorId))), profilesQueries = useProfileQueries(usersIds), limitedSortedParentComments = useMemo(
+  } = useEdificeClient(), usersIds = Array.from(new Set(defaultComments == null ? void 0 : defaultComments.map((comment) => comment.authorId))), profilesQueries = useProfileQueries(usersIds), idsOfDeletedCommentWithNoReply = useMemo(() => (defaultComments == null ? void 0 : defaultComments.filter((comment) => comment.deleted && !defaultComments.some((c) => c.replyTo === comment.id)).map((comment) => comment.id)) ?? [], [defaultComments]), displayedComments = useMemo(
     () => {
       var _a2;
-      const filteredAndSortedComments = ((_a2 = defaultComments == null ? void 0 : defaultComments.filter((comment) => !comment.replyTo)) == null ? void 0 : _a2.sort((a, b) => b.createdAt - a.createdAt)) ?? [];
-      return type === "edit" ? filteredAndSortedComments.slice(0, commentLimit) ?? [] : filteredAndSortedComments;
+      const result = ((_a2 = defaultComments == null ? void 0 : defaultComments.filter((comment) => !comment.replyTo && !idsOfDeletedCommentWithNoReply.includes(comment.id))) == null ? void 0 : _a2.sort((a, b) => b.createdAt - a.createdAt)) ?? [];
+      return type === "edit" ? result.slice(0, commentLimit) ?? [] : result;
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [commentLimit, defaultComments]
-  ), limitedSortedParentCommentsCount = (limitedSortedParentComments == null ? void 0 : limitedSortedParentComments.length) ?? 0, defaultParentCommentsCount = ((_a = defaultComments == null ? void 0 : defaultComments.filter((comment) => !comment.replyTo)) == null ? void 0 : _a.length) ?? 0, title = defaultComments != null && defaultComments.length && (defaultComments == null ? void 0 : defaultComments.length) > 1 ? t("comment.several", {
-    number: defaultComments == null ? void 0 : defaultComments.length
+  ), showMoreComments = (displayedComments == null ? void 0 : displayedComments.length) < (((_a = defaultComments == null ? void 0 : defaultComments.filter((comment) => !comment.replyTo && !idsOfDeletedCommentWithNoReply.includes(comment.id))) == null ? void 0 : _a.length) ?? 0), titleCommentsCount = ((_b = defaultComments == null ? void 0 : defaultComments.filter((comment) => !comment.deleted)) == null ? void 0 : _b.length) ?? 0, title = titleCommentsCount > 1 ? t("comment.several", {
+    number: titleCommentsCount
   }) : t("comment.little", {
-    number: defaultComments == null ? void 0 : defaultComments.length
+    number: titleCommentsCount
   });
   return {
+    t,
     profilesQueries,
     title,
     user,
     emptyscreenPath: illuPad,
-    defaultParentCommentsCount,
-    limitedSortedParentComments,
+    displayedComments,
+    showMoreComments,
     editCommentId,
     setEditCommentId,
     replyToCommentId,
     setReplyToCommentId,
-    limitedSortedParentCommentsCount,
-    t,
     handleMoreComments: () => {
-      const filteredComments = limitedSortedParentComments == null ? void 0 : limitedSortedParentComments.filter((comment) => !comment.replyTo), newLimit = (filteredComments == null ? void 0 : filteredComments.length) + (options.additionalComments ?? 5);
-      newLimit !== (filteredComments == null ? void 0 : filteredComments.length) && setCommentLimit(newLimit);
+      const newLimit = displayedComments.length + (options.additionalComments ?? 5);
+      newLimit !== displayedComments.length && setCommentLimit(newLimit);
     },
     handleDeleteComment: (id) => {
       type === "edit" && (callbacks == null || callbacks.delete(id));

package/dist/modules/comments/hooks/useCommentsContext.d.ts

@@ -1,5 +1,5 @@
 export declare const useCommentsContext: () => {
-    limitedSortedParentComments: import('../types').CommentProps[] | undefined;
+    displayedComments: import('../types').CommentProps[] | undefined;
     defaultComments: import('../types').CommentProps[] | undefined;
     editCommentId: string | null;
     replyToCommentId: string | null;

package/dist/modules/comments/provider/CommentProvider.js

@@ -28,13 +28,12 @@ const CommentProvider = ({
     title,
     user,
     emptyscreenPath,
-    defaultParentCommentsCount,
-    limitedSortedParentComments,
+    displayedComments,
+    showMoreComments,
     editCommentId,
     setEditCommentId,
     replyToCommentId,
     setReplyToCommentId,
-    limitedSortedParentCommentsCount,
     t,
     handleMoreComments,
     handleDeleteComment,
@@ -50,7 +49,7 @@ const CommentProvider = ({
     options
   }), userRights = type === "edit" ? props.rights : void 0, values = useMemo(
     () => ({
-      limitedSortedParentComments,
+      displayedComments,
       defaultComments,
       profiles: profilesQueries.data,
       editCommentId,
@@ -68,7 +67,7 @@ const CommentProvider = ({
       handleReset
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [limitedSortedParentComments, editCommentId, profilesQueries, options]
+    [displayedComments, editCommentId, profilesQueries, options]
   );
   return /* @__PURE__ */ jsx(CommentContext.Provider, { value: values, children: /* @__PURE__ */ jsxs("div", { className: "my-24", children: [
     /* @__PURE__ */ jsx(CommentHeader, { title }),
@@ -76,10 +75,10 @@ const CommentProvider = ({
       user && /* @__PURE__ */ jsx(CommentForm, { userId: user.userId }),
       profilesQueries.isLoading ? null : /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(CommentList, {}),
-        limitedSortedParentCommentsCount !== defaultParentCommentsCount && /* @__PURE__ */ jsx(Button, { variant: "ghost", color: "tertiary", onClick: handleMoreComments, className: "my-16", children: t("comment.more") })
+        showMoreComments && /* @__PURE__ */ jsx(Button, { variant: "ghost", color: "tertiary", onClick: handleMoreComments, className: "my-16", children: t("comment.more") })
       ] })
     ] }),
-    !limitedSortedParentCommentsCount && type === "edit" && /* @__PURE__ */ jsxs("div", { className: "comments-emptyscreen", children: [
+    !displayedComments.length && type === "edit" && /* @__PURE__ */ jsxs("div", { className: "comments-emptyscreen", children: [
       /* @__PURE__ */ jsx("div", { className: "comments-emptyscreen-wrapper", children: /* @__PURE__ */ jsx(EmptyScreen, { imageSrc: emptyscreenPath, size: 150 }) }),
       /* @__PURE__ */ jsx("p", { children: t("comment.emptyscreen") })
     ] })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edifice.io/react",
-  "version": "2.1.2-develop-pedago.20250320142932",
+  "version": "2.1.2-develop-pedago.20250320195838",
   "description": "Edifice React Library",
   "keywords": [
     "react",
@@ -118,9 +118,9 @@
     "react-slugify": "^3.0.3",
     "swiper": "^10.1.0",
     "ua-parser-js": "^1.0.36",
-    "@edifice.io/bootstrap": "2.1.2-develop-pedago.20250320142932",
-    "@edifice.io/tiptap-extensions": "2.1.2-develop-pedago.20250320142932",
-    "@edifice.io/utilities": "2.1.2-develop-pedago.20250320142932"
+    "@edifice.io/bootstrap": "2.1.2-develop-pedago.20250320195838",
+    "@edifice.io/tiptap-extensions": "2.1.2-develop-pedago.20250320195838",
+    "@edifice.io/utilities": "2.1.2-develop-pedago.20250320195838"
   },
   "devDependencies": {
     "@babel/plugin-transform-react-pure-annotations": "^7.23.3",
@@ -151,8 +151,8 @@
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.1.0",
     "vite-tsconfig-paths": "^5.0.1",
-    "@edifice.io/config": "2.1.2-develop-pedago.20250320142932",
-    "@edifice.io/client": "2.1.2-develop-pedago.20250320142932"
+    "@edifice.io/client": "2.1.2-develop-pedago.20250320195838",
+    "@edifice.io/config": "2.1.2-develop-pedago.20250320195838"
   },
   "peerDependencies": {
     "@react-spring/web": "^9.7.5",