diff options
author | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-20 19:27:53 +0530 |
---|---|---|
committer | usodhi <61431818+usodhi@users.noreply.github.com> | 2020-07-20 19:27:53 +0530 |
commit | 2d16c23cf8af25601b34e44b951ce108673831e4 (patch) | |
tree | 394a23ccfe452efead3550febd00b6bea087a73b /src/fields/Doc.ts | |
parent | 7b7d83f6f7070334fdfc4dd7cca03699b8e21078 (diff) | |
parent | d21ef189f2c160d3d80a5cf7d824c314262a59ac (diff) |
merge conflicts
Diffstat (limited to 'src/fields/Doc.ts')
-rw-r--r-- | src/fields/Doc.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index ef57171bf..2f3b7025e 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -898,9 +898,12 @@ export namespace Doc { } export function getDocTemplate(doc?: Doc) { - return doc?.isTemplateDoc ? doc : - Cast(doc?.dragFactory, Doc, null)?.isTemplateDoc ? doc?.dragFactory : - Cast(doc?.layout, Doc, null)?.isTemplateDoc ? doc?.layout : undefined; + return !doc ? undefined : + doc.isTemplateDoc ? doc : + Cast(doc.dragFactory, Doc, null)?.isTemplateDoc ? doc.dragFactory : + Cast(Doc.Layout(doc), Doc, null)?.isTemplateDoc ? + (Cast(Doc.Layout(doc), Doc, null).resolvedDataDoc ? Doc.Layout(doc).proto : Doc.Layout(doc)) : + undefined; } export function matchFieldValue(doc: Doc, key: string, value: any): boolean { |