diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-06-28 01:54:07 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-06-28 01:54:07 -0500 |
| commit | 31afe6fcaaa350f3e66ecd35637e2adea217dceb (patch) | |
| tree | 36ef22fda85c62fd668ba7454209fa08daddc064 /src/client/views/collections/CollectionSubView.tsx | |
| parent | e5385f9421b23d4119ac8704c9d127f1f296ac54 (diff) | |
| parent | 790cc785a5cad47f0dd274c7f4773eff7d7d9c2e (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into anika_schema_view
Diffstat (limited to 'src/client/views/collections/CollectionSubView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionSubView.tsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx index 570f9375e..3a13ac822 100644 --- a/src/client/views/collections/CollectionSubView.tsx +++ b/src/client/views/collections/CollectionSubView.tsx @@ -104,8 +104,7 @@ export function CollectionSubView<T, X>(schemaCtor: (doc: Doc) => T, moreProps?: } docFilters = () => { return this.props.ignoreFields?.includes("_docFilters") ? [] : - this.props.docFilters !== returnEmptyFilter ? this.props.docFilters() : - Cast(this.props.Document._docFilters, listSpec("string"), []); + [...this.props.docFilters(), ...Cast(this.props.Document._docFilters, listSpec("string"), [])]; } @computed get childDocs() { const docFilters = this.docFilters(); |