persist perferred selection tool and align tablet as well

packages/excalidraw/actions/actionCanvas.tsx

@@ -122,7 +122,7 @@ export const actionClearCanvas = register({
         pasteDialog: appState.pasteDialog,
         activeTool:
           appState.activeTool.type === "image"
-            ? { ...appState.activeTool, type: app.defaultSelectionTool }
+            ? { ...appState.activeTool, type: app.state.preferredSelectionTool }
             : appState.activeTool,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
@@ -501,7 +501,7 @@ export const actionToggleEraserTool = register({
     if (isEraserActive(appState)) {
       activeTool = updateActiveTool(appState, {
         ...(appState.activeTool.lastActiveTool || {
-          type: app.defaultSelectionTool,
+          type: app.state.preferredSelectionTool,
         }),
         lastActiveToolBeforeEraser: null,
       });
@@ -532,7 +532,7 @@ export const actionToggleLassoTool = register({
   icon: LassoIcon,
   trackEvent: { category: "toolbar" },
   predicate: (elements, appState, props, app) => {
-    return app.defaultSelectionTool !== "lasso";
+    return app.state.preferredSelectionTool !== "lasso";
   },
   perform: (elements, appState, _, app) => {
     let activeTool: AppState["activeTool"];

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -303,7 +303,7 @@ export const actionDeleteSelected = register({
       appState: {
         ...nextAppState,
         activeTool: updateActiveTool(appState, {
-          type: app.defaultSelectionTool,
+          type: app.state.preferredSelectionTool,
         }),
         multiElement: null,
         activeEmbeddable: null,

packages/excalidraw/actions/actionFinalize.tsx

@@ -261,13 +261,13 @@ export const actionFinalize = register({
     if (appState.activeTool.type === "eraser") {
       activeTool = updateActiveTool(appState, {
         ...(appState.activeTool.lastActiveTool || {
-          type: app.defaultSelectionTool,
+          type: app.state.preferredSelectionTool,
         }),
         lastActiveToolBeforeEraser: null,
       });
     } else {
       activeTool = updateActiveTool(appState, {
-        type: app.defaultSelectionTool,
+        type: app.state.preferredSelectionTool,
       });
     }
 

packages/excalidraw/appState.ts

@@ -11,6 +11,7 @@ import {
   THEME,
   DEFAULT_GRID_STEP,
   isTestEnv,
+  isMobileOrTablet,
 } from "@excalidraw/common";
 
 import type { AppState, NormalizedZoomValue } from "./types";
@@ -55,6 +56,7 @@ export const getDefaultAppState = (): Omit<
       fromSelection: false,
       lastActiveTool: null,
     },
+    preferredSelectionTool: isMobileOrTablet() ? "lasso" : "selection",
     penMode: false,
     penDetected: false,
     errorMessage: null,
@@ -176,6 +178,7 @@ const APP_STATE_STORAGE_CONF = (<
   editingTextElement: { browser: false, export: false, server: false },
   editingGroupId: { browser: true, export: false, server: false },
   activeTool: { browser: true, export: false, server: false },
+  preferredSelectionTool: { browser: true, export: false, server: false },
   penMode: { browser: true, export: false, server: false },
   penDetected: { browser: true, export: false, server: false },
   errorMessage: { browser: false, export: false, server: false },

packages/excalidraw/components/Actions.tsx

@@ -59,6 +59,7 @@ import "./Actions.scss";
 import { useDevice, useExcalidrawContainer } from "./App";
 import Stack from "./Stack";
 import { ToolButton } from "./ToolButton";
+import { ToolPopover } from "./ToolPopover";
 import { Tooltip } from "./Tooltip";
 import DropdownMenu from "./dropdownMenu/DropdownMenu";
 import { PropertiesPopover } from "./PropertiesPopover";
@@ -76,6 +77,7 @@ import {
   TextSizeIcon,
   adjustmentsIcon,
   DotsHorizontalIcon,
+  SelectionIcon,
 } from "./icons";
 
 import { Island } from "./Island";
@@ -1038,10 +1040,23 @@ export const ShapesSwitcher = ({
 }) => {
   const [isExtraToolsMenuOpen, setIsExtraToolsMenuOpen] = useState(false);
 
+  const SELECTION_TOOLS = [
+    {
+      type: "selection",
+      icon: SelectionIcon,
+      title: capitalizeString(t("toolBar.selection")),
+    },
+    {
+      type: "lasso",
+      icon: LassoIcon,
+      title: capitalizeString(t("toolBar.lasso")),
+    },
+  ] as const;
+
   const frameToolSelected = activeTool.type === "frame";
   const laserToolSelected = activeTool.type === "laser";
   const lassoToolSelected =
-    activeTool.type === "lasso" && app.defaultSelectionTool !== "lasso";
+    activeTool.type === "lasso" && app.state.preferredSelectionTool !== "lasso";
 
   const embeddableToolSelected = activeTool.type === "embeddable";
 
@@ -1068,6 +1083,39 @@ export const ShapesSwitcher = ({
           const shortcut = letter
             ? `${letter} ${t("helpDialog.or")} ${numericKey}`
             : `${numericKey}`;
+          // when in compact styles panel mode (tablet)
+          // use a ToolPopover for selection/lasso toggle as well
+          if (
+            (value === "selection" || value === "lasso") &&
+            appState.stylesPanelMode === "compact"
+          ) {
+            return (
+              <ToolPopover
+                key={"selection-popover"}
+                app={app}
+                options={SELECTION_TOOLS}
+                activeTool={activeTool as any}
+                defaultOption={app.state.preferredSelectionTool}
+                namePrefix="selectionType"
+                title={capitalizeString(t("toolBar.selection"))}
+                data-testid="toolbar-selection"
+                onToolChange={(type: string) => {
+                  if (type === "selection" || type === "lasso") {
+                    app.setActiveTool({ type });
+                    app.state.preferredSelectionTool = type as any;
+                  }
+                }}
+                displayedOption={
+                  SELECTION_TOOLS.find(
+                    (tool) => tool.type === app.state.preferredSelectionTool,
+                  ) || SELECTION_TOOLS[0]
+                }
+                isActive={
+                  activeTool.type === "selection" || activeTool.type === "lasso"
+                }
+              />
+            );
+          }
 
           return (
             <ToolButton
@@ -1169,7 +1217,7 @@ export const ShapesSwitcher = ({
           >
             {t("toolBar.laser")}
           </DropdownMenu.Item>
-          {app.defaultSelectionTool !== "lasso" && (
+          {appState.stylesPanelMode === "full" && (
             <DropdownMenu.Item
               onSelect={() => app.setActiveTool({ type: "lasso" })}
               icon={LassoIcon}

packages/excalidraw/components/App.tsx

@@ -662,14 +662,9 @@ class App extends React.Component<AppProps, AppState> {
   >();
   onRemoveEventListenersEmitter = new Emitter<[]>();
 
-  defaultSelectionTool: "selection" | "lasso" = "selection";
-
   constructor(props: AppProps) {
     super(props);
     const defaultAppState = getDefaultAppState();
-    this.defaultSelectionTool = isMobileOrTablet()
-      ? ("lasso" as const)
-      : ("selection" as const);
     const {
       excalidrawAPI,
       viewModeEnabled = false,
@@ -1621,7 +1616,7 @@ class App extends React.Component<AppProps, AppState> {
                             !this.state.isLoading &&
                             this.state.showWelcomeScreen &&
                             this.state.activeTool.type ===
-                              this.defaultSelectionTool &&
+                              this.state.preferredSelectionTool &&
                             !this.state.zenModeEnabled &&
                             !this.scene.getElementsIncludingDeleted().length
                           }
@@ -2380,7 +2375,7 @@ class App extends React.Component<AppProps, AppState> {
         activeTool.type === "selection"
           ? {
               ...activeTool,
-              type: this.defaultSelectionTool,
+              type: this.state.preferredSelectionTool,
             }
           : scene.appState.activeTool,
       isLoading: false,
@@ -3285,7 +3280,7 @@ class App extends React.Component<AppProps, AppState> {
 
       await this.insertClipboardContent(data, filesList, isPlainPaste);
 
-      this.setActiveTool({ type: this.defaultSelectionTool }, true);
+      this.setActiveTool({ type: this.state.preferredSelectionTool }, true);
       event?.preventDefault();
     },
   );
@@ -3431,7 +3426,7 @@ class App extends React.Component<AppProps, AppState> {
         }
       },
     );
-    this.setActiveTool({ type: this.defaultSelectionTool }, true);
+    this.setActiveTool({ type: this.state.preferredSelectionTool }, true);
 
     if (opts.fitToContent) {
       this.scrollToContent(duplicatedElements, {
@@ -3643,7 +3638,7 @@ class App extends React.Component<AppProps, AppState> {
           ...updateActiveTool(
             this.state,
             prevState.activeTool.locked
-              ? { type: this.defaultSelectionTool }
+              ? { type: this.state.preferredSelectionTool }
               : prevState.activeTool,
           ),
           locked: !prevState.activeTool.locked,
@@ -4654,7 +4649,7 @@ 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: this.defaultSelectionTool });
+          this.setActiveTool({ type: this.state.preferredSelectionTool });
         } else {
           this.setActiveTool({ type: "laser" });
         }
@@ -5499,7 +5494,7 @@ class App extends React.Component<AppProps, AppState> {
       return;
     }
     // we should only be able to double click when mode is selection
-    if (this.state.activeTool.type !== this.defaultSelectionTool) {
+    if (this.state.activeTool.type !== this.state.preferredSelectionTool) {
       return;
     }
 
@@ -7690,7 +7685,7 @@ class App extends React.Component<AppProps, AppState> {
     if (!this.state.activeTool.locked) {
       this.setState({
         activeTool: updateActiveTool(this.state, {
-          type: this.defaultSelectionTool,
+          type: this.state.preferredSelectionTool,
         }),
       });
     }
@@ -9404,7 +9399,7 @@ class App extends React.Component<AppProps, AppState> {
             this.setState((prevState) => ({
               newElement: null,
               activeTool: updateActiveTool(this.state, {
-                type: this.defaultSelectionTool,
+                type: this.state.preferredSelectionTool,
               }),
               selectedElementIds: makeNextSelectedElementIds(
                 {
@@ -10021,7 +10016,7 @@ class App extends React.Component<AppProps, AppState> {
           newElement: null,
           suggestedBindings: [],
           activeTool: updateActiveTool(this.state, {
-            type: this.defaultSelectionTool,
+            type: this.state.preferredSelectionTool,
           }),
         });
       } else {
@@ -10251,7 +10246,7 @@ class App extends React.Component<AppProps, AppState> {
         {
           newElement: null,
           activeTool: updateActiveTool(this.state, {
-            type: this.defaultSelectionTool,
+            type: this.state.preferredSelectionTool,
           }),
         },
         () => {
@@ -10684,7 +10679,7 @@ class App extends React.Component<AppProps, AppState> {
           event.nativeEvent.pointerType === "pen" &&
           // always allow if user uses a pen secondary button
           event.button !== POINTER_BUTTON.SECONDARY)) &&
-      this.state.activeTool.type !== this.defaultSelectionTool
+      this.state.activeTool.type !== this.state.preferredSelectionTool
     ) {
       return;
     }

packages/excalidraw/components/MobileToolBar.tsx

@@ -202,19 +202,19 @@ export const MobileToolBar = ({
         app={app}
         options={SELECTION_TOOLS}
         activeTool={activeTool}
-        defaultOption={app.defaultSelectionTool}
+        defaultOption={app.state.preferredSelectionTool}
         namePrefix="selectionType"
         title={capitalizeString(t("toolBar.selection"))}
         data-testid="toolbar-selection"
         onToolChange={(type: string) => {
           if (type === "selection" || type === "lasso") {
-            app.setActiveTool({ type: type });
-            app.defaultSelectionTool = type;
+            app.setActiveTool({ type });
+            app.state.preferredSelectionTool = type;
           }
         }}
         displayedOption={
           SELECTION_TOOLS.find(
-            (tool) => tool.type === app.defaultSelectionTool,
+            (tool) => tool.type === app.state.preferredSelectionTool,
           ) || SELECTION_TOOLS[0]
         }
         isActive={

packages/excalidraw/components/shapes.tsx

@@ -89,7 +89,7 @@ export const SHAPES = [
 ] as const;
 
 export const getToolbarTools = (app: AppClassProperties) => {
-  return app.defaultSelectionTool === "lasso"
+  return app.state.preferredSelectionTool === "lasso"
     ? ([
         {
           value: "lasso",

packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap

@@ -956,6 +956,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1151,6 +1152,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1364,6 +1366,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1694,6 +1697,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2024,6 +2028,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2237,6 +2242,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2477,6 +2483,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2774,6 +2781,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id3": true,
   },
@@ -3145,6 +3153,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -3637,6 +3646,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -3959,6 +3969,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -4281,6 +4292,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id3": true,
   },
@@ -5565,6 +5577,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -6781,6 +6794,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -7718,6 +7732,7 @@ exports[`contextMenu element > shows context menu for canvas > [end of test] app
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8714,6 +8729,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9707,6 +9723,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,

packages/excalidraw/tests/__snapshots__/history.test.tsx.snap

@@ -78,6 +78,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id4": true,
   },
@@ -693,6 +694,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id4": true,
   },
@@ -1181,6 +1183,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1544,6 +1547,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1910,6 +1914,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2169,6 +2174,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2613,6 +2619,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2915,6 +2922,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -3233,6 +3241,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -3526,6 +3535,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -3811,6 +3821,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -4045,6 +4056,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -4301,6 +4313,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -4571,6 +4584,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -4799,6 +4813,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -5027,6 +5042,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -5273,6 +5289,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -5528,6 +5545,7 @@ exports[`history > multiplayer undo/redo > conflicts in frames and their childre
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -5782,6 +5800,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id1": true,
   },
@@ -6110,6 +6129,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id8": true,
   },
@@ -6536,6 +6556,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id1": true,
   },
@@ -6912,6 +6933,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -7220,6 +7242,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -7535,6 +7558,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -7764,6 +7788,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8115,6 +8140,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8466,6 +8492,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -8871,6 +8898,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9157,6 +9185,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9420,6 +9449,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9684,6 +9714,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9918,6 +9949,7 @@ exports[`history > multiplayer undo/redo > should override remotely added groups
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -10211,6 +10243,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -10559,6 +10592,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -10797,6 +10831,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -11241,6 +11276,7 @@ exports[`history > multiplayer undo/redo > should update history entries after r
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -11500,6 +11536,7 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -11734,6 +11771,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -11970,6 +12008,7 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -12375,6 +12414,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -12581,6 +12621,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -12790,6 +12831,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -13087,6 +13129,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -13387,6 +13430,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on s
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": -50,
@@ -13628,6 +13672,7 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -13864,6 +13909,7 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -14100,6 +14146,7 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -14346,6 +14393,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -14679,6 +14727,7 @@ exports[`history > singleplayer undo/redo > should not collapse when applying co
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -14845,6 +14894,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -15131,6 +15181,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -15393,6 +15444,7 @@ exports[`history > singleplayer undo/redo > should not modify anything on unrela
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -15542,6 +15594,7 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -15826,6 +15879,7 @@ exports[`history > singleplayer undo/redo > should support appstate name or view
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -15984,6 +16038,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -16688,6 +16743,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -17322,6 +17378,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -17956,6 +18013,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -18674,6 +18732,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -19424,6 +19483,7 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -19903,6 +19963,7 @@ exports[`history > singleplayer undo/redo > should support duplication of groups
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id1": true,
   },
@@ -20413,6 +20474,7 @@ exports[`history > singleplayer undo/redo > should support element creation, del
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id3": true,
   },
@@ -20871,6 +20933,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },

packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap

@@ -79,6 +79,7 @@ exports[`given element A and group of elements B and given both are selected whe
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -504,6 +505,7 @@ exports[`given element A and group of elements B and given both are selected whe
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -919,6 +921,7 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1484,6 +1487,7 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -1690,6 +1694,7 @@ exports[`regression tests > adjusts z order when grouping > [end of test] appSta
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -2073,6 +2078,7 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] appSt
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -2317,6 +2323,7 @@ exports[`regression tests > arrow keys > [end of test] appState 1`] = `
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -2496,6 +2503,7 @@ exports[`regression tests > can drag element that covers another element, while
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id6": true,
   },
@@ -2820,6 +2828,7 @@ exports[`regression tests > change the properties of a shape > [end of test] app
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -3074,6 +3083,7 @@ exports[`regression tests > click on an element and drag it > [dragged] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -3314,6 +3324,7 @@ exports[`regression tests > click on an element and drag it > [end of test] appS
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -3549,6 +3560,7 @@ exports[`regression tests > click to select a shape > [end of test] appState 1`]
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id3": true,
   },
@@ -3806,6 +3818,7 @@ exports[`regression tests > click-drag to select a group > [end of test] appStat
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id6": true,
   },
@@ -4119,6 +4132,7 @@ exports[`regression tests > deleting last but one element in editing group shoul
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -4554,6 +4568,7 @@ exports[`regression tests > deselects group of selected elements on pointer down
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -4836,6 +4851,7 @@ exports[`regression tests > deselects group of selected elements on pointer up w
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -5111,6 +5127,7 @@ exports[`regression tests > deselects selected element on pointer down when poin
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -5318,6 +5335,7 @@ exports[`regression tests > deselects selected element, on pointer up, when clic
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -5517,6 +5535,7 @@ exports[`regression tests > double click to edit a group > [end of test] appStat
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -5909,6 +5928,7 @@ exports[`regression tests > drags selected elements from point inside common bou
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -6205,6 +6225,7 @@ exports[`regression tests > draw every type of shape > [end of test] appState 1`
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -7060,6 +7081,7 @@ exports[`regression tests > given a group of selected elements with an element t
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id6": true,
@@ -7393,6 +7415,7 @@ exports[`regression tests > given a selected element A and a not selected elemen
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -7671,6 +7694,7 @@ exports[`regression tests > given selected element A with lower z-index than uns
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -7905,6 +7929,7 @@ exports[`regression tests > given selected element A with lower z-index than uns
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -8144,6 +8169,7 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] appStat
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8323,6 +8349,7 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8502,6 +8529,7 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8681,6 +8709,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -8910,6 +8939,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9137,6 +9167,7 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9332,6 +9363,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9561,6 +9593,7 @@ exports[`regression tests > key d selects diamond tool > [end of test] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9740,6 +9773,7 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -9967,6 +10001,7 @@ exports[`regression tests > key o selects ellipse tool > [end of test] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -10146,6 +10181,7 @@ exports[`regression tests > key p selects freedraw tool > [end of test] appState
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -10341,6 +10377,7 @@ exports[`regression tests > key r selects rectangle tool > [end of test] appStat
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -10520,6 +10557,7 @@ exports[`regression tests > make a group and duplicate it > [end of test] appSta
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -11050,6 +11088,7 @@ exports[`regression tests > noop interaction after undo shouldn't create history
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -11329,6 +11368,7 @@ exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = `
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": "-6.25000",
@@ -11451,6 +11491,7 @@ exports[`regression tests > shift click on selected element should deselect it o
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -11650,6 +11691,7 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -11968,6 +12010,7 @@ exports[`regression tests > should group elements and ungroup them > [end of tes
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id3": true,
@@ -12396,6 +12439,7 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
     "id15": true,
@@ -13038,6 +13082,7 @@ exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] a
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 60,
@@ -13160,6 +13205,7 @@ exports[`regression tests > supports nested groups > [end of test] appState 1`]
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id0": true,
   },
@@ -13790,6 +13836,7 @@ exports[`regression tests > switches from group of selected elements to another
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id3": true,
     "id6": true,
@@ -14128,6 +14175,7 @@ exports[`regression tests > switches selected element on pointer down > [end of
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {
     "id3": true,
   },
@@ -14391,6 +14439,7 @@ exports[`regression tests > two-finger scroll works > [end of test] appState 1`]
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 20,
@@ -14513,6 +14562,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] appStat
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -14904,6 +14954,7 @@ exports[`regression tests > updates fontSize & fontFamily appState > [end of tes
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,
@@ -15029,6 +15080,7 @@ exports[`regression tests > zoom hotkeys > [end of test] appState 1`] = `
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,

packages/excalidraw/types.ts

@@ -316,6 +316,7 @@ export interface AppState {
     // indicates if the current tool is temporarily switched on from the selection tool
     fromSelection: boolean;
   } & ActiveTool;
+  preferredSelectionTool: "selection" | "lasso";
   penMode: boolean;
   penDetected: boolean;
   exportBackground: boolean;
@@ -364,7 +365,6 @@ export interface AppState {
     | { name: "ttd"; tab: "text-to-diagram" | "mermaid" }
     | { name: "commandPalette" }
     | { name: "elementLinkSelector"; sourceElementId: ExcalidrawElement["id"] };
-
   /**
    * Reflects user preference for whether the default sidebar should be docked.
    *
@@ -739,8 +739,6 @@ export type AppClassProperties = {
   onPointerUpEmitter: App["onPointerUpEmitter"];
   updateEditorAtom: App["updateEditorAtom"];
   onPointerDownEmitter: App["onPointerDownEmitter"];
-
-  defaultSelectionTool: "selection" | "lasso";
 };
 
 export type PointerDownState = Readonly<{

packages/utils/tests/__snapshots__/export.test.ts.snap

@@ -80,6 +80,7 @@ exports[`exportToSvg > with default arguments 1`] = `
   },
   "penDetected": false,
   "penMode": false,
+  "preferredSelectionTool": "selection",
   "previousSelectedElementIds": {},
   "resizingElement": null,
   "scrollX": 0,