feat: new Menu Component API (#6034)
* feat: new Menu Component API * allow valid children types * introduce menu group to group items * Add lang footer * use display name * displayName * define types inside * fix default menu * add json export to menu * fix * simplify expression * put open menu into own compo to optimize perf So that we don't rerun `useOutsideClickHook` (and rebind event listeners all the time) * naming tweaks * rename MenuComponents->MenuDefaultItems and export default items from Menu.Items * import Menu.scss in Menu.tsx * move menu scss to excal app * Don't filter children inside menu group * move E+ out of socials * support style prop for MenuItem and MenuGroup * Support header in menu group and add Excalidraw links header for default items in social section * rename header to title * fix padding for lang * render menu in mobile * review fixes * tweaks * Export collaborators and show in mobile menu * revert .env * lint :p * again lint * show correct actions in view mode for mobile * Whitelist Collaborators Comp * mobile styling * padding * don't show nerds when menu open in mobile * lint :( * hide shortcuts * refactor userlist to support mobile and keep a wrapper comp for excal app * use only UserList * render only on mobile for default items * remove unused hooks * Show collab button in menu when onCollabButtonClick present and hide export when UIOptions.canvasActions.export is false * fix tests * lint * inject userlist inside menu on mobile * revert userlist * move menu socials to default menu * fix collab * use meny in library * Make Menu generic and create hamburgemenu for public excal menu and use menu in library as well * use appState.openMenu for mobile * fix tests * styling fixes and support style and class name in menu content * fix test * rename MenuDefaultItems->DefaultItems * move footer css to its own comp * rename HamburgerMenu -> MainMenu * rename menu -> dropdownMenu and update classes, onClick->onToggle * close main menu when dialog closes * by bye filtering * update docs * fix lint * update example, docs for useDevice and footer in mobile, rename menu ->DropDownMenu everywhere * spec * remove isMenuOpenAtom and set openMenu as canvas for main menu, render decreases in specs :) * [temp] remove cyclic depenedency to fix build * hack- update appstate to sync lang change * Add more specs * wip: rewrite MainMenu footer * fix margin * fix snaps * not needed as lang list no more imported * simplify custom footer rendering * Add DropdownMenuItemLink and DropdownMenuItemCustom and update API, docs * fix `MainMenu.ItemCustom` * naming * use onSelect and base class for custom items * fix lint * fix snap * use custom item for lang * update docs * fix * properly use `MainMenu.ItemCustom` for `LanguageList` * add margin top to custom items * flex Co-authored-by: dwelle <luzar.david@gmail.com>
This commit is contained in:
parent
08afb857c3
commit
8420aecb34
@ -23,7 +23,7 @@ import { newElementWith } from "../element/mutateElement";
|
|||||||
import { getDefaultAppState, isEraserActive } from "../appState";
|
import { getDefaultAppState, isEraserActive } from "../appState";
|
||||||
import ClearCanvas from "../components/ClearCanvas";
|
import ClearCanvas from "../components/ClearCanvas";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import MenuItem from "../components/MenuItem";
|
import DropdownMenuItem from "../components/dropdownMenu/DropdownMenuItem";
|
||||||
import { getShortcutFromShortcutName } from "./shortcuts";
|
import { getShortcutFromShortcutName } from "./shortcuts";
|
||||||
|
|
||||||
export const actionChangeViewBackgroundColor = register({
|
export const actionChangeViewBackgroundColor = register({
|
||||||
@ -299,19 +299,23 @@ export const actionToggleTheme = register({
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
PanelComponent: ({ appState, updateData }) => (
|
PanelComponent: ({ appState, updateData }) => (
|
||||||
<MenuItem
|
<DropdownMenuItem
|
||||||
label={
|
onSelect={() => {
|
||||||
appState.theme === "dark"
|
|
||||||
? t("buttons.lightMode")
|
|
||||||
: t("buttons.darkMode")
|
|
||||||
}
|
|
||||||
onClick={() => {
|
|
||||||
updateData(appState.theme === THEME.LIGHT ? THEME.DARK : THEME.LIGHT);
|
updateData(appState.theme === THEME.LIGHT ? THEME.DARK : THEME.LIGHT);
|
||||||
}}
|
}}
|
||||||
icon={appState.theme === "dark" ? SunIcon : MoonIcon}
|
icon={appState.theme === "dark" ? SunIcon : MoonIcon}
|
||||||
dataTestId="toggle-dark-mode"
|
dataTestId="toggle-dark-mode"
|
||||||
shortcut={getShortcutFromShortcutName("toggleTheme")}
|
shortcut={getShortcutFromShortcutName("toggleTheme")}
|
||||||
/>
|
ariaLabel={
|
||||||
|
appState.theme === "dark"
|
||||||
|
? t("buttons.lightMode")
|
||||||
|
: t("buttons.darkMode")
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{appState.theme === "dark"
|
||||||
|
? t("buttons.lightMode")
|
||||||
|
: t("buttons.darkMode")}
|
||||||
|
</DropdownMenuItem>
|
||||||
),
|
),
|
||||||
keyTest: (event) => event.altKey && event.shiftKey && event.code === CODES.D,
|
keyTest: (event) => event.altKey && event.shiftKey && event.code === CODES.D,
|
||||||
});
|
});
|
||||||
|
@ -19,7 +19,7 @@ import { ActiveFile } from "../components/ActiveFile";
|
|||||||
import { isImageFileHandle } from "../data/blob";
|
import { isImageFileHandle } from "../data/blob";
|
||||||
import { nativeFileSystemSupported } from "../data/filesystem";
|
import { nativeFileSystemSupported } from "../data/filesystem";
|
||||||
import { Theme } from "../element/types";
|
import { Theme } from "../element/types";
|
||||||
import MenuItem from "../components/MenuItem";
|
import DropdownMenuItem from "../components/dropdownMenu/DropdownMenuItem";
|
||||||
import { getShortcutFromShortcutName } from "./shortcuts";
|
import { getShortcutFromShortcutName } from "./shortcuts";
|
||||||
|
|
||||||
export const actionChangeProjectName = register({
|
export const actionChangeProjectName = register({
|
||||||
@ -247,15 +247,19 @@ export const actionLoadScene = register({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.O,
|
keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.O,
|
||||||
PanelComponent: ({ updateData }) => (
|
PanelComponent: ({ updateData }) => {
|
||||||
<MenuItem
|
return (
|
||||||
label={t("buttons.load")}
|
<DropdownMenuItem
|
||||||
icon={LoadIcon}
|
icon={LoadIcon}
|
||||||
onClick={updateData}
|
onSelect={updateData}
|
||||||
dataTestId="load-button"
|
dataTestId="load-button"
|
||||||
shortcut={getShortcutFromShortcutName("loadScene")}
|
shortcut={getShortcutFromShortcutName("loadScene")}
|
||||||
/>
|
ariaLabel={t("buttons.load")}
|
||||||
),
|
>
|
||||||
|
{t("buttons.load")}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
);
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const actionExportWithDarkMode = register({
|
export const actionExportWithDarkMode = register({
|
||||||
|
@ -6,7 +6,7 @@ import { register } from "./register";
|
|||||||
import { allowFullScreen, exitFullScreen, isFullScreen } from "../utils";
|
import { allowFullScreen, exitFullScreen, isFullScreen } from "../utils";
|
||||||
import { KEYS } from "../keys";
|
import { KEYS } from "../keys";
|
||||||
import { HelpButton } from "../components/HelpButton";
|
import { HelpButton } from "../components/HelpButton";
|
||||||
import MenuItem from "../components/MenuItem";
|
import DropdownMenuItem from "../components/dropdownMenu/DropdownMenuItem";
|
||||||
|
|
||||||
export const actionToggleCanvasMenu = register({
|
export const actionToggleCanvasMenu = register({
|
||||||
name: "toggleCanvasMenu",
|
name: "toggleCanvasMenu",
|
||||||
@ -90,13 +90,15 @@ export const actionShortcuts = register({
|
|||||||
},
|
},
|
||||||
PanelComponent: ({ updateData, isInHamburgerMenu }) =>
|
PanelComponent: ({ updateData, isInHamburgerMenu }) =>
|
||||||
isInHamburgerMenu ? (
|
isInHamburgerMenu ? (
|
||||||
<MenuItem
|
<DropdownMenuItem
|
||||||
label={t("helpDialog.title")}
|
|
||||||
dataTestId="help-menu-item"
|
dataTestId="help-menu-item"
|
||||||
icon={HelpIcon}
|
icon={HelpIcon}
|
||||||
onClick={updateData}
|
onSelect={updateData}
|
||||||
shortcut="?"
|
shortcut="?"
|
||||||
/>
|
ariaLabel={t("helpDialog.title")}
|
||||||
|
>
|
||||||
|
{t("helpDialog.title")}
|
||||||
|
</DropdownMenuItem>
|
||||||
) : (
|
) : (
|
||||||
<HelpButton title={t("helpDialog.title")} onClick={updateData} />
|
<HelpButton title={t("helpDialog.title")} onClick={updateData} />
|
||||||
),
|
),
|
||||||
|
@ -5,7 +5,7 @@ import { save } from "../components/icons";
|
|||||||
import { t } from "../i18n";
|
import { t } from "../i18n";
|
||||||
|
|
||||||
import "./ActiveFile.scss";
|
import "./ActiveFile.scss";
|
||||||
import MenuItem from "./MenuItem";
|
import DropdownMenuItem from "./dropdownMenu/DropdownMenuItem";
|
||||||
|
|
||||||
type ActiveFileProps = {
|
type ActiveFileProps = {
|
||||||
fileName?: string;
|
fileName?: string;
|
||||||
@ -13,11 +13,11 @@ type ActiveFileProps = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const ActiveFile = ({ fileName, onSave }: ActiveFileProps) => (
|
export const ActiveFile = ({ fileName, onSave }: ActiveFileProps) => (
|
||||||
<MenuItem
|
<DropdownMenuItem
|
||||||
label={`${t("buttons.save")}`}
|
|
||||||
shortcut={getShortcutFromShortcutName("saveScene")}
|
shortcut={getShortcutFromShortcutName("saveScene")}
|
||||||
dataTestId="save-button"
|
dataTestId="save-button"
|
||||||
onClick={onSave}
|
onSelect={onSave}
|
||||||
icon={save}
|
icon={save}
|
||||||
/>
|
ariaLabel={`${t("buttons.save")}`}
|
||||||
|
>{`${t("buttons.save")}`}</DropdownMenuItem>
|
||||||
);
|
);
|
||||||
|
@ -272,13 +272,9 @@ import {
|
|||||||
isLocalLink,
|
isLocalLink,
|
||||||
} from "../element/Hyperlink";
|
} from "../element/Hyperlink";
|
||||||
import { shouldShowBoundingBox } from "../element/transformHandles";
|
import { shouldShowBoundingBox } from "../element/transformHandles";
|
||||||
import { atom } from "jotai";
|
|
||||||
import { Fonts } from "../scene/Fonts";
|
import { Fonts } from "../scene/Fonts";
|
||||||
import { actionPaste } from "../actions/actionClipboard";
|
import { actionPaste } from "../actions/actionClipboard";
|
||||||
|
|
||||||
export const isMenuOpenAtom = atom(false);
|
|
||||||
export const isDropdownOpenAtom = atom(false);
|
|
||||||
|
|
||||||
const deviceContextInitialValue = {
|
const deviceContextInitialValue = {
|
||||||
isSmScreen: false,
|
isSmScreen: false,
|
||||||
isMobile: false,
|
isMobile: false,
|
||||||
@ -289,7 +285,7 @@ const DeviceContext = React.createContext<Device>(deviceContextInitialValue);
|
|||||||
DeviceContext.displayName = "DeviceContext";
|
DeviceContext.displayName = "DeviceContext";
|
||||||
export const useDevice = () => useContext<Device>(DeviceContext);
|
export const useDevice = () => useContext<Device>(DeviceContext);
|
||||||
|
|
||||||
const ExcalidrawContainerContext = React.createContext<{
|
export const ExcalidrawContainerContext = React.createContext<{
|
||||||
container: HTMLDivElement | null;
|
container: HTMLDivElement | null;
|
||||||
id: string | null;
|
id: string | null;
|
||||||
}>({ container: null, id: null });
|
}>({ container: null, id: null });
|
||||||
@ -316,12 +312,19 @@ const ExcalidrawSetAppStateContext = React.createContext<
|
|||||||
>(() => {});
|
>(() => {});
|
||||||
ExcalidrawSetAppStateContext.displayName = "ExcalidrawSetAppStateContext";
|
ExcalidrawSetAppStateContext.displayName = "ExcalidrawSetAppStateContext";
|
||||||
|
|
||||||
|
const ExcalidrawActionManagerContext = React.createContext<
|
||||||
|
ActionManager | { renderAction: ActionManager["renderAction"] }
|
||||||
|
>({ renderAction: () => null });
|
||||||
|
ExcalidrawActionManagerContext.displayName = "ExcalidrawActionManagerContext";
|
||||||
|
|
||||||
export const useExcalidrawElements = () =>
|
export const useExcalidrawElements = () =>
|
||||||
useContext(ExcalidrawElementsContext);
|
useContext(ExcalidrawElementsContext);
|
||||||
export const useExcalidrawAppState = () =>
|
export const useExcalidrawAppState = () =>
|
||||||
useContext(ExcalidrawAppStateContext);
|
useContext(ExcalidrawAppStateContext);
|
||||||
export const useExcalidrawSetAppState = () =>
|
export const useExcalidrawSetAppState = () =>
|
||||||
useContext(ExcalidrawSetAppStateContext);
|
useContext(ExcalidrawSetAppStateContext);
|
||||||
|
export const useExcalidrawActionManager = () =>
|
||||||
|
useContext(ExcalidrawActionManagerContext);
|
||||||
|
|
||||||
let didTapTwice: boolean = false;
|
let didTapTwice: boolean = false;
|
||||||
let tappedTwiceTimer = 0;
|
let tappedTwiceTimer = 0;
|
||||||
@ -559,75 +562,79 @@ class App extends React.Component<AppProps, AppState> {
|
|||||||
<ExcalidrawElementsContext.Provider
|
<ExcalidrawElementsContext.Provider
|
||||||
value={this.scene.getNonDeletedElements()}
|
value={this.scene.getNonDeletedElements()}
|
||||||
>
|
>
|
||||||
<LayerUI
|
<ExcalidrawActionManagerContext.Provider
|
||||||
canvas={this.canvas}
|
value={this.actionManager}
|
||||||
appState={this.state}
|
|
||||||
files={this.files}
|
|
||||||
setAppState={this.setAppState}
|
|
||||||
actionManager={this.actionManager}
|
|
||||||
elements={this.scene.getNonDeletedElements()}
|
|
||||||
onCollabButtonClick={onCollabButtonClick}
|
|
||||||
onLockToggle={this.toggleLock}
|
|
||||||
onPenModeToggle={this.togglePenMode}
|
|
||||||
onInsertElements={(elements) =>
|
|
||||||
this.addElementsFromPasteOrLibrary({
|
|
||||||
elements,
|
|
||||||
position: "center",
|
|
||||||
files: null,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
langCode={getLanguage().code}
|
|
||||||
isCollaborating={this.props.isCollaborating}
|
|
||||||
renderTopRightUI={renderTopRightUI}
|
|
||||||
renderCustomStats={renderCustomStats}
|
|
||||||
renderCustomSidebar={this.props.renderSidebar}
|
|
||||||
showExitZenModeBtn={
|
|
||||||
typeof this.props?.zenModeEnabled === "undefined" &&
|
|
||||||
this.state.zenModeEnabled
|
|
||||||
}
|
|
||||||
libraryReturnUrl={this.props.libraryReturnUrl}
|
|
||||||
UIOptions={this.props.UIOptions}
|
|
||||||
focusContainer={this.focusContainer}
|
|
||||||
library={this.library}
|
|
||||||
id={this.id}
|
|
||||||
onImageAction={this.onImageAction}
|
|
||||||
renderWelcomeScreen={
|
|
||||||
this.state.showWelcomeScreen &&
|
|
||||||
this.state.activeTool.type === "selection" &&
|
|
||||||
!this.scene.getElementsIncludingDeleted().length
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
{this.props.children}
|
<LayerUI
|
||||||
</LayerUI>
|
canvas={this.canvas}
|
||||||
<div className="excalidraw-textEditorContainer" />
|
appState={this.state}
|
||||||
<div className="excalidraw-contextMenuContainer" />
|
files={this.files}
|
||||||
{selectedElement.length === 1 &&
|
setAppState={this.setAppState}
|
||||||
!this.state.contextMenu &&
|
actionManager={this.actionManager}
|
||||||
this.state.showHyperlinkPopup && (
|
elements={this.scene.getNonDeletedElements()}
|
||||||
<Hyperlink
|
onCollabButtonClick={onCollabButtonClick}
|
||||||
key={selectedElement[0].id}
|
onLockToggle={this.toggleLock}
|
||||||
element={selectedElement[0]}
|
onPenModeToggle={this.togglePenMode}
|
||||||
setAppState={this.setAppState}
|
onInsertElements={(elements) =>
|
||||||
onLinkOpen={this.props.onLinkOpen}
|
this.addElementsFromPasteOrLibrary({
|
||||||
|
elements,
|
||||||
|
position: "center",
|
||||||
|
files: null,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
langCode={getLanguage().code}
|
||||||
|
isCollaborating={this.props.isCollaborating}
|
||||||
|
renderTopRightUI={renderTopRightUI}
|
||||||
|
renderCustomStats={renderCustomStats}
|
||||||
|
renderCustomSidebar={this.props.renderSidebar}
|
||||||
|
showExitZenModeBtn={
|
||||||
|
typeof this.props?.zenModeEnabled === "undefined" &&
|
||||||
|
this.state.zenModeEnabled
|
||||||
|
}
|
||||||
|
libraryReturnUrl={this.props.libraryReturnUrl}
|
||||||
|
UIOptions={this.props.UIOptions}
|
||||||
|
focusContainer={this.focusContainer}
|
||||||
|
library={this.library}
|
||||||
|
id={this.id}
|
||||||
|
onImageAction={this.onImageAction}
|
||||||
|
renderWelcomeScreen={
|
||||||
|
this.state.showWelcomeScreen &&
|
||||||
|
this.state.activeTool.type === "selection" &&
|
||||||
|
!this.scene.getElementsIncludingDeleted().length
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{this.props.children}
|
||||||
|
</LayerUI>
|
||||||
|
<div className="excalidraw-textEditorContainer" />
|
||||||
|
<div className="excalidraw-contextMenuContainer" />
|
||||||
|
{selectedElement.length === 1 &&
|
||||||
|
!this.state.contextMenu &&
|
||||||
|
this.state.showHyperlinkPopup && (
|
||||||
|
<Hyperlink
|
||||||
|
key={selectedElement[0].id}
|
||||||
|
element={selectedElement[0]}
|
||||||
|
setAppState={this.setAppState}
|
||||||
|
onLinkOpen={this.props.onLinkOpen}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{this.state.toast !== null && (
|
||||||
|
<Toast
|
||||||
|
message={this.state.toast.message}
|
||||||
|
onClose={() => this.setToast(null)}
|
||||||
|
duration={this.state.toast.duration}
|
||||||
|
closable={this.state.toast.closable}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{this.state.toast !== null && (
|
{this.state.contextMenu && (
|
||||||
<Toast
|
<ContextMenu
|
||||||
message={this.state.toast.message}
|
items={this.state.contextMenu.items}
|
||||||
onClose={() => this.setToast(null)}
|
top={this.state.contextMenu.top}
|
||||||
duration={this.state.toast.duration}
|
left={this.state.contextMenu.left}
|
||||||
closable={this.state.toast.closable}
|
actionManager={this.actionManager}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{this.state.contextMenu && (
|
<main>{this.renderCanvas()}</main>
|
||||||
<ContextMenu
|
</ExcalidrawActionManagerContext.Provider>
|
||||||
items={this.state.contextMenu.items}
|
|
||||||
top={this.state.contextMenu.top}
|
|
||||||
left={this.state.contextMenu.left}
|
|
||||||
actionManager={this.actionManager}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<main>{this.renderCanvas()}</main>
|
|
||||||
</ExcalidrawElementsContext.Provider>{" "}
|
</ExcalidrawElementsContext.Provider>{" "}
|
||||||
</ExcalidrawAppStateContext.Provider>
|
</ExcalidrawAppStateContext.Provider>
|
||||||
</ExcalidrawSetAppStateContext.Provider>
|
</ExcalidrawSetAppStateContext.Provider>
|
||||||
|
@ -3,7 +3,7 @@ import { t } from "../i18n";
|
|||||||
import { TrashIcon } from "./icons";
|
import { TrashIcon } from "./icons";
|
||||||
|
|
||||||
import ConfirmDialog from "./ConfirmDialog";
|
import ConfirmDialog from "./ConfirmDialog";
|
||||||
import MenuItem from "./MenuItem";
|
import DropdownMenuItem from "./dropdownMenu/DropdownMenuItem";
|
||||||
|
|
||||||
const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
|
const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
|
||||||
const [showDialog, setShowDialog] = useState(false);
|
const [showDialog, setShowDialog] = useState(false);
|
||||||
@ -13,12 +13,14 @@ const ClearCanvas = ({ onConfirm }: { onConfirm: () => void }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<MenuItem
|
<DropdownMenuItem
|
||||||
label={t("buttons.clearReset")}
|
|
||||||
icon={TrashIcon}
|
icon={TrashIcon}
|
||||||
onClick={toggleDialog}
|
onSelect={toggleDialog}
|
||||||
dataTestId="clear-canvas-button"
|
dataTestId="clear-canvas-button"
|
||||||
/>
|
ariaLabel={t("buttons.clearReset")}
|
||||||
|
>
|
||||||
|
{t("buttons.clearReset")}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
|
||||||
{showDialog && (
|
{showDialog && (
|
||||||
<ConfirmDialog
|
<ConfirmDialog
|
||||||
|
@ -2,7 +2,7 @@ import { t } from "../i18n";
|
|||||||
import { UsersIcon } from "./icons";
|
import { UsersIcon } from "./icons";
|
||||||
|
|
||||||
import "./CollabButton.scss";
|
import "./CollabButton.scss";
|
||||||
import MenuItem from "./MenuItem";
|
import DropdownMenuItem from "./dropdownMenu/DropdownMenuItem";
|
||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
|
|
||||||
const CollabButton = ({
|
const CollabButton = ({
|
||||||
@ -19,13 +19,14 @@ const CollabButton = ({
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{isInHamburgerMenu ? (
|
{isInHamburgerMenu ? (
|
||||||
<MenuItem
|
<DropdownMenuItem
|
||||||
label={t("labels.liveCollaboration")}
|
|
||||||
dataTestId="collab-button"
|
dataTestId="collab-button"
|
||||||
icon={UsersIcon}
|
icon={UsersIcon}
|
||||||
onClick={onClick}
|
onSelect={onClick}
|
||||||
isCollaborating={isCollaborating}
|
ariaLabel={t("labels.liveCollaboration")}
|
||||||
/>
|
>
|
||||||
|
{t("labels.liveCollaboration")}
|
||||||
|
</DropdownMenuItem>
|
||||||
) : (
|
) : (
|
||||||
<button
|
<button
|
||||||
className={clsx("collab-button", { active: isCollaborating })}
|
className={clsx("collab-button", { active: isCollaborating })}
|
||||||
|
@ -3,9 +3,9 @@ import { Dialog, DialogProps } from "./Dialog";
|
|||||||
|
|
||||||
import "./ConfirmDialog.scss";
|
import "./ConfirmDialog.scss";
|
||||||
import DialogActionButton from "./DialogActionButton";
|
import DialogActionButton from "./DialogActionButton";
|
||||||
import { isMenuOpenAtom } from "./App";
|
|
||||||
import { isDropdownOpenAtom } from "./App";
|
|
||||||
import { useSetAtom } from "jotai";
|
import { useSetAtom } from "jotai";
|
||||||
|
import { isLibraryMenuOpenAtom } from "./LibraryMenuHeaderContent";
|
||||||
|
import { useExcalidrawSetAppState } from "./App";
|
||||||
|
|
||||||
interface Props extends Omit<DialogProps, "onCloseRequest"> {
|
interface Props extends Omit<DialogProps, "onCloseRequest"> {
|
||||||
onConfirm: () => void;
|
onConfirm: () => void;
|
||||||
@ -23,9 +23,8 @@ const ConfirmDialog = (props: Props) => {
|
|||||||
className = "",
|
className = "",
|
||||||
...rest
|
...rest
|
||||||
} = props;
|
} = props;
|
||||||
|
const setAppState = useExcalidrawSetAppState();
|
||||||
const setIsMenuOpen = useSetAtom(isMenuOpenAtom);
|
const setIsLibraryMenuOpen = useSetAtom(isLibraryMenuOpenAtom);
|
||||||
const setIsDropdownOpen = useSetAtom(isDropdownOpenAtom);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog
|
<Dialog
|
||||||
@ -39,16 +38,16 @@ const ConfirmDialog = (props: Props) => {
|
|||||||
<DialogActionButton
|
<DialogActionButton
|
||||||
label={cancelText}
|
label={cancelText}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setIsMenuOpen(false);
|
setAppState({ openMenu: null });
|
||||||
setIsDropdownOpen(false);
|
setIsLibraryMenuOpen(false);
|
||||||
onCancel();
|
onCancel();
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<DialogActionButton
|
<DialogActionButton
|
||||||
label={confirmText}
|
label={confirmText}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setIsMenuOpen(false);
|
setAppState({ openMenu: null });
|
||||||
setIsDropdownOpen(false);
|
setIsLibraryMenuOpen(false);
|
||||||
onConfirm();
|
onConfirm();
|
||||||
}}
|
}}
|
||||||
actionType="danger"
|
actionType="danger"
|
||||||
|
@ -2,7 +2,11 @@ import clsx from "clsx";
|
|||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { useCallbackRefState } from "../hooks/useCallbackRefState";
|
import { useCallbackRefState } from "../hooks/useCallbackRefState";
|
||||||
import { t } from "../i18n";
|
import { t } from "../i18n";
|
||||||
import { useExcalidrawContainer, useDevice } from "../components/App";
|
import {
|
||||||
|
useExcalidrawContainer,
|
||||||
|
useDevice,
|
||||||
|
useExcalidrawSetAppState,
|
||||||
|
} from "../components/App";
|
||||||
import { KEYS } from "../keys";
|
import { KEYS } from "../keys";
|
||||||
import "./Dialog.scss";
|
import "./Dialog.scss";
|
||||||
import { back, CloseIcon } from "./icons";
|
import { back, CloseIcon } from "./icons";
|
||||||
@ -10,8 +14,8 @@ import { Island } from "./Island";
|
|||||||
import { Modal } from "./Modal";
|
import { Modal } from "./Modal";
|
||||||
import { AppState } from "../types";
|
import { AppState } from "../types";
|
||||||
import { queryFocusableElements } from "../utils";
|
import { queryFocusableElements } from "../utils";
|
||||||
import { isMenuOpenAtom, isDropdownOpenAtom } from "./App";
|
|
||||||
import { useSetAtom } from "jotai";
|
import { useSetAtom } from "jotai";
|
||||||
|
import { isLibraryMenuOpenAtom } from "./LibraryMenuHeaderContent";
|
||||||
|
|
||||||
export interface DialogProps {
|
export interface DialogProps {
|
||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
@ -67,12 +71,12 @@ export const Dialog = (props: DialogProps) => {
|
|||||||
return () => islandNode.removeEventListener("keydown", handleKeyDown);
|
return () => islandNode.removeEventListener("keydown", handleKeyDown);
|
||||||
}, [islandNode, props.autofocus]);
|
}, [islandNode, props.autofocus]);
|
||||||
|
|
||||||
const setIsMenuOpen = useSetAtom(isMenuOpenAtom);
|
const setAppState = useExcalidrawSetAppState();
|
||||||
const setIsDropdownOpen = useSetAtom(isDropdownOpenAtom);
|
const setIsLibraryMenuOpen = useSetAtom(isLibraryMenuOpenAtom);
|
||||||
|
|
||||||
const onClose = () => {
|
const onClose = () => {
|
||||||
setIsMenuOpen(false);
|
setAppState({ openMenu: null });
|
||||||
setIsDropdownOpen(false);
|
setIsLibraryMenuOpen(false);
|
||||||
(lastActiveElement as HTMLElement).focus();
|
(lastActiveElement as HTMLElement).focus();
|
||||||
props.onCloseRequest();
|
props.onCloseRequest();
|
||||||
};
|
};
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import React, { useState } from "react";
|
import React from "react";
|
||||||
import { NonDeletedExcalidrawElement } from "../element/types";
|
import { NonDeletedExcalidrawElement } from "../element/types";
|
||||||
import { t } from "../i18n";
|
import { t } from "../i18n";
|
||||||
|
|
||||||
import { AppState, ExportOpts, BinaryFiles } from "../types";
|
import { AppState, ExportOpts, BinaryFiles } from "../types";
|
||||||
import { Dialog } from "./Dialog";
|
import { Dialog } from "./Dialog";
|
||||||
import { ExportIcon, exportToFileIcon, LinkIcon } from "./icons";
|
import { exportToFileIcon, LinkIcon } from "./icons";
|
||||||
import { ToolButton } from "./ToolButton";
|
import { ToolButton } from "./ToolButton";
|
||||||
import { actionSaveFileToDisk } from "../actions/actionExport";
|
import { actionSaveFileToDisk } from "../actions/actionExport";
|
||||||
import { Card } from "./Card";
|
import { Card } from "./Card";
|
||||||
@ -14,7 +14,6 @@ import { nativeFileSystemSupported } from "../data/filesystem";
|
|||||||
import { trackEvent } from "../analytics";
|
import { trackEvent } from "../analytics";
|
||||||
import { ActionManager } from "../actions/manager";
|
import { ActionManager } from "../actions/manager";
|
||||||
import { getFrame } from "../utils";
|
import { getFrame } from "../utils";
|
||||||
import MenuItem from "./MenuItem";
|
|
||||||
|
|
||||||
export type ExportCB = (
|
export type ExportCB = (
|
||||||
elements: readonly NonDeletedExcalidrawElement[],
|
elements: readonly NonDeletedExcalidrawElement[],
|
||||||
@ -94,6 +93,7 @@ export const JSONExportDialog = ({
|
|||||||
actionManager,
|
actionManager,
|
||||||
exportOpts,
|
exportOpts,
|
||||||
canvas,
|
canvas,
|
||||||
|
setAppState,
|
||||||
}: {
|
}: {
|
||||||
elements: readonly NonDeletedExcalidrawElement[];
|
elements: readonly NonDeletedExcalidrawElement[];
|
||||||
appState: AppState;
|
appState: AppState;
|
||||||
@ -101,24 +101,15 @@ export const JSONExportDialog = ({
|
|||||||
actionManager: ActionManager;
|
actionManager: ActionManager;
|
||||||
exportOpts: ExportOpts;
|
exportOpts: ExportOpts;
|
||||||
canvas: HTMLCanvasElement | null;
|
canvas: HTMLCanvasElement | null;
|
||||||
|
setAppState: React.Component<any, AppState>["setState"];
|
||||||
}) => {
|
}) => {
|
||||||
const [modalIsShown, setModalIsShown] = useState(false);
|
|
||||||
|
|
||||||
const handleClose = React.useCallback(() => {
|
const handleClose = React.useCallback(() => {
|
||||||
setModalIsShown(false);
|
setAppState({ openDialog: null });
|
||||||
}, []);
|
}, [setAppState]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<MenuItem
|
{appState.openDialog === "jsonExport" && (
|
||||||
icon={ExportIcon}
|
|
||||||
label={t("buttons.export")}
|
|
||||||
onClick={() => {
|
|
||||||
setModalIsShown(true);
|
|
||||||
}}
|
|
||||||
dataTestId="json-export-button"
|
|
||||||
/>
|
|
||||||
{modalIsShown && (
|
|
||||||
<Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
|
<Dialog onCloseRequest={handleClose} title={t("buttons.export")}>
|
||||||
<JSONExportModal
|
<JSONExportModal
|
||||||
elements={elements}
|
elements={elements}
|
||||||
|
@ -80,16 +80,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.layer-ui__wrapper__footer-center {
|
|
||||||
pointer-events: none;
|
|
||||||
& > * {
|
|
||||||
pointer-events: all;
|
|
||||||
}
|
|
||||||
|
|
||||||
display: flex;
|
|
||||||
width: 100%;
|
|
||||||
justify-content: flex-start;
|
|
||||||
}
|
|
||||||
.layer-ui__wrapper__footer-left,
|
.layer-ui__wrapper__footer-left,
|
||||||
.layer-ui__wrapper__footer-right,
|
.layer-ui__wrapper__footer-right,
|
||||||
.disable-zen-mode--visible {
|
.disable-zen-mode--visible {
|
||||||
|
@ -41,26 +41,17 @@ import "./LayerUI.scss";
|
|||||||
import "./Toolbar.scss";
|
import "./Toolbar.scss";
|
||||||
import { PenModeButton } from "./PenModeButton";
|
import { PenModeButton } from "./PenModeButton";
|
||||||
import { trackEvent } from "../analytics";
|
import { trackEvent } from "../analytics";
|
||||||
import { isMenuOpenAtom, useDevice } from "../components/App";
|
import { useDevice } from "../components/App";
|
||||||
import { Stats } from "./Stats";
|
import { Stats } from "./Stats";
|
||||||
import { actionToggleStats } from "../actions/actionToggleStats";
|
import { actionToggleStats } from "../actions/actionToggleStats";
|
||||||
import Footer from "./footer/Footer";
|
import Footer from "./footer/Footer";
|
||||||
import {
|
import { WelcomeScreenMenuArrow, WelcomeScreenTopToolbarArrow } from "./icons";
|
||||||
ExportImageIcon,
|
|
||||||
HamburgerMenuIcon,
|
|
||||||
WelcomeScreenMenuArrow,
|
|
||||||
WelcomeScreenTopToolbarArrow,
|
|
||||||
} from "./icons";
|
|
||||||
import { MenuLinks, Separator } from "./MenuUtils";
|
|
||||||
import { useOutsideClickHook } from "../hooks/useOutsideClick";
|
|
||||||
import WelcomeScreen from "./WelcomeScreen";
|
import WelcomeScreen from "./WelcomeScreen";
|
||||||
import { hostSidebarCountersAtom } from "./Sidebar/Sidebar";
|
import { hostSidebarCountersAtom } from "./Sidebar/Sidebar";
|
||||||
import { jotaiScope } from "../jotai";
|
import { jotaiScope } from "../jotai";
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import { LanguageList } from "../excalidraw-app/components/LanguageList";
|
|
||||||
import WelcomeScreenDecor from "./WelcomeScreenDecor";
|
import WelcomeScreenDecor from "./WelcomeScreenDecor";
|
||||||
import { getShortcutFromShortcutName } from "../actions/shortcuts";
|
import MainMenu from "./mainMenu/MainMenu";
|
||||||
import MenuItem from "./MenuItem";
|
|
||||||
|
|
||||||
interface LayerUIProps {
|
interface LayerUIProps {
|
||||||
actionManager: ActionManager;
|
actionManager: ActionManager;
|
||||||
@ -103,7 +94,6 @@ const LayerUI = ({
|
|||||||
showExitZenModeBtn,
|
showExitZenModeBtn,
|
||||||
isCollaborating,
|
isCollaborating,
|
||||||
renderTopRightUI,
|
renderTopRightUI,
|
||||||
|
|
||||||
renderCustomStats,
|
renderCustomStats,
|
||||||
renderCustomSidebar,
|
renderCustomSidebar,
|
||||||
libraryReturnUrl,
|
libraryReturnUrl,
|
||||||
@ -133,6 +123,7 @@ const LayerUI = ({
|
|||||||
actionManager={actionManager}
|
actionManager={actionManager}
|
||||||
exportOpts={UIOptions.canvasActions.export}
|
exportOpts={UIOptions.canvasActions.export}
|
||||||
canvas={canvas}
|
canvas={canvas}
|
||||||
|
setAppState={setAppState}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@ -186,9 +177,35 @@ const LayerUI = ({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const [isMenuOpen, setIsMenuOpen] = useAtom(isMenuOpenAtom);
|
const renderMenu = () => {
|
||||||
const menuRef = useOutsideClickHook(() => setIsMenuOpen(false));
|
return (
|
||||||
|
childrenComponents.Menu || (
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.DefaultItems.LoadScene />
|
||||||
|
<MainMenu.DefaultItems.SaveToActiveFile />
|
||||||
|
{UIOptions.canvasActions.export && <MainMenu.DefaultItems.Export />}
|
||||||
|
{UIOptions.canvasActions.saveAsImage && (
|
||||||
|
<MainMenu.DefaultItems.SaveAsImage />
|
||||||
|
)}
|
||||||
|
{onCollabButtonClick && (
|
||||||
|
<MainMenu.DefaultItems.LiveCollaboration
|
||||||
|
onSelect={onCollabButtonClick}
|
||||||
|
isCollaborating={isCollaborating}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<MainMenu.DefaultItems.Help />
|
||||||
|
<MainMenu.DefaultItems.ClearCanvas />
|
||||||
|
<MainMenu.Separator />
|
||||||
|
<MainMenu.Group title="Excalidraw links">
|
||||||
|
<MainMenu.DefaultItems.Socials />
|
||||||
|
</MainMenu.Group>
|
||||||
|
<MainMenu.Separator />
|
||||||
|
<MainMenu.DefaultItems.ToggleTheme />
|
||||||
|
<MainMenu.DefaultItems.ChangeCanvasBackground />
|
||||||
|
</MainMenu>
|
||||||
|
)
|
||||||
|
);
|
||||||
|
};
|
||||||
const renderCanvasActions = () => (
|
const renderCanvasActions = () => (
|
||||||
<div style={{ position: "relative" }}>
|
<div style={{ position: "relative" }}>
|
||||||
<WelcomeScreenDecor
|
<WelcomeScreenDecor
|
||||||
@ -199,87 +216,7 @@ const LayerUI = ({
|
|||||||
<div>{t("welcomeScreen.menuHints")}</div>
|
<div>{t("welcomeScreen.menuHints")}</div>
|
||||||
</div>
|
</div>
|
||||||
</WelcomeScreenDecor>
|
</WelcomeScreenDecor>
|
||||||
|
{renderMenu()}
|
||||||
<button
|
|
||||||
data-prevent-outside-click
|
|
||||||
className={clsx("menu-button", "zen-mode-transition", {
|
|
||||||
"transition-left": appState.zenModeEnabled,
|
|
||||||
})}
|
|
||||||
onClick={() => setIsMenuOpen(!isMenuOpen)}
|
|
||||||
type="button"
|
|
||||||
data-testid="menu-button"
|
|
||||||
>
|
|
||||||
{HamburgerMenuIcon}
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{isMenuOpen && (
|
|
||||||
<div
|
|
||||||
ref={menuRef}
|
|
||||||
style={{ position: "absolute", top: "100%", marginTop: ".25rem" }}
|
|
||||||
>
|
|
||||||
<Section heading="canvasActions">
|
|
||||||
{/* the zIndex ensures this menu has higher stacking order,
|
|
||||||
see https://github.com/excalidraw/excalidraw/pull/1445 */}
|
|
||||||
<Island
|
|
||||||
className="menu-container"
|
|
||||||
padding={2}
|
|
||||||
style={{ zIndex: 1 }}
|
|
||||||
>
|
|
||||||
{!appState.viewModeEnabled &&
|
|
||||||
actionManager.renderAction("loadScene")}
|
|
||||||
{/* // TODO barnabasmolnar/editor-redesign */}
|
|
||||||
{/* is this fine here? */}
|
|
||||||
{appState.fileHandle &&
|
|
||||||
actionManager.renderAction("saveToActiveFile")}
|
|
||||||
{renderJSONExportDialog()}
|
|
||||||
{UIOptions.canvasActions.saveAsImage && (
|
|
||||||
<MenuItem
|
|
||||||
label={t("buttons.exportImage")}
|
|
||||||
icon={ExportImageIcon}
|
|
||||||
dataTestId="image-export-button"
|
|
||||||
onClick={() => setAppState({ openDialog: "imageExport" })}
|
|
||||||
shortcut={getShortcutFromShortcutName("imageExport")}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{onCollabButtonClick && (
|
|
||||||
<CollabButton
|
|
||||||
isCollaborating={isCollaborating}
|
|
||||||
collaboratorCount={appState.collaborators.size}
|
|
||||||
onClick={onCollabButtonClick}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{actionManager.renderAction("toggleShortcuts", undefined, true)}
|
|
||||||
{!appState.viewModeEnabled &&
|
|
||||||
actionManager.renderAction("clearCanvas")}
|
|
||||||
<Separator />
|
|
||||||
<MenuLinks />
|
|
||||||
<Separator />
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
display: "flex",
|
|
||||||
flexDirection: "column",
|
|
||||||
rowGap: ".5rem",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div>{actionManager.renderAction("toggleTheme")}</div>
|
|
||||||
<div style={{ padding: "0 0.625rem" }}>
|
|
||||||
<LanguageList style={{ width: "100%" }} />
|
|
||||||
</div>
|
|
||||||
{!appState.viewModeEnabled && (
|
|
||||||
<div>
|
|
||||||
<div style={{ fontSize: ".75rem", marginBottom: ".5rem" }}>
|
|
||||||
{t("labels.canvasBackground")}
|
|
||||||
</div>
|
|
||||||
<div style={{ padding: "0 0.625rem" }}>
|
|
||||||
{actionManager.renderAction("changeViewBackgroundColor")}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</Island>
|
|
||||||
</Section>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -410,10 +347,7 @@ const LayerUI = ({
|
|||||||
},
|
},
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<UserList
|
<UserList collaborators={appState.collaborators} />
|
||||||
collaborators={appState.collaborators}
|
|
||||||
actionManager={actionManager}
|
|
||||||
/>
|
|
||||||
{onCollabButtonClick && (
|
{onCollabButtonClick && (
|
||||||
<CollabButton
|
<CollabButton
|
||||||
isInHamburgerMenu={false}
|
isInHamburgerMenu={false}
|
||||||
@ -466,6 +400,7 @@ const LayerUI = ({
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{renderImageExportDialog()}
|
{renderImageExportDialog()}
|
||||||
|
{renderJSONExportDialog()}
|
||||||
{appState.pasteDialog.shown && (
|
{appState.pasteDialog.shown && (
|
||||||
<PasteChartDialog
|
<PasteChartDialog
|
||||||
setAppState={setAppState}
|
setAppState={setAppState}
|
||||||
@ -497,6 +432,7 @@ const LayerUI = ({
|
|||||||
renderCustomStats={renderCustomStats}
|
renderCustomStats={renderCustomStats}
|
||||||
renderSidebars={renderSidebars}
|
renderSidebars={renderSidebars}
|
||||||
device={device}
|
device={device}
|
||||||
|
renderMenu={renderMenu}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@ -525,9 +461,8 @@ const LayerUI = ({
|
|||||||
appState={appState}
|
appState={appState}
|
||||||
actionManager={actionManager}
|
actionManager={actionManager}
|
||||||
showExitZenModeBtn={showExitZenModeBtn}
|
showExitZenModeBtn={showExitZenModeBtn}
|
||||||
>
|
footerCenter={childrenComponents.FooterCenter}
|
||||||
{childrenComponents.FooterCenter}
|
/>
|
||||||
</Footer>
|
|
||||||
|
|
||||||
{appState.showStats && (
|
{appState.showStats && (
|
||||||
<Stats
|
<Stats
|
||||||
|
@ -129,4 +129,27 @@
|
|||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.layer-ui__sidebar__header .dropdown-menu {
|
||||||
|
&.dropdown-menu--mobile {
|
||||||
|
top: 100%;
|
||||||
|
}
|
||||||
|
.dropdown-menu-container {
|
||||||
|
--gap: 0;
|
||||||
|
z-index: 1;
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 0;
|
||||||
|
|
||||||
|
:root[dir="rtl"] & {
|
||||||
|
right: 0;
|
||||||
|
left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
width: 196px;
|
||||||
|
box-shadow: var(--library-dropdown-shadow);
|
||||||
|
border-radius: var(--border-radius-lg);
|
||||||
|
padding: 0.25rem 0.5rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,14 +13,15 @@ import {
|
|||||||
import { ToolButton } from "./ToolButton";
|
import { ToolButton } from "./ToolButton";
|
||||||
import { fileOpen } from "../data/filesystem";
|
import { fileOpen } from "../data/filesystem";
|
||||||
import { muteFSAbortError } from "../utils";
|
import { muteFSAbortError } from "../utils";
|
||||||
import { useAtom } from "jotai";
|
import { atom, useAtom } from "jotai";
|
||||||
import { jotaiScope } from "../jotai";
|
import { jotaiScope } from "../jotai";
|
||||||
import ConfirmDialog from "./ConfirmDialog";
|
import ConfirmDialog from "./ConfirmDialog";
|
||||||
import PublishLibrary from "./PublishLibrary";
|
import PublishLibrary from "./PublishLibrary";
|
||||||
import { Dialog } from "./Dialog";
|
import { Dialog } from "./Dialog";
|
||||||
import { useOutsideClickHook } from "../hooks/useOutsideClick";
|
|
||||||
import MenuItem from "./MenuItem";
|
import DropdownMenu from "./dropdownMenu/DropdownMenu";
|
||||||
import { isDropdownOpenAtom } from "./App";
|
|
||||||
|
export const isLibraryMenuOpenAtom = atom(false);
|
||||||
|
|
||||||
const getSelectedItems = (
|
const getSelectedItems = (
|
||||||
libraryItems: LibraryItems,
|
libraryItems: LibraryItems,
|
||||||
@ -45,7 +46,9 @@ export const LibraryMenuHeader: React.FC<{
|
|||||||
appState,
|
appState,
|
||||||
}) => {
|
}) => {
|
||||||
const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
|
const [libraryItemsData] = useAtom(libraryItemsAtom, jotaiScope);
|
||||||
|
const [isLibraryMenuOpen, setIsLibraryMenuOpen] = useAtom(
|
||||||
|
isLibraryMenuOpenAtom,
|
||||||
|
);
|
||||||
const renderRemoveLibAlert = useCallback(() => {
|
const renderRemoveLibAlert = useCallback(() => {
|
||||||
const content = selectedItems.length
|
const content = selectedItems.length
|
||||||
? t("alerts.removeItemsFromsLibrary", { count: selectedItems.length })
|
? t("alerts.removeItemsFromsLibrary", { count: selectedItems.length })
|
||||||
@ -173,85 +176,86 @@ export const LibraryMenuHeader: React.FC<{
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const [isDropdownOpen, setIsDropdownOpen] = useAtom(isDropdownOpenAtom);
|
const renderLibraryMenu = () => {
|
||||||
const dropdownRef = useOutsideClickHook(() => setIsDropdownOpen(false));
|
return (
|
||||||
|
<DropdownMenu open={isLibraryMenuOpen}>
|
||||||
|
<DropdownMenu.Trigger
|
||||||
|
className="Sidebar__dropdown-btn"
|
||||||
|
onToggle={() => setIsLibraryMenuOpen(!isLibraryMenuOpen)}
|
||||||
|
>
|
||||||
|
{DotsIcon}
|
||||||
|
</DropdownMenu.Trigger>
|
||||||
|
<DropdownMenu.Content
|
||||||
|
onClickOutside={() => setIsLibraryMenuOpen(false)}
|
||||||
|
className="library-menu"
|
||||||
|
>
|
||||||
|
{!itemsSelected && (
|
||||||
|
<DropdownMenu.Item
|
||||||
|
onSelect={onLibraryImport}
|
||||||
|
icon={LoadIcon}
|
||||||
|
dataTestId="lib-dropdown--load"
|
||||||
|
>
|
||||||
|
{t("buttons.load")}
|
||||||
|
</DropdownMenu.Item>
|
||||||
|
)}
|
||||||
|
{!!items.length && (
|
||||||
|
<DropdownMenu.Item
|
||||||
|
onSelect={onLibraryExport}
|
||||||
|
icon={ExportIcon}
|
||||||
|
dataTestId="lib-dropdown--export"
|
||||||
|
>
|
||||||
|
{t("buttons.export")}
|
||||||
|
</DropdownMenu.Item>
|
||||||
|
)}
|
||||||
|
{!!items.length && (
|
||||||
|
<DropdownMenu.Item
|
||||||
|
onSelect={() => setShowRemoveLibAlert(true)}
|
||||||
|
icon={TrashIcon}
|
||||||
|
>
|
||||||
|
{resetLabel}
|
||||||
|
</DropdownMenu.Item>
|
||||||
|
)}
|
||||||
|
{itemsSelected && (
|
||||||
|
<DropdownMenu.Item
|
||||||
|
icon={publishIcon}
|
||||||
|
onSelect={() => setShowPublishLibraryDialog(true)}
|
||||||
|
dataTestId="lib-dropdown--remove"
|
||||||
|
>
|
||||||
|
{t("buttons.publishLibrary")}
|
||||||
|
</DropdownMenu.Item>
|
||||||
|
)}
|
||||||
|
</DropdownMenu.Content>
|
||||||
|
</DropdownMenu>
|
||||||
|
);
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<div style={{ position: "relative" }}>
|
<div style={{ position: "relative" }}>
|
||||||
<button
|
{renderLibraryMenu()}
|
||||||
type="button"
|
|
||||||
className="Sidebar__dropdown-btn"
|
|
||||||
data-prevent-outside-click
|
|
||||||
onClick={() => setIsDropdownOpen(!isDropdownOpen)}
|
|
||||||
>
|
|
||||||
{DotsIcon}
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{selectedItems.length > 0 && (
|
{selectedItems.length > 0 && (
|
||||||
<div className="library-actions-counter">{selectedItems.length}</div>
|
<div className="library-actions-counter">{selectedItems.length}</div>
|
||||||
)}
|
)}
|
||||||
|
{showRemoveLibAlert && renderRemoveLibAlert()}
|
||||||
{isDropdownOpen && (
|
{showPublishLibraryDialog && (
|
||||||
<div
|
<PublishLibrary
|
||||||
className="Sidebar__dropdown-content menu-container"
|
onClose={() => setShowPublishLibraryDialog(false)}
|
||||||
ref={dropdownRef}
|
libraryItems={getSelectedItems(
|
||||||
>
|
libraryItemsData.libraryItems,
|
||||||
{!itemsSelected && (
|
selectedItems,
|
||||||
<MenuItem
|
|
||||||
label={t("buttons.load")}
|
|
||||||
icon={LoadIcon}
|
|
||||||
dataTestId="lib-dropdown--load"
|
|
||||||
onClick={onLibraryImport}
|
|
||||||
/>
|
|
||||||
)}
|
)}
|
||||||
{showRemoveLibAlert && renderRemoveLibAlert()}
|
appState={appState}
|
||||||
{showPublishLibraryDialog && (
|
onSuccess={(data) =>
|
||||||
<PublishLibrary
|
onPublishLibSuccess(data, libraryItemsData.libraryItems)
|
||||||
onClose={() => setShowPublishLibraryDialog(false)}
|
}
|
||||||
libraryItems={getSelectedItems(
|
onError={(error) => window.alert(error)}
|
||||||
libraryItemsData.libraryItems,
|
updateItemsInStorage={() =>
|
||||||
selectedItems,
|
library.setLibrary(libraryItemsData.libraryItems)
|
||||||
)}
|
}
|
||||||
appState={appState}
|
onRemove={(id: string) =>
|
||||||
onSuccess={(data) =>
|
onSelectItems(selectedItems.filter((_id) => _id !== id))
|
||||||
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>
|
|
||||||
)}
|
)}
|
||||||
|
{publishLibSuccess && renderPublishSuccess()}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -1,85 +0,0 @@
|
|||||||
@import "../css/variables.module";
|
|
||||||
|
|
||||||
.excalidraw {
|
|
||||||
.menu-container {
|
|
||||||
background-color: #fff !important;
|
|
||||||
max-height: calc(100vh - 150px);
|
|
||||||
overflow-y: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-button {
|
|
||||||
@include outlineButtonStyles;
|
|
||||||
background-color: var(--island-bg-color);
|
|
||||||
width: var(--lg-button-size);
|
|
||||||
height: var(--lg-button-size);
|
|
||||||
|
|
||||||
svg {
|
|
||||||
width: var(--lg-icon-size);
|
|
||||||
height: var(--lg-icon-size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-item {
|
|
||||||
display: flex;
|
|
||||||
background-color: transparent;
|
|
||||||
border: 0;
|
|
||||||
align-items: center;
|
|
||||||
padding: 0 0.625rem;
|
|
||||||
height: 2rem;
|
|
||||||
column-gap: 0.625rem;
|
|
||||||
font-size: 0.875rem;
|
|
||||||
color: var(--color-gray-100);
|
|
||||||
cursor: pointer;
|
|
||||||
border-radius: var(--border-radius-md);
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
font-weight: normal;
|
|
||||||
font-family: inherit;
|
|
||||||
|
|
||||||
@media screen and (min-width: 1921px) {
|
|
||||||
height: 2.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__text {
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
overflow: hidden;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__shortcut {
|
|
||||||
margin-inline-start: auto;
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background-color: var(--button-hover);
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
svg {
|
|
||||||
width: 1rem;
|
|
||||||
height: 1rem;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.active-collab {
|
|
||||||
background-color: #ecfdf5;
|
|
||||||
color: #064e3c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
&.theme--dark {
|
|
||||||
.menu-item {
|
|
||||||
color: var(--color-gray-40);
|
|
||||||
|
|
||||||
&.active-collab {
|
|
||||||
background-color: #064e3c;
|
|
||||||
color: #ecfdf5;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-container {
|
|
||||||
background-color: var(--color-gray-90) !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
import clsx from "clsx";
|
|
||||||
import "./Menu.scss";
|
|
||||||
|
|
||||||
interface MenuProps {
|
|
||||||
icon: JSX.Element;
|
|
||||||
onClick: () => void;
|
|
||||||
label: string;
|
|
||||||
dataTestId: string;
|
|
||||||
shortcut?: string;
|
|
||||||
isCollaborating?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
const MenuItem = ({
|
|
||||||
icon,
|
|
||||||
onClick,
|
|
||||||
label,
|
|
||||||
dataTestId,
|
|
||||||
shortcut,
|
|
||||||
isCollaborating,
|
|
||||||
}: MenuProps) => {
|
|
||||||
return (
|
|
||||||
<button
|
|
||||||
className={clsx("menu-item", { "active-collab": isCollaborating })}
|
|
||||||
aria-label={label}
|
|
||||||
onClick={onClick}
|
|
||||||
data-testid={dataTestId}
|
|
||||||
title={label}
|
|
||||||
type="button"
|
|
||||||
>
|
|
||||||
<div className="menu-item__icon">{icon}</div>
|
|
||||||
<div className="menu-item__text">{label}</div>
|
|
||||||
{shortcut && <div className="menu-item__shortcut">{shortcut}</div>}
|
|
||||||
</button>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default MenuItem;
|
|
@ -1,53 +0,0 @@
|
|||||||
import { GithubIcon, DiscordIcon, PlusPromoIcon, TwitterIcon } from "./icons";
|
|
||||||
|
|
||||||
export const MenuLinks = () => (
|
|
||||||
<>
|
|
||||||
<a
|
|
||||||
href="https://plus.excalidraw.com/plus?utm_source=excalidraw&utm_medium=app&utm_content=hamburger"
|
|
||||||
target="_blank"
|
|
||||||
rel="noreferrer"
|
|
||||||
className="menu-item"
|
|
||||||
style={{ color: "var(--color-promo)" }}
|
|
||||||
>
|
|
||||||
<div className="menu-item__icon">{PlusPromoIcon}</div>
|
|
||||||
<div className="menu-item__text">Excalidraw+</div>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
className="menu-item"
|
|
||||||
href="https://github.com/excalidraw/excalidraw"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
>
|
|
||||||
<div className="menu-item__icon">{GithubIcon}</div>
|
|
||||||
<div className="menu-item__text">GitHub</div>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
className="menu-item"
|
|
||||||
target="_blank"
|
|
||||||
href="https://discord.gg/UexuTaE"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
>
|
|
||||||
<div className="menu-item__icon">{DiscordIcon}</div>
|
|
||||||
<div className="menu-item__text">Discord</div>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
className="menu-item"
|
|
||||||
target="_blank"
|
|
||||||
href="https://twitter.com/excalidraw"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
>
|
|
||||||
<div className="menu-item__icon">{TwitterIcon}</div>
|
|
||||||
<div className="menu-item__text">Twitter</div>
|
|
||||||
</a>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
export const Separator = () => (
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
height: "1px",
|
|
||||||
backgroundColor: "var(--default-border-color)",
|
|
||||||
margin: ".5rem 0",
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
);
|
|
@ -11,18 +11,13 @@ import { HintViewer } from "./HintViewer";
|
|||||||
import { calculateScrollCenter } from "../scene";
|
import { calculateScrollCenter } from "../scene";
|
||||||
import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
|
import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
|
||||||
import { Section } from "./Section";
|
import { Section } from "./Section";
|
||||||
import CollabButton from "./CollabButton";
|
|
||||||
import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
|
import { SCROLLBAR_WIDTH, SCROLLBAR_MARGIN } from "../scene/scrollbars";
|
||||||
import { LockButton } from "./LockButton";
|
import { LockButton } from "./LockButton";
|
||||||
import { UserList } from "./UserList";
|
|
||||||
import { LibraryButton } from "./LibraryButton";
|
import { LibraryButton } from "./LibraryButton";
|
||||||
import { PenModeButton } from "./PenModeButton";
|
import { PenModeButton } from "./PenModeButton";
|
||||||
import { Stats } from "./Stats";
|
import { Stats } from "./Stats";
|
||||||
import { actionToggleStats } from "../actions";
|
import { actionToggleStats } from "../actions";
|
||||||
import { MenuLinks, Separator } from "./MenuUtils";
|
|
||||||
import WelcomeScreen from "./WelcomeScreen";
|
import WelcomeScreen from "./WelcomeScreen";
|
||||||
import MenuItem from "./MenuItem";
|
|
||||||
import { ExportImageIcon } from "./icons";
|
|
||||||
|
|
||||||
type MobileMenuProps = {
|
type MobileMenuProps = {
|
||||||
appState: AppState;
|
appState: AppState;
|
||||||
@ -46,16 +41,14 @@ type MobileMenuProps = {
|
|||||||
renderSidebars: () => JSX.Element | null;
|
renderSidebars: () => JSX.Element | null;
|
||||||
device: Device;
|
device: Device;
|
||||||
renderWelcomeScreen?: boolean;
|
renderWelcomeScreen?: boolean;
|
||||||
|
renderMenu: () => React.ReactNode;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const MobileMenu = ({
|
export const MobileMenu = ({
|
||||||
appState,
|
appState,
|
||||||
elements,
|
elements,
|
||||||
actionManager,
|
actionManager,
|
||||||
renderJSONExportDialog,
|
|
||||||
renderImageExportDialog,
|
|
||||||
setAppState,
|
setAppState,
|
||||||
onCollabButtonClick,
|
|
||||||
onLockToggle,
|
onLockToggle,
|
||||||
onPenModeToggle,
|
onPenModeToggle,
|
||||||
canvas,
|
canvas,
|
||||||
@ -66,6 +59,7 @@ export const MobileMenu = ({
|
|||||||
renderSidebars,
|
renderSidebars,
|
||||||
device,
|
device,
|
||||||
renderWelcomeScreen,
|
renderWelcomeScreen,
|
||||||
|
renderMenu,
|
||||||
}: MobileMenuProps) => {
|
}: MobileMenuProps) => {
|
||||||
const renderToolbar = () => {
|
const renderToolbar = () => {
|
||||||
return (
|
return (
|
||||||
@ -147,16 +141,12 @@ export const MobileMenu = ({
|
|||||||
|
|
||||||
const renderAppToolbar = () => {
|
const renderAppToolbar = () => {
|
||||||
if (appState.viewModeEnabled) {
|
if (appState.viewModeEnabled) {
|
||||||
return (
|
return <div className="App-toolbar-content">{renderMenu()}</div>;
|
||||||
<div className="App-toolbar-content">
|
|
||||||
{actionManager.renderAction("toggleCanvasMenu")}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="App-toolbar-content">
|
<div className="App-toolbar-content">
|
||||||
{actionManager.renderAction("toggleCanvasMenu")}
|
{renderMenu()}
|
||||||
{actionManager.renderAction("toggleEditMenu")}
|
{actionManager.renderAction("toggleEditMenu")}
|
||||||
{actionManager.renderAction("undo")}
|
{actionManager.renderAction("undo")}
|
||||||
{actionManager.renderAction("redo")}
|
{actionManager.renderAction("redo")}
|
||||||
@ -168,58 +158,6 @@ export const MobileMenu = ({
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const renderCanvasActions = () => {
|
|
||||||
if (appState.viewModeEnabled) {
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{renderJSONExportDialog()}
|
|
||||||
<MenuItem
|
|
||||||
label={t("buttons.exportImage")}
|
|
||||||
icon={ExportImageIcon}
|
|
||||||
dataTestId="image-export-button"
|
|
||||||
onClick={() => setAppState({ openDialog: "imageExport" })}
|
|
||||||
/>
|
|
||||||
{renderImageExportDialog()}
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{!appState.viewModeEnabled && actionManager.renderAction("loadScene")}
|
|
||||||
{renderJSONExportDialog()}
|
|
||||||
{renderImageExportDialog()}
|
|
||||||
<MenuItem
|
|
||||||
label={t("buttons.exportImage")}
|
|
||||||
icon={ExportImageIcon}
|
|
||||||
dataTestId="image-export-button"
|
|
||||||
onClick={() => setAppState({ openDialog: "imageExport" })}
|
|
||||||
/>
|
|
||||||
{onCollabButtonClick && (
|
|
||||||
<CollabButton
|
|
||||||
isCollaborating={isCollaborating}
|
|
||||||
collaboratorCount={appState.collaborators.size}
|
|
||||||
onClick={onCollabButtonClick}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{actionManager.renderAction("toggleShortcuts", undefined, true)}
|
|
||||||
{!appState.viewModeEnabled && actionManager.renderAction("clearCanvas")}
|
|
||||||
<Separator />
|
|
||||||
<MenuLinks />
|
|
||||||
<Separator />
|
|
||||||
{!appState.viewModeEnabled && (
|
|
||||||
<div style={{ marginBottom: ".5rem" }}>
|
|
||||||
<div style={{ fontSize: ".75rem", marginBottom: ".5rem" }}>
|
|
||||||
{t("labels.canvasBackground")}
|
|
||||||
</div>
|
|
||||||
<div style={{ padding: "0 0.625rem" }}>
|
|
||||||
{actionManager.renderAction("changeViewBackgroundColor")}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{actionManager.renderAction("toggleTheme")}
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{renderSidebars()}
|
{renderSidebars()}
|
||||||
@ -244,27 +182,9 @@ export const MobileMenu = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Island padding={0}>
|
<Island padding={0}>
|
||||||
{appState.openMenu === "canvas" ? (
|
{appState.openMenu === "shape" &&
|
||||||
<Section className="App-mobile-menu" heading="canvasActions">
|
!appState.viewModeEnabled &&
|
||||||
<div className="panelColumn">
|
showSelectedShapeActions(appState, elements) ? (
|
||||||
<Stack.Col gap={2}>
|
|
||||||
{renderCanvasActions()}
|
|
||||||
{appState.collaborators.size > 0 && (
|
|
||||||
<fieldset>
|
|
||||||
<legend>{t("labels.collaborators")}</legend>
|
|
||||||
<UserList
|
|
||||||
mobile
|
|
||||||
collaborators={appState.collaborators}
|
|
||||||
actionManager={actionManager}
|
|
||||||
/>
|
|
||||||
</fieldset>
|
|
||||||
)}
|
|
||||||
</Stack.Col>
|
|
||||||
</div>
|
|
||||||
</Section>
|
|
||||||
) : appState.openMenu === "shape" &&
|
|
||||||
!appState.viewModeEnabled &&
|
|
||||||
showSelectedShapeActions(appState, elements) ? (
|
|
||||||
<Section className="App-mobile-menu" heading="selectedShapeActions">
|
<Section className="App-mobile-menu" heading="selectedShapeActions">
|
||||||
<SelectedShapeActions
|
<SelectedShapeActions
|
||||||
appState={appState}
|
appState={appState}
|
||||||
|
@ -3,24 +3,6 @@
|
|||||||
|
|
||||||
.excalidraw {
|
.excalidraw {
|
||||||
.Sidebar {
|
.Sidebar {
|
||||||
&__dropdown-content {
|
|
||||||
z-index: 1;
|
|
||||||
position: absolute;
|
|
||||||
top: 100%;
|
|
||||||
left: 0;
|
|
||||||
|
|
||||||
:root[dir="rtl"] & {
|
|
||||||
right: 0;
|
|
||||||
left: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
width: 180px;
|
|
||||||
box-shadow: var(--library-dropdown-shadow);
|
|
||||||
border-radius: var(--border-radius-lg);
|
|
||||||
padding: 0.25rem 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
&__close-btn,
|
&__close-btn,
|
||||||
&__pin-btn,
|
&__pin-btn,
|
||||||
&__dropdown-btn {
|
&__dropdown-btn {
|
||||||
|
@ -4,16 +4,16 @@ import React from "react";
|
|||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import { AppState, Collaborator } from "../types";
|
import { AppState, Collaborator } from "../types";
|
||||||
import { Tooltip } from "./Tooltip";
|
import { Tooltip } from "./Tooltip";
|
||||||
import { ActionManager } from "../actions/manager";
|
import { useExcalidrawActionManager } from "./App";
|
||||||
|
|
||||||
export const UserList: React.FC<{
|
export const UserList: React.FC<{
|
||||||
className?: string;
|
className?: string;
|
||||||
mobile?: boolean;
|
mobile?: boolean;
|
||||||
collaborators: AppState["collaborators"];
|
collaborators: AppState["collaborators"];
|
||||||
actionManager: ActionManager;
|
}> = ({ className, mobile, collaborators }) => {
|
||||||
}> = ({ className, mobile, collaborators, actionManager }) => {
|
const actionManager = useExcalidrawActionManager();
|
||||||
const uniqueCollaborators = new Map<string, Collaborator>();
|
|
||||||
|
|
||||||
|
const uniqueCollaborators = new Map<string, Collaborator>();
|
||||||
collaborators.forEach((collaborator, socketId) => {
|
collaborators.forEach((collaborator, socketId) => {
|
||||||
uniqueCollaborators.set(
|
uniqueCollaborators.set(
|
||||||
// filter on user id, else fall back on unique socketId
|
// filter on user id, else fall back on unique socketId
|
||||||
@ -44,26 +44,6 @@ export const UserList: React.FC<{
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO barnabasmolnar/editor-redesign
|
|
||||||
// probably remove before shipping :)
|
|
||||||
// 20 fake collaborators; for easy, convenient debug purposes ˇˇ
|
|
||||||
// const avatars = Array.from({ length: 20 }).map((_, index) => {
|
|
||||||
// const avatarJSX = actionManager.renderAction("goToCollaborator", [
|
|
||||||
// index.toString(),
|
|
||||||
// {
|
|
||||||
// username: `User ${index}`,
|
|
||||||
// },
|
|
||||||
// ]);
|
|
||||||
|
|
||||||
// return mobile ? (
|
|
||||||
// <Tooltip label={`User ${index}`} key={index}>
|
|
||||||
// {avatarJSX}
|
|
||||||
// </Tooltip>
|
|
||||||
// ) : (
|
|
||||||
// <React.Fragment key={index}>{avatarJSX}</React.Fragment>
|
|
||||||
// );
|
|
||||||
// });
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={clsx("UserList", className, { UserList_mobile: mobile })}>
|
<div className={clsx("UserList", className, { UserList_mobile: mobile })}>
|
||||||
{avatars}
|
{avatars}
|
||||||
|
@ -1,18 +1,10 @@
|
|||||||
import { useAtom } from "jotai";
|
|
||||||
import { actionLoadScene, actionShortcuts } from "../actions";
|
import { actionLoadScene, actionShortcuts } from "../actions";
|
||||||
import { ActionManager } from "../actions/manager";
|
import { ActionManager } from "../actions/manager";
|
||||||
import { getShortcutFromShortcutName } from "../actions/shortcuts";
|
import { getShortcutFromShortcutName } from "../actions/shortcuts";
|
||||||
import { isExcalidrawPlusSignedUser } from "../constants";
|
import { isExcalidrawPlusSignedUser } from "../constants";
|
||||||
import { collabDialogShownAtom } from "../excalidraw-app/collab/Collab";
|
|
||||||
import { t } from "../i18n";
|
import { t } from "../i18n";
|
||||||
import { AppState } from "../types";
|
import { AppState } from "../types";
|
||||||
import {
|
import { ExcalLogo, HelpIcon, LoadIcon, PlusPromoIcon } from "./icons";
|
||||||
ExcalLogo,
|
|
||||||
HelpIcon,
|
|
||||||
LoadIcon,
|
|
||||||
PlusPromoIcon,
|
|
||||||
UsersIcon,
|
|
||||||
} from "./icons";
|
|
||||||
import "./WelcomeScreen.scss";
|
import "./WelcomeScreen.scss";
|
||||||
|
|
||||||
const WelcomeScreenItem = ({
|
const WelcomeScreenItem = ({
|
||||||
@ -64,8 +56,6 @@ const WelcomeScreen = ({
|
|||||||
appState: AppState;
|
appState: AppState;
|
||||||
actionManager: ActionManager;
|
actionManager: ActionManager;
|
||||||
}) => {
|
}) => {
|
||||||
const [, setCollabDialogShown] = useAtom(collabDialogShownAtom);
|
|
||||||
|
|
||||||
let subheadingJSX;
|
let subheadingJSX;
|
||||||
|
|
||||||
if (isExcalidrawPlusSignedUser) {
|
if (isExcalidrawPlusSignedUser) {
|
||||||
@ -109,12 +99,6 @@ const WelcomeScreen = ({
|
|||||||
icon={LoadIcon}
|
icon={LoadIcon}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<WelcomeScreenItem
|
|
||||||
label={t("labels.liveCollaboration")}
|
|
||||||
shortcut={null}
|
|
||||||
onClick={() => setCollabDialogShown(true)}
|
|
||||||
icon={UsersIcon}
|
|
||||||
/>
|
|
||||||
<WelcomeScreenItem
|
<WelcomeScreenItem
|
||||||
onClick={() => actionManager.executeAction(actionShortcuts)}
|
onClick={() => actionManager.executeAction(actionShortcuts)}
|
||||||
label={t("helpDialog.title")}
|
label={t("helpDialog.title")}
|
||||||
|
127
src/components/dropdownMenu/DropdownMenu.scss
Normal file
127
src/components/dropdownMenu/DropdownMenu.scss
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
@import "../../css/variables.module";
|
||||||
|
|
||||||
|
.excalidraw {
|
||||||
|
.dropdown-menu {
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
|
||||||
|
&--mobile {
|
||||||
|
bottom: 55px;
|
||||||
|
top: auto;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
row-gap: 0.75rem;
|
||||||
|
|
||||||
|
.dropdown-menu-container {
|
||||||
|
padding: 8px 8px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
background-color: var(--island-bg-color);
|
||||||
|
box-shadow: var(--shadow-island);
|
||||||
|
border-radius: var(--border-radius-lg);
|
||||||
|
position: relative;
|
||||||
|
transition: box-shadow 0.5s ease-in-out;
|
||||||
|
|
||||||
|
&.zen-mode {
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-container {
|
||||||
|
background-color: #fff !important;
|
||||||
|
max-height: calc(100vh - 150px);
|
||||||
|
overflow-y: auto;
|
||||||
|
--gap: 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-item-base {
|
||||||
|
display: flex;
|
||||||
|
padding: 0 0.625rem;
|
||||||
|
column-gap: 0.625rem;
|
||||||
|
font-size: 0.875rem;
|
||||||
|
color: var(--color-gray-100);
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
font-weight: normal;
|
||||||
|
font-family: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-item {
|
||||||
|
background-color: transparent;
|
||||||
|
border: 0;
|
||||||
|
align-items: center;
|
||||||
|
height: 2rem;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--border-radius-md);
|
||||||
|
|
||||||
|
@media screen and (min-width: 1921px) {
|
||||||
|
height: 2.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__text {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__shortcut {
|
||||||
|
margin-inline-start: auto;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: var(--button-hover);
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
svg {
|
||||||
|
width: 1rem;
|
||||||
|
height: 1rem;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-item-custom {
|
||||||
|
margin-top: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-group-title {
|
||||||
|
font-size: 14px;
|
||||||
|
text-align: left;
|
||||||
|
margin: 10px 0;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.theme--dark {
|
||||||
|
.dropdown-menu-item {
|
||||||
|
color: var(--color-gray-40);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-container {
|
||||||
|
background-color: var(--color-gray-90) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-button {
|
||||||
|
@include outlineButtonStyles;
|
||||||
|
background-color: var(--island-bg-color);
|
||||||
|
width: var(--lg-button-size);
|
||||||
|
height: var(--lg-button-size);
|
||||||
|
|
||||||
|
svg {
|
||||||
|
width: var(--lg-icon-size);
|
||||||
|
height: var(--lg-icon-size);
|
||||||
|
}
|
||||||
|
|
||||||
|
&--mobile {
|
||||||
|
border: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
width: var(--default-button-size);
|
||||||
|
height: var(--default-button-size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
43
src/components/dropdownMenu/DropdownMenu.tsx
Normal file
43
src/components/dropdownMenu/DropdownMenu.tsx
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
import React from "react";
|
||||||
|
import DropdownMenuTrigger from "./DropdownMenuTrigger";
|
||||||
|
import DropdownMenuItem from "./DropdownMenuItem";
|
||||||
|
import MenuSeparator from "./DropdownMenuSeparator";
|
||||||
|
import DropdownMenuGroup from "./DropdownMenuGroup";
|
||||||
|
import DropdownMenuContent from "./DropdownMenuContent";
|
||||||
|
import DropdownMenuItemLink from "./DropdownMenuItemLink";
|
||||||
|
import DropdownMenuItemCustom from "./DropdownMenuItemCustom";
|
||||||
|
import {
|
||||||
|
getMenuContentComponent,
|
||||||
|
getMenuTriggerComponent,
|
||||||
|
} from "./dropdownMenuUtils";
|
||||||
|
|
||||||
|
import "./DropdownMenu.scss";
|
||||||
|
|
||||||
|
const DropdownMenu = ({
|
||||||
|
children,
|
||||||
|
open,
|
||||||
|
}: {
|
||||||
|
children?: React.ReactNode;
|
||||||
|
open: boolean;
|
||||||
|
}) => {
|
||||||
|
const MenuTriggerComp = getMenuTriggerComponent(children);
|
||||||
|
const MenuContentComp = getMenuContentComponent(children);
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{MenuTriggerComp}
|
||||||
|
{open && MenuContentComp}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
DropdownMenu.Trigger = DropdownMenuTrigger;
|
||||||
|
DropdownMenu.Content = DropdownMenuContent;
|
||||||
|
DropdownMenu.Item = DropdownMenuItem;
|
||||||
|
DropdownMenu.ItemLink = DropdownMenuItemLink;
|
||||||
|
DropdownMenu.ItemCustom = DropdownMenuItemCustom;
|
||||||
|
DropdownMenu.Group = DropdownMenuGroup;
|
||||||
|
DropdownMenu.Separator = MenuSeparator;
|
||||||
|
|
||||||
|
export default DropdownMenu;
|
||||||
|
|
||||||
|
DropdownMenu.displayName = "DropdownMenu";
|
51
src/components/dropdownMenu/DropdownMenuContent.tsx
Normal file
51
src/components/dropdownMenu/DropdownMenuContent.tsx
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
import { useOutsideClickHook } from "../../hooks/useOutsideClick";
|
||||||
|
import { Island } from "../Island";
|
||||||
|
|
||||||
|
import { useDevice } from "../App";
|
||||||
|
import clsx from "clsx";
|
||||||
|
import Stack from "../Stack";
|
||||||
|
|
||||||
|
const MenuContent = ({
|
||||||
|
children,
|
||||||
|
onClickOutside,
|
||||||
|
className = "",
|
||||||
|
style,
|
||||||
|
}: {
|
||||||
|
children?: React.ReactNode;
|
||||||
|
onClickOutside?: () => void;
|
||||||
|
className?: string;
|
||||||
|
style?: React.CSSProperties;
|
||||||
|
}) => {
|
||||||
|
const device = useDevice();
|
||||||
|
const menuRef = useOutsideClickHook(() => {
|
||||||
|
onClickOutside?.();
|
||||||
|
});
|
||||||
|
|
||||||
|
const classNames = clsx(`dropdown-menu ${className}`, {
|
||||||
|
"dropdown-menu--mobile": device.isMobile,
|
||||||
|
}).trim();
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
ref={menuRef}
|
||||||
|
className={classNames}
|
||||||
|
style={style}
|
||||||
|
data-testid="dropdown-menu"
|
||||||
|
>
|
||||||
|
{/* the zIndex ensures this menu has higher stacking order,
|
||||||
|
see https://github.com/excalidraw/excalidraw/pull/1445 */}
|
||||||
|
{device.isMobile ? (
|
||||||
|
<Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
|
||||||
|
) : (
|
||||||
|
<Island
|
||||||
|
className="dropdown-menu-container"
|
||||||
|
padding={2}
|
||||||
|
style={{ zIndex: 1 }}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</Island>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
export default MenuContent;
|
||||||
|
MenuContent.displayName = "DropdownMenuContent";
|
23
src/components/dropdownMenu/DropdownMenuGroup.tsx
Normal file
23
src/components/dropdownMenu/DropdownMenuGroup.tsx
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import React from "react";
|
||||||
|
|
||||||
|
const MenuGroup = ({
|
||||||
|
children,
|
||||||
|
className = "",
|
||||||
|
style,
|
||||||
|
title,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
className?: string;
|
||||||
|
style?: React.CSSProperties;
|
||||||
|
title?: string;
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<div className={`dropdown-menu-group ${className}`} style={style}>
|
||||||
|
{title && <p className="dropdown-menu-group-title">{title}</p>}
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MenuGroup;
|
||||||
|
MenuGroup.displayName = "DropdownMenuGroup";
|
45
src/components/dropdownMenu/DropdownMenuItem.tsx
Normal file
45
src/components/dropdownMenu/DropdownMenuItem.tsx
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
import React from "react";
|
||||||
|
import MenuItemContent from "./DropdownMenuItemContent";
|
||||||
|
|
||||||
|
export const getDrodownMenuItemClassName = (className = "") => {
|
||||||
|
return `dropdown-menu-item dropdown-menu-item-base ${className}`.trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
const DropdownMenuItem = ({
|
||||||
|
icon,
|
||||||
|
onSelect,
|
||||||
|
children,
|
||||||
|
dataTestId,
|
||||||
|
shortcut,
|
||||||
|
className,
|
||||||
|
style,
|
||||||
|
ariaLabel,
|
||||||
|
}: {
|
||||||
|
icon?: JSX.Element;
|
||||||
|
onSelect: () => void;
|
||||||
|
children: React.ReactNode;
|
||||||
|
dataTestId?: string;
|
||||||
|
shortcut?: string;
|
||||||
|
className?: string;
|
||||||
|
style?: React.CSSProperties;
|
||||||
|
ariaLabel?: string;
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
onClick={onSelect}
|
||||||
|
data-testid={dataTestId}
|
||||||
|
title={ariaLabel}
|
||||||
|
type="button"
|
||||||
|
className={getDrodownMenuItemClassName(className)}
|
||||||
|
style={style}
|
||||||
|
>
|
||||||
|
<MenuItemContent icon={icon} shortcut={shortcut}>
|
||||||
|
{children}
|
||||||
|
</MenuItemContent>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DropdownMenuItem;
|
||||||
|
DropdownMenuItem.displayName = "DropdownMenuItem";
|
23
src/components/dropdownMenu/DropdownMenuItemContent.tsx
Normal file
23
src/components/dropdownMenu/DropdownMenuItemContent.tsx
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import { useDevice } from "../App";
|
||||||
|
|
||||||
|
const MenuItemContent = ({
|
||||||
|
icon,
|
||||||
|
shortcut,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
icon?: JSX.Element;
|
||||||
|
shortcut?: string;
|
||||||
|
children: React.ReactNode;
|
||||||
|
}) => {
|
||||||
|
const device = useDevice();
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="dropdown-menu-item__icon">{icon}</div>
|
||||||
|
<div className="dropdown-menu-item__text">{children}</div>
|
||||||
|
{shortcut && !device.isMobile && (
|
||||||
|
<div className="dropdown-menu-item__shortcut">{shortcut}</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
export default MenuItemContent;
|
23
src/components/dropdownMenu/DropdownMenuItemCustom.tsx
Normal file
23
src/components/dropdownMenu/DropdownMenuItemCustom.tsx
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
const DropdownMenuItemCustom = ({
|
||||||
|
children,
|
||||||
|
className = "",
|
||||||
|
style,
|
||||||
|
dataTestId,
|
||||||
|
}: {
|
||||||
|
children: React.ReactNode;
|
||||||
|
className?: string;
|
||||||
|
style?: React.CSSProperties;
|
||||||
|
dataTestId?: string;
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={`dropdown-menu-item-base dropdown-menu-item-custom ${className}`.trim()}
|
||||||
|
style={style}
|
||||||
|
data-testid={dataTestId}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DropdownMenuItemCustom;
|
42
src/components/dropdownMenu/DropdownMenuItemLink.tsx
Normal file
42
src/components/dropdownMenu/DropdownMenuItemLink.tsx
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
import MenuItemContent from "./DropdownMenuItemContent";
|
||||||
|
import React from "react";
|
||||||
|
import { getDrodownMenuItemClassName } from "./DropdownMenuItem";
|
||||||
|
const DropdownMenuItemLink = ({
|
||||||
|
icon,
|
||||||
|
dataTestId,
|
||||||
|
shortcut,
|
||||||
|
href,
|
||||||
|
children,
|
||||||
|
className = "",
|
||||||
|
style,
|
||||||
|
ariaLabel,
|
||||||
|
}: {
|
||||||
|
icon?: JSX.Element;
|
||||||
|
children: React.ReactNode;
|
||||||
|
dataTestId?: string;
|
||||||
|
shortcut?: string;
|
||||||
|
className?: string;
|
||||||
|
href: string;
|
||||||
|
style?: React.CSSProperties;
|
||||||
|
ariaLabel?: string;
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<a
|
||||||
|
href={href}
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
className={getDrodownMenuItemClassName(className)}
|
||||||
|
style={style}
|
||||||
|
data-testid={dataTestId}
|
||||||
|
title={ariaLabel}
|
||||||
|
aria-label={ariaLabel}
|
||||||
|
>
|
||||||
|
<MenuItemContent icon={icon} shortcut={shortcut}>
|
||||||
|
{children}
|
||||||
|
</MenuItemContent>
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DropdownMenuItemLink;
|
||||||
|
DropdownMenuItemLink.displayName = "DropdownMenuItemLink";
|
14
src/components/dropdownMenu/DropdownMenuSeparator.tsx
Normal file
14
src/components/dropdownMenu/DropdownMenuSeparator.tsx
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
import React from "react";
|
||||||
|
|
||||||
|
const MenuSeparator = () => (
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
height: "1px",
|
||||||
|
backgroundColor: "var(--default-border-color)",
|
||||||
|
margin: ".5rem 0",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
export default MenuSeparator;
|
||||||
|
MenuSeparator.displayName = "DropdownMenuSeparator";
|
37
src/components/dropdownMenu/DropdownMenuTrigger.tsx
Normal file
37
src/components/dropdownMenu/DropdownMenuTrigger.tsx
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
import clsx from "clsx";
|
||||||
|
import { useDevice, useExcalidrawAppState } from "../App";
|
||||||
|
|
||||||
|
const MenuTrigger = ({
|
||||||
|
className = "",
|
||||||
|
children,
|
||||||
|
onToggle,
|
||||||
|
}: {
|
||||||
|
className?: string;
|
||||||
|
children: React.ReactNode;
|
||||||
|
onToggle: () => void;
|
||||||
|
}) => {
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const device = useDevice();
|
||||||
|
const classNames = clsx(
|
||||||
|
`dropdown-menu-button ${className}`,
|
||||||
|
"zen-mode-transition",
|
||||||
|
{
|
||||||
|
"transition-left": appState.zenModeEnabled,
|
||||||
|
"dropdown-menu-button--mobile": device.isMobile,
|
||||||
|
},
|
||||||
|
).trim();
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
data-prevent-outside-click
|
||||||
|
className={classNames}
|
||||||
|
onClick={onToggle}
|
||||||
|
type="button"
|
||||||
|
data-testid="dropdown-menu-button"
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MenuTrigger;
|
||||||
|
MenuTrigger.displayName = "DropdownMenuTrigger";
|
35
src/components/dropdownMenu/dropdownMenuUtils.ts
Normal file
35
src/components/dropdownMenu/dropdownMenuUtils.ts
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
import React from "react";
|
||||||
|
|
||||||
|
export const getMenuTriggerComponent = (children: React.ReactNode) => {
|
||||||
|
const comp = React.Children.toArray(children).find(
|
||||||
|
(child) =>
|
||||||
|
React.isValidElement(child) &&
|
||||||
|
typeof child.type !== "string" &&
|
||||||
|
//@ts-ignore
|
||||||
|
child?.type.displayName &&
|
||||||
|
//@ts-ignore
|
||||||
|
child.type.displayName === "DropdownMenuTrigger",
|
||||||
|
);
|
||||||
|
if (!comp) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
//@ts-ignore
|
||||||
|
return comp;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getMenuContentComponent = (children: React.ReactNode) => {
|
||||||
|
const comp = React.Children.toArray(children).find(
|
||||||
|
(child) =>
|
||||||
|
React.isValidElement(child) &&
|
||||||
|
typeof child.type !== "string" &&
|
||||||
|
//@ts-ignore
|
||||||
|
child?.type.displayName &&
|
||||||
|
//@ts-ignore
|
||||||
|
child.type.displayName === "DropdownMenuContent",
|
||||||
|
);
|
||||||
|
if (!comp) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
//@ts-ignore
|
||||||
|
return comp;
|
||||||
|
};
|
@ -1,7 +1,7 @@
|
|||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import { ActionManager } from "../../actions/manager";
|
import { ActionManager } from "../../actions/manager";
|
||||||
import { t } from "../../i18n";
|
import { t } from "../../i18n";
|
||||||
import { AppState } from "../../types";
|
import { AppState, UIChildrenComponents } from "../../types";
|
||||||
import {
|
import {
|
||||||
ExitZenModeAction,
|
ExitZenModeAction,
|
||||||
FinalizeAction,
|
FinalizeAction,
|
||||||
@ -13,20 +13,19 @@ import { WelcomeScreenHelpArrow } from "../icons";
|
|||||||
import { Section } from "../Section";
|
import { Section } from "../Section";
|
||||||
import Stack from "../Stack";
|
import Stack from "../Stack";
|
||||||
import WelcomeScreenDecor from "../WelcomeScreenDecor";
|
import WelcomeScreenDecor from "../WelcomeScreenDecor";
|
||||||
import FooterCenter from "./FooterCenter";
|
|
||||||
|
|
||||||
const Footer = ({
|
const Footer = ({
|
||||||
appState,
|
appState,
|
||||||
actionManager,
|
actionManager,
|
||||||
showExitZenModeBtn,
|
showExitZenModeBtn,
|
||||||
renderWelcomeScreen,
|
renderWelcomeScreen,
|
||||||
children,
|
footerCenter,
|
||||||
}: {
|
}: {
|
||||||
appState: AppState;
|
appState: AppState;
|
||||||
actionManager: ActionManager;
|
actionManager: ActionManager;
|
||||||
showExitZenModeBtn: boolean;
|
showExitZenModeBtn: boolean;
|
||||||
renderWelcomeScreen: boolean;
|
renderWelcomeScreen: boolean;
|
||||||
children?: React.ReactNode;
|
footerCenter: UIChildrenComponents["FooterCenter"];
|
||||||
}) => {
|
}) => {
|
||||||
const device = useDevice();
|
const device = useDevice();
|
||||||
const showFinalize =
|
const showFinalize =
|
||||||
@ -71,7 +70,7 @@ const Footer = ({
|
|||||||
</Section>
|
</Section>
|
||||||
</Stack.Col>
|
</Stack.Col>
|
||||||
</div>
|
</div>
|
||||||
<FooterCenter>{children}</FooterCenter>
|
{footerCenter}
|
||||||
<div
|
<div
|
||||||
className={clsx("layer-ui__wrapper__footer-right zen-mode-transition", {
|
className={clsx("layer-ui__wrapper__footer-right zen-mode-transition", {
|
||||||
"transition-right disable-pointerEvents": appState.zenModeEnabled,
|
"transition-right disable-pointerEvents": appState.zenModeEnabled,
|
||||||
|
10
src/components/footer/FooterCenter.scss
Normal file
10
src/components/footer/FooterCenter.scss
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
.footer-center {
|
||||||
|
pointer-events: none;
|
||||||
|
& > * {
|
||||||
|
pointer-events: all;
|
||||||
|
}
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: flex-start;
|
||||||
|
}
|
@ -1,11 +1,12 @@
|
|||||||
import clsx from "clsx";
|
import clsx from "clsx";
|
||||||
import { useExcalidrawAppState } from "../App";
|
import { useExcalidrawAppState } from "../App";
|
||||||
|
import "./FooterCenter.scss";
|
||||||
|
|
||||||
const FooterCenter = ({ children }: { children?: React.ReactNode }) => {
|
const FooterCenter = ({ children }: { children?: React.ReactNode }) => {
|
||||||
const appState = useExcalidrawAppState();
|
const appState = useExcalidrawAppState();
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={clsx("layer-ui__wrapper__footer-center zen-mode-transition", {
|
className={clsx("footer-center zen-mode-transition", {
|
||||||
"layer-ui__wrapper__footer-left--transition-bottom":
|
"layer-ui__wrapper__footer-left--transition-bottom":
|
||||||
appState.zenModeEnabled,
|
appState.zenModeEnabled,
|
||||||
})}
|
})}
|
||||||
|
174
src/components/mainMenu/DefaultItems.tsx
Normal file
174
src/components/mainMenu/DefaultItems.tsx
Normal file
@ -0,0 +1,174 @@
|
|||||||
|
import clsx from "clsx";
|
||||||
|
import { getShortcutFromShortcutName } from "../../actions/shortcuts";
|
||||||
|
import { t } from "../../i18n";
|
||||||
|
import {
|
||||||
|
useExcalidrawAppState,
|
||||||
|
useExcalidrawSetAppState,
|
||||||
|
useExcalidrawActionManager,
|
||||||
|
} from "../App";
|
||||||
|
import { ExportIcon, ExportImageIcon, UsersIcon } from "../icons";
|
||||||
|
import { GithubIcon, DiscordIcon, TwitterIcon } from "../icons";
|
||||||
|
import DropdownMenuItem from "../dropdownMenu/DropdownMenuItem";
|
||||||
|
import DropdownMenuItemLink from "../dropdownMenu/DropdownMenuItemLink";
|
||||||
|
|
||||||
|
export const LoadScene = () => {
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const actionManager = useExcalidrawActionManager();
|
||||||
|
if (appState.viewModeEnabled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return actionManager.renderAction("loadScene");
|
||||||
|
};
|
||||||
|
LoadScene.displayName = "LoadScene";
|
||||||
|
|
||||||
|
export const SaveToActiveFile = () => {
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const actionManager = useExcalidrawActionManager();
|
||||||
|
if (!appState.fileHandle) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return actionManager.renderAction("saveToActiveFile");
|
||||||
|
};
|
||||||
|
SaveToActiveFile.displayName = "SaveToActiveFile";
|
||||||
|
|
||||||
|
export const SaveAsImage = () => {
|
||||||
|
const setAppState = useExcalidrawSetAppState();
|
||||||
|
// Hack until we tie "t" to lang state
|
||||||
|
// eslint-disable-next-line
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
return (
|
||||||
|
<DropdownMenuItem
|
||||||
|
icon={ExportImageIcon}
|
||||||
|
dataTestId="image-export-button"
|
||||||
|
onSelect={() => setAppState({ openDialog: "imageExport" })}
|
||||||
|
shortcut={getShortcutFromShortcutName("imageExport")}
|
||||||
|
ariaLabel={t("buttons.exportImage")}
|
||||||
|
>
|
||||||
|
{t("buttons.exportImage")}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
SaveAsImage.displayName = "SaveAsImage";
|
||||||
|
|
||||||
|
export const Help = () => {
|
||||||
|
// Hack until we tie "t" to lang state
|
||||||
|
// eslint-disable-next-line
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
|
||||||
|
const actionManager = useExcalidrawActionManager();
|
||||||
|
return actionManager.renderAction("toggleShortcuts", undefined, true);
|
||||||
|
};
|
||||||
|
Help.displayName = "Help";
|
||||||
|
|
||||||
|
export const ClearCanvas = () => {
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const actionManager = useExcalidrawActionManager();
|
||||||
|
|
||||||
|
if (appState.viewModeEnabled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return actionManager.renderAction("clearCanvas");
|
||||||
|
};
|
||||||
|
ClearCanvas.displayName = "ClearCanvas";
|
||||||
|
|
||||||
|
export const ToggleTheme = () => {
|
||||||
|
// Hack until we tie "t" to lang state
|
||||||
|
// eslint-disable-next-line
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const actionManager = useExcalidrawActionManager();
|
||||||
|
return actionManager.renderAction("toggleTheme");
|
||||||
|
};
|
||||||
|
ToggleTheme.displayName = "ToggleTheme";
|
||||||
|
|
||||||
|
export const ChangeCanvasBackground = () => {
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const actionManager = useExcalidrawActionManager();
|
||||||
|
|
||||||
|
if (appState.viewModeEnabled) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<div style={{ marginTop: "0.5rem" }}>
|
||||||
|
<div style={{ fontSize: ".75rem", marginBottom: ".5rem" }}>
|
||||||
|
{t("labels.canvasBackground")}
|
||||||
|
</div>
|
||||||
|
<div style={{ padding: "0 0.625rem" }}>
|
||||||
|
{actionManager.renderAction("changeViewBackgroundColor")}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
ChangeCanvasBackground.displayName = "ChangeCanvasBackground";
|
||||||
|
|
||||||
|
export const Export = () => {
|
||||||
|
// Hack until we tie "t" to lang state
|
||||||
|
// eslint-disable-next-line
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const setAppState = useExcalidrawSetAppState();
|
||||||
|
return (
|
||||||
|
<DropdownMenuItem
|
||||||
|
icon={ExportIcon}
|
||||||
|
onSelect={() => {
|
||||||
|
setAppState({ openDialog: "jsonExport" });
|
||||||
|
}}
|
||||||
|
dataTestId="json-export-button"
|
||||||
|
ariaLabel={t("buttons.export")}
|
||||||
|
>
|
||||||
|
{t("buttons.export")}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
Export.displayName = "Export";
|
||||||
|
|
||||||
|
export const Socials = () => (
|
||||||
|
<>
|
||||||
|
<DropdownMenuItemLink
|
||||||
|
icon={GithubIcon}
|
||||||
|
href="https://github.com/excalidraw/excalidraw"
|
||||||
|
ariaLabel="GitHub"
|
||||||
|
>
|
||||||
|
GitHub
|
||||||
|
</DropdownMenuItemLink>
|
||||||
|
<DropdownMenuItemLink
|
||||||
|
icon={DiscordIcon}
|
||||||
|
href="https://discord.gg/UexuTaE"
|
||||||
|
ariaLabel="Discord"
|
||||||
|
>
|
||||||
|
Discord
|
||||||
|
</DropdownMenuItemLink>
|
||||||
|
<DropdownMenuItemLink
|
||||||
|
icon={TwitterIcon}
|
||||||
|
href="https://twitter.com/excalidraw"
|
||||||
|
ariaLabel="Twitter"
|
||||||
|
>
|
||||||
|
Twitter
|
||||||
|
</DropdownMenuItemLink>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
Socials.displayName = "Socials";
|
||||||
|
|
||||||
|
export const LiveCollaboration = ({
|
||||||
|
onSelect,
|
||||||
|
isCollaborating,
|
||||||
|
}: {
|
||||||
|
onSelect: () => void;
|
||||||
|
isCollaborating: boolean;
|
||||||
|
}) => {
|
||||||
|
// Hack until we tie "t" to lang state
|
||||||
|
// eslint-disable-next-line
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
return (
|
||||||
|
<DropdownMenuItem
|
||||||
|
dataTestId="collab-button"
|
||||||
|
icon={UsersIcon}
|
||||||
|
className={clsx({
|
||||||
|
"active-collab": isCollaborating,
|
||||||
|
})}
|
||||||
|
onSelect={onSelect}
|
||||||
|
>
|
||||||
|
{t("labels.liveCollaboration")}
|
||||||
|
</DropdownMenuItem>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
LiveCollaboration.displayName = "LiveCollaboration";
|
56
src/components/mainMenu/MainMenu.tsx
Normal file
56
src/components/mainMenu/MainMenu.tsx
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
import React from "react";
|
||||||
|
import {
|
||||||
|
useDevice,
|
||||||
|
useExcalidrawAppState,
|
||||||
|
useExcalidrawSetAppState,
|
||||||
|
} from "../App";
|
||||||
|
import DropdownMenu from "../dropdownMenu/DropdownMenu";
|
||||||
|
|
||||||
|
import * as DefaultItems from "./DefaultItems";
|
||||||
|
|
||||||
|
import { UserList } from "../UserList";
|
||||||
|
import { t } from "../../i18n";
|
||||||
|
import { HamburgerMenuIcon } from "../icons";
|
||||||
|
|
||||||
|
const MainMenu = ({ children }: { children?: React.ReactNode }) => {
|
||||||
|
const device = useDevice();
|
||||||
|
const appState = useExcalidrawAppState();
|
||||||
|
const setAppState = useExcalidrawSetAppState();
|
||||||
|
const onClickOutside = device.isMobile
|
||||||
|
? undefined
|
||||||
|
: () => setAppState({ openMenu: null });
|
||||||
|
return (
|
||||||
|
<DropdownMenu open={appState.openMenu === "canvas"}>
|
||||||
|
<DropdownMenu.Trigger
|
||||||
|
onToggle={() => {
|
||||||
|
setAppState({
|
||||||
|
openMenu: appState.openMenu === "canvas" ? null : "canvas",
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{HamburgerMenuIcon}
|
||||||
|
</DropdownMenu.Trigger>
|
||||||
|
<DropdownMenu.Content onClickOutside={onClickOutside}>
|
||||||
|
{children}
|
||||||
|
{device.isMobile && appState.collaborators.size > 0 && (
|
||||||
|
<fieldset className="UserList-Wrapper">
|
||||||
|
<legend>{t("labels.collaborators")}</legend>
|
||||||
|
<UserList mobile={true} collaborators={appState.collaborators} />
|
||||||
|
</fieldset>
|
||||||
|
)}
|
||||||
|
</DropdownMenu.Content>
|
||||||
|
</DropdownMenu>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
MainMenu.Trigger = DropdownMenu.Trigger;
|
||||||
|
MainMenu.Item = DropdownMenu.Item;
|
||||||
|
MainMenu.ItemLink = DropdownMenu.ItemLink;
|
||||||
|
MainMenu.ItemCustom = DropdownMenu.ItemCustom;
|
||||||
|
MainMenu.Group = DropdownMenu.Group;
|
||||||
|
MainMenu.Separator = DropdownMenu.Separator;
|
||||||
|
MainMenu.DefaultItems = DefaultItems;
|
||||||
|
|
||||||
|
export default MainMenu;
|
||||||
|
|
||||||
|
MainMenu.displayName = "Menu";
|
@ -569,6 +569,20 @@
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.UserList-Wrapper {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: none;
|
||||||
|
text-align: left;
|
||||||
|
|
||||||
|
legend {
|
||||||
|
display: block;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
font-weight: 400;
|
||||||
|
margin: 0 0 0.25rem;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.ErrorSplash.excalidraw {
|
.ErrorSplash.excalidraw {
|
||||||
|
@ -8,23 +8,21 @@ export const LanguageList = ({ style }: { style?: React.CSSProperties }) => {
|
|||||||
const [langCode, setLangCode] = useAtom(langCodeAtom);
|
const [langCode, setLangCode] = useAtom(langCodeAtom);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<select
|
||||||
<select
|
className="dropdown-select dropdown-select__language"
|
||||||
className="dropdown-select dropdown-select__language"
|
onChange={({ target }) => setLangCode(target.value)}
|
||||||
onChange={({ target }) => setLangCode(target.value)}
|
value={langCode}
|
||||||
value={langCode}
|
aria-label={i18n.t("buttons.selectLanguage")}
|
||||||
aria-label={i18n.t("buttons.selectLanguage")}
|
style={style}
|
||||||
style={style}
|
>
|
||||||
>
|
<option key={i18n.defaultLang.code} value={i18n.defaultLang.code}>
|
||||||
<option key={i18n.defaultLang.code} value={i18n.defaultLang.code}>
|
{i18n.defaultLang.label}
|
||||||
{i18n.defaultLang.label}
|
</option>
|
||||||
|
{languages.map((lang) => (
|
||||||
|
<option key={lang.code} value={lang.code}>
|
||||||
|
{lang.label}
|
||||||
</option>
|
</option>
|
||||||
{languages.map((lang) => (
|
))}
|
||||||
<option key={lang.code} value={lang.code}>
|
</select>
|
||||||
{lang.label}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</React.Fragment>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
&.theme--dark {
|
&.theme--dark {
|
||||||
--color-primary-contrast-offset: #726dff; // to offset Chubb illusion
|
--color-primary-contrast-offset: #726dff; // to offset Chubb illusion
|
||||||
}
|
}
|
||||||
.layer-ui__wrapper .layer-ui__wrapper__footer-center {
|
.footer-center {
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
margin-top: auto;
|
margin-top: auto;
|
||||||
margin-bottom: auto;
|
margin-bottom: auto;
|
||||||
@ -24,7 +24,29 @@
|
|||||||
height: 1.2rem;
|
height: 1.2rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-menu-container {
|
||||||
|
.dropdown-menu-item {
|
||||||
|
&.active-collab {
|
||||||
|
background-color: #ecfdf5;
|
||||||
|
color: #064e3c;
|
||||||
|
}
|
||||||
|
&.ExcalidrawPlus {
|
||||||
|
color: var(--color-promo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.theme--dark {
|
||||||
|
.dropdown-menu-item {
|
||||||
|
&.active-collab {
|
||||||
|
background-color: #064e3c;
|
||||||
|
color: #ecfdf5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.excalidraw-app.is-collaborating {
|
.excalidraw-app.is-collaborating {
|
||||||
[data-testid="clear-canvas-button"] {
|
[data-testid="clear-canvas-button"] {
|
||||||
display: none;
|
display: none;
|
||||||
|
@ -21,7 +21,12 @@ import {
|
|||||||
} from "../element/types";
|
} from "../element/types";
|
||||||
import { useCallbackRefState } from "../hooks/useCallbackRefState";
|
import { useCallbackRefState } from "../hooks/useCallbackRefState";
|
||||||
import { t } from "../i18n";
|
import { t } from "../i18n";
|
||||||
import { Excalidraw, defaultLang, Footer } from "../packages/excalidraw/index";
|
import {
|
||||||
|
Excalidraw,
|
||||||
|
defaultLang,
|
||||||
|
Footer,
|
||||||
|
MainMenu,
|
||||||
|
} from "../packages/excalidraw/index";
|
||||||
import {
|
import {
|
||||||
AppState,
|
AppState,
|
||||||
LibraryItems,
|
LibraryItems,
|
||||||
@ -79,8 +84,11 @@ import { reconcileElements } from "./collab/reconciliation";
|
|||||||
import { parseLibraryTokensFromUrl, useHandleLibrary } from "../data/library";
|
import { parseLibraryTokensFromUrl, useHandleLibrary } from "../data/library";
|
||||||
import { EncryptedIcon } from "./components/EncryptedIcon";
|
import { EncryptedIcon } from "./components/EncryptedIcon";
|
||||||
import { ExcalidrawPlusAppLink } from "./components/ExcalidrawPlusAppLink";
|
import { ExcalidrawPlusAppLink } from "./components/ExcalidrawPlusAppLink";
|
||||||
|
import { LanguageList } from "./components/LanguageList";
|
||||||
|
import { PlusPromoIcon } from "../components/icons";
|
||||||
|
|
||||||
polyfill();
|
polyfill();
|
||||||
|
|
||||||
window.EXCALIDRAW_THROTTLE_RENDER = true;
|
window.EXCALIDRAW_THROTTLE_RENDER = true;
|
||||||
|
|
||||||
const languageDetector = new LanguageDetector();
|
const languageDetector = new LanguageDetector();
|
||||||
@ -229,7 +237,6 @@ export const langCodeAtom = atom(
|
|||||||
const ExcalidrawWrapper = () => {
|
const ExcalidrawWrapper = () => {
|
||||||
const [errorMessage, setErrorMessage] = useState("");
|
const [errorMessage, setErrorMessage] = useState("");
|
||||||
const [langCode, setLangCode] = useAtom(langCodeAtom);
|
const [langCode, setLangCode] = useAtom(langCodeAtom);
|
||||||
|
|
||||||
// initial state
|
// initial state
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -594,6 +601,39 @@ const ExcalidrawWrapper = () => {
|
|||||||
localStorage.setItem(STORAGE_KEYS.LOCAL_STORAGE_LIBRARY, serializedItems);
|
localStorage.setItem(STORAGE_KEYS.LOCAL_STORAGE_LIBRARY, serializedItems);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const renderMenu = () => {
|
||||||
|
return (
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.DefaultItems.LoadScene />
|
||||||
|
<MainMenu.DefaultItems.SaveToActiveFile />
|
||||||
|
<MainMenu.DefaultItems.Export />
|
||||||
|
<MainMenu.DefaultItems.SaveAsImage />
|
||||||
|
<MainMenu.DefaultItems.LiveCollaboration
|
||||||
|
isCollaborating={isCollaborating}
|
||||||
|
onSelect={() => setCollabDialogShown(true)}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<MainMenu.DefaultItems.Help />
|
||||||
|
<MainMenu.DefaultItems.ClearCanvas />
|
||||||
|
<MainMenu.Separator />
|
||||||
|
<MainMenu.ItemLink
|
||||||
|
icon={PlusPromoIcon}
|
||||||
|
href="https://plus.excalidraw.com/plus?utm_source=excalidraw&utm_medium=app&utm_content=hamburger"
|
||||||
|
className="ExcalidrawPlus"
|
||||||
|
>
|
||||||
|
Excalidraw+
|
||||||
|
</MainMenu.ItemLink>
|
||||||
|
<MainMenu.DefaultItems.Socials />
|
||||||
|
<MainMenu.Separator />
|
||||||
|
<MainMenu.DefaultItems.ToggleTheme />
|
||||||
|
<MainMenu.ItemCustom>
|
||||||
|
<LanguageList style={{ width: "100%" }} />
|
||||||
|
</MainMenu.ItemCustom>
|
||||||
|
<MainMenu.DefaultItems.ChangeCanvasBackground />
|
||||||
|
</MainMenu>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
style={{ height: "100%" }}
|
style={{ height: "100%" }}
|
||||||
@ -640,6 +680,7 @@ const ExcalidrawWrapper = () => {
|
|||||||
autoFocus={true}
|
autoFocus={true}
|
||||||
theme={theme}
|
theme={theme}
|
||||||
>
|
>
|
||||||
|
{renderMenu()}
|
||||||
<Footer>
|
<Footer>
|
||||||
<div style={{ display: "flex", gap: ".5rem", alignItems: "center" }}>
|
<div style={{ display: "flex", gap: ".5rem", alignItems: "center" }}>
|
||||||
<ExcalidrawPlusAppLink />
|
<ExcalidrawPlusAppLink />
|
||||||
|
@ -15,6 +15,8 @@ Please add the latest change on the top under the correct section.
|
|||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
|
- Expose component API for the Excalidraw main menu [#6034](https://github.com/excalidraw/excalidraw/pull/6034), You can read more about its usage [here](https://github.com/excalidraw/excalidraw/blob/master/src/packages/excalidraw/README.md#MainMenu)
|
||||||
|
|
||||||
- Render Footer as a component instead of render prop [#5970](https://github.com/excalidraw/excalidraw/pull/5970). You can read more about its usage [here](https://github.com/excalidraw/excalidraw/blob/master/src/packages/excalidraw/README.md#Footer)
|
- Render Footer as a component instead of render prop [#5970](https://github.com/excalidraw/excalidraw/pull/5970). You can read more about its usage [here](https://github.com/excalidraw/excalidraw/blob/master/src/packages/excalidraw/README.md#Footer)
|
||||||
|
|
||||||
#### BREAKING CHANGE
|
#### BREAKING CHANGE
|
||||||
|
@ -405,6 +405,195 @@ const App = () => {
|
|||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
|
This will only for `Desktop` devices.
|
||||||
|
|
||||||
|
For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useDevice`](#useDevice) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { useDevice, Footer } from "@excalidraw/excalidraw";
|
||||||
|
|
||||||
|
const MobileFooter = ({
|
||||||
|
}) => {
|
||||||
|
const device = useDevice();
|
||||||
|
if (device.isMobile) {
|
||||||
|
return (
|
||||||
|
<Footer>
|
||||||
|
<button
|
||||||
|
className="custom-footer"
|
||||||
|
onClick={() => alert("This is custom footer in mobile menu")}
|
||||||
|
>
|
||||||
|
{" "}
|
||||||
|
custom footer{" "}
|
||||||
|
</button>
|
||||||
|
</Footer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
|
||||||
|
};
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item1")}> Item1 </MainMenu.Item>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item2")}> Item 2 </>
|
||||||
|
<MobileFooter/>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
You can visit the[ example](https://ehlz3.csb.app/) for working demo.
|
||||||
|
|
||||||
|
#### MainMenu
|
||||||
|
|
||||||
|
By default Excalidraw will render the `MainMenu` with default options. If you want to customise the `MainMenu`, you can pass the `MainMenu` component with the list options. You can visit [codesandbox example](https://ehlz3.csb.app/) for a working demo.
|
||||||
|
|
||||||
|
**Usage**
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { MainMenu } from "@excalidraw/excalidraw";
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item1")}> Item1 </MainMenu.Item>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item2")}> Item 2 </>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**MainMenu**
|
||||||
|
|
||||||
|
This is the `MainMenu` component which you need to import to render the menu with custom options.
|
||||||
|
|
||||||
|
**MainMenu.Item**
|
||||||
|
|
||||||
|
To render an item, its recommended to use `MainMenu.Item`.
|
||||||
|
|
||||||
|
| Prop | Type | Required | Default | Description |
|
||||||
|
| --- | --- | --- | --- | --- |
|
||||||
|
| `onSelect` | `Function` | Yes | `undefined` | The handler is triggered when the item is selected. |
|
||||||
|
| `children` | `React.ReactNode` | Yes | `undefined` | The content of the menu item |
|
||||||
|
| `icon` | `JSX.Element` | No | `undefined` | The icon used in the menu item |
|
||||||
|
| `shortcut` | `string` | No | `undefined` | The shortcut to be shown for the menu item |
|
||||||
|
| `className` | `string` | No | "" | The class names to be added to the menu item |
|
||||||
|
| `style` | `React.CSSProperties` | No | `undefined` | The inline styles to be added to the menu item |
|
||||||
|
| `ariaLabel` | `string` | `undefined` | No | The `aria-label` to be added to the item for accessibility |
|
||||||
|
| `dataTestId` | `string` | `undefined` | No | The `data-testid` to be added to the item. |
|
||||||
|
|
||||||
|
**MainMenu.ItemLink**
|
||||||
|
|
||||||
|
To render an item as a link, its recommended to use `MainMenu.ItemLink`.
|
||||||
|
|
||||||
|
**Usage**
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { MainMenu } from "@excalidraw/excalidraw";
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.ItemLink href="https://google.com">Google</MainMenu.ItemLink>
|
||||||
|
<MainMenu.ItemLink href="https://excalidraw.com">
|
||||||
|
Excalidraw
|
||||||
|
</MainMenu.ItemLink>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>;
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
| Prop | Type | Required | Default | Description |
|
||||||
|
| --- | --- | --- | --- | --- |
|
||||||
|
| `href` | `string` | Yes | `undefined` | The `href` attribute to be added to the `anchor` element. |
|
||||||
|
| `children` | `React.ReactNode` | Yes | `undefined` | The content of the menu item |
|
||||||
|
| `icon` | `JSX.Element` | No | `undefined` | The icon used in the menu item |
|
||||||
|
| `shortcut` | `string` | No | `undefined` | The shortcut to be shown for the menu item |
|
||||||
|
| `className` | `string` | No | "" | The class names to be added to the menu item |
|
||||||
|
| `style` | `React.CSSProperties` | No | `undefined` | The inline styles to be added to the menu item |
|
||||||
|
| `ariaLabel` | `string` | No | `undefined` | The `aria-label` to be added to the item for accessibility |
|
||||||
|
| `dataTestId` | `string` | No | `undefined` | The `data-testid` to be added to the item. |
|
||||||
|
|
||||||
|
**MainMenu.ItemCustom**
|
||||||
|
|
||||||
|
To render a custom item, you can use `MainMenu.ItemCustom`.
|
||||||
|
|
||||||
|
**Usage**
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { MainMenu } from "@excalidraw/excalidraw";
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.ItemCustom>
|
||||||
|
<button
|
||||||
|
style={{ height: "2rem" }}
|
||||||
|
onClick={() => window.alert("custom menu item")}
|
||||||
|
>
|
||||||
|
{" "}
|
||||||
|
custom item
|
||||||
|
</button>
|
||||||
|
</MainMenu.ItemCustom>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>;
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
| Prop | Type | Required | Default | Description |
|
||||||
|
| --- | --- | --- | --- | --- |
|
||||||
|
| `children` | `React.ReactNode` | Yes | `undefined` | The content of the menu item |
|
||||||
|
| `className` | `string` | No | "" | The class names to be added to the menu item |
|
||||||
|
| `style` | `React.CSSProperties` | No | `undefined` | The inline styles to be added to the menu item |
|
||||||
|
| `dataTestId` | `string` | No | `undefined` | The `data-testid` to be added to the item. |
|
||||||
|
|
||||||
|
**MainMenu.DefaultItems**
|
||||||
|
|
||||||
|
For the items which are shown in the menu in [excalidraw.com](https://excalidraw.com), you can use `MainMenu.DefaultItems`
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { MainMenu } from "@excalidraw/excalidraw";
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.DefaultItems.Socials/>
|
||||||
|
<MainMenu.DefaultItems.Export/>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item1")}> Item1 </MainMenu.Item>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item2")}> Item 2 </>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Here is a [complete list](https://github.com/excalidraw/excalidraw/blob/master/src/components/mainMenu/DefaultItems.tsx) of the default items.
|
||||||
|
|
||||||
|
**MainMenu.Group**
|
||||||
|
|
||||||
|
To Group item in the main menu, you can use `MainMenu.Group`
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { MainMenu } from "@excalidraw/excalidraw";
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.Group title="Excalidraw items">
|
||||||
|
<MainMenu.DefaultItems.Socials/>
|
||||||
|
<MainMenu.DefaultItems.Export/>
|
||||||
|
</MainMenu.Group>
|
||||||
|
<MainMenu.Group title="custom items">
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item1")}> Item1 </MainMenu.Item>
|
||||||
|
<MainMenu.Item onSelect={() => window.alert("Item2")}> Item 2 </>
|
||||||
|
</MainMenu.Group>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| Prop | Type | Required | Default | Description |
|
||||||
|
| --- | --- | --- | --- | --- |
|
||||||
|
| `children ` | `React.ReactNode` | Yes | `undefined` | The content of the `Menu Group` |
|
||||||
|
| `title` | `string` | No | `undefined` | The `title` for the grouped items |
|
||||||
|
| `className` | `string` | No | "" | The `classname` to be added to the group |
|
||||||
|
| `style` | `React.CSsSProperties` | No | `undefined` | The inline `styles` to be added to the group |
|
||||||
|
|
||||||
### Props
|
### Props
|
||||||
|
|
||||||
| Name | Type | Default | Description |
|
| Name | Type | Default | Description |
|
||||||
@ -1369,6 +1558,53 @@ viewportCoordsToSceneCoords({clientX: number, clientY: number}, appState: <a hre
|
|||||||
|
|
||||||
This function returns equivalent scene coords for the provided viewport coords in params.
|
This function returns equivalent scene coords for the provided viewport coords in params.
|
||||||
|
|
||||||
|
#### useDevice
|
||||||
|
|
||||||
|
This hook can be used to check the type of device which is being used. It can only be used inside the `children` of `Excalidraw` component
|
||||||
|
|
||||||
|
```js
|
||||||
|
import { useDevice, Footer } from "@excalidraw/excalidraw";
|
||||||
|
|
||||||
|
const MobileFooter = ({
|
||||||
|
}) => {
|
||||||
|
const device = useDevice();
|
||||||
|
if (device.isMobile) {
|
||||||
|
return (
|
||||||
|
<Footer>
|
||||||
|
<button
|
||||||
|
className="custom-footer"
|
||||||
|
onClick={() => alert("This is custom footer in mobile menu")}
|
||||||
|
>
|
||||||
|
{" "}
|
||||||
|
custom footer{" "}
|
||||||
|
</button>
|
||||||
|
</Footer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
|
||||||
|
};
|
||||||
|
const App = () => {
|
||||||
|
<Excalidraw>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.Item> Item1 </MainMenu.Item>
|
||||||
|
<MainMenu.Item> Item 2 </>
|
||||||
|
<MobileFooter/>
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
The `device` has the following `attributes`
|
||||||
|
|
||||||
|
| Name | Type | Description |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `isSmScreen` | `boolean` | Set to `true` when the device small screen is small (Width < `640px` ) |
|
||||||
|
| `isMobile` | `boolean` | Set to `true` when the device is `mobile` |
|
||||||
|
| `isTouchScreen` | `boolean` | Set to `true` for `touch` devices |
|
||||||
|
| `canDeviceFitSidebar` | `boolean` | Implies whether there is enough space to fit the `sidebar` |
|
||||||
|
|
||||||
### Exported constants
|
### Exported constants
|
||||||
|
|
||||||
#### `FONT_FAMILY`
|
#### `FONT_FAMILY`
|
||||||
|
@ -73,9 +73,4 @@
|
|||||||
.custom-element {
|
.custom-element {
|
||||||
padding: 0.1rem;
|
padding: 0.1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.excalidraw-container .layer-ui__wrapper .layer-ui__wrapper__footer-center {
|
|
||||||
// Remove once we stop importing langauge list from excalidraw app
|
|
||||||
justify-content: flex-start;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,8 @@ import {
|
|||||||
} from "../../../types";
|
} from "../../../types";
|
||||||
import { NonDeletedExcalidrawElement } from "../../../element/types";
|
import { NonDeletedExcalidrawElement } from "../../../element/types";
|
||||||
import { ImportedLibraryData } from "../../../data/types";
|
import { ImportedLibraryData } from "../../../data/types";
|
||||||
|
import CustomFooter from "./CustomFooter";
|
||||||
|
import MobileFooter from "./MobileFooter";
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
interface Window {
|
interface Window {
|
||||||
@ -69,24 +71,9 @@ const {
|
|||||||
restoreElements,
|
restoreElements,
|
||||||
Sidebar,
|
Sidebar,
|
||||||
Footer,
|
Footer,
|
||||||
|
MainMenu,
|
||||||
} = window.ExcalidrawLib;
|
} = window.ExcalidrawLib;
|
||||||
|
|
||||||
const COMMENT_SVG = (
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="2"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
className="feather feather-message-circle"
|
|
||||||
>
|
|
||||||
<path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path>
|
|
||||||
</svg>
|
|
||||||
);
|
|
||||||
const COMMENT_ICON_DIMENSION = 32;
|
const COMMENT_ICON_DIMENSION = 32;
|
||||||
const COMMENT_INPUT_HEIGHT = 50;
|
const COMMENT_INPUT_HEIGHT = 50;
|
||||||
const COMMENT_INPUT_WIDTH = 150;
|
const COMMENT_INPUT_WIDTH = 150;
|
||||||
@ -343,6 +330,7 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const renderCommentIcons = () => {
|
const renderCommentIcons = () => {
|
||||||
return Object.values(commentIcons).map((commentIcon) => {
|
return Object.values(commentIcons).map((commentIcon) => {
|
||||||
if (!excalidrawAPI) {
|
if (!excalidrawAPI) {
|
||||||
@ -495,6 +483,35 @@ export default function App() {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const renderMenu = () => {
|
||||||
|
return (
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.DefaultItems.SaveAsImage />
|
||||||
|
<MainMenu.DefaultItems.Export />
|
||||||
|
<MainMenu.Separator />
|
||||||
|
{isCollaborating && (
|
||||||
|
<MainMenu.DefaultItems.LiveCollaboration
|
||||||
|
onSelect={() => window.alert("You clicked on collab button")}
|
||||||
|
isCollaborating={isCollaborating}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<MainMenu.Group title="Excalidraw links">
|
||||||
|
<MainMenu.DefaultItems.Socials />
|
||||||
|
</MainMenu.Group>
|
||||||
|
<MainMenu.Separator />
|
||||||
|
<MainMenu.ItemCustom>
|
||||||
|
<button
|
||||||
|
style={{ height: "2rem" }}
|
||||||
|
onClick={() => window.alert("custom menu item")}
|
||||||
|
>
|
||||||
|
custom item
|
||||||
|
</button>
|
||||||
|
</MainMenu.ItemCustom>
|
||||||
|
<MainMenu.DefaultItems.Help />
|
||||||
|
{excalidrawAPI && <MobileFooter excalidrawAPI={excalidrawAPI} />}
|
||||||
|
</MainMenu>
|
||||||
|
);
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<div className="App" ref={appRef}>
|
<div className="App" ref={appRef}>
|
||||||
<h1> Excalidraw Example</h1>
|
<h1> Excalidraw Example</h1>
|
||||||
@ -675,43 +692,12 @@ export default function App() {
|
|||||||
onScrollChange={rerenderCommentIcons}
|
onScrollChange={rerenderCommentIcons}
|
||||||
renderSidebar={renderSidebar}
|
renderSidebar={renderSidebar}
|
||||||
>
|
>
|
||||||
<Footer>
|
{excalidrawAPI && (
|
||||||
<button
|
<Footer>
|
||||||
className="custom-element"
|
<CustomFooter excalidrawAPI={excalidrawAPI} />
|
||||||
onClick={() => {
|
</Footer>
|
||||||
excalidrawAPI?.setActiveTool({
|
)}
|
||||||
type: "custom",
|
{renderMenu()}
|
||||||
customType: "comment",
|
|
||||||
});
|
|
||||||
const url = `data:${MIME_TYPES.svg},${encodeURIComponent(
|
|
||||||
`<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
stroke-width="2"
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
class="feather feather-message-circle"
|
|
||||||
>
|
|
||||||
<path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path>
|
|
||||||
</svg>`,
|
|
||||||
)}`;
|
|
||||||
excalidrawAPI?.setCursor(`url(${url}), auto`);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{COMMENT_SVG}
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
className="custom-footer"
|
|
||||||
onClick={() => alert("This is dummy footer")}
|
|
||||||
>
|
|
||||||
{" "}
|
|
||||||
custom footer{" "}
|
|
||||||
</button>
|
|
||||||
</Footer>
|
|
||||||
</Excalidraw>
|
</Excalidraw>
|
||||||
{Object.keys(commentIcons || []).length > 0 && renderCommentIcons()}
|
{Object.keys(commentIcons || []).length > 0 && renderCommentIcons()}
|
||||||
{comment && renderComment()}
|
{comment && renderComment()}
|
||||||
|
65
src/packages/excalidraw/example/CustomFooter.tsx
Normal file
65
src/packages/excalidraw/example/CustomFooter.tsx
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
import { ExcalidrawImperativeAPI } from "../../../types";
|
||||||
|
import { MIME_TYPES } from "../entry";
|
||||||
|
const COMMENT_SVG = (
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="24"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
strokeWidth="2"
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
className="feather feather-message-circle"
|
||||||
|
>
|
||||||
|
<path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
const CustomFooter = ({
|
||||||
|
excalidrawAPI,
|
||||||
|
}: {
|
||||||
|
excalidrawAPI: ExcalidrawImperativeAPI;
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<button
|
||||||
|
className="custom-element"
|
||||||
|
onClick={() => {
|
||||||
|
excalidrawAPI?.setActiveTool({
|
||||||
|
type: "custom",
|
||||||
|
customType: "comment",
|
||||||
|
});
|
||||||
|
const url = `data:${MIME_TYPES.svg},${encodeURIComponent(
|
||||||
|
`<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="24"
|
||||||
|
height="24"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="2"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
class="feather feather-message-circle"
|
||||||
|
>
|
||||||
|
<path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path>
|
||||||
|
</svg>`,
|
||||||
|
)}`;
|
||||||
|
excalidrawAPI?.setCursor(`url(${url}), auto`);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{COMMENT_SVG}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
className="custom-footer"
|
||||||
|
onClick={() => alert("This is dummy footer")}
|
||||||
|
>
|
||||||
|
{" "}
|
||||||
|
custom footer{" "}
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default CustomFooter;
|
20
src/packages/excalidraw/example/MobileFooter.tsx
Normal file
20
src/packages/excalidraw/example/MobileFooter.tsx
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { ExcalidrawImperativeAPI } from "../../../types";
|
||||||
|
import CustomFooter from "./CustomFooter";
|
||||||
|
const { useDevice, Footer } = window.ExcalidrawLib;
|
||||||
|
|
||||||
|
const MobileFooter = ({
|
||||||
|
excalidrawAPI,
|
||||||
|
}: {
|
||||||
|
excalidrawAPI: ExcalidrawImperativeAPI;
|
||||||
|
}) => {
|
||||||
|
const device = useDevice();
|
||||||
|
if (device.isMobile) {
|
||||||
|
return (
|
||||||
|
<Footer>
|
||||||
|
<CustomFooter excalidrawAPI={excalidrawAPI} />
|
||||||
|
</Footer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
export default MobileFooter;
|
@ -11,6 +11,7 @@ import { DEFAULT_UI_OPTIONS } from "../../constants";
|
|||||||
import { Provider } from "jotai";
|
import { Provider } from "jotai";
|
||||||
import { jotaiScope, jotaiStore } from "../../jotai";
|
import { jotaiScope, jotaiStore } from "../../jotai";
|
||||||
import Footer from "../../components/footer/FooterCenter";
|
import Footer from "../../components/footer/FooterCenter";
|
||||||
|
import MainMenu from "../../components/mainMenu/MainMenu";
|
||||||
|
|
||||||
const ExcalidrawBase = (props: ExcalidrawProps) => {
|
const ExcalidrawBase = (props: ExcalidrawProps) => {
|
||||||
const {
|
const {
|
||||||
@ -239,3 +240,5 @@ export {
|
|||||||
|
|
||||||
export { Sidebar } from "../../components/Sidebar/Sidebar";
|
export { Sidebar } from "../../components/Sidebar/Sidebar";
|
||||||
export { Footer };
|
export { Footer };
|
||||||
|
export { MainMenu };
|
||||||
|
export { useDevice } from "../../components/App";
|
||||||
|
@ -14613,7 +14613,7 @@ Object {
|
|||||||
"offsetLeft": 0,
|
"offsetLeft": 0,
|
||||||
"offsetTop": 0,
|
"offsetTop": 0,
|
||||||
"openDialog": null,
|
"openDialog": null,
|
||||||
"openMenu": null,
|
"openMenu": "canvas",
|
||||||
"openPopup": null,
|
"openPopup": null,
|
||||||
"openSidebar": null,
|
"openSidebar": null,
|
||||||
"pasteDialog": Object {
|
"pasteDialog": Object {
|
||||||
@ -14672,7 +14672,7 @@ Object {
|
|||||||
|
|
||||||
exports[`regression tests rerenders UI on language change: [end of test] number of elements 1`] = `0`;
|
exports[`regression tests rerenders UI on language change: [end of test] number of elements 1`] = `0`;
|
||||||
|
|
||||||
exports[`regression tests rerenders UI on language change: [end of test] number of renders 1`] = `10`;
|
exports[`regression tests rerenders UI on language change: [end of test] number of renders 1`] = `11`;
|
||||||
|
|
||||||
exports[`regression tests shift click on selected element should deselect it on pointer up: [end of test] appState 1`] = `
|
exports[`regression tests shift click on selected element should deselect it on pointer up: [end of test] appState 1`] = `
|
||||||
Object {
|
Object {
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
|||||||
import { fireEvent, GlobalTestState, render } from "../test-utils";
|
import { fireEvent, GlobalTestState, toggleMenu, render } from "../test-utils";
|
||||||
import { Excalidraw, Footer } from "../../packages/excalidraw/index";
|
import { Excalidraw, Footer, MainMenu } from "../../packages/excalidraw/index";
|
||||||
import { queryByText, queryByTestId } from "@testing-library/react";
|
import { queryByText, queryByTestId } from "@testing-library/react";
|
||||||
import { GRID_SIZE, THEME } from "../../constants";
|
import { GRID_SIZE, THEME } from "../../constants";
|
||||||
import { t } from "../../i18n";
|
import { t } from "../../i18n";
|
||||||
@ -7,6 +7,12 @@ import { t } from "../../i18n";
|
|||||||
const { h } = window;
|
const { h } = window;
|
||||||
|
|
||||||
describe("<Excalidraw/>", () => {
|
describe("<Excalidraw/>", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
const menu = document.querySelector(".dropdown-menu");
|
||||||
|
if (menu) {
|
||||||
|
toggleMenu(document.querySelector(".excalidraw")!);
|
||||||
|
}
|
||||||
|
});
|
||||||
describe("Test zenModeEnabled prop", () => {
|
describe("Test zenModeEnabled prop", () => {
|
||||||
it('should show exit zen mode button when zen mode is set and zen mode option in context menu when zenModeEnabled is "undefined"', async () => {
|
it('should show exit zen mode button when zen mode is set and zen mode option in context menu when zenModeEnabled is "undefined"', async () => {
|
||||||
const { container } = await render(<Excalidraw />);
|
const { container } = await render(<Excalidraw />);
|
||||||
@ -56,9 +62,7 @@ describe("<Excalidraw/>", () => {
|
|||||||
<div>This is a custom footer</div>
|
<div>This is a custom footer</div>
|
||||||
</Excalidraw>,
|
</Excalidraw>,
|
||||||
);
|
);
|
||||||
expect(
|
expect(container.querySelector(".footer-center")).toBe(null);
|
||||||
container.querySelector(".layer-ui__wrapper__footer-center"),
|
|
||||||
).toBeEmptyDOMElement();
|
|
||||||
|
|
||||||
// Footer passed hence it will render the footer
|
// Footer passed hence it will render the footer
|
||||||
({ container } = await render(
|
({ container } = await render(
|
||||||
@ -68,12 +72,17 @@ describe("<Excalidraw/>", () => {
|
|||||||
</Footer>
|
</Footer>
|
||||||
</Excalidraw>,
|
</Excalidraw>,
|
||||||
));
|
));
|
||||||
expect(
|
expect(container.querySelector(".footer-center")).toMatchInlineSnapshot(`
|
||||||
container.querySelector(".layer-ui__wrapper__footer-center")?.innerHTML,
|
<div
|
||||||
).toMatchInlineSnapshot(
|
class="footer-center zen-mode-transition"
|
||||||
`"<div class=\\"layer-ui__wrapper__footer-center zen-mode-transition\\"><div>This is a custom footer</div></div>"`,
|
>
|
||||||
);
|
<div>
|
||||||
|
This is a custom footer
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("Test gridModeEnabled prop", () => {
|
describe("Test gridModeEnabled prop", () => {
|
||||||
it('should show grid mode in context menu when gridModeEnabled is "undefined"', async () => {
|
it('should show grid mode in context menu when gridModeEnabled is "undefined"', async () => {
|
||||||
const { container } = await render(<Excalidraw />);
|
const { container } = await render(<Excalidraw />);
|
||||||
@ -112,98 +121,51 @@ describe("<Excalidraw/>", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("Test theme prop", () => {
|
it("should render main menu with host menu items if passed from host", async () => {
|
||||||
it("should show the theme toggle by default", async () => {
|
const { container } = await render(
|
||||||
const { container } = await render(<Excalidraw />);
|
<Excalidraw UIOptions={undefined}>
|
||||||
|
<MainMenu>
|
||||||
expect(h.state.theme).toBe(THEME.LIGHT);
|
<MainMenu.Item onSelect={() => window.alert("Clicked")}>
|
||||||
|
Click me
|
||||||
queryByTestId(container, "menu-button")!.click();
|
</MainMenu.Item>
|
||||||
const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
|
<MainMenu.ItemLink href="blog.excalidaw.com">
|
||||||
expect(darkModeToggle).toBeTruthy();
|
Excalidraw blog
|
||||||
});
|
</MainMenu.ItemLink>
|
||||||
|
<MainMenu.ItemCustom>
|
||||||
it("should not show theme toggle when the theme prop is defined", async () => {
|
<button
|
||||||
const { container } = await render(<Excalidraw theme="dark" />);
|
style={{ height: "2rem" }}
|
||||||
expect(h.state.theme).toBe(THEME.DARK);
|
onClick={() => window.alert("custom menu item")}
|
||||||
expect(queryByTestId(container, "toggle-dark-mode")).toBe(null);
|
>
|
||||||
});
|
{" "}
|
||||||
|
custom menu item
|
||||||
it("should show theme mode toggle when `UIOptions.canvasActions.toggleTheme` is true", async () => {
|
</button>
|
||||||
const { container } = await render(
|
</MainMenu.ItemCustom>
|
||||||
<Excalidraw
|
<MainMenu.DefaultItems.Help />
|
||||||
theme={THEME.DARK}
|
</MainMenu>
|
||||||
UIOptions={{ canvasActions: { toggleTheme: true } }}
|
</Excalidraw>,
|
||||||
/>,
|
);
|
||||||
);
|
//open menu
|
||||||
expect(h.state.theme).toBe(THEME.DARK);
|
toggleMenu(container);
|
||||||
const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
|
expect(queryByTestId(container, "dropdown-menu")).toMatchSnapshot();
|
||||||
expect(darkModeToggle).toBeTruthy();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("should not show theme toggle when `UIOptions.canvasActions.toggleTheme` is false", async () => {
|
|
||||||
const { container } = await render(
|
|
||||||
<Excalidraw
|
|
||||||
UIOptions={{ canvasActions: { toggleTheme: false } }}
|
|
||||||
theme={THEME.DARK}
|
|
||||||
/>,
|
|
||||||
);
|
|
||||||
expect(h.state.theme).toBe(THEME.DARK);
|
|
||||||
const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
|
|
||||||
expect(darkModeToggle).toBeFalsy();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("Test name prop", () => {
|
|
||||||
it('should allow editing name when the name prop is "undefined"', async () => {
|
|
||||||
const { container } = await render(<Excalidraw />);
|
|
||||||
|
|
||||||
fireEvent.click(queryByTestId(container, "image-export-button")!);
|
|
||||||
const textInput: HTMLInputElement | null = document.querySelector(
|
|
||||||
".ExportDialog .ProjectName .TextInput",
|
|
||||||
);
|
|
||||||
expect(textInput?.value).toContain(`${t("labels.untitled")}`);
|
|
||||||
expect(textInput?.nodeName).toBe("INPUT");
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should set the name and not allow editing when the name prop is present"', async () => {
|
|
||||||
const name = "test";
|
|
||||||
const { container } = await render(<Excalidraw name={name} />);
|
|
||||||
|
|
||||||
await fireEvent.click(queryByTestId(container, "image-export-button")!);
|
|
||||||
const textInput = document.querySelector(
|
|
||||||
".ExportDialog .ProjectName .TextInput--readonly",
|
|
||||||
);
|
|
||||||
expect(textInput?.textContent).toEqual(name);
|
|
||||||
expect(textInput?.nodeName).toBe("SPAN");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("Test UIOptions prop", () => {
|
describe("Test UIOptions prop", () => {
|
||||||
it('should not hide any UI element when the UIOptions prop is "undefined"', async () => {
|
|
||||||
await render(<Excalidraw />);
|
|
||||||
|
|
||||||
const canvasActions = document.querySelector(
|
|
||||||
'section[aria-labelledby="test-id-canvasActions-title"]',
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(canvasActions).toMatchSnapshot();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("Test canvasActions", () => {
|
describe("Test canvasActions", () => {
|
||||||
it('should not hide any UI element when canvasActions is "undefined"', async () => {
|
it('should render menu with default items when "UIOPtions" is "undefined"', async () => {
|
||||||
await render(<Excalidraw UIOptions={{}} />);
|
const { container } = await render(
|
||||||
const canvasActions = document.querySelector(
|
<Excalidraw UIOptions={undefined} />,
|
||||||
'section[aria-labelledby="test-id-canvasActions-title"]',
|
|
||||||
);
|
);
|
||||||
expect(canvasActions).toMatchSnapshot();
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
expect(queryByTestId(container, "dropdown-menu")).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("should hide clear canvas button when clearCanvas is false", async () => {
|
it("should hide clear canvas button when clearCanvas is false", async () => {
|
||||||
const { container } = await render(
|
const { container } = await render(
|
||||||
<Excalidraw UIOptions={{ canvasActions: { clearCanvas: false } }} />,
|
<Excalidraw UIOptions={{ canvasActions: { clearCanvas: false } }} />,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "clear-canvas-button")).toBeNull();
|
expect(queryByTestId(container, "clear-canvas-button")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -211,7 +173,8 @@ describe("<Excalidraw/>", () => {
|
|||||||
const { container } = await render(
|
const { container } = await render(
|
||||||
<Excalidraw UIOptions={{ canvasActions: { export: false } }} />,
|
<Excalidraw UIOptions={{ canvasActions: { export: false } }} />,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "json-export-button")).toBeNull();
|
expect(queryByTestId(container, "json-export-button")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -219,7 +182,8 @@ describe("<Excalidraw/>", () => {
|
|||||||
const { container } = await render(
|
const { container } = await render(
|
||||||
<Excalidraw UIOptions={{ canvasActions: { saveAsImage: false } }} />,
|
<Excalidraw UIOptions={{ canvasActions: { saveAsImage: false } }} />,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "image-export-button")).toBeNull();
|
expect(queryByTestId(container, "image-export-button")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -237,7 +201,8 @@ describe("<Excalidraw/>", () => {
|
|||||||
UIOptions={{ canvasActions: { export: { saveFileToDisk: false } } }}
|
UIOptions={{ canvasActions: { export: { saveFileToDisk: false } } }}
|
||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "save-as-button")).toBeNull();
|
expect(queryByTestId(container, "save-as-button")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -247,7 +212,8 @@ describe("<Excalidraw/>", () => {
|
|||||||
UIOptions={{ canvasActions: { saveToActiveFile: false } }}
|
UIOptions={{ canvasActions: { saveToActiveFile: false } }}
|
||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "save-button")).toBeNull();
|
expect(queryByTestId(container, "save-button")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -257,7 +223,8 @@ describe("<Excalidraw/>", () => {
|
|||||||
UIOptions={{ canvasActions: { changeViewBackgroundColor: false } }}
|
UIOptions={{ canvasActions: { changeViewBackgroundColor: false } }}
|
||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "canvas-background-picker")).toBeNull();
|
expect(queryByTestId(container, "canvas-background-picker")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -265,12 +232,110 @@ describe("<Excalidraw/>", () => {
|
|||||||
const { container } = await render(
|
const { container } = await render(
|
||||||
<Excalidraw UIOptions={{ canvasActions: { toggleTheme: false } }} />,
|
<Excalidraw UIOptions={{ canvasActions: { toggleTheme: false } }} />,
|
||||||
);
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
expect(queryByTestId(container, "toggle-dark-mode")).toBeNull();
|
expect(queryByTestId(container, "toggle-dark-mode")).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should not render default items in custom menu even if passed if the prop in `canvasActions` is set to false", async () => {
|
||||||
|
const { container } = await render(
|
||||||
|
<Excalidraw UIOptions={{ canvasActions: { loadScene: false } }}>
|
||||||
|
<MainMenu>
|
||||||
|
<MainMenu.ItemCustom>
|
||||||
|
<button
|
||||||
|
style={{ height: "2rem" }}
|
||||||
|
onClick={() => window.alert("custom menu item")}
|
||||||
|
>
|
||||||
|
{" "}
|
||||||
|
custom item
|
||||||
|
</button>
|
||||||
|
</MainMenu.ItemCustom>
|
||||||
|
<MainMenu.DefaultItems.LoadScene />
|
||||||
|
</MainMenu>
|
||||||
|
</Excalidraw>,
|
||||||
|
);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
// load button shouldn't be rendered since `UIActions.canvasActions.loadScene` is `false`
|
||||||
|
expect(queryByTestId(container, "load-button")).toBeNull();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("Test theme prop", () => {
|
||||||
|
it("should show the theme toggle by default", async () => {
|
||||||
|
const { container } = await render(<Excalidraw />);
|
||||||
|
expect(h.state.theme).toBe(THEME.LIGHT);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
|
||||||
|
expect(darkModeToggle).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should not show theme toggle when the theme prop is defined", async () => {
|
||||||
|
const { container } = await render(<Excalidraw theme={THEME.DARK} />);
|
||||||
|
|
||||||
|
expect(h.state.theme).toBe(THEME.DARK);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
expect(queryByTestId(container, "toggle-dark-mode")).toBe(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should show theme mode toggle when `UIOptions.canvasActions.toggleTheme` is true", async () => {
|
||||||
|
const { container } = await render(
|
||||||
|
<Excalidraw
|
||||||
|
theme={THEME.DARK}
|
||||||
|
UIOptions={{ canvasActions: { toggleTheme: true } }}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
expect(h.state.theme).toBe(THEME.DARK);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
|
||||||
|
expect(darkModeToggle).toBeTruthy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should not show theme toggle when `UIOptions.canvasActions.toggleTheme` is false", async () => {
|
||||||
|
const { container } = await render(
|
||||||
|
<Excalidraw
|
||||||
|
UIOptions={{ canvasActions: { toggleTheme: false } }}
|
||||||
|
theme={THEME.DARK}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
expect(h.state.theme).toBe(THEME.DARK);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
|
||||||
|
expect(darkModeToggle).toBeFalsy();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Test name prop", () => {
|
||||||
|
it('should allow editing name when the name prop is "undefined"', async () => {
|
||||||
|
const { container } = await render(<Excalidraw />);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
fireEvent.click(queryByTestId(container, "image-export-button")!);
|
||||||
|
const textInput: HTMLInputElement | null = document.querySelector(
|
||||||
|
".ExportDialog .ProjectName .TextInput",
|
||||||
|
);
|
||||||
|
expect(textInput?.value).toContain(`${t("labels.untitled")}`);
|
||||||
|
expect(textInput?.nodeName).toBe("INPUT");
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should set the name and not allow editing when the name prop is present"', async () => {
|
||||||
|
const name = "test";
|
||||||
|
const { container } = await render(<Excalidraw name={name} />);
|
||||||
|
//open menu
|
||||||
|
toggleMenu(container);
|
||||||
|
await fireEvent.click(queryByTestId(container, "image-export-button")!);
|
||||||
|
const textInput = document.querySelector(
|
||||||
|
".ExportDialog .ProjectName .TextInput--readonly",
|
||||||
|
);
|
||||||
|
expect(textInput?.textContent).toEqual(name);
|
||||||
|
expect(textInput?.nodeName).toBe("SPAN");
|
||||||
|
});
|
||||||
|
});
|
||||||
describe("Test autoFocus prop", () => {
|
describe("Test autoFocus prop", () => {
|
||||||
it("should not focus when autoFocus is false", async () => {
|
it("should not focus when autoFocus is false", async () => {
|
||||||
const { container } = await render(<Excalidraw />);
|
const { container } = await render(<Excalidraw />);
|
||||||
|
@ -446,7 +446,7 @@ describe("regression tests", () => {
|
|||||||
UI.clickTool("rectangle");
|
UI.clickTool("rectangle");
|
||||||
// english lang should display `thin` label
|
// english lang should display `thin` label
|
||||||
expect(screen.queryByTitle(/thin/i)).not.toBeNull();
|
expect(screen.queryByTitle(/thin/i)).not.toBeNull();
|
||||||
fireEvent.click(document.querySelector(".menu-button")!);
|
fireEvent.click(document.querySelector(".dropdown-menu-button")!);
|
||||||
|
|
||||||
fireEvent.change(document.querySelector(".dropdown-select__language")!, {
|
fireEvent.change(document.querySelector(".dropdown-select__language")!, {
|
||||||
target: { value: "de-DE" },
|
target: { value: "de-DE" },
|
||||||
|
@ -6,6 +6,7 @@ import {
|
|||||||
RenderResult,
|
RenderResult,
|
||||||
RenderOptions,
|
RenderOptions,
|
||||||
waitFor,
|
waitFor,
|
||||||
|
fireEvent,
|
||||||
} from "@testing-library/react";
|
} from "@testing-library/react";
|
||||||
|
|
||||||
import * as toolQueries from "./queries/toolQueries";
|
import * as toolQueries from "./queries/toolQueries";
|
||||||
@ -184,3 +185,8 @@ export const assertSelectedElements = (
|
|||||||
expect(selectedElementIds.length).toBe(ids.length);
|
expect(selectedElementIds.length).toBe(ids.length);
|
||||||
expect(selectedElementIds).toEqual(expect.arrayContaining(ids));
|
expect(selectedElementIds).toEqual(expect.arrayContaining(ids));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const toggleMenu = (container: HTMLElement) => {
|
||||||
|
// open menu
|
||||||
|
fireEvent.click(container.querySelector(".dropdown-menu-button")!);
|
||||||
|
};
|
||||||
|
@ -161,7 +161,7 @@ export type AppState = {
|
|||||||
| "strokeColorPicker"
|
| "strokeColorPicker"
|
||||||
| null;
|
| null;
|
||||||
openSidebar: "library" | "customSidebar" | null;
|
openSidebar: "library" | "customSidebar" | null;
|
||||||
openDialog: "imageExport" | "help" | null;
|
openDialog: "imageExport" | "help" | "jsonExport" | null;
|
||||||
isSidebarDocked: boolean;
|
isSidebarDocked: boolean;
|
||||||
|
|
||||||
lastPointerDownWith: PointerType;
|
lastPointerDownWith: PointerType;
|
||||||
@ -517,7 +517,7 @@ export type Device = Readonly<{
|
|||||||
}>;
|
}>;
|
||||||
|
|
||||||
export type UIChildrenComponents = {
|
export type UIChildrenComponents = {
|
||||||
[k in "FooterCenter"]?:
|
[k in "FooterCenter" | "Menu"]?:
|
||||||
| React.ReactPortal
|
| React.ReactPortal
|
||||||
| React.ReactElement<unknown, string | React.JSXElementConstructor<any>>;
|
| React.ReactElement<unknown, string | React.JSXElementConstructor<any>>;
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user