feat: init mouse movements

This commit is contained in:
swve 2024-04-04 20:16:47 +02:00
parent 2afc6ec5e9
commit 54718d7111
3 changed files with 129 additions and 3 deletions

View file

@ -58,6 +58,7 @@ interface Editor {
ydoc: any ydoc: any
hocuspocusProvider: any, hocuspocusProvider: any,
isCollabEnabledOnThisOrg: boolean isCollabEnabledOnThisOrg: boolean
userRandomColor: string
setContent: (content: string) => void setContent: (content: string) => void
} }
@ -142,7 +143,7 @@ function Editor(props: Editor) {
provider: props.hocuspocusProvider, provider: props.hocuspocusProvider,
user: { user: {
name: props.session.user.first_name + ' ' + props.session.user.last_name, name: props.session.user.first_name + ' ' + props.session.user.last_name,
color: randomColor({ luminosity: 'light' }), color: props.userRandomColor ,
}, },
}), }),
] : []), ] : []),

View file

@ -11,7 +11,10 @@ import { useSession } from '@components/Contexts/SessionContext'
import { HocuspocusProvider } from '@hocuspocus/provider' import { HocuspocusProvider } from '@hocuspocus/provider'
import * as Y from 'yjs' import * as Y from 'yjs'
import { IndexeddbPersistence } from 'y-indexeddb' import { IndexeddbPersistence } from 'y-indexeddb'
import { LEARNHOUSE_COLLABORATION_WS_URL, getCollaborationServerUrl } from '@services/config/config' import { getCollaborationServerUrl } from '@services/config/config'
import randomColor from 'randomcolor'
import MouseMovements from './MouseMovements'
import { v4 as uuidv4 } from 'uuid';
interface EditorWrapperProps { interface EditorWrapperProps {
content: string content: string
@ -24,16 +27,43 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
const session = useSession() as any const session = useSession() as any
// Define provider in the state // Define provider in the state
const [provider, setProvider] = React.useState<HocuspocusProvider | null>(null); const [provider, setProvider] = React.useState<HocuspocusProvider | null>(null);
const [thisPageColor, setThisPageColor] = useState(randomColor({ luminosity: 'light' }) as string)
let uuid = uuidv4();
const [onlinePageInstanceID, setOnlinePageInstanceID] = useState(uuid as string)
/* Collaboration Features */ /* Collaboration Features */
const collab = getCollaborationServerUrl() const collab = getCollaborationServerUrl()
const isCollabEnabledOnThisOrg = props.org.config.config.GeneralConfig.collaboration && collab const isCollabEnabledOnThisOrg = props.org.config.config.GeneralConfig.collaboration && collab
const doc = new Y.Doc() const doc = new Y.Doc()
// mouse movement
const [mouseMovements, setMouseMovements] = useState({} as any);
const timeoutRef = useRef<NodeJS.Timeout | null>(null);
const debouncedSetMouseMovements = (newMovements: any) => {
if (timeoutRef.current) {
clearTimeout(timeoutRef.current);
}
timeoutRef.current = setTimeout(() => {
setMouseMovements(newMovements);
}, 10);
};
// Store the Y document in the browser // Store the Y document in the browser
new IndexeddbPersistence(props.activity.activity_uuid, doc) new IndexeddbPersistence(props.activity.activity_uuid, doc)
document.addEventListener("mousemove", (event) => {
// Share any information you like
provider?.setAwarenessField("userMouseMovement", {
user: session.user,
mouseX: event.clientX,
mouseY: event.clientY,
color: thisPageColor,
onlineInstanceID: onlinePageInstanceID
});
});
async function setContent(content: any) { async function setContent(content: any) {
let activity = props.activity let activity = props.activity
@ -57,6 +87,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
// Create a ref to store the last save timestamp of each user // Create a ref to store the last save timestamp of each user
const lastSaveTimestampRef = useRef({}) as any; const lastSaveTimestampRef = useRef({}) as any;
@ -71,8 +102,30 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
// TODO(alpha code): This whole block of code should be improved to something more efficient and less hacky // TODO(alpha code): This whole block of code should be improved to something more efficient and less hacky
onAwarenessUpdate: ({ states }) => { onAwarenessUpdate: ({ states }) => {
const usersStates = states; const usersStates = states;
/* Showing user mouse movement */
usersStates.forEach((userState: any) => {
if (userState.userMouseMovement) {
const userMouseMovement = userState.userMouseMovement;
// Check if a user has saved the document // Update the mouse movements state
debouncedSetMouseMovements((prevMovements: any) => {
return {
...prevMovements,
[userMouseMovement.user.user_uuid]: {
user: userMouseMovement.user,
mouseX: userMouseMovement.mouseX,
mouseY: userMouseMovement.mouseY,
color: userMouseMovement.color,
onlinePageInstanceID: userMouseMovement.onlineInstanceID
},
};
}
);
}
});
/* Notifiying if a user has saved course content */
usersStates.forEach((userState: any) => { usersStates.forEach((userState: any) => {
if (userState.savings_states) { if (userState.savings_states) {
const savingsState = userState.savings_states const savingsState = userState.savings_states
@ -109,6 +162,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
return ( return (
<> <>
<Toast></Toast> <Toast></Toast>
<MouseMovements movements={mouseMovements} onlinePageInstanceID={onlinePageInstanceID} />
<OrgProvider orgslug={props.org.slug}> <OrgProvider orgslug={props.org.slug}>
{!session.isLoading && (<Editor {!session.isLoading && (<Editor
org={props.org} org={props.org}
@ -120,6 +174,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
ydoc={doc} ydoc={doc}
hocuspocusProvider={provider} hocuspocusProvider={provider}
isCollabEnabledOnThisOrg={isCollabEnabledOnThisOrg} isCollabEnabledOnThisOrg={isCollabEnabledOnThisOrg}
userRandomColor={thisPageColor}
></Editor>)} ></Editor>)}
</OrgProvider> </OrgProvider>
</> </>
@ -127,4 +182,7 @@ function EditorWrapper(props: EditorWrapperProps): JSX.Element {
} }
} }
export default EditorWrapper export default EditorWrapper

View file

@ -0,0 +1,67 @@
import { m, motion } from "framer-motion";
import React from 'react'
interface User {
user_uuid: string;
first_name: string;
last_name: string;
}
interface Movement {
user: User;
mouseX: number;
mouseY: number;
color: string;
onlinePageInstanceID: string;
}
interface MouseMovementsProps {
movements: Record<string, Movement>;
onlinePageInstanceID: string;
}
function MouseMovements({ movements, onlinePageInstanceID }: MouseMovementsProps): JSX.Element {
return (
<div>
{Object.keys(movements).map((key) => (
movements[key].onlinePageInstanceID !== onlinePageInstanceID && (<motion.div
key={key}
className="flex -space-x-2"
style={{
position: "fixed",
zIndex: 10000,
}}
initial={{ x: 0, y: 0 }}
animate={{ x: movements[key].mouseX, y: movements[key].mouseY }}
transition={{
type: "spring",
damping: 30,
mass: 0.8,
stiffness: 350,
}}
>
<CursorSvg color={movements[key].color} />
<div
style={{ backgroundColor: movements[key].color }}
className={`px-3 h-fit py-0.5 rounded-full font-bold text-[11px] shadow-sm text-black`}>{movements[key].user.first_name} {movements[key].user.last_name}</div>
</motion.div>)
))}
</div>
);
}
function CursorSvg({ color }: { color: string }) {
return (
<svg width="32" height="44" viewBox="0 0 24 36" fill="none">
<path
fill={color}
d="M5.65376 12.3673H5.46026L5.31717 12.4976L0.500002 16.8829L0.500002 1.19841L11.7841 12.3673H5.65376Z"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
);
}
export default MouseMovements;