* 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>
258 lines
7.9 KiB
TypeScript
258 lines
7.9 KiB
TypeScript
import React, { useCallback, useState } from "react";
|
|
import { saveLibraryAsJSON } from "../data/json";
|
|
import Library, { libraryItemsAtom } from "../data/library";
|
|
import { t } from "../i18n";
|
|
import { AppState, LibraryItem, LibraryItems } from "../types";
|
|
import {
|
|
DotsIcon,
|
|
ExportIcon,
|
|
LoadIcon,
|
|
publishIcon,
|
|
TrashIcon,
|
|
} from "./icons";
|
|
import { ToolButton } from "./ToolButton";
|
|
import { fileOpen } from "../data/filesystem";
|
|
import { muteFSAbortError } from "../utils";
|
|
import { useAtom } from "jotai";
|
|
import { jotaiScope } from "../jotai";
|
|
import ConfirmDialog from "./ConfirmDialog";
|
|
import PublishLibrary from "./PublishLibrary";
|
|
import { Dialog } from "./Dialog";
|
|
import { useOutsideClickHook } from "../hooks/useOutsideClick";
|
|
import MenuItem from "./MenuItem";
|
|
import { isDropdownOpenAtom } from "./App";
|
|
|
|
const getSelectedItems = (
|
|
libraryItems: LibraryItems,
|
|
selectedItems: LibraryItem["id"][],
|
|
) => libraryItems.filter((item) => selectedItems.includes(item.id));
|
|
|
|
export const LibraryMenuHeader: React.FC<{
|
|
setAppState: React.Component<any, AppState>["setState"];
|
|
selectedItems: LibraryItem["id"][];
|
|
library: Library;
|
|
onRemoveFromLibrary: () => void;
|
|
resetLibrary: () => void;
|
|
onSelectItems: (items: LibraryItem["id"][]) => void;
|
|
appState: AppState;
|
|
}> = ({
|
|
setAppState,
|
|
selectedItems,
|
|
library,
|
|
onRemoveFromLibrary,
|
|
resetLibrary,
|
|
onSelectItems,
|
|
appState,
|
|
}) => {
|
|
const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
|
|
|
|
const renderRemoveLibAlert = useCallback(() => {
|
|
const content = selectedItems.length
|
|
? t("alerts.removeItemsFromsLibrary", { count: selectedItems.length })
|
|
: t("alerts.resetLibrary");
|
|
const title = selectedItems.length
|
|
? t("confirmDialog.removeItemsFromLib")
|
|
: t("confirmDialog.resetLibrary");
|
|
return (
|
|
<ConfirmDialog
|
|
onConfirm={() => {
|
|
if (selectedItems.length) {
|
|
onRemoveFromLibrary();
|
|
} else {
|
|
resetLibrary();
|
|
}
|
|
setShowRemoveLibAlert(false);
|
|
}}
|
|
onCancel={() => {
|
|
setShowRemoveLibAlert(false);
|
|
}}
|
|
title={title}
|
|
>
|
|
<p>{content}</p>
|
|
</ConfirmDialog>
|
|
);
|
|
}, [selectedItems, onRemoveFromLibrary, resetLibrary]);
|
|
|
|
const [showRemoveLibAlert, setShowRemoveLibAlert] = useState(false);
|
|
|
|
const itemsSelected = !!selectedItems.length;
|
|
const items = itemsSelected
|
|
? libraryItemsData.libraryItems.filter((item) =>
|
|
selectedItems.includes(item.id),
|
|
)
|
|
: libraryItemsData.libraryItems;
|
|
const resetLabel = itemsSelected
|
|
? t("buttons.remove")
|
|
: t("buttons.resetLibrary");
|
|
|
|
const [showPublishLibraryDialog, setShowPublishLibraryDialog] =
|
|
useState(false);
|
|
const [publishLibSuccess, setPublishLibSuccess] = useState<null | {
|
|
url: string;
|
|
authorName: string;
|
|
}>(null);
|
|
const renderPublishSuccess = useCallback(() => {
|
|
return (
|
|
<Dialog
|
|
onCloseRequest={() => setPublishLibSuccess(null)}
|
|
title={t("publishSuccessDialog.title")}
|
|
className="publish-library-success"
|
|
small={true}
|
|
>
|
|
<p>
|
|
{t("publishSuccessDialog.content", {
|
|
authorName: publishLibSuccess!.authorName,
|
|
})}{" "}
|
|
<a
|
|
href={publishLibSuccess?.url}
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
>
|
|
{t("publishSuccessDialog.link")}
|
|
</a>
|
|
</p>
|
|
<ToolButton
|
|
type="button"
|
|
title={t("buttons.close")}
|
|
aria-label={t("buttons.close")}
|
|
label={t("buttons.close")}
|
|
onClick={() => setPublishLibSuccess(null)}
|
|
data-testid="publish-library-success-close"
|
|
className="publish-library-success-close"
|
|
/>
|
|
</Dialog>
|
|
);
|
|
}, [setPublishLibSuccess, publishLibSuccess]);
|
|
|
|
const onPublishLibSuccess = useCallback(
|
|
(data: { url: string; authorName: string }, libraryItems: LibraryItems) => {
|
|
setShowPublishLibraryDialog(false);
|
|
setPublishLibSuccess({ url: data.url, authorName: data.authorName });
|
|
const nextLibItems = libraryItems.slice();
|
|
nextLibItems.forEach((libItem) => {
|
|
if (selectedItems.includes(libItem.id)) {
|
|
libItem.status = "published";
|
|
}
|
|
});
|
|
library.setLibrary(nextLibItems);
|
|
},
|
|
[setShowPublishLibraryDialog, setPublishLibSuccess, selectedItems, library],
|
|
);
|
|
|
|
const onLibraryImport = async () => {
|
|
try {
|
|
await library.updateLibrary({
|
|
libraryItems: fileOpen({
|
|
description: "Excalidraw library files",
|
|
// ToDo: Be over-permissive until https://bugs.webkit.org/show_bug.cgi?id=34442
|
|
// gets resolved. Else, iOS users cannot open `.excalidraw` files.
|
|
/*
|
|
extensions: [".json", ".excalidrawlib"],
|
|
*/
|
|
}),
|
|
merge: true,
|
|
openLibraryMenu: true,
|
|
});
|
|
} catch (error: any) {
|
|
if (error?.name === "AbortError") {
|
|
console.warn(error);
|
|
return;
|
|
}
|
|
setAppState({ errorMessage: t("errors.importLibraryError") });
|
|
}
|
|
};
|
|
|
|
const onLibraryExport = async () => {
|
|
const libraryItems = itemsSelected
|
|
? items
|
|
: await library.getLatestLibrary();
|
|
saveLibraryAsJSON(libraryItems)
|
|
.catch(muteFSAbortError)
|
|
.catch((error) => {
|
|
setAppState({ errorMessage: error.message });
|
|
});
|
|
};
|
|
|
|
const [isDropdownOpen, setIsDropdownOpen] = useAtom(isDropdownOpenAtom);
|
|
const dropdownRef = useOutsideClickHook(() => setIsDropdownOpen(false));
|
|
|
|
return (
|
|
<div style={{ position: "relative" }}>
|
|
<button
|
|
type="button"
|
|
className="Sidebar__dropdown-btn"
|
|
data-prevent-outside-click
|
|
onClick={() => setIsDropdownOpen(!isDropdownOpen)}
|
|
>
|
|
{DotsIcon}
|
|
</button>
|
|
|
|
{selectedItems.length > 0 && (
|
|
<div className="library-actions-counter">{selectedItems.length}</div>
|
|
)}
|
|
|
|
{isDropdownOpen && (
|
|
<div
|
|
className="Sidebar__dropdown-content menu-container"
|
|
ref={dropdownRef}
|
|
>
|
|
{!itemsSelected && (
|
|
<MenuItem
|
|
label={t("buttons.load")}
|
|
icon={LoadIcon}
|
|
dataTestId="lib-dropdown--load"
|
|
onClick={onLibraryImport}
|
|
/>
|
|
)}
|
|
{showRemoveLibAlert && renderRemoveLibAlert()}
|
|
{showPublishLibraryDialog && (
|
|
<PublishLibrary
|
|
onClose={() => setShowPublishLibraryDialog(false)}
|
|
libraryItems={getSelectedItems(
|
|
libraryItemsData.libraryItems,
|
|
selectedItems,
|
|
)}
|
|
appState={appState}
|
|
onSuccess={(data) =>
|
|
onPublishLibSuccess(data, libraryItemsData.libraryItems)
|
|
}
|
|
onError={(error) => window.alert(error)}
|
|
updateItemsInStorage={() =>
|
|
library.setLibrary(libraryItemsData.libraryItems)
|
|
}
|
|
onRemove={(id: string) =>
|
|
onSelectItems(selectedItems.filter((_id) => _id !== id))
|
|
}
|
|
/>
|
|
)}
|
|
{publishLibSuccess && renderPublishSuccess()}
|
|
{!!items.length && (
|
|
<>
|
|
<MenuItem
|
|
label={t("buttons.export")}
|
|
icon={ExportIcon}
|
|
onClick={onLibraryExport}
|
|
dataTestId="lib-dropdown--export"
|
|
/>
|
|
<MenuItem
|
|
label={resetLabel}
|
|
icon={TrashIcon}
|
|
onClick={() => setShowRemoveLibAlert(true)}
|
|
dataTestId="lib-dropdown--remove"
|
|
/>
|
|
</>
|
|
)}
|
|
{itemsSelected && (
|
|
<MenuItem
|
|
label={t("buttons.publishLibrary")}
|
|
icon={publishIcon}
|
|
dataTestId="lib-dropdown--publish"
|
|
onClick={() => setShowPublishLibraryDialog(true)}
|
|
/>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|