* 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>
459 lines
14 KiB
TypeScript
459 lines
14 KiB
TypeScript
import { ReactNode, useCallback, useEffect, useState } from "react";
|
|
import OpenColor from "open-color";
|
|
|
|
import { Dialog } from "./Dialog";
|
|
import { t } from "../i18n";
|
|
|
|
import { AppState, LibraryItems, LibraryItem } from "../types";
|
|
import { exportToCanvas } from "../packages/utils";
|
|
import {
|
|
EXPORT_DATA_TYPES,
|
|
EXPORT_SOURCE,
|
|
MIME_TYPES,
|
|
VERSIONS,
|
|
} from "../constants";
|
|
import { ExportedLibraryData } from "../data/types";
|
|
|
|
import "./PublishLibrary.scss";
|
|
import SingleLibraryItem from "./SingleLibraryItem";
|
|
import { canvasToBlob, resizeImageFile } from "../data/blob";
|
|
import { chunk } from "../utils";
|
|
import DialogActionButton from "./DialogActionButton";
|
|
|
|
interface PublishLibraryDataParams {
|
|
authorName: string;
|
|
githubHandle: string;
|
|
name: string;
|
|
description: string;
|
|
twitterHandle: string;
|
|
website: string;
|
|
}
|
|
|
|
const LOCAL_STORAGE_KEY_PUBLISH_LIBRARY = "publish-library-data";
|
|
|
|
const savePublishLibDataToStorage = (data: PublishLibraryDataParams) => {
|
|
try {
|
|
localStorage.setItem(
|
|
LOCAL_STORAGE_KEY_PUBLISH_LIBRARY,
|
|
JSON.stringify(data),
|
|
);
|
|
} catch (error: any) {
|
|
// Unable to access window.localStorage
|
|
console.error(error);
|
|
}
|
|
};
|
|
|
|
const importPublishLibDataFromStorage = () => {
|
|
try {
|
|
const data = localStorage.getItem(LOCAL_STORAGE_KEY_PUBLISH_LIBRARY);
|
|
if (data) {
|
|
return JSON.parse(data);
|
|
}
|
|
} catch (error: any) {
|
|
// Unable to access localStorage
|
|
console.error(error);
|
|
}
|
|
|
|
return null;
|
|
};
|
|
|
|
const generatePreviewImage = async (libraryItems: LibraryItems) => {
|
|
const MAX_ITEMS_PER_ROW = 6;
|
|
const BOX_SIZE = 128;
|
|
const BOX_PADDING = Math.round(BOX_SIZE / 16);
|
|
const BORDER_WIDTH = Math.max(Math.round(BOX_SIZE / 64), 2);
|
|
|
|
const rows = chunk(libraryItems, MAX_ITEMS_PER_ROW);
|
|
|
|
const canvas = document.createElement("canvas");
|
|
|
|
canvas.width =
|
|
rows[0].length * BOX_SIZE +
|
|
(rows[0].length + 1) * (BOX_PADDING * 2) -
|
|
BOX_PADDING * 2;
|
|
canvas.height =
|
|
rows.length * BOX_SIZE +
|
|
(rows.length + 1) * (BOX_PADDING * 2) -
|
|
BOX_PADDING * 2;
|
|
|
|
const ctx = canvas.getContext("2d")!;
|
|
|
|
ctx.fillStyle = OpenColor.white;
|
|
ctx.fillRect(0, 0, canvas.width, canvas.height);
|
|
|
|
// draw items
|
|
// ---------------------------------------------------------------------------
|
|
for (const [index, item] of libraryItems.entries()) {
|
|
const itemCanvas = await exportToCanvas({
|
|
elements: item.elements,
|
|
files: null,
|
|
maxWidthOrHeight: BOX_SIZE,
|
|
});
|
|
|
|
const { width, height } = itemCanvas;
|
|
|
|
// draw item
|
|
// -------------------------------------------------------------------------
|
|
const rowOffset =
|
|
Math.floor(index / MAX_ITEMS_PER_ROW) * (BOX_SIZE + BOX_PADDING * 2);
|
|
const colOffset =
|
|
(index % MAX_ITEMS_PER_ROW) * (BOX_SIZE + BOX_PADDING * 2);
|
|
|
|
ctx.drawImage(
|
|
itemCanvas,
|
|
colOffset + (BOX_SIZE - width) / 2 + BOX_PADDING,
|
|
rowOffset + (BOX_SIZE - height) / 2 + BOX_PADDING,
|
|
);
|
|
|
|
// draw item border
|
|
// -------------------------------------------------------------------------
|
|
ctx.lineWidth = BORDER_WIDTH;
|
|
ctx.strokeStyle = OpenColor.gray[4];
|
|
ctx.strokeRect(
|
|
colOffset + BOX_PADDING / 2,
|
|
rowOffset + BOX_PADDING / 2,
|
|
BOX_SIZE + BOX_PADDING,
|
|
BOX_SIZE + BOX_PADDING,
|
|
);
|
|
}
|
|
|
|
return await resizeImageFile(
|
|
new File([await canvasToBlob(canvas)], "preview", { type: MIME_TYPES.png }),
|
|
{
|
|
outputType: MIME_TYPES.jpg,
|
|
maxWidthOrHeight: 5000,
|
|
},
|
|
);
|
|
};
|
|
|
|
const PublishLibrary = ({
|
|
onClose,
|
|
libraryItems,
|
|
appState,
|
|
onSuccess,
|
|
onError,
|
|
updateItemsInStorage,
|
|
onRemove,
|
|
}: {
|
|
onClose: () => void;
|
|
libraryItems: LibraryItems;
|
|
appState: AppState;
|
|
onSuccess: (data: {
|
|
url: string;
|
|
authorName: string;
|
|
items: LibraryItems;
|
|
}) => void;
|
|
|
|
onError: (error: Error) => void;
|
|
updateItemsInStorage: (items: LibraryItems) => void;
|
|
onRemove: (id: string) => void;
|
|
}) => {
|
|
const [libraryData, setLibraryData] = useState<PublishLibraryDataParams>({
|
|
authorName: "",
|
|
githubHandle: "",
|
|
name: "",
|
|
description: "",
|
|
twitterHandle: "",
|
|
website: "",
|
|
});
|
|
|
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
|
|
|
useEffect(() => {
|
|
const data = importPublishLibDataFromStorage();
|
|
if (data) {
|
|
setLibraryData(data);
|
|
}
|
|
}, []);
|
|
|
|
const [clonedLibItems, setClonedLibItems] = useState<LibraryItems>(
|
|
libraryItems.slice(),
|
|
);
|
|
|
|
useEffect(() => {
|
|
setClonedLibItems(libraryItems.slice());
|
|
}, [libraryItems]);
|
|
|
|
const onInputChange = (event: any) => {
|
|
setLibraryData({
|
|
...libraryData,
|
|
[event.target.name]: event.target.value,
|
|
});
|
|
};
|
|
|
|
const onSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
|
|
event.preventDefault();
|
|
setIsSubmitting(true);
|
|
const erroredLibItems: LibraryItem[] = [];
|
|
let isError = false;
|
|
clonedLibItems.forEach((libItem) => {
|
|
let error = "";
|
|
if (!libItem.name) {
|
|
error = t("publishDialog.errors.required");
|
|
isError = true;
|
|
}
|
|
erroredLibItems.push({ ...libItem, error });
|
|
});
|
|
|
|
if (isError) {
|
|
setClonedLibItems(erroredLibItems);
|
|
setIsSubmitting(false);
|
|
return;
|
|
}
|
|
|
|
const previewImage = await generatePreviewImage(clonedLibItems);
|
|
|
|
const libContent: ExportedLibraryData = {
|
|
type: EXPORT_DATA_TYPES.excalidrawLibrary,
|
|
version: VERSIONS.excalidrawLibrary,
|
|
source: EXPORT_SOURCE,
|
|
libraryItems: clonedLibItems,
|
|
};
|
|
const content = JSON.stringify(libContent, null, 2);
|
|
const lib = new Blob([content], { type: "application/json" });
|
|
|
|
const formData = new FormData();
|
|
formData.append("excalidrawLib", lib);
|
|
formData.append("previewImage", previewImage);
|
|
formData.append("previewImageType", previewImage.type);
|
|
formData.append("title", libraryData.name);
|
|
formData.append("authorName", libraryData.authorName);
|
|
formData.append("githubHandle", libraryData.githubHandle);
|
|
formData.append("name", libraryData.name);
|
|
formData.append("description", libraryData.description);
|
|
formData.append("twitterHandle", libraryData.twitterHandle);
|
|
formData.append("website", libraryData.website);
|
|
|
|
fetch(`${process.env.REACT_APP_LIBRARY_BACKEND}/submit`, {
|
|
method: "post",
|
|
body: formData,
|
|
})
|
|
.then(
|
|
(response) => {
|
|
if (response.ok) {
|
|
return response.json().then(({ url }) => {
|
|
// flush data from local storage
|
|
localStorage.removeItem(LOCAL_STORAGE_KEY_PUBLISH_LIBRARY);
|
|
onSuccess({
|
|
url,
|
|
authorName: libraryData.authorName,
|
|
items: clonedLibItems,
|
|
});
|
|
});
|
|
}
|
|
return response
|
|
.json()
|
|
.catch(() => {
|
|
throw new Error(response.statusText || "something went wrong");
|
|
})
|
|
.then((error) => {
|
|
throw new Error(
|
|
error.message || response.statusText || "something went wrong",
|
|
);
|
|
});
|
|
},
|
|
(err) => {
|
|
console.error(err);
|
|
onError(err);
|
|
setIsSubmitting(false);
|
|
},
|
|
)
|
|
.catch((err) => {
|
|
console.error(err);
|
|
onError(err);
|
|
setIsSubmitting(false);
|
|
});
|
|
};
|
|
|
|
const renderLibraryItems = () => {
|
|
const items: ReactNode[] = [];
|
|
clonedLibItems.forEach((libItem, index) => {
|
|
items.push(
|
|
<div className="single-library-item-wrapper" key={index}>
|
|
<SingleLibraryItem
|
|
libItem={libItem}
|
|
appState={appState}
|
|
index={index}
|
|
onChange={(val, index) => {
|
|
const items = clonedLibItems.slice();
|
|
items[index].name = val;
|
|
setClonedLibItems(items);
|
|
}}
|
|
onRemove={onRemove}
|
|
/>
|
|
</div>,
|
|
);
|
|
});
|
|
return <div className="selected-library-items">{items}</div>;
|
|
};
|
|
|
|
const onDialogClose = useCallback(() => {
|
|
updateItemsInStorage(clonedLibItems);
|
|
savePublishLibDataToStorage(libraryData);
|
|
onClose();
|
|
}, [clonedLibItems, onClose, updateItemsInStorage, libraryData]);
|
|
|
|
const shouldRenderForm = !!libraryItems.length;
|
|
|
|
const containsPublishedItems = libraryItems.some(
|
|
(item) => item.status === "published",
|
|
);
|
|
|
|
return (
|
|
<Dialog
|
|
onCloseRequest={onDialogClose}
|
|
title={t("publishDialog.title")}
|
|
className="publish-library"
|
|
>
|
|
{shouldRenderForm ? (
|
|
<form onSubmit={onSubmit}>
|
|
<div className="publish-library-note">
|
|
{t("publishDialog.noteDescription.pre")}
|
|
<a
|
|
href="https://libraries.excalidraw.com"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
>
|
|
{t("publishDialog.noteDescription.link")}
|
|
</a>{" "}
|
|
{t("publishDialog.noteDescription.post")}
|
|
</div>
|
|
<span className="publish-library-note">
|
|
{t("publishDialog.noteGuidelines.pre")}
|
|
<a
|
|
href="https://github.com/excalidraw/excalidraw-libraries#guidelines"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
>
|
|
{t("publishDialog.noteGuidelines.link")}
|
|
</a>
|
|
{t("publishDialog.noteGuidelines.post")}
|
|
</span>
|
|
|
|
<div className="publish-library-note">
|
|
{t("publishDialog.noteItems")}
|
|
</div>
|
|
{containsPublishedItems && (
|
|
<span className="publish-library-note publish-library-warning">
|
|
{t("publishDialog.republishWarning")}
|
|
</span>
|
|
)}
|
|
{renderLibraryItems()}
|
|
<div className="publish-library__fields">
|
|
<label>
|
|
<div>
|
|
<span>{t("publishDialog.libraryName")}</span>
|
|
<span aria-hidden="true" className="required">
|
|
*
|
|
</span>
|
|
</div>
|
|
<input
|
|
type="text"
|
|
name="name"
|
|
required
|
|
value={libraryData.name}
|
|
onChange={onInputChange}
|
|
placeholder={t("publishDialog.placeholder.libraryName")}
|
|
/>
|
|
</label>
|
|
<label style={{ alignItems: "flex-start" }}>
|
|
<div>
|
|
<span>{t("publishDialog.libraryDesc")}</span>
|
|
<span aria-hidden="true" className="required">
|
|
*
|
|
</span>
|
|
</div>
|
|
<textarea
|
|
name="description"
|
|
rows={4}
|
|
required
|
|
value={libraryData.description}
|
|
onChange={onInputChange}
|
|
placeholder={t("publishDialog.placeholder.libraryDesc")}
|
|
/>
|
|
</label>
|
|
<label>
|
|
<div>
|
|
<span>{t("publishDialog.authorName")}</span>
|
|
<span aria-hidden="true" className="required">
|
|
*
|
|
</span>
|
|
</div>
|
|
<input
|
|
type="text"
|
|
name="authorName"
|
|
required
|
|
value={libraryData.authorName}
|
|
onChange={onInputChange}
|
|
placeholder={t("publishDialog.placeholder.authorName")}
|
|
/>
|
|
</label>
|
|
<label>
|
|
<span>{t("publishDialog.githubUsername")}</span>
|
|
<input
|
|
type="text"
|
|
name="githubHandle"
|
|
value={libraryData.githubHandle}
|
|
onChange={onInputChange}
|
|
placeholder={t("publishDialog.placeholder.githubHandle")}
|
|
/>
|
|
</label>
|
|
<label>
|
|
<span>{t("publishDialog.twitterUsername")}</span>
|
|
<input
|
|
type="text"
|
|
name="twitterHandle"
|
|
value={libraryData.twitterHandle}
|
|
onChange={onInputChange}
|
|
placeholder={t("publishDialog.placeholder.twitterHandle")}
|
|
/>
|
|
</label>
|
|
<label>
|
|
<span>{t("publishDialog.website")}</span>
|
|
<input
|
|
type="text"
|
|
name="website"
|
|
pattern="https?://.+"
|
|
title={t("publishDialog.errors.website")}
|
|
value={libraryData.website}
|
|
onChange={onInputChange}
|
|
placeholder={t("publishDialog.placeholder.website")}
|
|
/>
|
|
</label>
|
|
<span className="publish-library-note">
|
|
{t("publishDialog.noteLicense.pre")}
|
|
<a
|
|
href="https://github.com/excalidraw/excalidraw-libraries/blob/main/LICENSE"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
>
|
|
{t("publishDialog.noteLicense.link")}
|
|
</a>
|
|
{t("publishDialog.noteLicense.post")}
|
|
</span>
|
|
</div>
|
|
<div className="publish-library__buttons">
|
|
<DialogActionButton
|
|
label={t("buttons.cancel")}
|
|
onClick={onDialogClose}
|
|
data-testid="cancel-clear-canvas-button"
|
|
/>
|
|
<DialogActionButton
|
|
type="submit"
|
|
label={t("buttons.submit")}
|
|
actionType="primary"
|
|
isLoading={isSubmitting}
|
|
/>
|
|
</div>
|
|
</form>
|
|
) : (
|
|
<p style={{ padding: "1em", textAlign: "center", fontWeight: 500 }}>
|
|
{t("publishDialog.atleastOneLibItem")}
|
|
</p>
|
|
)}
|
|
</Dialog>
|
|
);
|
|
};
|
|
|
|
export default PublishLibrary;
|