diff options
author | Jenny Yu <jennyyu212@outlook.com> | 2022-06-08 19:00:02 -0700 |
---|---|---|
committer | Jenny Yu <jennyyu212@outlook.com> | 2022-06-08 19:00:02 -0700 |
commit | dff15ea5cc4b351f9bea90c1822e1b02d4f0730b (patch) | |
tree | e3e893b6b8fdf95e9860673f0b4357e26dc9ff1d /src/client/views/nodes/WebBox.tsx | |
parent | 88a8f35c33bbff61b0058a66d7bcc586d483deca (diff) | |
parent | 0ae3de67900489a6ffd43eabaa810c3ec3fdddd9 (diff) |
fix: merge conflicts
Diffstat (limited to 'src/client/views/nodes/WebBox.tsx')
-rw-r--r-- | src/client/views/nodes/WebBox.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/nodes/WebBox.tsx b/src/client/views/nodes/WebBox.tsx index 28af6bfa1..10974ca03 100644 --- a/src/client/views/nodes/WebBox.tsx +++ b/src/client/views/nodes/WebBox.tsx @@ -756,7 +756,7 @@ export class WebBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps whenChildContentsActiveChanged={this.whenChildContentsActiveChanged} removeDocument={this.removeDocument} moveDocument={this.moveDocument} - addDocument={this.sidebarAddDocument} + addDocument={this.addDocument} styleProvider={this.childStyleProvider} childPointerEvents={this.props.isContentActive() ? "all" : undefined} pointerEvents={this.annotationPointerEvents} />; |