diff options
Diffstat (limited to 'src/client/views/DocComponent.tsx')
| -rw-r--r-- | src/client/views/DocComponent.tsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/client/views/DocComponent.tsx b/src/client/views/DocComponent.tsx index fbc27192c..9d7c06750 100644 --- a/src/client/views/DocComponent.tsx +++ b/src/client/views/DocComponent.tsx @@ -1,11 +1,16 @@ import * as React from 'react'; import { Doc } from '../../new_fields/Doc'; +import { Touchable } from './Touchable'; import { computed, action } from 'mobx'; import { Cast, BoolCast } from '../../new_fields/Types'; import { listSpec } from '../../new_fields/Schema'; import { InkingControl } from './InkingControl'; import { InkTool } from '../../new_fields/InkField'; +<<<<<<< HEAD +export function DocComponent<P extends { Document: Doc }, T>(schemaCtor: (doc: Doc) => T) { + class Component extends Touchable<P> { +======= /// DocComponents returns a generic base class for React views of document fields that are not interactive interface DocComponentProps { @@ -13,6 +18,7 @@ interface DocComponentProps { } export function DocComponent<P extends DocComponentProps, T>(schemaCtor: (doc: Doc) => T) { class Component extends React.Component<P> { +>>>>>>> 33811c112c7e479813908ba10f72813954a3e289 //TODO This might be pretty inefficient if doc isn't observed, because computed doesn't cache then @computed get Document(): T { |