change css back to original

src/actions/actionCanvas.tsx

@@ -18,7 +18,6 @@ import {
   getDefaultAppState,
   isEraserActive,
   isHandToolActive,
-  isLaserPointerActive,
 } from "../appState";
 import { DEFAULT_CANVAS_BACKGROUND_PICKS } from "../colors";
 import { Bounds } from "../element/bounds";
@@ -440,44 +439,3 @@ export const actionToggleHandTool = register({
   },
   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",
-});

src/actions/shortcuts.ts

@@ -36,7 +36,6 @@ export type ShortcutName =
       | "flipVertical"
       | "hyperlink"
       | "toggleElementLock"
-      | "toggleLaserPointerTool"
     >
   | "saveScene"
   | "imageExport";
@@ -84,7 +83,6 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   viewMode: [getShortcutKey("Alt+R")],
   hyperlink: [getShortcutKey("CtrlOrCmd+K")],
   toggleElementLock: [getShortcutKey("CtrlOrCmd+Shift+L")],
-  toggleLaserPointerTool: [getShortcutKey("K")],
 };
 
 export const getShortcutFromShortcutName = (name: ShortcutName) => {

src/actions/types.ts

@@ -124,8 +124,7 @@ export type ActionName =
   | "setFrameAsActiveTool"
   | "setEmbeddableAsActiveTool"
   | "createContainerFromText"
-  | "wrapTextInContainer"
-  | "toggleLaserPointerTool";
+  | "wrapTextInContainer";
 
 export type PanelComponentProps = {
   elements: readonly ExcalidrawElement[];

src/appState.ts

@@ -266,11 +266,3 @@ export const isHandToolActive = ({
 }) => {
   return activeTool.type === "hand";
 };
-
-export const isLaserPointerActive = ({
-  activeTool,
-}: {
-  activeTool: AppState["activeTool"];
-}) => {
-  return activeTool.type === "laser";
-};

src/components/App.tsx

@@ -46,7 +46,6 @@ import {
   getDefaultAppState,
   isEraserActive,
   isHandToolActive,
-  isLaserPointerActive,
 } from "../appState";
 import { parseClipboard } from "../clipboard";
 import {
@@ -344,11 +343,7 @@ import {
   actionRemoveAllElementsFromFrame,
   actionSelectAllElementsInFrame,
 } from "../actions/actionFrame";
-import {
-  actionToggleHandTool,
-  zoomToFit,
-  actionToggleLaserPointer,
-} from "../actions/actionCanvas";
+import { actionToggleHandTool, zoomToFit } from "../actions/actionCanvas";
 import { jotaiStore } from "../jotai";
 import { activeConfirmDialogAtom } from "./ActiveConfirmDialog";
 import {
@@ -2915,22 +2910,7 @@ class App extends React.Component<AppProps, AppState> {
         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) {
-        //revert to hand in case a key is pressed (K is handled above)
-        if (event.key !== KEYS.K) {
-          this.setActiveTool({ type: "selection" });
-        }
         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 (
         event[KEYS.CTRL_OR_CMD] &&
         (event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE)
@@ -3623,18 +3612,6 @@ class App extends React.Component<AppProps, AppState> {
     if (this.state.multiElement) {
       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
     if (this.state.activeTool.type !== "selection") {
       return;
@@ -4762,7 +4739,7 @@ class App extends React.Component<AppProps, AppState> {
         (event.button === POINTER_BUTTON.WHEEL ||
           (event.button === POINTER_BUTTON.MAIN && isHoldingSpace) ||
           isHandToolActive(this.state) ||
-          (this.state.viewModeEnabled && !isLaserPointerActive(this.state)))
+          this.state.viewModeEnabled)
       ) ||
       isTextElement(this.state.editingElement)
     ) {
@@ -8166,7 +8143,6 @@ class App extends React.Component<AppProps, AppState> {
           actionToggleZenMode,
           actionToggleViewMode,
           actionToggleStats,
-          actionToggleLaserPointer,
         ];
       }
 

src/components/LaserTool/LaserPathManager.ts

@@ -106,6 +106,13 @@ export class LaserPathManager {
   }
 
   startPath(x: number, y: number) {
+    if (this.container) {
+      this.container.style.top = "0px";
+      this.container.style.left = "0px";
+      const { x, y } = this.container.getBoundingClientRect();
+      this.container.style.top = `${-y}px`;
+      this.container.style.left = `${-x}px`;
+    }
     this.ownState.currentPath = instantiatePath();
     this.ownState.currentPath.addPoint([x, y, performance.now()]);
     this.updatePath(this.ownState);

src/components/LaserTool/LaserToolOverlay.scss

@@ -6,7 +6,6 @@
     position: fixed;
     top: 0;
     left: 0;
-
     z-index: 2;
 
     .LaserToolOverlayCanvas {

src/components/canvases/InteractiveCanvas.tsx

@@ -155,7 +155,9 @@ const InteractiveCanvas = (props: InteractiveCanvasProps) => {
       onPointerCancel={props.onPointerCancel}
       onTouchMove={props.onTouchMove}
       onPointerDown={props.onPointerDown}
-      onDoubleClick={props.onDoubleClick}
+      onDoubleClick={
+        props.appState.viewModeEnabled ? undefined : props.onDoubleClick
+      }
     >
       {t("labels.drawingCanvas")}
     </canvas>

src/locales/en.json

@@ -1,6 +1,5 @@
 {
   "labels": {
-    "laser": "Toggle laser pointer",
     "paste": "Paste",
     "pasteAsPlaintext": "Paste as plaintext",
     "pasteCharts": "Paste charts",