Skip to content

fix: Fix the style guide #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mofojed merged 2 commits into from
Mar 2, 2023
Merged

fix: Fix the style guide #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
151aad4
Fix the style guide
mofojed Mar 1, 2023
2734df3
Remove `useEffect`
mofojed Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions packages/code-studio/src/AppRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect } from 'react';
import React from 'react';
import { Provider } from 'react-redux';
import { MonacoUtils } from '@deephaven/console';
import { store } from '@deephaven/redux';
Expand All @@ -8,16 +8,14 @@ import DownloadServiceWorkerUtils from './DownloadServiceWorkerUtils';
import { unregister } from './serviceWorker';

export function AppRoot() {
useEffect(() => {
unregister();
DownloadServiceWorkerUtils.registerOnLoaded();
MonacoUtils.init({ getWorker: () => new MonacoWorker() });
unregister();
DownloadServiceWorkerUtils.registerOnLoaded();
MonacoUtils.init({ getWorker: () => new MonacoWorker() });

// disable annoying dnd-react warnings
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
window['__react-beautiful-dnd-disable-dev-warnings'] = true;
}, []);
// disable annoying dnd-react warnings
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
window['__react-beautiful-dnd-disable-dev-warnings'] = true;

return (
<Provider store={store}>
Expand Down
29 changes: 29 additions & 0 deletions packages/code-studio/src/styleguide/StyleGuideRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import React from 'react';
import { Provider } from 'react-redux';
import 'fira';
import '@deephaven/components/scss/BaseStyleSheet.scss';
import { MonacoUtils } from '@deephaven/console';
import { store } from '@deephaven/redux';
import MonacoWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
import DownloadServiceWorkerUtils from '../DownloadServiceWorkerUtils';
import { unregister } from '../serviceWorker';
import StyleGuideInit from './StyleGuideInit';

export function StyleGuideRoot() {
unregister();
DownloadServiceWorkerUtils.registerOnLoaded();
MonacoUtils.init({ getWorker: () => new MonacoWorker() });

// disable annoying dnd-react warnings
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
window['__react-beautiful-dnd-disable-dev-warnings'] = true;

return (
<Provider store={store}>
<StyleGuideInit />
</Provider>
);
}

export default StyleGuideRoot;
33 changes: 0 additions & 33 deletions packages/code-studio/src/styleguide/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,7 @@
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="/manifest.json" />

<link rel="icon" href="#VITE_FAVICON#" />

<!-- The script is currently tightly coupled with the server -->
<script
src="#VITE_CORE_API_URL#/#VITE_OPEN_API_NAME#"
type="text/javascript"
></script>
<script
src="#VITE_CORE_API_URL#/#VITE_CORE_API_NAME#"
type="text/javascript"
></script>
<script>
(function () {
document.addEventListener('DOMContentLoaded', function () {
// If for some reason the API doesn't load, our app will not work. Write out a message to help the user.
if (!window.dh) {
document.getElementById('root').insertAdjacentHTML(
'afterbegin',
`<div class="modal d-block">
<div class="modal-dialog modal-dialog-centered theme-bg-light">
<div class="modal-content">
<div class="modal-body">
<h5 class="modal-title">Error: Unable to load API</h5>
<p class="text-break">Ensure the server is running and you are able to reach #VITE_CORE_API_URL#/#VITE_CORE_API_NAME#, then refresh the page.</p>
</div>
</div>
</div>
</div>`
);
}
});
})();
</script>
<title>Deephaven Styleguide</title>
</head>
<body>
Expand Down
34 changes: 15 additions & 19 deletions packages/code-studio/src/styleguide/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
import React from 'react';
import React, { Suspense } from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import 'fira';
import '@deephaven/components/scss/BaseStyleSheet.scss';
import { MonacoUtils } from '@deephaven/console';
import { store } from '@deephaven/redux';
import MonacoWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
import DownloadServiceWorkerUtils from '../DownloadServiceWorkerUtils';
import { LoadingOverlay } from '@deephaven/components';
import { ApiBootstrap } from '@deephaven/jsapi-bootstrap';
import logInit from '../log/LogInit';
import { unregister } from '../serviceWorker';
import StyleGuideInit from './StyleGuideInit';

logInit();

const StyleGuideRoot = React.lazy(() => import('./StyleGuideRoot'));

ReactDOM.render(
<Provider store={store}>
<StyleGuideInit />
</Provider>,
<ApiBootstrap
apiUrl={`${import.meta.env.VITE_CORE_API_URL}/${
import.meta.env.VITE_CORE_API_NAME
}`}
setGlobally
>
<Suspense fallback={<LoadingOverlay />}>
<StyleGuideRoot />
</Suspense>
</ApiBootstrap>,
document.getElementById('root')
);
unregister();
DownloadServiceWorkerUtils.registerOnLoaded();
MonacoUtils.init({ getWorker: () => new MonacoWorker() });

// disable annoying dnd-react warnings
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
window['__react-beautiful-dnd-disable-dev-warnings'] = true;
⚡