-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: avoid DropZone leaking style to children
- Loading branch information
Showing
6 changed files
with
378 additions
and
433 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,210 +1,20 @@ | ||
| import { ErrorBoundary } from 'react-error-boundary'; | ||
| import { FaMeteor, FaTabletAlt, FaGlasses, FaSave } from 'react-icons/fa'; | ||
| import { KbsProvider, useKbsGlobal } from 'react-kbs'; | ||
| import { KbsProvider } from 'react-kbs'; | ||
|
|
||
| import { | ||
| AppStateProvider, | ||
| useAppDispatch, | ||
| useAppState, | ||
| getCurrentMeasurement, | ||
| download, | ||
| getSelectedMeasurement, | ||
| } from '../../app-data/index'; | ||
| import { | ||
| MeasurementExplorer, | ||
| MeasurementInfoPanel, | ||
| MeasurementsPanel, | ||
| } from '../../app/index'; | ||
| import { | ||
| FullscreenToolbarButton, | ||
| Accordion, | ||
| DropZoneContainer, | ||
| Header, | ||
| RootLayout, | ||
| SplitPane, | ||
| Toolbar, | ||
| FullScreenProvider, | ||
| } from '../../components/index'; | ||
| import { AppStateProvider } from '../../app-data/index'; | ||
| import { RootLayout, FullScreenProvider } from '../../components/index'; | ||
|
|
||
| import MainLayout from './MainLayout'; | ||
|
|
||
| export default function App() { | ||
| return ( | ||
| <RootLayout> | ||
| <KbsProvider> | ||
| <AppStateProvider> | ||
| <FullScreenProvider> | ||
| <DropZoneArea /> | ||
| <MainLayout /> | ||
| </FullScreenProvider> | ||
| </AppStateProvider> | ||
| </KbsProvider> | ||
| </RootLayout> | ||
| ); | ||
| } | ||
|
|
||
| function ErrorFallback({ error, resetErrorBoundary }) { | ||
| return ( | ||
| <div role="alert"> | ||
| <p>Something went wrong:</p> | ||
| <pre>{error.message}</pre> | ||
| <button type="button" onClick={resetErrorBoundary}> | ||
| Try again | ||
| </button> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| function DropZoneArea() { | ||
| const dispatch = useAppDispatch(); | ||
| const appState = useAppState(); | ||
| const measurement = getCurrentMeasurement(appState); | ||
|
|
||
| function saveHandler(filename = 'file', spaceIndent = 0) { | ||
| const data = JSON.stringify( | ||
| { data: appState.data, view: appState.view }, | ||
| (_key, value) => | ||
| ArrayBuffer.isView(value) ? Array.from(value as any) : value, | ||
| spaceIndent, | ||
| ); | ||
| const blob = new Blob([data], { type: 'text/plain' }); | ||
| download(blob, `${filename}.ium`); | ||
| } | ||
| useKbsGlobal([ | ||
| { | ||
| shortcut: { key: 's', ctrl: true }, | ||
| handler() { | ||
| saveHandler(); | ||
| }, | ||
| }, | ||
| ]); | ||
|
|
||
| return ( | ||
| <DropZoneContainer | ||
| onDrop={() => { | ||
| // TODO | ||
| }} | ||
| > | ||
| <div | ||
| style={{ | ||
| height: '100%', | ||
| display: 'flex', | ||
| flexDirection: 'column', | ||
| }} | ||
| > | ||
| <Header> | ||
| <Toolbar orientation="horizontal"> | ||
| <Toolbar.Item titleOrientation="horizontal" title="Logo"> | ||
| <FaMeteor /> | ||
| </Toolbar.Item> | ||
| <Toolbar.Item | ||
| titleOrientation="horizontal" | ||
| title="Save as ium" | ||
| onClick={() => saveHandler()} | ||
| > | ||
| <FaSave /> | ||
| </Toolbar.Item> | ||
| </Toolbar> | ||
| <Toolbar orientation="horizontal"> | ||
| <FullscreenToolbarButton /> | ||
| </Toolbar> | ||
| </Header> | ||
| <div | ||
| style={{ | ||
| display: 'flex', | ||
| flexDirection: 'row', | ||
| flex: 1, | ||
| }} | ||
| > | ||
| <div> | ||
| <Toolbar orientation="vertical"> | ||
| <Toolbar.Item title="Glasses" active> | ||
| <FaGlasses /> | ||
| </Toolbar.Item> | ||
| <Toolbar.Item title="Open in large mode"> | ||
| <FaTabletAlt /> | ||
| </Toolbar.Item> | ||
| </Toolbar> | ||
| </div> | ||
| <div | ||
| style={{ | ||
| width: '100%', | ||
| maxHeight: '100%', | ||
| }} | ||
| > | ||
| <SplitPane | ||
| initialSize="400px" | ||
| initialClosed={500} | ||
| controlledSide="end" | ||
| > | ||
| <ErrorBoundary | ||
| FallbackComponent={ErrorFallback} | ||
| onReset={() => { | ||
| // reset the state of your app so the error doesn't happen again | ||
| }} | ||
| > | ||
| <div | ||
| style={{ | ||
| padding: 5, | ||
| width: '100%', | ||
| height: '100%', | ||
| }} | ||
| > | ||
| {measurement ? ( | ||
| <MeasurementExplorer | ||
| measurement={measurement} | ||
| width="100%" | ||
| height="100%" | ||
| kind={ | ||
| appState.view.selectedKind === 'mass' ? 'mass' : '1d' | ||
| } | ||
| /> | ||
| ) : ( | ||
| <span>No data, add them with drag and drop</span> | ||
| )} | ||
| </div> | ||
| </ErrorBoundary> | ||
| <div | ||
| style={{ | ||
| width: '100%', | ||
| height: '100%', | ||
| flex: '1 1 0%', | ||
| }} | ||
| > | ||
| <Accordion> | ||
| <Accordion.Item title="Measurement" defaultOpened> | ||
| <div | ||
| style={{ | ||
| flex: '1 1 0%', | ||
| width: '100%', | ||
| }} | ||
| > | ||
| <MeasurementsPanel | ||
| measurements={appState.data.measurements} | ||
| onTabSelect={(kind) => { | ||
| dispatch({ | ||
| type: 'SELECT_MEASUREMENT_KIND', | ||
| payload: kind, | ||
| }); | ||
| }} | ||
| selectedMeasurement={getSelectedMeasurement(appState)} | ||
| onMeasurementSelect={({ measurement, kind }) => { | ||
| dispatch({ | ||
| type: 'SELECT_MEASUREMENT', | ||
| payload: { id: measurement.id, kind }, | ||
| }); | ||
| }} | ||
| /> | ||
| </div> | ||
| </Accordion.Item> | ||
| <Accordion.Item title="Info Panel"> | ||
| {measurement && ( | ||
| <MeasurementInfoPanel measurement={measurement} /> | ||
| )} | ||
| </Accordion.Item> | ||
| </Accordion> | ||
| </div> | ||
| </SplitPane> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </DropZoneContainer> | ||
| ); | ||
| } |
Oops, something went wrong.