diff options
| author | kimdahey <claire_kim1@brown.edu> | 2019-09-21 15:43:22 -0400 |
|---|---|---|
| committer | kimdahey <claire_kim1@brown.edu> | 2019-09-21 15:43:22 -0400 |
| commit | 0b0789816e8a996b32d92e305da84b5922a49f40 (patch) | |
| tree | e0a5ae13305c3f4d20413c5930f8281741fade98 /src/client/views/nodes/FieldView.tsx | |
| parent | f520d5a821b515e0c216f055e93f0549bd6733a9 (diff) | |
| parent | 1d5dc3eb4095cea017412de9519b8eaee979c16c (diff) | |
merge conflicts
Diffstat (limited to 'src/client/views/nodes/FieldView.tsx')
| -rw-r--r-- | src/client/views/nodes/FieldView.tsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/views/nodes/FieldView.tsx b/src/client/views/nodes/FieldView.tsx index 943d181d6..49fc2263d 100644 --- a/src/client/views/nodes/FieldView.tsx +++ b/src/client/views/nodes/FieldView.tsx @@ -30,6 +30,7 @@ export interface FieldViewProps { leaveNativeSize?: boolean; fitToBox?: boolean; ContainingCollectionView: Opt<CollectionView | CollectionPDFView | CollectionVideoView>; + ContainingCollectionDoc: Opt<Doc>; ruleProvider: Doc | undefined; Document: Doc; DataDoc?: Doc; @@ -38,7 +39,7 @@ export interface FieldViewProps { select: (isCtrlPressed: boolean) => void; renderDepth: number; addDocument?: (document: Doc, allowDuplicates?: boolean) => boolean; - addDocTab: (document: Doc, dataDoc: Doc | undefined, where: string) => void; + addDocTab: (document: Doc, dataDoc: Doc | undefined, where: string) => boolean; pinToPres: (document: Doc) => void; removeDocument?: (document: Doc) => boolean; moveDocument?: (document: Doc, targetCollection: Doc, addDocument: (document: Doc) => boolean) => boolean; |