Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2' into v2-ui

This commit is contained in:
Vishnu 2025-05-22 15:53:18 +05:30
parent e161c2768e b6aa4ab632
commit 6524d77490
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/components/ui/collaboration/CommentThreads.tsx
View File

@ -2,14 +2,14 @@ import React, { useState } from "react";
import { getAvatarColor } from "../../../modules/collaboration/functions/getAvatarColor"; import { getAvatarColor } from "../../../modules/collaboration/functions/getAvatarColor";
const CommentThreads: React.FC = () => { const CommentThreads: React.FC = () => {
const [expand, setExpand] = useState(true); const [expand, setExpand] = useState(false);
const commentsedUsers = [ const commentsedUsers = [
{ {
userId: "1", userId: "1",
userName: "user", userName: "user",
}, },
{ {
userId: "1", userId: "2",
userName: "Admin", userName: "Admin",
}, },
]; ];

8
app/src/modules/collaboration/comments/instances/commentInstance/commentInstance.tsx
View File

@ -2,6 +2,7 @@ import { Html, TransformControls } from '@react-three/drei';
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { usePlayButtonStore } from '../../../../../store/usePlayButtonStore'; import { usePlayButtonStore } from '../../../../../store/usePlayButtonStore';
import { detectModifierKeys } from '../../../../../utils/shortcutkeys/detectModifierKeys'; import { detectModifierKeys } from '../../../../../utils/shortcutkeys/detectModifierKeys';
import CommentThreads from '../../../../../components/ui/collaboration/CommentThreads';
function CommentInstance({ comment }: { comment: CommentSchema }) { function CommentInstance({ comment }: { comment: CommentSchema }) {
const { isPlaying } = usePlayButtonStore(); const { isPlaying } = usePlayButtonStore();
@ -38,9 +39,10 @@ function CommentInstance({ comment }: { comment: CommentSchema }) {
center center
position={comment.position} position={comment.position}
rotation={comment.rotation} rotation={comment.rotation}
className='comments-main-wrapper'
> >
<CommentThreads />
<div {/* <div
className='outer' className='outer'
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
@ -53,7 +55,7 @@ function CommentInstance({ comment }: { comment: CommentSchema }) {
<div> <div>
hii hii
</div> </div>
</div> </div> */}
</Html> </Html>
{CommentRef.current && transformMode && ( {CommentRef.current && transformMode && (
<TransformControls <TransformControls

3
app/src/styles/scene/comments.scss
View File

@ -1,6 +1,9 @@
@use "../abstracts/variables" as *; @use "../abstracts/variables" as *;
@use "../abstracts/mixins" as *; @use "../abstracts/mixins" as *;
.comments-main-wrapper{
position: relative;
}
.comments-threads-wrapper { .comments-threads-wrapper {
position: absolute; position: absolute;
top: 0; top: 0;