* 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>
310 lines
8.6 KiB
TypeScript
310 lines
8.6 KiB
TypeScript
import React, { useState } from "react";
|
|
import { serializeLibraryAsJSON } from "../data/json";
|
|
import { ExcalidrawElement, NonDeleted } from "../element/types";
|
|
import { t } from "../i18n";
|
|
import { AppState, ExcalidrawProps, LibraryItem, LibraryItems } from "../types";
|
|
import { arrayToMap, chunk } from "../utils";
|
|
import { LibraryUnit } from "./LibraryUnit";
|
|
import Stack from "./Stack";
|
|
|
|
import "./LibraryMenuItems.scss";
|
|
import { MIME_TYPES } from "../constants";
|
|
import Spinner from "./Spinner";
|
|
import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";
|
|
import clsx from "clsx";
|
|
|
|
const CELLS_PER_ROW = 4;
|
|
|
|
const LibraryMenuItems = ({
|
|
isLoading,
|
|
libraryItems,
|
|
onAddToLibrary,
|
|
onInsertLibraryItems,
|
|
pendingElements,
|
|
selectedItems,
|
|
onSelectItems,
|
|
theme,
|
|
id,
|
|
libraryReturnUrl,
|
|
}: {
|
|
isLoading: boolean;
|
|
libraryItems: LibraryItems;
|
|
pendingElements: LibraryItem["elements"];
|
|
onInsertLibraryItems: (libraryItems: LibraryItems) => void;
|
|
onAddToLibrary: (elements: LibraryItem["elements"]) => void;
|
|
selectedItems: LibraryItem["id"][];
|
|
onSelectItems: (id: LibraryItem["id"][]) => void;
|
|
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
|
|
theme: AppState["theme"];
|
|
id: string;
|
|
}) => {
|
|
const [lastSelectedItem, setLastSelectedItem] = useState<
|
|
LibraryItem["id"] | null
|
|
>(null);
|
|
|
|
const onItemSelectToggle = (
|
|
id: LibraryItem["id"],
|
|
event: React.MouseEvent,
|
|
) => {
|
|
const shouldSelect = !selectedItems.includes(id);
|
|
|
|
const orderedItems = [...unpublishedItems, ...publishedItems];
|
|
|
|
if (shouldSelect) {
|
|
if (event.shiftKey && lastSelectedItem) {
|
|
const rangeStart = orderedItems.findIndex(
|
|
(item) => item.id === lastSelectedItem,
|
|
);
|
|
const rangeEnd = orderedItems.findIndex((item) => item.id === id);
|
|
|
|
if (rangeStart === -1 || rangeEnd === -1) {
|
|
onSelectItems([...selectedItems, id]);
|
|
return;
|
|
}
|
|
|
|
const selectedItemsMap = arrayToMap(selectedItems);
|
|
const nextSelectedIds = orderedItems.reduce(
|
|
(acc: LibraryItem["id"][], item, idx) => {
|
|
if (
|
|
(idx >= rangeStart && idx <= rangeEnd) ||
|
|
selectedItemsMap.has(item.id)
|
|
) {
|
|
acc.push(item.id);
|
|
}
|
|
return acc;
|
|
},
|
|
[],
|
|
);
|
|
|
|
onSelectItems(nextSelectedIds);
|
|
} else {
|
|
onSelectItems([...selectedItems, id]);
|
|
}
|
|
setLastSelectedItem(id);
|
|
} else {
|
|
setLastSelectedItem(null);
|
|
onSelectItems(selectedItems.filter((_id) => _id !== id));
|
|
}
|
|
};
|
|
|
|
const getInsertedElements = (id: string) => {
|
|
let targetElements;
|
|
if (selectedItems.includes(id)) {
|
|
targetElements = libraryItems.filter((item) =>
|
|
selectedItems.includes(item.id),
|
|
);
|
|
} else {
|
|
targetElements = libraryItems.filter((item) => item.id === id);
|
|
}
|
|
return targetElements;
|
|
};
|
|
|
|
const createLibraryItemCompo = (params: {
|
|
item:
|
|
| LibraryItem
|
|
| /* pending library item */ {
|
|
id: null;
|
|
elements: readonly NonDeleted<ExcalidrawElement>[];
|
|
}
|
|
| null;
|
|
onClick?: () => void;
|
|
key: string;
|
|
}) => {
|
|
return (
|
|
<Stack.Col key={params.key}>
|
|
<LibraryUnit
|
|
elements={params.item?.elements}
|
|
isPending={!params.item?.id && !!params.item?.elements}
|
|
onClick={params.onClick || (() => {})}
|
|
id={params.item?.id || null}
|
|
selected={!!params.item?.id && selectedItems.includes(params.item.id)}
|
|
onToggle={onItemSelectToggle}
|
|
onDrag={(id, event) => {
|
|
event.dataTransfer.setData(
|
|
MIME_TYPES.excalidrawlib,
|
|
serializeLibraryAsJSON(getInsertedElements(id)),
|
|
);
|
|
}}
|
|
/>
|
|
</Stack.Col>
|
|
);
|
|
};
|
|
|
|
const renderLibrarySection = (
|
|
items: (
|
|
| LibraryItem
|
|
| /* pending library item */ {
|
|
id: null;
|
|
elements: readonly NonDeleted<ExcalidrawElement>[];
|
|
}
|
|
)[],
|
|
) => {
|
|
const _items = items.map((item) => {
|
|
if (item.id) {
|
|
return createLibraryItemCompo({
|
|
item,
|
|
onClick: () => onInsertLibraryItems(getInsertedElements(item.id)),
|
|
key: item.id,
|
|
});
|
|
}
|
|
return createLibraryItemCompo({
|
|
key: "__pending__item__",
|
|
item,
|
|
onClick: () => onAddToLibrary(pendingElements),
|
|
});
|
|
});
|
|
|
|
// ensure we render all empty cells if no items are present
|
|
let rows = chunk(_items, CELLS_PER_ROW);
|
|
if (!rows.length) {
|
|
rows = [[]];
|
|
}
|
|
|
|
return rows.map((rowItems, index, rows) => {
|
|
if (index === rows.length - 1) {
|
|
// pad row with empty cells
|
|
rowItems = rowItems.concat(
|
|
new Array(CELLS_PER_ROW - rowItems.length)
|
|
.fill(null)
|
|
.map((_, index) => {
|
|
return createLibraryItemCompo({
|
|
key: `empty_${index}`,
|
|
item: null,
|
|
});
|
|
}),
|
|
);
|
|
}
|
|
return (
|
|
<Stack.Row
|
|
align="center"
|
|
key={index}
|
|
className="library-menu-items-container__row"
|
|
>
|
|
{rowItems}
|
|
</Stack.Row>
|
|
);
|
|
});
|
|
};
|
|
|
|
const unpublishedItems = libraryItems.filter(
|
|
(item) => item.status !== "published",
|
|
);
|
|
const publishedItems = libraryItems.filter(
|
|
(item) => item.status === "published",
|
|
);
|
|
|
|
const showBtn =
|
|
!libraryItems.length &&
|
|
!unpublishedItems.length &&
|
|
!publishedItems.length &&
|
|
!pendingElements.length;
|
|
|
|
return (
|
|
<div
|
|
className="library-menu-items-container"
|
|
style={
|
|
pendingElements.length ||
|
|
unpublishedItems.length ||
|
|
publishedItems.length
|
|
? { justifyContent: "flex-start" }
|
|
: {}
|
|
}
|
|
>
|
|
<Stack.Col
|
|
className="library-menu-items-container__items"
|
|
align="start"
|
|
gap={1}
|
|
style={{
|
|
flex: publishedItems.length > 0 ? 1 : "0 1 auto",
|
|
marginBottom: 0,
|
|
}}
|
|
>
|
|
<>
|
|
<div>
|
|
{(pendingElements.length > 0 ||
|
|
unpublishedItems.length > 0 ||
|
|
publishedItems.length > 0) && (
|
|
<div className="library-menu-items-container__header">
|
|
{t("labels.personalLib")}
|
|
</div>
|
|
)}
|
|
{isLoading && (
|
|
<div
|
|
style={{
|
|
position: "absolute",
|
|
top: "var(--container-padding-y)",
|
|
right: "var(--container-padding-x)",
|
|
transform: "translateY(50%)",
|
|
}}
|
|
>
|
|
<Spinner />
|
|
</div>
|
|
)}
|
|
</div>
|
|
{!pendingElements.length && !unpublishedItems.length ? (
|
|
<div className="library-menu-items__no-items">
|
|
<div
|
|
className={clsx({
|
|
"library-menu-items__no-items__label": showBtn,
|
|
})}
|
|
>
|
|
{t("library.noItems")}
|
|
</div>
|
|
<div className="library-menu-items__no-items__hint">
|
|
{publishedItems.length > 0
|
|
? t("library.hint_emptyPrivateLibrary")
|
|
: t("library.hint_emptyLibrary")}
|
|
</div>
|
|
</div>
|
|
) : (
|
|
renderLibrarySection([
|
|
// append pending library item
|
|
...(pendingElements.length
|
|
? [{ id: null, elements: pendingElements }]
|
|
: []),
|
|
...unpublishedItems,
|
|
])
|
|
)}
|
|
</>
|
|
|
|
<>
|
|
{(publishedItems.length > 0 ||
|
|
pendingElements.length > 0 ||
|
|
unpublishedItems.length > 0) && (
|
|
<div className="library-menu-items-container__header library-menu-items-container__header--excal">
|
|
{t("labels.excalidrawLib")}
|
|
</div>
|
|
)}
|
|
{publishedItems.length > 0 ? (
|
|
renderLibrarySection(publishedItems)
|
|
) : unpublishedItems.length > 0 ? (
|
|
<div
|
|
style={{
|
|
margin: "1rem 0",
|
|
display: "flex",
|
|
flexDirection: "column",
|
|
alignItems: "center",
|
|
justifyContent: "center",
|
|
width: "100%",
|
|
fontSize: ".9rem",
|
|
}}
|
|
>
|
|
{t("library.noItems")}
|
|
</div>
|
|
) : null}
|
|
</>
|
|
|
|
{showBtn && (
|
|
<LibraryMenuBrowseButton
|
|
id={id}
|
|
libraryReturnUrl={libraryReturnUrl}
|
|
theme={theme}
|
|
/>
|
|
)}
|
|
</Stack.Col>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
export default LibraryMenuItems;
|