From b04b7029fd3c631564eab50ce1afeb5514386af7 Mon Sep 17 00:00:00 2001
From: Steve Ruiz <steveruizok@gmail.com>
Date: Tue, 19 Oct 2021 14:17:04 +0100
Subject: [PATCH] Change copy

---
 packages/core/src/utils/utils.ts                          | 3 +--
 packages/tldraw/src/components/menu/preferences.tsx       | 8 ++++----
 .../sessions/transform-single/transform-single.session.ts | 2 +-
 .../state/session/sessions/transform/transform.session.ts | 2 +-
 .../state/session/sessions/translate/translate.session.ts | 2 +-
 packages/tldraw/src/state/tlstate.ts                      | 4 ++--
 packages/tldraw/src/types.ts                              | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/utils/utils.ts b/packages/core/src/utils/utils.ts
index 34dde3ba3..c91a2a7d3 100644
--- a/packages/core/src/utils/utils.ts
+++ b/packages/core/src/utils/utils.ts
@@ -1558,8 +1558,7 @@ left past the initial left edge) then swap points on that axis.
 
         fxs.forEach((f, i) =>
           txs.forEach((t, k) => {
-            // If we're not dragging carefully, only snap to
-            // center or opposite points
+            // If we're not dragging carefully, only snap to center or opposite points
             if (xs || !(isCareful || i === 0 || i + k === 3)) return
 
             if (Math.abs(t - f) < distance) {
diff --git a/packages/tldraw/src/components/menu/preferences.tsx b/packages/tldraw/src/components/menu/preferences.tsx
index 49a03cdfa..a2b1b8fc8 100644
--- a/packages/tldraw/src/components/menu/preferences.tsx
+++ b/packages/tldraw/src/components/menu/preferences.tsx
@@ -35,8 +35,8 @@ export function Preferences() {
     tlstate.setSetting('showBindingHandles', (v) => !v)
   }, [tlstate])
 
-  const toggleallowSnaps = React.useCallback(() => {
-    tlstate.setSetting('allowSnaps', (v) => !v)
+  const toggleisSnapping = React.useCallback(() => {
+    tlstate.setSetting('isSnapping', (v) => !v)
   }, [tlstate])
 
   const toggleCloneControls = React.useCallback(() => {
@@ -75,8 +75,8 @@ export function Preferences() {
       >
         <span>Clone Handles</span>
       </DropdownMenuCheckboxItem>
-      <DropdownMenuCheckboxItem checked={settings.allowSnaps} onCheckedChange={toggleallowSnaps}>
-        <span>Snapping</span>
+      <DropdownMenuCheckboxItem checked={settings.isSnapping} onCheckedChange={toggleisSnapping}>
+        <span>Always Show Snaps</span>
       </DropdownMenuCheckboxItem>
     </DropdownMenuSubMenu>
   )
diff --git a/packages/tldraw/src/state/session/sessions/transform-single/transform-single.session.ts b/packages/tldraw/src/state/session/sessions/transform-single/transform-single.session.ts
index 096abf3d4..10570900b 100644
--- a/packages/tldraw/src/state/session/sessions/transform-single/transform-single.session.ts
+++ b/packages/tldraw/src/state/session/sessions/transform-single/transform-single.session.ts
@@ -81,7 +81,7 @@ export class TransformSingleSession implements Session {
     const { zoom } = data.document.pageStates[currentPageId].camera
 
     if (
-      ((data.settings.allowSnaps && !metaKey) || (!data.settings.allowSnaps && metaKey)) &&
+      ((data.settings.isSnapping && !metaKey) || (!data.settings.isSnapping && metaKey)) &&
       !initialShape.rotation && // not now anyway
       this.speed * zoom < SLOW_SPEED &&
       this.snapInfo.state === 'ready'
diff --git a/packages/tldraw/src/state/session/sessions/transform/transform.session.ts b/packages/tldraw/src/state/session/sessions/transform/transform.session.ts
index 7c1dd592c..610f9af6d 100644
--- a/packages/tldraw/src/state/session/sessions/transform/transform.session.ts
+++ b/packages/tldraw/src/state/session/sessions/transform/transform.session.ts
@@ -86,7 +86,7 @@ export class TransformSession implements Session {
     const { zoom } = data.document.pageStates[currentPageId].camera
 
     if (
-      ((data.settings.allowSnaps && !metaKey) || (!data.settings.allowSnaps && metaKey)) &&
+      ((data.settings.isSnapping && !metaKey) || (!data.settings.isSnapping && metaKey)) &&
       this.speed * zoom < SLOW_SPEED &&
       this.snapInfo.state === 'ready'
     ) {
diff --git a/packages/tldraw/src/state/session/sessions/translate/translate.session.ts b/packages/tldraw/src/state/session/sessions/translate/translate.session.ts
index 9d0877c02..1351c6e19 100644
--- a/packages/tldraw/src/state/session/sessions/translate/translate.session.ts
+++ b/packages/tldraw/src/state/session/sessions/translate/translate.session.ts
@@ -148,7 +148,7 @@ export class TranslateSession implements Session {
     const { zoom } = data.document.pageStates[currentPageId].camera
 
     if (
-      ((data.settings.allowSnaps && !metaKey) || (!data.settings.allowSnaps && metaKey)) &&
+      ((data.settings.isSnapping && !metaKey) || (!data.settings.isSnapping && metaKey)) &&
       this.speed * zoom < SLOW_SPEED &&
       this.snapInfo.state === 'ready'
     ) {
diff --git a/packages/tldraw/src/state/tlstate.ts b/packages/tldraw/src/state/tlstate.ts
index e90810b3b..309ffeb33 100644
--- a/packages/tldraw/src/state/tlstate.ts
+++ b/packages/tldraw/src/state/tlstate.ts
@@ -2422,7 +2422,7 @@ export class TLDrawState extends StateManager<Data> {
     }
   }
 
-  static version = 10.4
+  static version = 10.5
 
   static defaultDocument: TLDrawDocument = {
     id: 'doc',
@@ -2453,11 +2453,11 @@ export class TLDrawState extends StateManager<Data> {
       isDarkMode: false,
       isZoomSnap: false,
       isFocusMode: false,
+      isSnapping: false,
       isDebugMode: process.env.NODE_ENV === 'development',
       isReadonlyMode: false,
       nudgeDistanceLarge: 16,
       nudgeDistanceSmall: 1,
-      allowSnaps: true,
       showRotateHandles: true,
       showBindingHandles: true,
       showCloneHandles: true,
diff --git a/packages/tldraw/src/types.ts b/packages/tldraw/src/types.ts
index 4b0abb827..0a9f63de2 100644
--- a/packages/tldraw/src/types.ts
+++ b/packages/tldraw/src/types.ts
@@ -27,7 +27,7 @@ export interface TLDrawSettings {
   nudgeDistanceSmall: number
   nudgeDistanceLarge: number
   isFocusMode: boolean
-  allowSnaps: boolean
+  isSnapping: boolean
   showRotateHandles: boolean
   showBindingHandles: boolean
   showCloneHandles: boolean