diff options
| author | bobzel <zzzman@gmail.com> | 2021-02-03 16:06:48 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2021-02-03 16:06:48 -0500 |
| commit | 9ae759a3c612bee4803e3714ef4ff141603a9341 (patch) | |
| tree | 6f24528fab4a5afd604d2af87f4c1758e0ab121c /src | |
| parent | 6b15f2498209a896fba50da5ae3085405324991b (diff) | |
fixed selecting text in lightbox view.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/MainView.tsx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index 1f96a26a4..d72b2b409 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -601,8 +601,17 @@ export class MainView extends React.Component { lightboxFuture: (Opt<Doc>)[] = []; @computed get lightboxView() { if (this.lightboxHistory.lastElement() !== this.LightboxDoc) this.lightboxHistory.push(this.LightboxDoc); + let downx = 0, downy = 0; return !this.LightboxDoc ? (null) : - <div className="mainView-lightBox-frame" onClick={action(() => this.LightboxDoc = undefined)} > + <div className="mainView-lightBox-frame" + onPointerDown={e => { downx = e.clientX; downy = e.clientY; }} + onClick={action(e => { + if (Math.abs(downx - e.clientX) < 4 && Math.abs(downy - e.clientY) < 4) { + this.lightboxHistory = []; + this.lightboxFuture = []; + this.LightboxDoc = undefined; + } + })} > <div className="mainView-lightBox-contents" style={{ left: Math.min(window.innerWidth / 4, 200), top: Math.min(window.innerHeight / 4, 100), @@ -633,7 +642,7 @@ export class MainView extends React.Component { ContainingCollectionDoc={undefined} renderDepth={0} /> </div> - <div style={{ position: "absolute", width: Math.min(window.innerWidth / 4, 200) }}> + <div style={{ position: "absolute", display: this.LightboxDoc && this.lightboxHistory.length ? "" : "none", width: Math.min(window.innerWidth / 4, 200) }}> <div className="mainView-lightBox-navBtn" style={{ top: window.innerHeight / 2 - 12.50 }} onClick={action(e => { e.stopPropagation(); @@ -643,7 +652,7 @@ export class MainView extends React.Component { <FontAwesomeIcon icon={"chevron-left"} size="3x" /> </div> </div> - <div style={{ position: "absolute", left: window.innerWidth - Math.min(window.innerWidth / 4, 200), width: Math.min(window.innerWidth / 4, 200) }}> + <div style={{ position: "absolute", display: this.LightboxDoc && this.lightboxFuture.length ? "" : "none", left: window.innerWidth - Math.min(window.innerWidth / 4, 200), width: Math.min(window.innerWidth / 4, 200) }}> <div className="mainView-lightBox-navBtn" style={{ top: window.innerHeight / 2 - 12.50 }} onClick={action(e => { e.stopPropagation(); |