OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix regression around read receipt animation from refs changes (#12100) 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/28217/head
Michael Telatynski 2024-01-03 11:36:11 +00:00 committed by GitHub
parent 46e350a957
commit 2c714e2d9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NodeAnimator.tsx
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React, { Key, ReactElement, ReactFragment, ReactInstance, ReactPortal } from "react";
import React, { Key, MutableRefObject, ReactElement, ReactFragment, ReactInstance, ReactPortal } from "react";
import ReactDom from "react-dom";
interface IChildProps {
@ -31,6 +31,8 @@ interface IProps {
// a list of state objects to apply to each child node in turn
startStyles: React.CSSProperties[];
innerRef?: MutableRefObject<any>;
}
function isReactElement(c: ReactElement | ReactFragment | ReactPortal): c is ReactElement {
@ -123,6 +125,10 @@ export default class NodeAnimator extends React.Component<IProps> {
}, 0);
}
this.nodes[k] = node;
if (this.props.innerRef) {
this.props.innerRef.current = node;
}
}
public render(): React.ReactNode {

3
src/components/views/rooms/ReadReceiptMarker.tsx
View File

@ -208,7 +208,7 @@ export default class ReadReceiptMarker extends React.PureComponent<IProps, IStat
};
return (
<NodeAnimator startStyles={this.state.startStyles}>
<NodeAnimator startStyles={this.state.startStyles} innerRef={this.avatar}>
<MemberAvatar
member={this.props.member ?? null}
fallbackUserId={this.props.fallbackUserId}
@ -216,7 +216,6 @@ export default class ReadReceiptMarker extends React.PureComponent<IProps, IStat
aria-live="off"
size="14px"
style={style}
ref={this.avatar}
hideTitle
tabIndex={-1}
/>