From f7dcf8b0f7f2efaa4f2c7755d459ecf882a7dd79 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 17 May 2022 11:24:00 -0500
Subject: [PATCH] components/toolbar: move from utils

This is a better home.
---
 src/{utils => components/toolbar}/Toolbar.tsx | 2 +-
 src/explorer/Explorer.tsx                     | 2 +-
 src/toolbar/Toolbar.tsx                       | 2 +-
 src/utils/react.test.tsx                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{utils => components/toolbar}/Toolbar.tsx (97%)

diff --git a/src/utils/Toolbar.tsx b/src/components/toolbar/Toolbar.tsx
similarity index 97%
rename from src/utils/Toolbar.tsx
rename to src/components/toolbar/Toolbar.tsx
index e62de383..4d46753e 100644
--- a/src/utils/Toolbar.tsx
+++ b/src/components/toolbar/Toolbar.tsx
@@ -2,7 +2,7 @@
 // Copyright (c) 2022 The Pybricks Authors
 
 import React, { AriaAttributes, KeyboardEventHandler, useCallback } from 'react';
-import { FocusAction } from './react';
+import { FocusAction } from '../../utils/react';
 
 type ToolbarProps = Pick<AriaAttributes, 'aria-label' | 'aria-labelledby'> & {
     /** CSS class name for the tooltip element. */
diff --git a/src/explorer/Explorer.tsx b/src/explorer/Explorer.tsx
index cb03140b..0faf57c7 100644
--- a/src/explorer/Explorer.tsx
+++ b/src/explorer/Explorer.tsx
@@ -24,8 +24,8 @@ import {
     useTreeEnvironment,
 } from 'react-complex-tree';
 import { useDispatch } from 'react-redux';
+import Toolbar from '../components/toolbar/Toolbar';
 import { useSelector } from '../reducers';
-import Toolbar from '../utils/Toolbar';
 import { isMacOS } from '../utils/os';
 import { useRovingTabIndex } from '../utils/react';
 import { TreeItemContext, TreeItemData, renderers } from '../utils/tree-renderer';
diff --git a/src/toolbar/Toolbar.tsx b/src/toolbar/Toolbar.tsx
index 4f868d93..65756260 100644
--- a/src/toolbar/Toolbar.tsx
+++ b/src/toolbar/Toolbar.tsx
@@ -3,7 +3,7 @@
 
 import { ButtonGroup } from '@blueprintjs/core';
 import React, { useRef } from 'react';
-import UtilsToolbar from '../utils/Toolbar';
+import UtilsToolbar from '../components/toolbar/Toolbar';
 import { useRovingTabIndex } from '../utils/react';
 import BluetoothButton from './buttons/bluetooth/BluetoothButton';
 import FlashButton from './buttons/flash/FlashButton';
diff --git a/src/utils/react.test.tsx b/src/utils/react.test.tsx
index 50372572..0c15b4a6 100644
--- a/src/utils/react.test.tsx
+++ b/src/utils/react.test.tsx
@@ -5,7 +5,7 @@ import { cleanup } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React, { useRef } from 'react';
 import { testRender } from '../../test';
-import Toolbar from './Toolbar';
+import Toolbar from '../components/toolbar/Toolbar';
 import { useRovingTabIndex } from './react';
 
 afterEach(() => {