diff options
author | eleanor-park <eleanor_park@brown.edu> | 2024-07-23 12:10:03 -0400 |
---|---|---|
committer | eleanor-park <eleanor_park@brown.edu> | 2024-07-23 12:10:03 -0400 |
commit | 9e2f51dc5a1c82e9293e04c71f4430fd67ff3378 (patch) | |
tree | b9111a1e31a31223c556850330ec187f3c396d64 /src/client/views/MainView.tsx | |
parent | 3e1ef3d0b5445065ab3f44ffc17bbb04efaa8c8a (diff) | |
parent | a1960941edc43d71508ec5cb244f453eb06cf2e1 (diff) |
Merge remote-tracking branch 'origin/zach-starter' into eleanor-gptdraw
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r-- | src/client/views/MainView.tsx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index d9a8730e4..fd1af7547 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -78,6 +78,7 @@ import { GPTPopup } from './pdf/GPTPopup/GPTPopup'; import { TopBar } from './topbar/TopBar'; import { SmartDrawHandler } from './smartdraw/SmartDrawHandler'; import { AnnotationPalette } from './smartdraw/AnnotationPalette'; +import { InkTranscription } from './InkTranscription'; const { LEFT_MENU_WIDTH, TOPBAR_HEIGHT } = require('./global/globalCssVariables.module.scss'); // prettier-ignore const _global = (window /* browser */ || global) /* node */ as any; @@ -1112,6 +1113,7 @@ export class MainView extends ObservableReactComponent<{}> { <MarqueeOptionsMenu /> <TimelineMenu /> <RichTextMenu /> + <InkTranscription /> {this.snapLines} <LightboxView key="lightbox" PanelWidth={this._windowWidth} addSplit={CollectionDockingView.AddSplit} PanelHeight={this._windowHeight} maxBorder={this.lightboxMaxBorder} /> <GPTPopup key="gptpopup" /> |