6334bd832f
* Placed eraser into shape switcher (top toolbar). Redesigned top toolbar. * Redesigned zoom and undo-redo buttons. * Started redesigning left toolbar. * Redesigned help dialog. * Colour picker now somewhat in line with new design * [WIP] Changed a bunch of icons. TODO: organise new icons. * [WIP] Organised a bunch of icons. Still some to do * [WIP] Started working on hamburger menu. * Fixed some bugs with hamburger menu. * Menu and left toolbar positioning. * Added some more items to hamburger menu. * Changed some icons. * Modal/dialog styling & bunch of fixes. * Some more dialog improvements & fixes. * Mobile menu changes. * Menu can now be closed with outside click. * Collab avatars and button changes. * Icon sizing. Left toolbar positioning. * Implemented welcome screen rendering logic. * [WIP] Welcome screen content + design. * Some more welcome screen content and design. * Merge fixes. * Tweaked icon set. * Welcome screen darkmode fix. * Content updates. * Various small fixes & adjustments. Moved language selection into menu. Fixed some problematic icons. Slightly moved encryption icon. * Sidebar header redesign. * Libraries content rendering logic + some styling. * Somem more library sidebar styling. * Publish library dialog styling. * scroll-back-to-content btn styling * ColorPicker positioning. * Library button styling. * ColorPicker positioning "fix". * Misc adjustments. * PenMode button changes. * Trying to make mobile somewhat usable. * Added a couple of icons. * Added some shortcuts. * Prevent welcome screen flickering. Fix issue with welcome screen interactivity. Don't show sidebar button when docked. * Icon sizing on smaller screens. * Sidebar styling changes. * Alignment button... well... alignments. * Fix inconsistent padding in left toolbar. * HintViewer changes. * Hamburger menu changes. * Move encryption badge back to its original pos. * Arrowhead changes. Active state, colours + stronger shadow. * Added new custom font. * Fixed bug with library button not rendering. * Fixed issue with lang selection colours. * Add tooltips for undo, redo. * Address some dark mode contrast issues. * (Re)introduce counter for selectedItems in sidebar * [WIP] Tweaked bounding box colour & padding. * Dashed bounding box for remote clients. * Some more bounding box tweaks. * Removed docking animation for now... * Address some RTL issues. * Welcome screen responsiveness. * use lighter selection color in dark mode & align naming * use rounded corners for transform handles * use lighter gray for welcomeScreen text in dark mode * disable selection on dialog buttons * change selection button icon * fix library item width being flexible * library: visually align spinner with first section heading * lint * fix scrollbar color in dark mode & make thinner * adapt properties panel max-height * add shrotcut label to save-to-current-file * fix unrelated `useOutsideClick` firing for active modal * add promo color to e+ menu item * fix type * lowered button size * fix transform handles raidus not accounting for zoom * attempt fix for excal logo on safari * final fix for excal logo on safari * fixing fhd resolution button sized * remove TODO shortcut * Collab related styling changes. Expanding avatar list no longer offsets top toolbar. Added active state & collaborator count badge for collab button. * Tweaked collab button active colours. * Added active style to collab btn in hamburger menu * Remove unnecessary comment. * Added back promo link for non (signed in) E+ users * Go to E+ button added for signed in E+ users. * Close menu & dropdown on modal close. * tweak icons & fix rendering on smaller sizes [part one] * align welcomeScreen icons with other UI * switch icon resize mq to `device-width` * disable welcomeScreen items `:hover` when selecting on canvas * change selection box color and style * reduce selection padding and fix group selection styling * improve collab cursor styling - make name borders round - hide status when "active" - remove black/gray colors * add Twitter to hamburger menu * align collab button * add shortcut for image export dialog * revert yarn.lock * fix more tabler icons * slightly better-looking penMode button * change penMode button & tooltip * revert hamburger menu icon * align padding on lang picker & canvas bg * updated robot txt to allow twitter bot and fb bot * added new OG and tweaked the OG state * add tooltip to collab button * align style for scroll-to-content button * fix pointer-events around toolbar * fix decor arrow positioning and RTL * fix welcomeScreen-item active state in dark mode * change `load` button copy * prevent shadow anim when opening a docked sidebar * update E+ links ga params * show redirect-to-eplus welcomeScreen subheading for signed-in users * make more generic * add ga for eplus redirect button * change copy and icons for hamburger export buttons * update snaps * trim the username to account for trailing spaces * tweaks around decor breakpoints * fix linear element editor test * remove .env change * remove `it.only` Co-authored-by: dwelle <luzar.david@gmail.com> Co-authored-by: Maielo <maielo.mv@gmail.com> Co-authored-by: Aakansha Doshi <aakansha1216@gmail.com>
73 lines
2.0 KiB
TypeScript
73 lines
2.0 KiB
TypeScript
import "./UserList.scss";
|
|
|
|
import React from "react";
|
|
import clsx from "clsx";
|
|
import { AppState, Collaborator } from "../types";
|
|
import { Tooltip } from "./Tooltip";
|
|
import { ActionManager } from "../actions/manager";
|
|
|
|
export const UserList: React.FC<{
|
|
className?: string;
|
|
mobile?: boolean;
|
|
collaborators: AppState["collaborators"];
|
|
actionManager: ActionManager;
|
|
}> = ({ className, mobile, collaborators, actionManager }) => {
|
|
const uniqueCollaborators = new Map<string, Collaborator>();
|
|
|
|
collaborators.forEach((collaborator, socketId) => {
|
|
uniqueCollaborators.set(
|
|
// filter on user id, else fall back on unique socketId
|
|
collaborator.id || socketId,
|
|
collaborator,
|
|
);
|
|
});
|
|
|
|
const avatars =
|
|
uniqueCollaborators.size > 0 &&
|
|
Array.from(uniqueCollaborators)
|
|
.filter(([_, client]) => Object.keys(client).length !== 0)
|
|
.map(([clientId, collaborator]) => {
|
|
const avatarJSX = actionManager.renderAction("goToCollaborator", [
|
|
clientId,
|
|
collaborator,
|
|
]);
|
|
|
|
return mobile ? (
|
|
<Tooltip
|
|
label={collaborator.username || "Unknown user"}
|
|
key={clientId}
|
|
>
|
|
{avatarJSX}
|
|
</Tooltip>
|
|
) : (
|
|
<React.Fragment key={clientId}>{avatarJSX}</React.Fragment>
|
|
);
|
|
});
|
|
|
|
// TODO barnabasmolnar/editor-redesign
|
|
// probably remove before shipping :)
|
|
// 20 fake collaborators; for easy, convenient debug purposes ˇˇ
|
|
// const avatars = Array.from({ length: 20 }).map((_, index) => {
|
|
// const avatarJSX = actionManager.renderAction("goToCollaborator", [
|
|
// index.toString(),
|
|
// {
|
|
// username: `User ${index}`,
|
|
// },
|
|
// ]);
|
|
|
|
// return mobile ? (
|
|
// <Tooltip label={`User ${index}`} key={index}>
|
|
// {avatarJSX}
|
|
// </Tooltip>
|
|
// ) : (
|
|
// <React.Fragment key={index}>{avatarJSX}</React.Fragment>
|
|
// );
|
|
// });
|
|
|
|
return (
|
|
<div className={clsx("UserList", className, { UserList_mobile: mobile })}>
|
|
{avatars}
|
|
</div>
|
|
);
|
|
};
|