Compare commits

..
Author SHA1 Message Date
dependabot[bot]andGitHub 658248d1da build(deps): bump postcss from 8.4.24 to 8.4.31
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.24 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.24...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-05 15:05:57 +00:00
9 changed files with 23 additions and 124 deletions
-42
View File
@@ -18,7 +18,6 @@ import {
getDefaultAppState, getDefaultAppState,
isEraserActive, isEraserActive,
isHandToolActive, isHandToolActive,
isLaserPointerActive,
} from "../appState"; } from "../appState";
import { DEFAULT_CANVAS_BACKGROUND_PICKS } from "../colors"; import { DEFAULT_CANVAS_BACKGROUND_PICKS } from "../colors";
import { Bounds } from "../element/bounds"; import { Bounds } from "../element/bounds";
@@ -440,44 +439,3 @@ export const actionToggleHandTool = register({
}, },
keyTest: (event) => event.key === KEYS.H, keyTest: (event) => event.key === KEYS.H,
}); });
export const actionToggleLaserPointer = register({
name: "toggleLaserPointerTool",
viewMode: true,
trackEvent: { category: "menu" },
perform(elements, appState, _, app) {
let activeTool: AppState["activeTool"];
if (isLaserPointerActive(appState)) {
activeTool = updateActiveTool(appState, {
...(appState.activeTool.lastActiveTool || {
type: appState.viewModeEnabled ? "hand" : "selection",
}),
lastActiveToolBeforeEraser: null,
});
setCursor(
app.interactiveCanvas,
appState.viewModeEnabled ? CURSOR_TYPE.GRAB : CURSOR_TYPE.POINTER,
);
} else {
activeTool = updateActiveTool(appState, {
type: "laser",
lastActiveToolBeforeEraser: appState.activeTool,
});
setCursor(app.interactiveCanvas, CURSOR_TYPE.CROSSHAIR);
}
return {
appState: {
...appState,
selectedElementIds: {},
selectedGroupIds: {},
activeEmbeddable: null,
activeTool,
},
commitToHistory: true,
};
},
checked: (appState) => appState.activeTool.type === "laser",
contextItemLabel: "labels.laser",
});
-2
View File
@@ -36,7 +36,6 @@ export type ShortcutName =
| "flipVertical" | "flipVertical"
| "hyperlink" | "hyperlink"
| "toggleElementLock" | "toggleElementLock"
| "toggleLaserPointerTool"
> >
| "saveScene" | "saveScene"
| "imageExport"; | "imageExport";
@@ -84,7 +83,6 @@ const shortcutMap: Record<ShortcutName, string[]> = {
viewMode: [getShortcutKey("Alt+R")], viewMode: [getShortcutKey("Alt+R")],
hyperlink: [getShortcutKey("CtrlOrCmd+K")], hyperlink: [getShortcutKey("CtrlOrCmd+K")],
toggleElementLock: [getShortcutKey("CtrlOrCmd+Shift+L")], toggleElementLock: [getShortcutKey("CtrlOrCmd+Shift+L")],
toggleLaserPointerTool: [getShortcutKey("K")],
}; };
export const getShortcutFromShortcutName = (name: ShortcutName) => { export const getShortcutFromShortcutName = (name: ShortcutName) => {
+1 -2
View File
@@ -124,8 +124,7 @@ export type ActionName =
| "setFrameAsActiveTool" | "setFrameAsActiveTool"
| "setEmbeddableAsActiveTool" | "setEmbeddableAsActiveTool"
| "createContainerFromText" | "createContainerFromText"
| "wrapTextInContainer" | "wrapTextInContainer";
| "toggleLaserPointerTool";
export type PanelComponentProps = { export type PanelComponentProps = {
elements: readonly ExcalidrawElement[]; elements: readonly ExcalidrawElement[];
-8
View File
@@ -266,11 +266,3 @@ export const isHandToolActive = ({
}) => { }) => {
return activeTool.type === "hand"; return activeTool.type === "hand";
}; };
export const isLaserPointerActive = ({
activeTool,
}: {
activeTool: AppState["activeTool"];
}) => {
return activeTool.type === "laser";
};
+11 -35
View File
@@ -46,7 +46,6 @@ import {
getDefaultAppState, getDefaultAppState,
isEraserActive, isEraserActive,
isHandToolActive, isHandToolActive,
isLaserPointerActive,
} from "../appState"; } from "../appState";
import { parseClipboard } from "../clipboard"; import { parseClipboard } from "../clipboard";
import { import {
@@ -344,11 +343,7 @@ import {
actionRemoveAllElementsFromFrame, actionRemoveAllElementsFromFrame,
actionSelectAllElementsInFrame, actionSelectAllElementsInFrame,
} from "../actions/actionFrame"; } from "../actions/actionFrame";
import { import { actionToggleHandTool, zoomToFit } from "../actions/actionCanvas";
actionToggleHandTool,
zoomToFit,
actionToggleLaserPointer,
} from "../actions/actionCanvas";
import { jotaiStore } from "../jotai"; import { jotaiStore } from "../jotai";
import { activeConfirmDialogAtom } from "./ActiveConfirmDialog"; import { activeConfirmDialogAtom } from "./ActiveConfirmDialog";
import { import {
@@ -2915,22 +2910,7 @@ class App extends React.Component<AppProps, AppState> {
return; return;
} }
if (event.key === KEYS.K && !event.altKey && !event[KEYS.CTRL_OR_CMD]) {
if (isLaserPointerActive(this.state)) {
this.setActiveTool({
type: "selection",
});
} else {
this.setActiveTool({ type: "laser" });
}
return;
}
if (this.state.viewModeEnabled) { if (this.state.viewModeEnabled) {
//revert to hand in case a key is pressed (K is handled above)
if (event.key !== KEYS.K) {
this.setActiveTool({ type: "selection" });
}
return; return;
} }
@@ -3080,6 +3060,15 @@ class App extends React.Component<AppProps, AppState> {
} }
} }
if (event.key === KEYS.K && !event.altKey && !event[KEYS.CTRL_OR_CMD]) {
if (this.state.activeTool.type === "laser") {
this.setActiveTool({ type: "selection" });
} else {
this.setActiveTool({ type: "laser" });
}
return;
}
if ( if (
event[KEYS.CTRL_OR_CMD] && event[KEYS.CTRL_OR_CMD] &&
(event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE) (event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE)
@@ -3623,18 +3612,6 @@ class App extends React.Component<AppProps, AppState> {
if (this.state.multiElement) { if (this.state.multiElement) {
return; return;
} }
if (this.state.viewModeEnabled) {
if (this.state.activeTool.type === "laser") {
this.setActiveTool({ type: "selection" });
setCursor(this.interactiveCanvas, CURSOR_TYPE.GRAB);
} else {
this.setActiveTool({ type: "laser" });
setCursor(this.interactiveCanvas, CURSOR_TYPE.CROSSHAIR);
}
return;
}
// we should only be able to double click when mode is selection // we should only be able to double click when mode is selection
if (this.state.activeTool.type !== "selection") { if (this.state.activeTool.type !== "selection") {
return; return;
@@ -4762,7 +4739,7 @@ class App extends React.Component<AppProps, AppState> {
(event.button === POINTER_BUTTON.WHEEL || (event.button === POINTER_BUTTON.WHEEL ||
(event.button === POINTER_BUTTON.MAIN && isHoldingSpace) || (event.button === POINTER_BUTTON.MAIN && isHoldingSpace) ||
isHandToolActive(this.state) || isHandToolActive(this.state) ||
(this.state.viewModeEnabled && !isLaserPointerActive(this.state))) this.state.viewModeEnabled)
) || ) ||
isTextElement(this.state.editingElement) isTextElement(this.state.editingElement)
) { ) {
@@ -8166,7 +8143,6 @@ class App extends React.Component<AppProps, AppState> {
actionToggleZenMode, actionToggleZenMode,
actionToggleViewMode, actionToggleViewMode,
actionToggleStats, actionToggleStats,
actionToggleLaserPointer,
]; ];
} }
+4 -20
View File
@@ -91,7 +91,7 @@ export class LaserPathManager {
private collaboratorsState: Map<string, CollabolatorState> = new Map(); private collaboratorsState: Map<string, CollabolatorState> = new Map();
private rafId: number | undefined; private rafId: number | undefined;
private isDrawing = false; private lastUpdate = 0;
private container: SVGSVGElement | undefined; private container: SVGSVGElement | undefined;
constructor(private app: App) { constructor(private app: App) {
@@ -100,7 +100,7 @@ export class LaserPathManager {
destroy() { destroy() {
this.stop(); this.stop();
this.isDrawing = false; this.lastUpdate = 0;
this.ownState = instantiateCollabolatorState(); this.ownState = instantiateCollabolatorState();
this.collaboratorsState = new Map(); this.collaboratorsState = new Map();
} }
@@ -127,7 +127,7 @@ export class LaserPathManager {
} }
private updatePath(state: CollabolatorState) { private updatePath(state: CollabolatorState) {
this.isDrawing = true; this.lastUpdate = performance.now();
if (!this.isRunning) { if (!this.isRunning) {
this.start(); this.start();
@@ -160,7 +160,7 @@ export class LaserPathManager {
this.updateCollabolatorsState(); this.updateCollabolatorsState();
if (this.isDrawing) { if (performance.now() - this.lastUpdate < DECAY_TIME * 2) {
this.update(); this.update();
} else { } else {
this.isRunning = false; this.isRunning = false;
@@ -250,8 +250,6 @@ export class LaserPathManager {
return; return;
} }
let somePathsExist = false;
for (const [key, state] of this.collaboratorsState.entries()) { for (const [key, state] of this.collaboratorsState.entries()) {
if (!this.app.state.collaborators.has(key)) { if (!this.app.state.collaborators.has(key)) {
state.svg.remove(); state.svg.remove();
@@ -271,10 +269,6 @@ export class LaserPathManager {
paths += ` ${this.draw(state.currentPath)}`; paths += ` ${this.draw(state.currentPath)}`;
} }
if (paths.trim()) {
somePathsExist = true;
}
state.svg.setAttribute("d", paths); state.svg.setAttribute("d", paths);
state.svg.setAttribute("fill", getClientColor(key)); state.svg.setAttribute("fill", getClientColor(key));
} }
@@ -293,17 +287,7 @@ export class LaserPathManager {
paths += ` ${this.draw(this.ownState.currentPath)}`; paths += ` ${this.draw(this.ownState.currentPath)}`;
} }
paths = paths.trim();
if (paths) {
somePathsExist = true;
}
this.ownState.svg.setAttribute("d", paths); this.ownState.svg.setAttribute("d", paths);
this.ownState.svg.setAttribute("fill", "red"); this.ownState.svg.setAttribute("fill", "red");
if (!somePathsExist) {
this.isDrawing = false;
}
} }
} }
@@ -155,7 +155,9 @@ const InteractiveCanvas = (props: InteractiveCanvasProps) => {
onPointerCancel={props.onPointerCancel} onPointerCancel={props.onPointerCancel}
onTouchMove={props.onTouchMove} onTouchMove={props.onTouchMove}
onPointerDown={props.onPointerDown} onPointerDown={props.onPointerDown}
onDoubleClick={props.onDoubleClick} onDoubleClick={
props.appState.viewModeEnabled ? undefined : props.onDoubleClick
}
> >
{t("labels.drawingCanvas")} {t("labels.drawingCanvas")}
</canvas> </canvas>
-1
View File
@@ -1,6 +1,5 @@
{ {
"labels": { "labels": {
"laser": "Toggle laser pointer",
"paste": "Paste", "paste": "Paste",
"pasteAsPlaintext": "Paste as plaintext", "pasteAsPlaintext": "Paste as plaintext",
"pasteCharts": "Paste charts", "pasteCharts": "Paste charts",
+4 -13
View File
@@ -5994,19 +5994,10 @@ portfinder@^1.0.28:
debug "^3.2.7" debug "^3.2.7"
mkdirp "^0.5.6" mkdirp "^0.5.6"
postcss@^8.4.23: postcss@^8.4.23, postcss@^8.4.24:
version "8.4.24" version "8.4.31"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg== integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
source-map-js "^1.0.2"
postcss@^8.4.24:
version "8.4.25"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.25.tgz#4a133f5e379eda7f61e906c3b1aaa9b81292726f"
integrity sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==
dependencies: dependencies:
nanoid "^3.3.6" nanoid "^3.3.6"
picocolors "^1.0.0" picocolors "^1.0.0"