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/DocumentIcon.tsx | |
parent | 88a8f35c33bbff61b0058a66d7bcc586d483deca (diff) | |
parent | 0ae3de67900489a6ffd43eabaa810c3ec3fdddd9 (diff) |
fix: merge conflicts
Diffstat (limited to 'src/client/views/nodes/DocumentIcon.tsx')
-rw-r--r-- | src/client/views/nodes/DocumentIcon.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/nodes/DocumentIcon.tsx b/src/client/views/nodes/DocumentIcon.tsx index a9c998757..56de2d1fc 100644 --- a/src/client/views/nodes/DocumentIcon.tsx +++ b/src/client/views/nodes/DocumentIcon.tsx @@ -52,7 +52,7 @@ export class DocumentIconContainer extends React.Component { }; }, getVars() { - const docs = DocumentManager.Instance.DocumentViews; + const docs = Array.from(DocumentManager.Instance.DocumentViews); const capturedVariables: { [name: string]: Field } = {}; usedDocuments.forEach(index => capturedVariables[`d${index}`] = docs[index].props.Document); return { capturedVariables }; @@ -60,6 +60,6 @@ export class DocumentIconContainer extends React.Component { }; } render() { - return DocumentManager.Instance.DocumentViews.map((dv, i) => <DocumentIcon key={i} index={i} view={dv} />); + return Array.from(DocumentManager.Instance.DocumentViews).map((dv, i) => <DocumentIcon key={i} index={i} view={dv} />); } }
\ No newline at end of file |