aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2019-11-22 08:59:43 -0500
committerBob Zeleznik <zzzman@gmail.com>2019-11-22 08:59:43 -0500
commit6172389522cd186a6eb3d53b9f38f9d6fde3ba1f (patch)
treeb420c452a6fdb463be3ad4e6b0eab1a01773ad12 /src
parent7ef52a87d1731770c6e1a8cd1aef31cb384fff05 (diff)
cleaned up previewcursor warnings
Diffstat (limited to 'src')
-rw-r--r--src/client/views/PreviewCursor.scss1
-rw-r--r--src/client/views/PreviewCursor.tsx30
2 files changed, 14 insertions, 17 deletions
diff --git a/src/client/views/PreviewCursor.scss b/src/client/views/PreviewCursor.scss
index 20f9b9a49..d384fd284 100644
--- a/src/client/views/PreviewCursor.scss
+++ b/src/client/views/PreviewCursor.scss
@@ -6,4 +6,5 @@
top: 0;
left:0;
pointer-events: none;
+ opacity: 1;
} \ No newline at end of file
diff --git a/src/client/views/PreviewCursor.tsx b/src/client/views/PreviewCursor.tsx
index eed2cc5da..136a272ab 100644
--- a/src/client/views/PreviewCursor.tsx
+++ b/src/client/views/PreviewCursor.tsx
@@ -1,4 +1,4 @@
-import { action, observable, runInAction } from 'mobx';
+import { action, observable, runInAction, trace } from 'mobx';
import { observer } from 'mobx-react';
import "normalize.css";
import * as React from 'react';
@@ -7,21 +7,16 @@ import { Docs } from '../documents/Documents';
// import { Transform } from 'prosemirror-transform';
import { Doc } from '../../new_fields/Doc';
import { Transform } from "../util/Transform";
+import { TraceMobx } from '../../new_fields/util';
@observer
export class PreviewCursor extends React.Component<{}> {
- private _prompt = React.createRef<HTMLDivElement>();
static _onKeyPress?: (e: KeyboardEvent) => void;
static _getTransform: () => Transform;
static _addLiveTextDoc: (doc: Doc) => void;
static _addDocument: (doc: Doc) => boolean;
@observable static _clickPoint = [0, 0];
@observable public static Visible = false;
- //when focus is lost, this will remove the preview cursor
- @action onBlur = (): void => {
- PreviewCursor.Visible = false;
- }
-
constructor(props: any) {
super(props);
document.addEventListener("keydown", this.onKeyPress);
@@ -108,6 +103,12 @@ export class PreviewCursor extends React.Component<{}> {
}
}
}
+
+ //when focus is lost, this will remove the preview cursor
+ @action onBlur = (): void => {
+ PreviewCursor.Visible = false;
+ }
+
@action
public static Show(x: number, y: number,
onKeyPress: (e: KeyboardEvent) => void,
@@ -119,18 +120,13 @@ export class PreviewCursor extends React.Component<{}> {
this._addLiveTextDoc = addLiveText;
this._getTransform = getTransform;
this._addDocument = addDocument;
- setTimeout(action(() => this.Visible = true), (1));
+ this.Visible = true;
}
render() {
- if (!PreviewCursor._clickPoint) {
- return (null);
- }
- if (PreviewCursor.Visible && this._prompt.current) {
- this._prompt.current.focus();
- }
- return <div className="previewCursor" id="previewCursor" onBlur={this.onBlur} tabIndex={0} ref={this._prompt}
- style={{ transform: `translate(${PreviewCursor._clickPoint[0]}px, ${PreviewCursor._clickPoint[1]}px)`, opacity: PreviewCursor.Visible ? 1 : 0 }}>
- I
+ return (!PreviewCursor._clickPoint || !PreviewCursor.Visible) ? (null) :
+ <div className="previewCursor" onBlur={this.onBlur} tabIndex={0} ref={e => e && e.focus()}
+ style={{ transform: `translate(${PreviewCursor._clickPoint[0]}px, ${PreviewCursor._clickPoint[1]}px)` }}>
+ I
</div >;
}
} \ No newline at end of file