6334bd832f
* 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>
193 lines
5.4 KiB
TypeScript
193 lines
5.4 KiB
TypeScript
import React from "react";
|
|
import { Popover } from "./Popover";
|
|
|
|
import "./IconPicker.scss";
|
|
import { isArrowKey, KEYS } from "../keys";
|
|
import { getLanguage } from "../i18n";
|
|
import clsx from "clsx";
|
|
|
|
function Picker<T>({
|
|
options,
|
|
value,
|
|
label,
|
|
onChange,
|
|
onClose,
|
|
}: {
|
|
label: string;
|
|
value: T;
|
|
options: { value: T; text: string; icon: JSX.Element; keyBinding: string }[];
|
|
onChange: (value: T) => void;
|
|
onClose: () => void;
|
|
}) {
|
|
const rFirstItem = React.useRef<HTMLButtonElement>();
|
|
const rActiveItem = React.useRef<HTMLButtonElement>();
|
|
const rGallery = React.useRef<HTMLDivElement>(null);
|
|
|
|
React.useEffect(() => {
|
|
// After the component is first mounted focus on first input
|
|
if (rActiveItem.current) {
|
|
rActiveItem.current.focus();
|
|
} else if (rGallery.current) {
|
|
rGallery.current.focus();
|
|
}
|
|
}, []);
|
|
|
|
const handleKeyDown = (event: React.KeyboardEvent) => {
|
|
const pressedOption = options.find(
|
|
(option) => option.keyBinding === event.key.toLowerCase(),
|
|
)!;
|
|
|
|
if (!(event.metaKey || event.altKey || event.ctrlKey) && pressedOption) {
|
|
// Keybinding navigation
|
|
const index = options.indexOf(pressedOption);
|
|
(rGallery!.current!.children![index] as any).focus();
|
|
event.preventDefault();
|
|
} else if (event.key === KEYS.TAB) {
|
|
// Tab navigation cycle through options. If the user tabs
|
|
// away from the picker, close the picker. We need to use
|
|
// a timeout here to let the stack clear before checking.
|
|
setTimeout(() => {
|
|
const active = rActiveItem.current;
|
|
const docActive = document.activeElement;
|
|
if (active !== docActive) {
|
|
onClose();
|
|
}
|
|
}, 0);
|
|
} else if (isArrowKey(event.key)) {
|
|
// Arrow navigation
|
|
const { activeElement } = document;
|
|
const isRTL = getLanguage().rtl;
|
|
const index = Array.prototype.indexOf.call(
|
|
rGallery!.current!.children,
|
|
activeElement,
|
|
);
|
|
if (index !== -1) {
|
|
const length = options.length;
|
|
let nextIndex = index;
|
|
|
|
switch (event.key) {
|
|
// Select the next option
|
|
case isRTL ? KEYS.ARROW_LEFT : KEYS.ARROW_RIGHT:
|
|
case KEYS.ARROW_DOWN: {
|
|
nextIndex = (index + 1) % length;
|
|
break;
|
|
}
|
|
// Select the previous option
|
|
case isRTL ? KEYS.ARROW_RIGHT : KEYS.ARROW_LEFT:
|
|
case KEYS.ARROW_UP: {
|
|
nextIndex = (length + index - 1) % length;
|
|
break;
|
|
}
|
|
}
|
|
|
|
(rGallery.current!.children![nextIndex] as any).focus();
|
|
}
|
|
event.preventDefault();
|
|
} else if (event.key === KEYS.ESCAPE || event.key === KEYS.ENTER) {
|
|
// Close on escape or enter
|
|
event.preventDefault();
|
|
onClose();
|
|
}
|
|
event.nativeEvent.stopImmediatePropagation();
|
|
event.stopPropagation();
|
|
};
|
|
|
|
return (
|
|
<div
|
|
className={`picker`}
|
|
role="dialog"
|
|
aria-modal="true"
|
|
aria-label={label}
|
|
onKeyDown={handleKeyDown}
|
|
>
|
|
<div className="picker-content" ref={rGallery}>
|
|
{options.map((option, i) => (
|
|
<button
|
|
className={clsx("picker-option", {
|
|
active: value === option.value,
|
|
})}
|
|
onClick={(event) => {
|
|
(event.currentTarget as HTMLButtonElement).focus();
|
|
onChange(option.value);
|
|
}}
|
|
title={`${option.text} — ${option.keyBinding.toUpperCase()}`}
|
|
aria-label={option.text || "none"}
|
|
aria-keyshortcuts={option.keyBinding}
|
|
key={option.text}
|
|
ref={(el) => {
|
|
if (el && i === 0) {
|
|
rFirstItem.current = el;
|
|
}
|
|
if (el && option.value === value) {
|
|
rActiveItem.current = el;
|
|
}
|
|
}}
|
|
onFocus={() => {
|
|
onChange(option.value);
|
|
}}
|
|
>
|
|
{option.icon}
|
|
<span className="picker-keybinding">{option.keyBinding}</span>
|
|
</button>
|
|
))}
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export function IconPicker<T>({
|
|
value,
|
|
label,
|
|
options,
|
|
onChange,
|
|
group = "",
|
|
}: {
|
|
label: string;
|
|
value: T;
|
|
options: { value: T; text: string; icon: JSX.Element; keyBinding: string }[];
|
|
onChange: (value: T) => void;
|
|
group?: string;
|
|
}) {
|
|
const [isActive, setActive] = React.useState(false);
|
|
const rPickerButton = React.useRef<any>(null);
|
|
const isRTL = getLanguage().rtl;
|
|
|
|
return (
|
|
<div>
|
|
<button
|
|
name={group}
|
|
className={isActive ? "active" : ""}
|
|
aria-label={label}
|
|
onClick={() => setActive(!isActive)}
|
|
ref={rPickerButton}
|
|
>
|
|
{options.find((option) => option.value === value)?.icon}
|
|
</button>
|
|
<React.Suspense fallback="">
|
|
{isActive ? (
|
|
<>
|
|
<Popover
|
|
onCloseRequest={(event) =>
|
|
event.target !== rPickerButton.current && setActive(false)
|
|
}
|
|
{...(isRTL ? { right: 5.5 } : { left: -5.5 })}
|
|
>
|
|
<Picker
|
|
options={options}
|
|
value={value}
|
|
label={label}
|
|
onChange={onChange}
|
|
onClose={() => {
|
|
setActive(false);
|
|
rPickerButton.current?.focus();
|
|
}}
|
|
/>
|
|
</Popover>
|
|
<div className="picker-triangle" />
|
|
</>
|
|
) : null}
|
|
</React.Suspense>
|
|
</div>
|
|
);
|
|
}
|