Skip to content

add comment component: #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 20, 2023
Merged

add comment component: #317

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3132a4
add comment component:
mousheng Jul 31, 2023
639d6e0
fix: comment component
Aug 3, 2023
a8f4023
Merge branch 'dev' into comment_component
FalkWolsky Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: comment component
  • Loading branch information
Aqib Mirza committed Aug 3, 2023
commit 639d6e0436a3b4970a672a314ce6286b7d65fae6
243 changes: 121 additions & 122 deletions client/packages/lowcoder/src/comps/comps/commentComp/commentComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,138 +214,137 @@ const CommentCompBase = (
}
};
return (
<div
style={{
<div style={{
margin: style.margin ?? "3px",
padding: style.padding ?? "3px",
width: widthCalculator(style.margin ?? "3px"),
height: heightCalculator(style.margin ?? "3px"),
background: style.background,
overflow: "auto",
overflowX: "hidden",
borderRadius: style.radius,
}}
ref={divRef}
>
<List
header={
title !== "" ? (
<div>
{commentListData.length > 1
? title
.replaceAll("%d", commentListData.length.toString())
.replace("comment", "comments")
: title.replaceAll("%d", commentListData.length.toString())}
</div>
) : (
""
)
}
size="small"
}}>
<div
style={{
overflow: "auto",
overflowX: "hidden",
height: "100%",
}}
ref={divRef}
>
<VirtualList
data={commentListData}
////////////////////////////////////////////////////////////////
// T_T , Frustrating, unable to obtain component height
// height={height - (sendCommentAble ? 145 : 45) + (title === "" ? 40 : 0)}
// ref={VirtualListRef}
////////////////////////////////////////////////////////////////
itemKey="createdAt"
<List
header={
title !== "" ? (
<div style={{position: 'sticky', top:0, background: style.background}}>
{commentListData.length > 1
? title
.replaceAll("%d", commentListData.length.toString())
.replace("comment", "comments")
: title.replaceAll("%d", commentListData.length.toString())}
</div>
) : (
""
)
}
size="small"
>
{(item, index) => (
<List.Item
key={item?.createdAt}
actions={
deleteAble
? [
<CloseOutlined
style={{ color: "#c32230" }}
onClick={() => handleDelete(index)}
/>,
]
: undefined
}
>
<List.Item.Meta
avatar={generateCommentAvatar(item)}
title={
<div onClick={() => props.onEvent("click")}>
<a>{item?.user?.name}</a>
<Tooltip
title={
dayjs(item?.createdAt).isValid()
? dayjs(item?.createdAt).format("YYYY/M/D HH:mm:ss")
: trans("comment.dateErr")
}
placement="bottom"
>
<span
style={{
paddingLeft: "5px",
color: "#999",
fontSize: "11px",
}}
>
{dayjs(item?.createdAt).isValid()
? dayjs(item?.createdAt).fromNow()
: trans("comment.dateErr")}
</span>
</Tooltip>
</div>
}
description={<span>{item?.value}</span>}
/>
</List.Item>
)}
</VirtualList>
</List>
{sendCommentAble ? (
<>
<Mentions
style={{
width: "98%",
height: 50,
margin: "0px 10px 0px 5px",
// position: "fixed",
// bottom: "50px",
}}
onSearch={onSearch}
prefix={Object.keys(MentionListData)}
onChange={onChange}
onSelect={(option: any) => {
dispatch(changeChildAction("mentionName", option?.value, false));
props.onEvent("mention");
}}
value={context}
rows={2}
onPressEnter={onPressEnter}
placeholder={placeholder}
<VirtualList
data={commentListData}
////////////////////////////////////////////////////////////////
// T_T , Frustrating, unable to obtain component height
// height={height - (sendCommentAble ? 145 : 45) + (title === "" ? 40 : 0)}
// ref={VirtualListRef}
////////////////////////////////////////////////////////////////
itemKey="createdAt"
>
{(MentionListData[prefix] || []).map(
(value: string, index: number) => (
<Mentions.Option key={index.toString()} value={value}>
{value}
</Mentions.Option>
)
{(item, index) => (
<List.Item
key={item?.createdAt}
actions={
deleteAble
? [
<CloseOutlined
style={{ color: "#c32230" }}
onClick={() => handleDelete(index)}
/>,
]
: undefined
}
>
<List.Item.Meta
avatar={generateCommentAvatar(item)}
title={
<div onClick={() => props.onEvent("click")}>
<a>{item?.user?.name}</a>
<Tooltip
title={
dayjs(item?.createdAt).isValid()
? dayjs(item?.createdAt).format("YYYY/M/D HH:mm:ss")
: trans("comment.dateErr")
}
placement="bottom"
>
<span
style={{
paddingLeft: "5px",
color: "#999",
fontSize: "11px",
}}
>
{dayjs(item?.createdAt).isValid()
? dayjs(item?.createdAt).fromNow()
: trans("comment.dateErr")}
</span>
</Tooltip>
</div>
}
description={<span>{item?.value}</span>}
/>
</List.Item>
)}
</Mentions>
<Button
type="primary"
style={{
width: "98%",
margin: "10px 10px 10px 5px",
// position: "fixed",
// bottom: "0px",
}}
onClick={handleSubmit}
disabled={context === ""}
>
{buttonText}
</Button>
</>
) : (
""
)}
</VirtualList>
</List>
{sendCommentAble ? (
<div style={{position: "sticky", bottom: 0, background: style.background}}>
<Mentions
style={{
width: "100%",
height: 50,
}}
onSearch={onSearch}
prefix={Object.keys(MentionListData)}
onChange={onChange}
onSelect={(option: any) => {
dispatch(changeChildAction("mentionName", option?.value, false));
props.onEvent("mention");
}}
value={context}
rows={2}
onPressEnter={onPressEnter}
placeholder={placeholder}
>
{(MentionListData[prefix] || []).map(
(value: string, index: number) => (
<Mentions.Option key={index.toString()} value={value}>
{value}
</Mentions.Option>
)
)}
</Mentions>
<Button
type="primary"
style={{
width: "100%",
marginTop: "10px",
}}
onClick={handleSubmit}
disabled={context === ""}
>
{buttonText}
</Button>
</div>
) : (
""
)}
</div>
</div>
);
};
Expand Down