feat: DH-16956: Move fontbootstrap from app-utils to components so it can be consumed in DHE

packages/app-utils/package.json

@@ -46,8 +46,6 @@
     "@deephaven/redux": "file:../redux",
     "@deephaven/storage": "file:../storage",
     "@deephaven/utils": "file:../utils",
-    "@fontsource/fira-mono": "5.0.13",
-    "@fontsource/fira-sans": "5.0.20",
     "@paciolan/remote-component": "2.13.0",
     "@paciolan/remote-module-loader": "^3.0.2",
     "classnames": "^2.5.1",

packages/app-utils/src/components/AppBootstrap.tsx

@@ -5,13 +5,16 @@ import '@deephaven/components/scss/BaseStyleSheet.scss';
 import { ClientBootstrap } from '@deephaven/jsapi-bootstrap';
 import { useBroadcastLoginListener } from '@deephaven/jsapi-components';
 import { type Plugin } from '@deephaven/plugin';
-import { ContextActions, ContextMenuRoot } from '@deephaven/components';
-import FontBootstrap from './FontBootstrap';
+import {
+  ContextActions,
+  ContextMenuRoot,
+  FontBootstrap,
+  FontsLoaded,
+} from '@deephaven/components';
 import PluginsBootstrap from './PluginsBootstrap';
 import AuthBootstrap from './AuthBootstrap';
 import ConnectionBootstrap from './ConnectionBootstrap';
 import { getConnectOptions, createExportLogsContextAction } from '../utils';
-import FontsLoaded from './FontsLoaded';
 import UserBootstrap from './UserBootstrap';
 import ServerConfigBootstrap from './ServerConfigBootstrap';
 import ThemeBootstrap from './ThemeBootstrap';

packages/app-utils/src/components/index.ts

@@ -3,8 +3,6 @@ export * from './AppDashboards';
 export * from './AuthBootstrap';
 export * from './ConnectionBootstrap';
 export * from './ConnectionContext';
-export * from './FontBootstrap';
-export * from './FontsLoaded';
 export * from './PluginsBootstrap';
 export * from './ThemeBootstrap';
 export * from './useConnection';

packages/code-studio/src/styleguide/StyleGuideRoot.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { Provider } from 'react-redux';
-import { FontBootstrap } from '@deephaven/app-utils';
+import { FontBootstrap } from '@deephaven/components';
 import '@deephaven/components/scss/BaseStyleSheet.scss';
 import { MonacoUtils } from '@deephaven/console';
 import { store } from '@deephaven/redux';

packages/components/package.json

@@ -29,6 +29,8 @@
     "@deephaven/log": "file:../log",
     "@deephaven/react-hooks": "file:../react-hooks",
     "@deephaven/utils": "file:../utils",
+    "@fontsource/fira-mono": "5.0.13",
+    "@fontsource/fira-sans": "5.0.20",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@internationalized/date": "^3.5.5",

packages/components/scss/BaseStyleSheet.scss

@@ -913,7 +913,7 @@ input[type='number']::-webkit-inner-spin-button {
   }
 }
 
-/** Preload some fonts for grid metric calculations, loaded in App.jsx */
+/** Preload some fonts for grid metric calculations, loaded by FontBootstrap */
 /* stylelint-disable */
 .fira-sans-regular {
   font-family: 'Fira Sans';

packages/app-utils/src/components/FontsLoaded.tsx → packages/components/src/theme/FontsLoaded.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { LoadingOverlay } from '@deephaven/components';
+import LoadingOverlay from '../LoadingOverlay';
 import { FontsLoadedContext } from './FontBootstrap';
 
 export type FontsLoadedProps = {

packages/components/src/theme/index.ts

@@ -9,3 +9,5 @@ export * from './Logo';
 export * from './colorUtils';
 export * from './useExternalTheme';
 export * from './useSpectrumThemeProvider';
+export * from './FontsLoaded';
+export * from './FontBootstrap';