From f54beab97fd42a904d71be1533ad57f34152baab Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 15 Jan 2021 11:08:04 -0600
Subject: [PATCH] use consistent tooltip delay

---
 src/actions/settings.ts            | 2 +-
 src/components/ActionButton.tsx    | 7 ++++++-
 src/components/LinkButton.tsx      | 2 ++
 src/components/OpenFileButton.tsx  | 2 ++
 src/components/SettingsDrawer.tsx  | 5 ++---
 src/reducers/settings.ts           | 2 +-
 src/sagas/settings.test.ts         | 2 +-
 src/sagas/settings.ts              | 2 +-
 src/settings/ui.ts                 | 7 +++++++
 src/settings/{index.ts => user.ts} | 4 ++--
 10 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 src/settings/ui.ts
 rename src/settings/{index.ts => user.ts} (94%)

diff --git a/src/actions/settings.ts b/src/actions/settings.ts
index cfa4ba1a..e2f477d9 100644
--- a/src/actions/settings.ts
+++ b/src/actions/settings.ts
@@ -2,7 +2,7 @@
 // Copyright (c) 2021 The Pybricks Authors
 
 import { Action } from 'redux';
-import { SettingId } from '../settings';
+import { SettingId } from '../settings/user';
 
 /** Actions related to settings. */
 export enum SettingsActionType {
diff --git a/src/components/ActionButton.tsx b/src/components/ActionButton.tsx
index 23aad054..7377dcb6 100644
--- a/src/components/ActionButton.tsx
+++ b/src/components/ActionButton.tsx
@@ -12,6 +12,7 @@ import {
 } from '@blueprintjs/core';
 import { WithI18nProps, withI18n } from '@shopify/react-i18n';
 import React from 'react';
+import { tooltipDelay } from '../settings/ui';
 import { TooltipId } from './button-i18n';
 import en from './button-i18n.en.json';
 
@@ -42,7 +43,11 @@ class ActionButton extends React.Component<Props> {
             tooltipText += ` (${this.props.keyboardShortcut})`;
         }
         return (
-            <Tooltip content={tooltipText} position={Position.BOTTOM}>
+            <Tooltip
+                content={tooltipText}
+                position={Position.BOTTOM}
+                hoverOpenDelay={tooltipDelay}
+            >
                 <Button
                     ref={this.buttonRef}
                     intent={Intent.PRIMARY}
diff --git a/src/components/LinkButton.tsx b/src/components/LinkButton.tsx
index f795d9c1..4f8e8ac1 100644
--- a/src/components/LinkButton.tsx
+++ b/src/components/LinkButton.tsx
@@ -4,6 +4,7 @@
 import { Button, Intent, Position, Tooltip } from '@blueprintjs/core';
 import { WithI18nProps, withI18n } from '@shopify/react-i18n';
 import React from 'react';
+import { tooltipDelay } from '../settings/ui';
 import { TooltipId } from './button-i18n';
 import en from './button-i18n.en.json';
 
@@ -28,6 +29,7 @@ class LinkButton extends React.Component<Props> {
             <Tooltip
                 content={this.props.i18n.translate(this.props.tooltip)}
                 position={Position.BOTTOM}
+                hoverOpenDelay={tooltipDelay}
             >
                 <Button
                     intent={Intent.PRIMARY}
diff --git a/src/components/OpenFileButton.tsx b/src/components/OpenFileButton.tsx
index 44f1225c..5b15d74f 100644
--- a/src/components/OpenFileButton.tsx
+++ b/src/components/OpenFileButton.tsx
@@ -5,6 +5,7 @@ import { Button, Intent, Position, Tooltip } from '@blueprintjs/core';
 import { WithI18nProps, withI18n } from '@shopify/react-i18n';
 import React from 'react';
 import Dropzone, { FileRejection } from 'react-dropzone';
+import { tooltipDelay } from '../settings/ui';
 import { TooltipId } from './button-i18n';
 import en from './button-i18n.en.json';
 
@@ -81,6 +82,7 @@ class OpenFileButton extends React.Component<Props> {
                     <Tooltip
                         content={this.props.i18n.translate(this.props.tooltip)}
                         position={Position.BOTTOM}
+                        hoverOpenDelay={tooltipDelay}
                     >
                         <Button
                             {...getRootProps()}
diff --git a/src/components/SettingsDrawer.tsx b/src/components/SettingsDrawer.tsx
index c7d3d68e..6cd44b60 100644
--- a/src/components/SettingsDrawer.tsx
+++ b/src/components/SettingsDrawer.tsx
@@ -9,15 +9,14 @@ import { Action, Dispatch } from '../actions';
 import { closeSettings } from '../actions/app';
 import { setBoolean } from '../actions/settings';
 import { RootState } from '../reducers';
-import { SettingId } from '../settings';
+import { tooltipDelay } from '../settings/ui';
+import { SettingId } from '../settings/user';
 import { isMacOS } from '../utils/os';
 import { SettingsStringId } from './settings-i18n';
 import en from './settings-i18n.en.json';
 
 import './settings.scss';
 
-const tooltipDelay = 1000;
-
 type StateProps = {
     open: boolean;
     showDocs: boolean;
diff --git a/src/reducers/settings.ts b/src/reducers/settings.ts
index 51d4294e..6ae87bc5 100644
--- a/src/reducers/settings.ts
+++ b/src/reducers/settings.ts
@@ -4,7 +4,7 @@
 import { Reducer, combineReducers } from 'redux';
 import { Action } from '../actions';
 import { SettingsActionType } from '../actions/settings';
-import { SettingId, getDefaultBooleanValue } from '../settings';
+import { SettingId, getDefaultBooleanValue } from '../settings/user';
 
 export interface SettingsState {
     readonly darkMode: boolean;
diff --git a/src/sagas/settings.test.ts b/src/sagas/settings.test.ts
index ad4c762a..5875b79f 100644
--- a/src/sagas/settings.test.ts
+++ b/src/sagas/settings.test.ts
@@ -7,7 +7,7 @@ import { AsyncSaga } from '../../test';
 import { startup } from '../actions/app';
 import { didBooleanChange, didFailToSetBoolean, setBoolean } from '../actions/settings';
 import { SettingsState } from '../reducers/settings';
-import { SettingId } from '../settings';
+import { SettingId } from '../settings/user';
 import settings from './settings';
 
 afterAll(() => {
diff --git a/src/sagas/settings.ts b/src/sagas/settings.ts
index 1cbf66d5..4a6dc695 100644
--- a/src/sagas/settings.ts
+++ b/src/sagas/settings.ts
@@ -15,7 +15,7 @@ import {
     didFailToSetBoolean,
 } from '../actions/settings';
 import { RootState } from '../reducers';
-import { SettingId, getDefaultBooleanValue } from '../settings';
+import { SettingId, getDefaultBooleanValue } from '../settings/user';
 
 function stringToBoolean(value: string): boolean {
     return value.toLowerCase().match(/(true|yes|1)/) !== null;
diff --git a/src/settings/ui.ts b/src/settings/ui.ts
new file mode 100644
index 00000000..b9916a6c
--- /dev/null
+++ b/src/settings/ui.ts
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2021 The Pybricks Authors
+
+// Definitions for compile-time UI settings.
+
+/** Time in milliseconds before showing tooltip popover. */
+export const tooltipDelay = 1000;
diff --git a/src/settings/index.ts b/src/settings/user.ts
similarity index 94%
rename from src/settings/index.ts
rename to src/settings/user.ts
index 8fc3f7e0..0066ddff 100644
--- a/src/settings/index.ts
+++ b/src/settings/user.ts
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) 2021 The Pybricks Authors
 
-import { prefersDarkMode } from '../utils/os';
+// Definitions for user selectable settings.
 
-// Definitions for user settings.
+import { prefersDarkMode } from '../utils/os';
 
 export enum SettingId {
     ShowDocs = 'showDocs',