mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-04-14 16:40:58 -04:00
* 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>
309 lines
8.5 KiB
TypeScript
309 lines
8.5 KiB
TypeScript
import {
|
|
useRef,
|
|
useState,
|
|
useEffect,
|
|
useCallback,
|
|
RefObject,
|
|
forwardRef,
|
|
} from "react";
|
|
import Library, {
|
|
distributeLibraryItemsOnSquareGrid,
|
|
libraryItemsAtom,
|
|
} from "../data/library";
|
|
import { t } from "../i18n";
|
|
import { randomId } from "../random";
|
|
import { LibraryItems, LibraryItem, AppState, ExcalidrawProps } from "../types";
|
|
|
|
import "./LibraryMenu.scss";
|
|
import LibraryMenuItems from "./LibraryMenuItems";
|
|
import { EVENT } from "../constants";
|
|
import { KEYS } from "../keys";
|
|
import { trackEvent } from "../analytics";
|
|
import { useAtom } from "jotai";
|
|
import { jotaiScope } from "../jotai";
|
|
import Spinner from "./Spinner";
|
|
import {
|
|
useDevice,
|
|
useExcalidrawElements,
|
|
useExcalidrawSetAppState,
|
|
} from "./App";
|
|
import { Sidebar } from "./Sidebar/Sidebar";
|
|
import { getSelectedElements } from "../scene";
|
|
import { NonDeletedExcalidrawElement } from "../element/types";
|
|
import { LibraryMenuHeader } from "./LibraryMenuHeaderContent";
|
|
import LibraryMenuBrowseButton from "./LibraryMenuBrowseButton";
|
|
|
|
const useOnClickOutside = (
|
|
ref: RefObject<HTMLElement>,
|
|
cb: (event: MouseEvent) => void,
|
|
) => {
|
|
useEffect(() => {
|
|
const listener = (event: MouseEvent) => {
|
|
if (!ref.current) {
|
|
return;
|
|
}
|
|
|
|
if (
|
|
event.target instanceof Element &&
|
|
(ref.current.contains(event.target) ||
|
|
!document.body.contains(event.target))
|
|
) {
|
|
return;
|
|
}
|
|
|
|
cb(event);
|
|
};
|
|
document.addEventListener("pointerdown", listener, false);
|
|
|
|
return () => {
|
|
document.removeEventListener("pointerdown", listener);
|
|
};
|
|
}, [ref, cb]);
|
|
};
|
|
|
|
const LibraryMenuWrapper = forwardRef<
|
|
HTMLDivElement,
|
|
{ children: React.ReactNode }
|
|
>(({ children }, ref) => {
|
|
return (
|
|
<div ref={ref} className="layer-ui__library">
|
|
{children}
|
|
</div>
|
|
);
|
|
});
|
|
|
|
export const LibraryMenuContent = ({
|
|
onInsertLibraryItems,
|
|
pendingElements,
|
|
onAddToLibrary,
|
|
setAppState,
|
|
libraryReturnUrl,
|
|
library,
|
|
id,
|
|
appState,
|
|
selectedItems,
|
|
onSelectItems,
|
|
}: {
|
|
pendingElements: LibraryItem["elements"];
|
|
onInsertLibraryItems: (libraryItems: LibraryItems) => void;
|
|
onAddToLibrary: () => void;
|
|
setAppState: React.Component<any, AppState>["setState"];
|
|
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
|
|
library: Library;
|
|
id: string;
|
|
appState: AppState;
|
|
selectedItems: LibraryItem["id"][];
|
|
onSelectItems: (id: LibraryItem["id"][]) => void;
|
|
}) => {
|
|
const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
|
|
|
|
const addToLibrary = useCallback(
|
|
async (elements: LibraryItem["elements"], libraryItems: LibraryItems) => {
|
|
trackEvent("element", "addToLibrary", "ui");
|
|
if (elements.some((element) => element.type === "image")) {
|
|
return setAppState({
|
|
errorMessage: "Support for adding images to the library coming soon!",
|
|
});
|
|
}
|
|
const nextItems: LibraryItems = [
|
|
{
|
|
status: "unpublished",
|
|
elements,
|
|
id: randomId(),
|
|
created: Date.now(),
|
|
},
|
|
...libraryItems,
|
|
];
|
|
onAddToLibrary();
|
|
library.setLibrary(nextItems).catch(() => {
|
|
setAppState({ errorMessage: t("alerts.errorAddingToLibrary") });
|
|
});
|
|
},
|
|
[onAddToLibrary, library, setAppState],
|
|
);
|
|
|
|
if (
|
|
libraryItemsData.status === "loading" &&
|
|
!libraryItemsData.isInitialized
|
|
) {
|
|
return (
|
|
<LibraryMenuWrapper>
|
|
<div className="layer-ui__library-message">
|
|
<div>
|
|
<Spinner size="2em" />
|
|
<span>{t("labels.libraryLoadingMessage")}</span>
|
|
</div>
|
|
</div>
|
|
</LibraryMenuWrapper>
|
|
);
|
|
}
|
|
|
|
const showBtn =
|
|
libraryItemsData.libraryItems.length > 0 || pendingElements.length > 0;
|
|
|
|
return (
|
|
<LibraryMenuWrapper>
|
|
<LibraryMenuItems
|
|
isLoading={libraryItemsData.status === "loading"}
|
|
libraryItems={libraryItemsData.libraryItems}
|
|
onAddToLibrary={(elements) =>
|
|
addToLibrary(elements, libraryItemsData.libraryItems)
|
|
}
|
|
onInsertLibraryItems={onInsertLibraryItems}
|
|
pendingElements={pendingElements}
|
|
selectedItems={selectedItems}
|
|
onSelectItems={onSelectItems}
|
|
id={id}
|
|
libraryReturnUrl={libraryReturnUrl}
|
|
theme={appState.theme}
|
|
/>
|
|
{showBtn && (
|
|
<LibraryMenuBrowseButton
|
|
id={id}
|
|
libraryReturnUrl={libraryReturnUrl}
|
|
theme={appState.theme}
|
|
/>
|
|
)}
|
|
</LibraryMenuWrapper>
|
|
);
|
|
};
|
|
|
|
export const LibraryMenu: React.FC<{
|
|
appState: AppState;
|
|
onInsertElements: (elements: readonly NonDeletedExcalidrawElement[]) => void;
|
|
libraryReturnUrl: ExcalidrawProps["libraryReturnUrl"];
|
|
focusContainer: () => void;
|
|
library: Library;
|
|
id: string;
|
|
}> = ({
|
|
appState,
|
|
onInsertElements,
|
|
libraryReturnUrl,
|
|
focusContainer,
|
|
library,
|
|
id,
|
|
}) => {
|
|
const setAppState = useExcalidrawSetAppState();
|
|
const elements = useExcalidrawElements();
|
|
const device = useDevice();
|
|
|
|
const [selectedItems, setSelectedItems] = useState<LibraryItem["id"][]>([]);
|
|
const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
|
|
|
|
const ref = useRef<HTMLDivElement | null>(null);
|
|
|
|
const closeLibrary = useCallback(() => {
|
|
const isDialogOpen = !!document.querySelector(".Dialog");
|
|
|
|
// Prevent closing if any dialog is open
|
|
if (isDialogOpen) {
|
|
return;
|
|
}
|
|
setAppState({ openSidebar: null });
|
|
}, [setAppState]);
|
|
|
|
useOnClickOutside(
|
|
ref,
|
|
useCallback(
|
|
(event) => {
|
|
// If click on the library icon, do nothing so that LibraryButton
|
|
// can toggle library menu
|
|
if ((event.target as Element).closest(".ToolIcon__library")) {
|
|
return;
|
|
}
|
|
if (!appState.isSidebarDocked || !device.canDeviceFitSidebar) {
|
|
closeLibrary();
|
|
}
|
|
},
|
|
[closeLibrary, appState.isSidebarDocked, device.canDeviceFitSidebar],
|
|
),
|
|
);
|
|
|
|
useEffect(() => {
|
|
const handleKeyDown = (event: KeyboardEvent) => {
|
|
if (
|
|
event.key === KEYS.ESCAPE &&
|
|
(!appState.isSidebarDocked || !device.canDeviceFitSidebar)
|
|
) {
|
|
closeLibrary();
|
|
}
|
|
};
|
|
document.addEventListener(EVENT.KEYDOWN, handleKeyDown);
|
|
return () => {
|
|
document.removeEventListener(EVENT.KEYDOWN, handleKeyDown);
|
|
};
|
|
}, [closeLibrary, appState.isSidebarDocked, device.canDeviceFitSidebar]);
|
|
|
|
const deselectItems = useCallback(() => {
|
|
setAppState({
|
|
selectedElementIds: {},
|
|
selectedGroupIds: {},
|
|
});
|
|
}, [setAppState]);
|
|
|
|
const removeFromLibrary = useCallback(
|
|
async (libraryItems: LibraryItems) => {
|
|
const nextItems = libraryItems.filter(
|
|
(item) => !selectedItems.includes(item.id),
|
|
);
|
|
library.setLibrary(nextItems).catch(() => {
|
|
setAppState({ errorMessage: t("alerts.errorRemovingFromLibrary") });
|
|
});
|
|
setSelectedItems([]);
|
|
},
|
|
[library, setAppState, selectedItems, setSelectedItems],
|
|
);
|
|
|
|
const resetLibrary = useCallback(() => {
|
|
library.resetLibrary();
|
|
focusContainer();
|
|
}, [library, focusContainer]);
|
|
|
|
return (
|
|
<Sidebar
|
|
__isInternal
|
|
// necessary to remount when switching between internal
|
|
// and custom (host app) sidebar, so that the `props.onClose`
|
|
// is colled correctly
|
|
key="library"
|
|
className="layer-ui__library-sidebar"
|
|
initialDockedState={appState.isSidebarDocked}
|
|
onDock={(docked) => {
|
|
trackEvent(
|
|
"library",
|
|
`toggleLibraryDock (${docked ? "dock" : "undock"})`,
|
|
`sidebar (${device.isMobile ? "mobile" : "desktop"})`,
|
|
);
|
|
}}
|
|
ref={ref}
|
|
>
|
|
<Sidebar.Header className="layer-ui__library-header">
|
|
<LibraryMenuHeader
|
|
appState={appState}
|
|
setAppState={setAppState}
|
|
selectedItems={selectedItems}
|
|
onSelectItems={setSelectedItems}
|
|
library={library}
|
|
onRemoveFromLibrary={() =>
|
|
removeFromLibrary(libraryItemsData.libraryItems)
|
|
}
|
|
resetLibrary={resetLibrary}
|
|
/>
|
|
</Sidebar.Header>
|
|
<LibraryMenuContent
|
|
pendingElements={getSelectedElements(elements, appState, true)}
|
|
onInsertLibraryItems={(libraryItems) => {
|
|
onInsertElements(distributeLibraryItemsOnSquareGrid(libraryItems));
|
|
}}
|
|
onAddToLibrary={deselectItems}
|
|
setAppState={setAppState}
|
|
libraryReturnUrl={libraryReturnUrl}
|
|
library={library}
|
|
id={id}
|
|
appState={appState}
|
|
selectedItems={selectedItems}
|
|
onSelectItems={setSelectedItems}
|
|
/>
|
|
</Sidebar>
|
|
);
|
|
};
|