* 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>
106 lines
3.3 KiB
TypeScript
106 lines
3.3 KiB
TypeScript
import clsx from "clsx";
|
|
import React, { useEffect, useState } from "react";
|
|
import { useCallbackRefState } from "../hooks/useCallbackRefState";
|
|
import { t } from "../i18n";
|
|
import { useExcalidrawContainer, useDevice } from "../components/App";
|
|
import { KEYS } from "../keys";
|
|
import "./Dialog.scss";
|
|
import { back, CloseIcon } from "./icons";
|
|
import { Island } from "./Island";
|
|
import { Modal } from "./Modal";
|
|
import { AppState } from "../types";
|
|
import { queryFocusableElements } from "../utils";
|
|
import { isMenuOpenAtom, isDropdownOpenAtom } from "./App";
|
|
import { useSetAtom } from "jotai";
|
|
|
|
export interface DialogProps {
|
|
children: React.ReactNode;
|
|
className?: string;
|
|
small?: boolean;
|
|
onCloseRequest(): void;
|
|
title: React.ReactNode;
|
|
autofocus?: boolean;
|
|
theme?: AppState["theme"];
|
|
closeOnClickOutside?: boolean;
|
|
}
|
|
|
|
export const Dialog = (props: DialogProps) => {
|
|
const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
|
|
const [lastActiveElement] = useState(document.activeElement);
|
|
const { id } = useExcalidrawContainer();
|
|
|
|
useEffect(() => {
|
|
if (!islandNode) {
|
|
return;
|
|
}
|
|
|
|
const focusableElements = queryFocusableElements(islandNode);
|
|
|
|
if (focusableElements.length > 0 && props.autofocus !== false) {
|
|
// If there's an element other than close, focus it.
|
|
(focusableElements[1] || focusableElements[0]).focus();
|
|
}
|
|
|
|
const handleKeyDown = (event: KeyboardEvent) => {
|
|
if (event.key === KEYS.TAB) {
|
|
const focusableElements = queryFocusableElements(islandNode);
|
|
const { activeElement } = document;
|
|
const currentIndex = focusableElements.findIndex(
|
|
(element) => element === activeElement,
|
|
);
|
|
|
|
if (currentIndex === 0 && event.shiftKey) {
|
|
focusableElements[focusableElements.length - 1].focus();
|
|
event.preventDefault();
|
|
} else if (
|
|
currentIndex === focusableElements.length - 1 &&
|
|
!event.shiftKey
|
|
) {
|
|
focusableElements[0].focus();
|
|
event.preventDefault();
|
|
}
|
|
}
|
|
};
|
|
|
|
islandNode.addEventListener("keydown", handleKeyDown);
|
|
|
|
return () => islandNode.removeEventListener("keydown", handleKeyDown);
|
|
}, [islandNode, props.autofocus]);
|
|
|
|
const setIsMenuOpen = useSetAtom(isMenuOpenAtom);
|
|
const setIsDropdownOpen = useSetAtom(isDropdownOpenAtom);
|
|
|
|
const onClose = () => {
|
|
setIsMenuOpen(false);
|
|
setIsDropdownOpen(false);
|
|
(lastActiveElement as HTMLElement).focus();
|
|
props.onCloseRequest();
|
|
};
|
|
|
|
return (
|
|
<Modal
|
|
className={clsx("Dialog", props.className)}
|
|
labelledBy="dialog-title"
|
|
maxWidth={props.small ? 550 : 800}
|
|
onCloseRequest={onClose}
|
|
theme={props.theme}
|
|
closeOnClickOutside={props.closeOnClickOutside}
|
|
>
|
|
<Island ref={setIslandNode}>
|
|
<h2 id={`${id}-dialog-title`} className="Dialog__title">
|
|
<span className="Dialog__titleContent">{props.title}</span>
|
|
<button
|
|
className="Modal__close"
|
|
onClick={onClose}
|
|
title={t("buttons.close")}
|
|
aria-label={t("buttons.close")}
|
|
>
|
|
{useDevice().isMobile ? back : CloseIcon}
|
|
</button>
|
|
</h2>
|
|
<div className="Dialog__content">{props.children}</div>
|
|
</Island>
|
|
</Modal>
|
|
);
|
|
};
|