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

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

@@ -29,7 +29,7 @@ const DeleteModal = /* @__PURE__ */ lazy(() => import("./DeleteModal.js")), Comm
   } = comment, [ref, onFocus, resizeTextarea] = useAutosizeTextarea(!0), [isDeleteModalOpen, setIsDeleteModalOpen] = useState(!1), {
     t
   } = useTranslation(), {
-    comments,
+    defaultComments,
     editCommentId,
     options,
     type,
@@ -39,7 +39,7 @@ const DeleteModal = /* @__PURE__ */ lazy(() => import("./DeleteModal.js")), Comm
     handleReset,
     handleUpdateComment,
     handleReplyToComment
-  } = useCommentsContext(), replies = (comments == null ? void 0 : comments.filter((comm) => comm.replyTo === comment.id)) ?? [], hasReplies = replies.length > 0, hasAllDeletedReplies = replies.every((reply) => reply.deleted), isEditing = editCommentId === comment.id, handleChangeContent = (event) => {
+  } = useCommentsContext(), replies = (defaultComments == null ? void 0 : defaultComments.filter((comm) => comm.replyTo === comment.id)) ?? [], hasReplies = replies.length > 0, hasAllDeletedReplies = replies.every((reply) => reply.deleted), isEditing = editCommentId === comment.id, handleChangeContent = (event) => {
     resizeTextarea(), setValue(event.target.value);
   };
   return /* @__PURE__ */ jsxs(Fragment, { children: [

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

@@ -6,15 +6,15 @@ function CommentList() {
   const {
     user
   } = useEdificeClient(), {
-    comments,
+    displayedComments,
     profiles
   } = useCommentsContext();
-  return comments == null ? void 0 : comments.map((comment) => {
+  return displayedComments == null ? void 0 : displayedComments.map((comment) => {
     var _a;
     const {
       authorId
     } = comment, profile = ((_a = profiles == null ? void 0 : profiles.find((user2) => (user2 == null ? void 0 : user2.userId) === authorId)) == null ? void 0 : _a.profile) ?? "Guest";
-    return /* @__PURE__ */ jsx("div", { children: !comment.replyTo && /* @__PURE__ */ jsx(Comment, { comment, profile, userId: user == null ? void 0 : user.userId }) }, comment.id);
+    return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Comment, { comment, profile, userId: user == null ? void 0 : user.userId }) }, comment.id);
   });
 }
 export {

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

@@ -8,7 +8,6 @@ const CommentReplies = ({
   parentComment
 }) => {
   const {
-    comments,
     profiles,
     options,
     replyToCommentId
@@ -21,7 +20,6 @@ const CommentReplies = ({
     handleMoreReplies
   } = useCommentReplies({
     parentComment,
-    comments,
     profiles,
     options
   }), showCommentForm = replyToCommentId === parentComment.id && !parentComment.deleted;

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

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

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

@@ -1,7 +1,6 @@
 import { CommentOptions, CommentProps, UserProfileResult } from '../types';
-export declare const useCommentReplies: ({ parentComment, comments, profiles, options, }: {
+export declare const useCommentReplies: ({ parentComment, profiles, options, }: {
     parentComment: CommentProps;
-    comments: CommentProps[] | undefined;
     profiles: (UserProfileResult | undefined)[];
     options: Partial<CommentOptions>;
 }) => {
@@ -10,6 +9,5 @@ export declare const useCommentReplies: ({ parentComment, comments, profiles, op
     profile: "Student" | "Teacher" | "Relative" | "Personnel" | "Guest";
     slicedReplies: CommentProps[];
     defaultReplies: CommentProps[];
-    orphanReplies: CommentProps[];
     handleMoreReplies: () => void;
 };

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

@@ -1,9 +1,9 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useEdificeClient } from "../../../providers/EdificeClientProvider/EdificeClientProvider.hook.js";
+import { useCommentsContext } from "./useCommentsContext.js";
 const useCommentReplies = ({
   parentComment,
-  comments,
   profiles,
   options
 }) => {
@@ -12,19 +12,20 @@ const useCommentReplies = ({
     maxReplies,
     additionalReplies
   } = options, [repliesLimit, setRepliesLimit] = useState(maxReplies), {
+    defaultComments
+  } = useCommentsContext(), {
     user
   } = useEdificeClient(), {
     t
   } = useTranslation(), {
     authorId
-  } = parentComment, profile = ((_a = profiles == null ? void 0 : profiles.find((user2) => (user2 == null ? void 0 : user2.userId) === authorId)) == null ? void 0 : _a.profile) ?? "Guest", defaultReplies = (comments == null ? void 0 : comments.filter((comment) => comment.replyTo === parentComment.id)) ?? [], slicedReplies = (defaultReplies == null ? void 0 : defaultReplies.sort((a, b) => b.createdAt - a.createdAt).slice(0, repliesLimit)) ?? [], orphanReplies = (comments == null ? void 0 : comments.filter((comment) => comment.replyTo && !comments.find((c) => c.id === comment.replyTo))) ?? [];
+  } = parentComment, profile = ((_a = profiles == null ? void 0 : profiles.find((user2) => (user2 == null ? void 0 : user2.userId) === authorId)) == null ? void 0 : _a.profile) ?? "Guest", defaultReplies = (defaultComments == null ? void 0 : defaultComments.filter((comment) => comment.replyTo === parentComment.id)) ?? [], slicedReplies = (defaultReplies == null ? void 0 : defaultReplies.sort((a, b) => b.createdAt - a.createdAt).slice(0, repliesLimit)) ?? [];
   return {
     t,
     user,
     profile,
     slicedReplies,
     defaultReplies,
-    orphanReplies,
     handleMoreReplies: () => {
       const newLimit = slicedReplies.length + (additionalReplies ?? 2);
       newLimit !== slicedReplies.length && setRepliesLimit(newLimit);

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;
-    defaultCommentsCount: number;
-    comments: 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>>;
-    commentsCount: 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

@@ -14,31 +14,34 @@ const useComments = ({
     t
   } = useTranslation(), {
     user
-  } = useEdificeClient(), usersIds = Array.from(new Set(defaultComments == null ? void 0 : defaultComments.map((comment) => comment.authorId))), profilesQueries = useProfileQueries(usersIds), comments = useMemo(
-    () => type === "edit" ? (defaultComments == null ? void 0 : defaultComments.sort((a, b) => b.createdAt - a.createdAt).slice(0, commentLimit)) ?? [] : (defaultComments == null ? void 0 : defaultComments.sort((a, b) => b.createdAt - a.createdAt)) ?? [],
+  } = 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 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]
-  ), commentsCount = ((_a = comments == null ? void 0 : comments.filter((comment) => !comment.deleted)) == null ? void 0 : _a.length) ?? 0, defaultCommentsCount = ((_b = defaultComments == null ? void 0 : defaultComments.filter((comment) => !comment.deleted)) == null ? void 0 : _b.length) ?? 0, title = defaultCommentsCount && defaultCommentsCount > 1 ? t("comment.several", {
-    number: defaultCommentsCount
+  ), 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: defaultCommentsCount
+    number: titleCommentsCount
   });
   return {
+    t,
     profilesQueries,
     title,
     user,
     emptyscreenPath: illuPad,
-    defaultCommentsCount,
-    comments,
+    displayedComments,
+    showMoreComments,
     editCommentId,
     setEditCommentId,
     replyToCommentId,
     setReplyToCommentId,
-    commentsCount,
-    t,
     handleMoreComments: () => {
-      const newLimit = (comments == null ? void 0 : comments.length) + (options.additionalComments ?? 5);
-      newLimit !== comments.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,6 @@
 export declare const useCommentsContext: () => {
-    comments: import('../types').CommentProps[] | undefined;
+    displayedComments: import('../types').CommentProps[] | undefined;
+    defaultComments: import('../types').CommentProps[] | undefined;
     editCommentId: string | null;
     replyToCommentId: string | null;
     profiles: (import('../types').UserProfileResult | undefined)[];

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

@@ -28,13 +28,12 @@ const CommentProvider = ({
     title,
     user,
     emptyscreenPath,
-    defaultCommentsCount,
-    comments,
+    displayedComments,
+    showMoreComments,
     editCommentId,
     setEditCommentId,
     replyToCommentId,
     setReplyToCommentId,
-    commentsCount,
     t,
     handleMoreComments,
     handleDeleteComment,
@@ -50,7 +49,8 @@ const CommentProvider = ({
     options
   }), userRights = type === "edit" ? props.rights : void 0, values = useMemo(
     () => ({
-      comments,
+      displayedComments,
+      defaultComments,
       profiles: profilesQueries.data,
       editCommentId,
       replyToCommentId,
@@ -67,7 +67,7 @@ const CommentProvider = ({
       handleReset
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [comments, 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 }),
@@ -75,10 +75,10 @@ const CommentProvider = ({
       user && /* @__PURE__ */ jsx(CommentForm, { userId: user.userId }),
       profilesQueries.isLoading ? null : /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(CommentList, {}),
-        commentsCount !== defaultCommentsCount && /* @__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") })
       ] })
     ] }),
-    !commentsCount && 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.20250319191946",
+  "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.20250319191946",
-    "@edifice.io/tiptap-extensions": "2.1.2-develop-pedago.20250319191946",
-    "@edifice.io/utilities": "2.1.2-develop-pedago.20250319191946"
+    "@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.20250319191946",
-    "@edifice.io/client": "2.1.2-develop-pedago.20250319191946"
+    "@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",