diff options
author | Tyler Schicke <tyler_schicke@brown.edu> | 2019-04-08 21:58:34 -0400 |
---|---|---|
committer | Tyler Schicke <tyler_schicke@brown.edu> | 2019-04-08 21:58:34 -0400 |
commit | e963f324fe8436ff5fc8ee21cdf091b6265690f9 (patch) | |
tree | b6a4255bd3a0a3c30504639f3e0e7a48ebadd420 /src/client/views/Main.tsx | |
parent | 0c76a60386cc0693b1572b5a8cf23b37243e5ab7 (diff) | |
parent | a2135bcc0a995378aad0e71ade832a4d526a37f0 (diff) |
Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into propsRefactor
Diffstat (limited to 'src/client/views/Main.tsx')
-rw-r--r-- | src/client/views/Main.tsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index 9868f6c74..6376fd694 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -321,7 +321,7 @@ export class Main extends React.Component { isShown={this.areWorkspacesShown} toggle={this.toggleWorkspaces} /> } return ( - [ + <> <div id="main-div"> <DocumentDecorations /> <Measure onResize={(r: any) => runInAction(() => { @@ -339,9 +339,9 @@ export class Main extends React.Component { {this.miscButtons} {workspaceMenu} <InkingControl /> - </div>, - this.activeTextBox - ] + </div> + {this.activeTextBox} + </> ); } |