diff options
| author | Stanley Yip <stanley_yip@brown.edu> | 2019-10-13 15:58:23 -0400 |
|---|---|---|
| committer | Stanley Yip <stanley_yip@brown.edu> | 2019-10-13 15:58:23 -0400 |
| commit | b50381f4872d4e5eaa6d1d8949ea4e10d468cfd8 (patch) | |
| tree | c2939d230a5618aa609e4db84bfdee923bad80bd /src/client/views/OverlayView.tsx | |
| parent | bd796f24677b2aacd32a371da6d2b7c7eb354018 (diff) | |
| parent | baf6ed901d341cade58741d363bbc475519558ae (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into interaction_stanley
Diffstat (limited to 'src/client/views/OverlayView.tsx')
| -rw-r--r-- | src/client/views/OverlayView.tsx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/views/OverlayView.tsx b/src/client/views/OverlayView.tsx index bb6dd5076..95c7b2683 100644 --- a/src/client/views/OverlayView.tsx +++ b/src/client/views/OverlayView.tsx @@ -145,6 +145,7 @@ export class OverlayView extends React.Component { return (null); } return CurrentUserUtils.UserDocument.overlays instanceof Doc && DocListCast(CurrentUserUtils.UserDocument.overlays.data).map(d => { + d.inOverlay = true; let offsetx = 0, offsety = 0; let onPointerMove = action((e: PointerEvent) => { if (e.buttons === 1) { @@ -170,14 +171,14 @@ export class OverlayView extends React.Component { document.addEventListener("pointerup", onPointerUp); }; return <div className="overlayView-doc" key={d[Id]} onPointerDown={onPointerDown} style={{ transform: `translate(${d.x}px, ${d.y}px)`, display: d.isMinimized ? "none" : "" }}> - <DocumentContentsView + <DocumentView Document={d} ChromeHeight={returnZero} - isSelected={returnFalse} - select={emptyFunction} - ruleProvider={undefined} - layoutKey={"layout"} + // isSelected={returnFalse} + // select={emptyFunction} + // layoutKey={"layout"} bringToFront={emptyFunction} + ruleProvider={undefined} addDocument={undefined} removeDocument={undefined} ContentScaling={returnOne} |
