Skip to content

Commit

Permalink
fix: use react-shadow to avoid being affected by external style
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed May 1, 2021
1 parent 179b7c9 commit fd7b803
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 17 deletions.
105 changes: 105 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Expand Up @@ -93,6 +93,7 @@
"react-ocl-nmr": "^1.0.0",
"react-plot": "^0.10.0",
"react-rnd": "^10.2.4",
"react-shadow": "^19.0.2",
"react-simple-code-editor": "^0.11.0",
"react-slider": "^1.1.4",
"react-split-pane": "^0.1.92",
Expand Down
35 changes: 18 additions & 17 deletions src/component/NMRium.tsx
Expand Up @@ -16,6 +16,7 @@ import {
ReactElement,
ReactNode,
} from 'react';
import root from 'react-shadow/emotion';
import SplitPane from 'react-split-pane';
import { useToggle, useFullscreen } from 'react-use';

Expand Down Expand Up @@ -291,19 +292,19 @@ function NMRium({
}, [dispatchMiddleWare]);

return (
<ErrorBoundary>
<GlobalProvider
value={{
rootRef: rootRef.current,
elementsWraperRef: elementsWraperRef.current,
}}
>
<PreferencesProvider value={preferencesState}>
<div
onMouseEnter={mouseEnterHandler}
onMouseLeave={mouseLeaveHandler}
style={{ height: '100%', position: 'relative' }}
>
<root.div
onMouseEnter={mouseEnterHandler}
onMouseLeave={mouseLeaveHandler}
style={{ height: '100%', position: 'relative' }}
>
<ErrorBoundary>
<GlobalProvider
value={{
rootRef: rootRef.current,
elementsWraperRef: elementsWraperRef.current,
}}
>
<PreferencesProvider value={preferencesState}>
{/* @ts-expect-error: TODO remove when HelpProvider is migrated */}
<HelpProvider
data={helpData}
Expand Down Expand Up @@ -403,10 +404,10 @@ function NMRium({
</DispatchProvider>
</AlertProvider>
</HelpProvider>
</div>
</PreferencesProvider>
</GlobalProvider>
</ErrorBoundary>
</PreferencesProvider>
</GlobalProvider>
</ErrorBoundary>
</root.div>
);
}

Expand Down

0 comments on commit fd7b803

Please sign in to comment.