Skip to content
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.

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

upgraded inline-comment v2 #213

Open
wants to merge 60 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
f27f6a3
demo comment
kylengn Dec 23, 2024
a2a364b
merge main
kylengn Dec 27, 2024
b8d03c4
wip
kylengn Dec 27, 2024
eb6dfbb
update comment logic
kylengn Dec 28, 2024
cdeb6bd
update stylings
kylengn Jan 3, 2025
7e923ae
Merge remote-tracking branch 'origin' into kyle/comment-demo
kylengn Jan 3, 2025
6c73b8a
Merge remote-tracking branch 'origin' into kyle/comment-demo
kylengn Jan 3, 2025
4a959d6
upgrade ui components
kylengn Jan 3, 2025
abb3948
upgrade ui components
kylengn Jan 3, 2025
cf028d5
added comment bubble menu
kylengn Jan 5, 2025
6457d8b
refactor and update
kylengn Jan 6, 2025
191e1d9
update state logic
kylengn Jan 7, 2025
20bc7fb
update state logic 2
kylengn Jan 7, 2025
8f15f46
update styling
kylengn Jan 7, 2025
2a34621
Merge remote-tracking branch 'origin' into kyle/comment-demo
kylengn Jan 7, 2025
2898854
refactor & enhance mobile ux
kylengn Jan 8, 2025
df05139
Merge remote-tracking branch 'origin' into kyle/comment-demo
kylengn Jan 8, 2025
addc4ba
done resolve and delete
kylengn Jan 8, 2025
7baf917
update collapse all replies
kylengn Jan 8, 2025
5e329c2
merging updates
maitrakhatri Jan 9, 2025
198647e
upgrade context
kylengn Jan 9, 2025
3eee10f
Merge branch 'maitra/comment-demo' into kyle/comment-context
kylengn Jan 9, 2025
f059895
Merge remote-tracking branch 'origin' into kyle/comment-context
kylengn Jan 9, 2025
6f3d22e
ux fixes
kylengn Jan 9, 2025
30038d8
line break comment and reply supports
kylengn Jan 9, 2025
ba72d83
add replySectionRef
kylengn Jan 10, 2025
6d3412f
Merge remote-tracking branch 'origin' into kyle/comment-context
kylengn Jan 13, 2025
3135253
update generic comment
kylengn Jan 13, 2025
499ec42
updated onchange handler
Joshua-onwuzu Jan 14, 2025
4cf73b5
Merge remote-tracking branch 'origin' into kyle/comment-context
kylengn Jan 15, 2025
e1fa7a9
ui/ux feedbacks resolve
kylengn Jan 15, 2025
680d688
feedbacks
kylengn Jan 16, 2025
ac778db
added paddings for comment card
kylengn Jan 16, 2025
55cd359
removed unused code
kylengn Jan 16, 2025
52a5215
2.1.1-v2-patch-1
kylengn Jan 16, 2025
c17e43c
fix: spacing related changes for comment-drawer (#218)
SrishtiLodhi Jan 16, 2025
05fa291
feedbacks 2
kylengn Jan 16, 2025
42ef8bd
update focused state of inline comment card
kylengn Jan 17, 2025
95f2a70
fixed bubble menu bug
kylengn Jan 17, 2025
2ac3a2c
fixed bugs
kylengn Jan 17, 2025
c2a365d
fixed nav up and down
kylengn Jan 17, 2025
e308e5e
finished feedbacks
kylengn Jan 17, 2025
4e57b87
2.1.1-v2-patch-2
kylengn Jan 17, 2025
897122c
fixed card jumping on hover
kylengn Jan 20, 2025
2e00810
removed unused code
kylengn Jan 20, 2025
b449d19
export type IComment
maitrakhatri Jan 20, 2025
8c36ac0
2.1.1-v2-patch-3
maitrakhatri Jan 20, 2025
2d0be19
update ens and refactor interfaces (#223)
kylengn Jan 20, 2025
b205a8d
fixed username and zIndex
kylengn Jan 21, 2025
cca9528
2.1.1-v2-patch-4
kylengn Jan 21, 2025
e05e13b
fixed useEnsName hook and animate
kylengn Jan 21, 2025
7553c08
2.1.1-v2-patch-5
maitrakhatri Jan 21, 2025
af22737
fixed username appearance
kylengn Jan 22, 2025
b0ceecb
fix: reply callbakc
maitrakhatri Jan 22, 2025
d7e0d94
2.1.1-v2-patch-6
maitrakhatri Jan 22, 2025
9ae2d2c
fix: reply callback on comment drawer
maitrakhatri Jan 23, 2025
428f975
2.1.1-v2-patch-7
maitrakhatri Jan 23, 2025
4670850
feat: resovel, unresolve, delete callback
maitrakhatri Jan 23, 2025
1f428fa
2.1.1-v2-patch-8
maitrakhatri Jan 23, 2025
a5436b8
changed resolve icons
kylengn Jan 24, 2025
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
70 changes: 67 additions & 3 deletions demo/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
TagType,
} from '@fileverse/ui';
import { useMediaQuery } from 'usehooks-ts';
import { IComment } from '../../package/extensions/comment';

const sampleTags = [
{ name: 'Talks & Presentations', isActive: true, color: '#F6B1B2' },
Expand All @@ -30,7 +31,6 @@ function App() {
const [selectedTags, setSelectedTags] = useState<TagType[]>([]);
const [isCommentSectionOpen, setIsCommentSectionOpen] = useState(false);
const [isPresentationMode, setIsPresentationMode] = useState(false);

const [inlineCommentData, setInlineCommentData] = useState({
inlineCommentText: '',
highlightedTextContent: '',
Expand All @@ -43,6 +43,48 @@ function App() {

const collaborationId = window.location.pathname.split('/')[2]; // example url - /doc/1234, that why's used second element of array

//To handle comments from consumer side
const [commentDrawerOpen, setCommentDrawerOpen] = useState(false);
const [initialComments, setInitialComment] = useState<IComment[]>([]);
const handleReplyOnComment = (id: string, reply: IComment) => {
setInitialComment((prev) =>
prev.map((comment) => {
if (comment.id === id) {
return {
...comment,
replies: [...(comment.replies || []), reply],
};
}
return comment; // Ensure you return the unchanged comment
}),
);
};
const handleNewComment = (comment: IComment) => {
setInitialComment((prev) => [...prev, comment]);
};
const handleResolveComment = (commentId: string) => {
setInitialComment(
initialComments.map((comment) =>
comment.id === commentId ? { ...comment, resolved: true } : comment,
),
);
};

const handleUnresolveComment = (commentId: string) => {
setInitialComment(
initialComments.map((comment) =>
comment.id === commentId ? { ...comment, resolved: false } : comment,
),
);
};
const handleDeleteComment = (commentId: string) => {
setInitialComment(
initialComments.filter((comment) => comment.id !== commentId),
);
};

//To handle comments from consumer side

useEffect(() => {
if (collaborationId) {
const name = prompt('Whats your username');
Expand Down Expand Up @@ -86,8 +128,21 @@ function App() {
</div>
</div>
<div className="flex gap-2">
<IconButton variant={'ghost'} icon="Presentation" size="md" onClick={() => setIsPresentationMode(true)} />
<IconButton variant={'ghost'} icon="MessageSquareText" size="md" />
<IconButton
variant={'ghost'}
icon="Presentation"
size="md"
onClick={() => {
commentDrawerOpen && setCommentDrawerOpen(false);
setIsPresentationMode(true);
}}
/>
<IconButton
variant={'ghost'}
icon="MessageSquareText"
size="md"
onClick={() => setCommentDrawerOpen((prev) => !prev)}
/>
<IconButton
variant={'ghost'}
icon="Share2"
Expand Down Expand Up @@ -140,6 +195,8 @@ function App() {
setIsCommentSectionOpen={setIsCommentSectionOpen}
setInlineCommentData={setInlineCommentData}
inlineCommentData={inlineCommentData}
commentDrawerOpen={commentDrawerOpen}
setCommentDrawerOpen={setCommentDrawerOpen}
isPresentationMode={isPresentationMode}
setIsPresentationMode={setIsPresentationMode}
zoomLevel={zoomLevel}
Expand All @@ -149,6 +206,13 @@ function App() {
onInlineComment={(): void => {}}
onMarkdownImport={(): void => {}}
onMarkdownExport={(): void => {}}
initialComments={initialComments}
onCommentReply={handleReplyOnComment}
onNewComment={handleNewComment}
setInitialComments={setInitialComment}
onResolveComment={handleResolveComment}
onUnresolveComment={handleUnresolveComment}
onDeleteComment={handleDeleteComment}
/>
<Toaster
position={!isMobile ? 'bottom-right' : 'center-top'}
Expand Down
2 changes: 1 addition & 1 deletion demo/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export default {
theme: {
extend: {},
},
plugins: [],
plugins: [require('tailwindcss-animate')],
};
14 changes: 12 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@fileverse-dev/ddoc",
"private": false,
"description": "DDoc",
"version": "2.1.1-patch-8",
"version": "2.1.1-v2-patch-8",
"main": "dist/index.es.js",
"module": "dist/index.es.js",
"exports": {
Expand Down Expand Up @@ -72,6 +72,7 @@
"base64-js": "^1.5.1",
"classnames": "^2.5.1",
"copy-to-clipboard": "^3.3.3",
"date-fns": "^4.1.0",
"dompurify": "^3.1.6",
"embla-carousel-react": "^8.1.5",
"ethers": "^6.13.1",
Expand Down
9 changes: 9 additions & 0 deletions package/assets/ens.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading