"Select All" only appears when clicking outside of a shape via actionFilter (#329)

Co-authored-by: Christopher Chedeau <vjeuxx@gmail.com>
This commit is contained in:
Jeremy Press 2020-01-12 07:10:15 -08:00 committed by Christopher Chedeau
parent 88a9cee8bb
commit abf2aaa102
3 changed files with 25 additions and 6 deletions

View file

@ -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,