Feat/reduce bundle size #106
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,24 +1,12 @@ | ||
| import React from "react" | ||
| import { BrowserRouter as Router, Route, Switch, Redirect } from "react-router-dom" | ||
| import ReactGA from "react-ga" | ||
| import { VirtualHexapod, getNewPlotParams } from "./hexapod" | ||
| import * as defaults from "./templates" | ||
| import { SECTION_NAMES, PATH_LINKS } from "./components/vars" | ||
| import { Nav } from "./components" | ||
|
|
||
| import Routes from "./routes" | ||
|
|
||
| ReactGA.initialize("UA-170794768-1", { | ||
| //debug: true, | ||
|
|
@@ -28,9 +16,7 @@ ReactGA.initialize("UA-170794768-1", { | |
|
|
||
| class App extends React.Component { | ||
| state = { | ||
| showPoseMessage: false, | ||
| showInfo: false, | ||
| info: {}, | ||
|
|
||
|
|
@@ -53,25 +39,29 @@ class App extends React.Component { | |
|
|
||
| onPageLoad = pageName => { | ||
| ReactGA.pageview(window.location.pathname + window.location.search) | ||
|
|
||
| if (pageName === SECTION_NAMES.landingPage) { | ||
| return this.setState({ | ||
| showInfo: false, | ||
| showPoseMessage: false, | ||
| }) | ||
| } | ||
|
|
||
| return this.setState( | ||
| { | ||
| showInfo: false, | ||
| showPoseMessage: false, | ||
| hexapodParams: { | ||
| ...this.state.hexapodParams, | ||
| pose: defaults.DEFAULT_POSE, | ||
| }, | ||
| }, | ||
| () => | ||
| this.updatePlot( | ||
| this.state.hexapodParams.dimensions, | ||
| defaults.DEFAULT_POSE | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| /* * * * * * * * * * * * * * | ||
|
|
@@ -80,7 +70,7 @@ class App extends React.Component { | |
|
|
||
| updatePlot = (dimensions, pose) => { | ||
| const newHexapodModel = new VirtualHexapod(dimensions, pose) | ||
| return this.updatePlotWithHexapod(newHexapodModel) | ||
| } | ||
|
|
||
| updatePlotWithHexapod = hexapod => { | ||
|
|
@@ -89,7 +79,7 @@ class App extends React.Component { | |
| } | ||
|
|
||
| const [data, layout] = getNewPlotParams(hexapod, this.state.plot.latestCameraView) | ||
| return this.setState({ | ||
| plot: { | ||
| ...this.state.plot, | ||
| data, | ||
|
|
@@ -106,7 +96,7 @@ class App extends React.Component { | |
| logCameraView = relayoutData => { | ||
| const newCameraView = relayoutData["scene.camera"] | ||
| const plot = { ...this.state.plot, latestCameraView: newCameraView } | ||
| return this.setState({ ...this.state, plot: plot }) | ||
| } | ||
|
|
||
| /* * * * * * * * * * * * * * | ||
|
|
@@ -115,7 +105,7 @@ class App extends React.Component { | |
|
|
||
| updateIk = (hexapod, updatedStateParams) => { | ||
| this.updatePlotWithHexapod(hexapod) | ||
| return this.setState({ ...updatedStateParams }) | ||
| } | ||
|
|
||
| updateDimensions = dimensions => | ||
|
|
@@ -124,101 +114,34 @@ class App extends React.Component { | |
| updatePose = pose => this.updatePlot(this.state.hexapodParams.dimensions, pose) | ||
|
|
||
| /* * * * * * * * * * * * * * | ||
| * Layout | ||
| * * * * * * * * * * * * * */ | ||
|
|
||
| render() { | ||
| const { plot, ...rest } = this.state | ||
| const routeProps = { | ||
|
There was a problem hiding this comment. Could there be a better way to structure this than pushing about 15 props on route? Maybe using contexts ? There was a problem hiding this comment. Yes, I actually a branch where I've built the Provider pattern, so that'll come up next. I just needed to understand correctly which pieces of state are running through the App. For instance in that branch I have it divided as hexapod params, plot data, and the rest of settings. And that results in 3 context providers. Edit |
||
| ...rest, | ||
| ...plot, | ||
| revision: plot.revisionCounter, | ||
| onRelayout: this.logCameraView, | ||
| updatePose: this.updatePose, | ||
| updateIk: this.updateIk, | ||
| updateDimensions: this.updateDimensions, | ||
| } | ||
| return ( | ||
| <Router> | ||
| <Nav /> | ||
| <Switch> | ||
| <Route path={PATH_LINKS.map(({ path }) => path)} exact> | ||
| <Routes {...routeProps} onPageLoad={this.onPageLoad} /> | ||
| </Route> | ||
| <Route> | ||
| <Redirect to="/" /> | ||
|
|
||
| </Route> | ||
| </Switch> | ||
| </Router> | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| export default App | ||
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,5 +1,7 @@ | ||
| import React from "react" | ||
|
|
||
| const createPlotlyComponent = () => ({ style, testId }) => ( | ||
| <div style={style} data-testid={testId}></div> | ||
| ) | ||
|
|
||
| export default createPlotlyComponent |
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,20 +1,72 @@ | ||
| import React, { useCallback, useLayoutEffect, useState, useRef } from "react" | ||
| import createPlotlyComponent from "react-plotly.js/factory" | ||
|
|
||
| import { sleep } from "../utils" | ||
|
|
||
| const PlotlyPromise = () => | ||
| import("plotly.js-gl3d-dist-min").then(Plotly => Plotly.default) | ||
|
|
||
| export const HexapodPlot = ({ data, layout, onRelayout, revision, promise }) => { | ||
| const ref = useRef() | ||
| const loadingRef = useRef() | ||
| const promiseRef = useRef(promise) | ||
| const [ready, setReady] = useState(false) | ||
| const [error, setError] = useState(false) | ||
|
|
||
| const loader = useCallback(() => { | ||
| setError(false) | ||
|
|
||
| promiseRef | ||
| .current() | ||
| .then(Plotly => { | ||
| ref.current = createPlotlyComponent(Plotly) | ||
| }) | ||
| .then(sleep(250)) | ||
| .then(() => { | ||
| if (loadingRef.current) { | ||
| setReady(true) | ||
| } | ||
| }) | ||
| .catch(() => setError(true)) | ||
| }, []) | ||
|
|
||
| useLayoutEffect(() => { | ||
| loader() | ||
| }, [loader]) | ||
|
|
||
| if (error) { | ||
| return ( | ||
| <> | ||
| <h2>Error Loading Plotly</h2> | ||
| <button className="button" onClick={loader}> | ||
| Retry | ||
| </button> | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| if (!ready) { | ||
| return <h2 ref={loadingRef}>Loading...</h2> | ||
| } | ||
|
|
||
| const Plot = ref.current | ||
|
|
||
| return ( | ||
| <Plot | ||
| data={data} | ||
| layout={layout} | ||
| useResizeHandler={true} | ||
| style={{ height: "100%", width: "100%" }} | ||
| config={{ displaylogo: false, responsive: true }} | ||
| onRelayout={onRelayout} | ||
| revision={revision} | ||
| testId="plot" | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| const HexapodPlotWithPlotlyPromise = props => ( | ||
| <HexapodPlot {...props} promise={PlotlyPromise} /> | ||
| ) | ||
|
|
||
| export default HexapodPlotWithPlotlyPromise |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for bumping this up 👍 💯