smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: bump socket.io-client & collab tweaks (#7444)

Browse source
This commit is contained in:
David Luzar 2023-12-16 00:23:59 +01:00 • committed by GitHub
parent 2c0929e537
commit 20e3acf7a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 89 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/excalidraw/components/Avatar.tsx
View file

@ -10,6 +10,7 @@ type AvatarProps = {
name: string;
src?: string;
isBeingFollowed?: boolean;
isCurrentUser: boolean;
};
export const Avatar = ({
@ -18,6 +19,7 @@ export const Avatar = ({
name,
src,
isBeingFollowed,
isCurrentUser,
}: AvatarProps) => {
const shortName = getNameInitial(name);
const [error, setError] = useState(false);
@ -25,7 +27,10 @@ export const Avatar = ({
const style = loadImg ? undefined : { background: color };
return (
<div
className={clsx("Avatar", { "Avatar--is-followed": isBeingFollowed })}
className={clsx("Avatar", {
"Avatar--is-followed": isBeingFollowed,
"Avatar--is-current-user": isCurrentUser,
})}
style={style}
onClick={onClick}
>

4
packages/excalidraw/components/LayerUI.tsx
View file

@ -338,7 +338,9 @@ const LayerUI = ({
},
)}
>
<UserList collaborators={appState.collaborators} />
{appState.collaborators.size > 0 && (
<UserList collaborators={appState.collaborators} />
)}
{renderTopRightUI?.(device.editor.isMobile, appState)}
{!appState.viewModeEnabled &&
// hide button when sidebar docked

2
packages/excalidraw/components/UserList.tsx
View file

@ -100,7 +100,7 @@ export const UserList = React.memo(
// const uniqueCollaboratorsMap = sampleCollaborators;
const uniqueCollaboratorsArray = Array.from(uniqueCollaboratorsMap).filter(
([_, collaborator]) => Object.keys(collaborator).length !== 1,
([_, collaborator]) => collaborator.username?.trim(),
);
const [searchTerm, setSearchTerm] = React.useState("");