diff options
Diffstat (limited to 'src/client/views/nodes')
| -rw-r--r-- | src/client/views/nodes/LinkBox.scss | 23 | ||||
| -rw-r--r-- | src/client/views/nodes/LinkBox.tsx | 28 | ||||
| -rw-r--r-- | src/client/views/nodes/LinkEditor.scss | 3 | ||||
| -rw-r--r-- | src/client/views/nodes/VideoBox.tsx | 4 |
4 files changed, 31 insertions, 27 deletions
diff --git a/src/client/views/nodes/LinkBox.scss b/src/client/views/nodes/LinkBox.scss index 8bc70b48f..639f83b38 100644 --- a/src/client/views/nodes/LinkBox.scss +++ b/src/client/views/nodes/LinkBox.scss @@ -1,14 +1,14 @@ @import "../globalCssVariables"; .link-container { width: 100%; - height: 35px; + height: 50px; display: flex; flex-direction: row; border-top: 0.5px solid #bababa; } .info-container { - width: 55%; + width: 65%; padding-top: 5px; padding-left: 5px; display: flex; @@ -24,7 +24,8 @@ } .button-container { - width: 45%; + width: 35%; + padding-top: 8px; display: flex; flex-direction: row; } @@ -49,17 +50,17 @@ cursor: pointer; } -.fa-icon-view { - margin-left: 3px; - margin-top: 5px; -} +// .fa-icon-view { +// margin-left: 3px; +// margin-top: 5px; +// } .fa-icon-edit { - margin-left: 5px; - margin-top: 5px; + margin-left: 6px; + margin-top: 6px; } .fa-icon-delete { - margin-left: 6px; - margin-top: 5px; + margin-left: 7px; + margin-top: 6px; }
\ No newline at end of file diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx index 1c0e316e8..8f979fdd7 100644 --- a/src/client/views/nodes/LinkBox.tsx +++ b/src/client/views/nodes/LinkBox.tsx @@ -11,6 +11,7 @@ import { undoBatch } from "../../util/UndoManager"; import { CollectionDockingView } from "../collections/CollectionDockingView"; import './LinkBox.scss'; import React = require("react"); +import { runInAction } from 'mobx'; library.add(faEye); @@ -46,6 +47,7 @@ export class LinkBox extends React.Component<Props> { } let contextView = DocumentManager.Instance.getDocumentView(contextDoc); if (contextView) { + contextDoc.SetText(KeyStore.PanTransformType, "Ease"); contextView.props.focus(contextDoc); } else { CollectionDockingView.Instance.AddRightSplit(contextDoc); @@ -69,20 +71,22 @@ export class LinkBox extends React.Component<Props> { e.stopPropagation(); this.props.linkDoc.GetTAsync(KeyStore.LinkedFromDocs, Document, field => { if (field) { - field.GetTAsync<ListField<Document>>(KeyStore.LinkedToDocs, ListField, field => { - if (field) { - field.Data.splice(field.Data.indexOf(this.props.linkDoc)); - } - }); + field.GetTAsync<ListField<Document>>(KeyStore.LinkedToDocs, ListField, field => + runInAction(() => { + if (field) { + field.Data.splice(field.Data.indexOf(this.props.linkDoc)); + } + })); } }); this.props.linkDoc.GetTAsync(KeyStore.LinkedToDocs, Document, field => { if (field) { - field.GetTAsync<ListField<Document>>(KeyStore.LinkedFromDocs, ListField, field => { - if (field) { - field.Data.splice(field.Data.indexOf(this.props.linkDoc)); - } - }); + field.GetTAsync<ListField<Document>>(KeyStore.LinkedFromDocs, ListField, field => + runInAction(() => { + if (field) { + field.Data.splice(field.Data.indexOf(this.props.linkDoc)); + } + })); } }); } @@ -102,8 +106,8 @@ export class LinkBox extends React.Component<Props> { </div> <div className="button-container"> - <div title="Follow Link" className="button" onPointerDown={this.onViewButtonPressed}> - <FontAwesomeIcon className="fa-icon-view" icon="eye" size="sm" /></div> + {/* <div title="Follow Link" className="button" onPointerDown={this.onViewButtonPressed}> + <FontAwesomeIcon className="fa-icon-view" icon="eye" size="sm" /></div> */} <div title="Edit Link" className="button" onPointerDown={this.onEditButtonPressed}> <FontAwesomeIcon className="fa-icon-edit" icon="edit" size="sm" /></div> <div title="Delete Link" className="button" onPointerDown={this.onDeleteButtonPressed}> diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss index ea2e7289c..9629585d7 100644 --- a/src/client/views/nodes/LinkEditor.scss +++ b/src/client/views/nodes/LinkEditor.scss @@ -22,7 +22,7 @@ .save-button { width: 50px; - height: 20px; + height: 22px; pointer-events: auto; background-color: $dark-color; color: $light-color; @@ -38,6 +38,5 @@ .save-button:hover { background: $main-accent; - transform: scale(1.05); cursor: pointer; }
\ No newline at end of file diff --git a/src/client/views/nodes/VideoBox.tsx b/src/client/views/nodes/VideoBox.tsx index b34f1dc08..3bb930ba7 100644 --- a/src/client/views/nodes/VideoBox.tsx +++ b/src/client/views/nodes/VideoBox.tsx @@ -65,11 +65,11 @@ export class VideoBox extends React.Component<FieldViewProps> { return <div>Loading</div>; } return (this.props.Document.GetNumber(KeyStore.NativeHeight, 0)) ? - this.videoContent(field.data.href) : + this.videoContent(field.Data.href) : <Measure onResize={this.setScaling}> {({ measureRef }) => <div style={{ width: "100%", height: "auto" }} ref={measureRef}> - {this.videoContent(field.data.href)} + {this.videoContent(field!.Data.href)} </div> } </Measure>; |
