Virtual whiteboard for sketching hand-drawn like diagrams
"Select All" only appears when clicking outside of a shape via actionFilter (#329)
Jeremy Pressabf2aaa102b7
diff --git a/src/actions/manager.tsx b/src/actions/manager.tsxindex b50d1d2681..cc2049217b 100644--- a/src/actions/manager.tsx+++ b/src/actions/manager.tsx@@ -1,5 +1,10 @@import React from "react";-import { Action, ActionsManagerInterface, UpdaterFn } from "./types";+import {+ Action,+ ActionsManagerInterface,+ UpdaterFn,+ ActionFilterFn+} from "./types";import { ExcalidrawElement } from "../element/types";import { AppState } from "../types";@@ -40,9 +45,11 @@ export class ActionManager implements ActionsManagerInterface {getContextMenuItems(elements: readonly ExcalidrawElement[],appState: AppState,- updater: UpdaterFn+ updater: UpdaterFn,+ actionFilter: ActionFilterFn = action => action) {return Object.values(this.actions)+ .filter(actionFilter).filter(action => "contextItemLabel" in action).sort((a, b) =>diff --git a/src/actions/types.ts b/src/actions/types.tsindex ba989c5cb4..3ebb2b985d 100644--- a/src/actions/types.ts+++ b/src/actions/types.ts@@ -14,6 +14,7 @@ type ActionFn = () => ActionResult;export type UpdaterFn = (res: ActionResult) => void;+export type ActionFilterFn = (action: Action) => void;export interface Action {name: string;@@ -46,7 +47,8 @@ export interface ActionsManagerInterface {getContextMenuItems: (elements: readonly ExcalidrawElement[],appState: AppState,- updater: UpdaterFn+ updater: UpdaterFn,+ actionFilter: ActionFilterFn) => { label: string; action: () => void }[];renderAction: (name: string,diff --git a/src/index.tsx b/src/index.tsxindex 3652773d31..59b07a900c 100644--- a/src/index.tsx+++ b/src/index.tsx@@ -64,7 +64,7 @@ import {actionPasteStyles} from "./actions";import { SidePanel } from "./components/SidePanel";-import { ActionResult } from "./actions/types";+import { Action, ActionResult } from "./actions/types";import { getDefaultAppState } from "./appState";let { elements } = createScene();@@ -123,6 +123,7 @@ export class App extends React.Component<{}, AppState> {rc: RoughCanvas | null = null;actionManager: ActionManager = new ActionManager();+ canvasOnlyActions: Array<Action>;constructor(props: any) {super(props);this.actionManager.registerAction(actionDeleteSelected);@@ -151,6 +152,8 @@ export class App extends React.Component<{}, AppState> {this.actionManager.registerAction(actionCopyStyles);this.actionManager.registerAction(actionPasteStyles);++ this.canvasOnlyActions = [actionSelectAll];}private syncActionResult = (res: ActionResult) => {@@ -398,7 +401,13 @@ export class App extends React.Component<{}, AppState> {navigator.clipboard && {label: "Paste",action: () => this.pasteFromClipboard()- }+ },+ ...this.actionManager.getContextMenuItems(+ elements,+ this.state,+ this.syncActionResult,+ action => this.canvasOnlyActions.includes(action)+ )],top: e.clientY,left: e.clientX@@ -425,7 +434,8 @@ export class App extends React.Component<{}, AppState> {...this.actionManager.getContextMenuItems(elements,this.state,- this.syncActionResult+ this.syncActionResult,+ action => !this.canvasOnlyActions.includes(action))],top: e.clientY,