marcel/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-09-21 08:20:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into danieljgeiger-mathjax

Browse Source
This commit is contained in:
Daniel J. Geiger
2023-01-07 11:58:15 -06:00
parent 8c558a0f33 40d53d9231
commit 45faf7d58f
82 changed files with 750 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/App.tsx
View File

@@ -323,9 +323,9 @@ const ExcalidrawSetAppStateContext = React.createContext<
>(() => {});
ExcalidrawSetAppStateContext.displayName = "ExcalidrawSetAppStateContext";
const ExcalidrawActionManagerContext = React.createContext<
ActionManager | { renderAction: ActionManager["renderAction"] }
>({ renderAction: () => null });
const ExcalidrawActionManagerContext = React.createContext<ActionManager>(
null!,
);
ExcalidrawActionManagerContext.displayName = "ExcalidrawActionManagerContext";
export const useExcalidrawElements = () =>
@@ -6247,15 +6247,15 @@ class App extends React.Component<AppProps, AppState> {
const appState = this.actionManager.getAppState();
let addedCustom = false;
getCustomActions().forEach((action) => {
if (action.contextItemPredicate && type !== "shape") {
if (action.predicate && type !== "shape") {
if (
action.contextItemPredicate!(
action.predicate!(
allElements,
appState,
this.actionManager.app.props,
this.actionManager.app,
) &&
this.actionManager.isActionEnabled(allElements, appState, action.name)
this.actionManager.isActionEnabled(action)
) {
addedCustom = true;
options.push(action);
@@ -6263,7 +6263,7 @@ class App extends React.Component<AppProps, AppState> {
} else if (action.shapeConfigPredicate && type === "shape") {
if (
action.shapeConfigPredicate!(allElements, appState, { source }) &&
this.actionManager.isActionEnabled(allElements, appState, action.name)
this.actionManager.isActionEnabled(action)
) {
options.push(action);
}