diff --git a/wax-prosemirror-components/src/components/comments/ConnectedComment.js b/wax-prosemirror-components/src/components/comments/ConnectedComment.js index b411616ae6242d7f45e0dbf765889d85edc675dc..b23e3fed7d4b9828f3ad949eea0f874e5305843d 100644 --- a/wax-prosemirror-components/src/components/comments/ConnectedComment.js +++ b/wax-prosemirror-components/src/components/comments/ConnectedComment.js @@ -1,5 +1,5 @@ /* eslint react/prop-types: 0 */ -import React, { useState, useEffect, useContext, memo } from 'react'; +import React, { useContext, memo } from 'react'; import { TextSelection } from 'prosemirror-state'; import { last, maxBy } from 'lodash'; import styled from 'styled-components'; @@ -12,8 +12,6 @@ const ConnectedCommentStyled = styled.div` `; export default ({ comment, top, commentId }) => { - const [commentAnnotation, setCommentAnnotation] = useState(comment); - const MemorizedComponent = memo(() => { const { view, @@ -56,7 +54,7 @@ export default ({ comment, top, commentId }) => { timestamp: Math.floor(Date.now() / 300000), }; - commentAnnotation.attrs.conversation.push(obj); + comment.attrs.conversation.push(obj); allCommentsWithSameId.forEach(singleComment => { dispatch( @@ -64,8 +62,8 @@ export default ({ comment, top, commentId }) => { singleComment.pos, singleComment.pos + singleComment.nodeSize, commentMark.create({ - ...((commentAnnotation && commentAnnotation.attrs) || {}), - conversation: commentAnnotation.attrs.conversation, + ...((comment && comment.attrs) || {}), + conversation: comment.attrs.conversation, }), ), ); diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js index 01139c8ef788b55167b84be7006e36f6a4fb60cf..20e29ba6b9c48bac885763e3558fa8d02e2986af 100644 --- a/wax-prosemirror-components/src/components/rightArea/RightArea.js +++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js @@ -20,6 +20,7 @@ export default ({ area }) => { const [isFirstRun, setFirstRun] = useState(true); const setTops = useCallback(() => { + console.log('setTops'); const result = []; let markNodeEl = null; let annotationTop = 0;