From 8fc720a1a2362f51c425480eaa1304fa55848dbf Mon Sep 17 00:00:00 2001
From: somebody1234 <ehern.lee@gmail.com>
Date: Sat, 21 Oct 2023 01:20:09 +1000
Subject: [PATCH] Move `Rect` to `util/` (#8121)

`rect.ts` is not a store, and hence does not belong in `stores/`

# Important Notes
None
---
 app/gui2/src/components/GraphEdge.vue   | 2 +-
 app/gui2/src/components/GraphEditor.vue | 2 +-
 app/gui2/src/components/GraphNode.vue   | 2 +-
 app/gui2/src/components/NodeSpan.vue    | 2 +-
 app/gui2/src/util/navigator.ts          | 2 +-
 app/gui2/src/{stores => util}/rect.ts   | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename app/gui2/src/{stores => util}/rect.ts (100%)

diff --git a/app/gui2/src/components/GraphEdge.vue b/app/gui2/src/components/GraphEdge.vue
index 05fd0f57ef8f..3019236d4bf0 100644
--- a/app/gui2/src/components/GraphEdge.vue
+++ b/app/gui2/src/components/GraphEdge.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { Edge } from '@/stores/graph'
-import type { Rect } from '@/stores/rect'
+import type { Rect } from '@/util/rect'
 import { clamp } from '@vueuse/core'
 import type { ExprId } from 'shared/yjsModel'
 import { computed } from 'vue'
diff --git a/app/gui2/src/components/GraphEditor.vue b/app/gui2/src/components/GraphEditor.vue
index 06fd294602e0..852ebcfcbde0 100644
--- a/app/gui2/src/components/GraphEditor.vue
+++ b/app/gui2/src/components/GraphEditor.vue
@@ -8,11 +8,11 @@ import SelectionBrush from '@/components/SelectionBrush.vue'
 import TopBar from '@/components/TopBar.vue'
 import { useGraphStore } from '@/stores/graph'
 import { useProjectStore } from '@/stores/project'
-import type { Rect } from '@/stores/rect'
 import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import { colorFromString } from '@/util/colors'
 import { keyboardBusy, keyboardBusyExceptIn, useEvent, usePointer } from '@/util/events'
 import { useNavigator } from '@/util/navigator'
+import type { Rect } from '@/util/rect'
 import { Vec2 } from '@/util/vec2'
 import * as set from 'lib0/set'
 import type { ContentRange, ExprId } from 'shared/yjsModel'
diff --git a/app/gui2/src/components/GraphNode.vue b/app/gui2/src/components/GraphNode.vue
index b17b65552ae4..eb4930c0f933 100644
--- a/app/gui2/src/components/GraphNode.vue
+++ b/app/gui2/src/components/GraphNode.vue
@@ -10,7 +10,6 @@ import {
 } from '@/providers/visualizationConfig'
 import type { Node } from '@/stores/graph'
 import { useProjectStore } from '@/stores/project'
-import { Rect } from '@/stores/rect'
 import { useSuggestionDbStore } from '@/stores/suggestionDatabase'
 import {
   DEFAULT_VISUALIZATION_CONFIGURATION,
@@ -24,6 +23,7 @@ import { methodNameToIcon, typeNameToIcon } from '@/util/getIconName'
 import type { UnsafeMutable } from '@/util/mutable'
 import type { Opt } from '@/util/opt'
 import { qnJoin, tryQualifiedName } from '@/util/qualifiedName'
+import { Rect } from '@/util/rect'
 import { unwrap } from '@/util/result'
 import type { Vec2 } from '@/util/vec2'
 import type { ContentRange, ExprId, VisualizationIdentifier } from 'shared/yjsModel'
diff --git a/app/gui2/src/components/NodeSpan.vue b/app/gui2/src/components/NodeSpan.vue
index 86e78f1f20f5..a37f53c07dd3 100644
--- a/app/gui2/src/components/NodeSpan.vue
+++ b/app/gui2/src/components/NodeSpan.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { spanKindName, type Span } from '@/stores/graph'
-import { Rect } from '@/stores/rect'
 import { useResizeObserver } from '@/util/events'
+import { Rect } from '@/util/rect'
 import { Vec2 } from '@/util/vec2'
 import type { ExprId } from 'shared/yjsModel'
 import { computed, onUpdated, ref, shallowRef, watch } from 'vue'
diff --git a/app/gui2/src/util/navigator.ts b/app/gui2/src/util/navigator.ts
index 80d68c708f65..8090a7a2a81b 100644
--- a/app/gui2/src/util/navigator.ts
+++ b/app/gui2/src/util/navigator.ts
@@ -1,5 +1,5 @@
-import { Rect } from '@/stores/rect'
 import { PointerButtonMask, useEvent, usePointer, useResizeObserver } from '@/util/events'
+import { Rect } from '@/util/rect'
 import { Vec2 } from '@/util/vec2'
 import { computed, proxyRefs, ref, type Ref } from 'vue'
 
diff --git a/app/gui2/src/stores/rect.ts b/app/gui2/src/util/rect.ts
similarity index 100%
rename from app/gui2/src/stores/rect.ts
rename to app/gui2/src/util/rect.ts