aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-06-17 18:13:36 -0400
committerbob <bcz@cs.brown.edu>2019-06-17 18:13:36 -0400
commit0cd0f5afdef91740fecdedaaecb2ed6be054eee5 (patch)
tree9edbe9328f25eedb0251ce72f6a7cff98d8cd7c3 /src
parenta408a4d791fa19f19bd9fab791c2bea2c0d178ab (diff)
somewhat fixed problem of titles & text boxes
Diffstat (limited to 'src')
-rw-r--r--src/client/views/MainOverlayTextBox.tsx4
-rw-r--r--src/client/views/Templates.tsx8
2 files changed, 8 insertions, 4 deletions
diff --git a/src/client/views/MainOverlayTextBox.tsx b/src/client/views/MainOverlayTextBox.tsx
index 23e90ece5..4e983c906 100644
--- a/src/client/views/MainOverlayTextBox.tsx
+++ b/src/client/views/MainOverlayTextBox.tsx
@@ -10,6 +10,7 @@ import { Transform } from '../util/Transform';
import { CollectionDockingView } from './collections/CollectionDockingView';
import "./MainOverlayTextBox.scss";
import { FormattedTextBox } from './nodes/FormattedTextBox';
+import { For } from 'babel-types';
interface MainOverlayTextBoxProps {
}
@@ -25,6 +26,7 @@ export class MainOverlayTextBox extends React.Component<MainOverlayTextBoxProps>
private _textProxyDiv: React.RefObject<HTMLDivElement>;
private _textBottom: boolean | undefined;
private _textAutoHeight: boolean | undefined;
+ private _textBox: FormattedTextBox | undefined;
@observable public TextDoc?: Doc;
constructor(props: MainOverlayTextBoxProps) {
@@ -33,6 +35,7 @@ export class MainOverlayTextBox extends React.Component<MainOverlayTextBoxProps>
MainOverlayTextBox.Instance = this;
reaction(() => FormattedTextBox.InputBoxOverlay,
(box?: FormattedTextBox) => {
+ this._textBox = box;
if (box) {
this.TextDoc = box.props.Document;
let sxf = Utils.GetScreenTransform(box ? box.CurrentDiv : undefined);
@@ -68,6 +71,7 @@ export class MainOverlayTextBox extends React.Component<MainOverlayTextBoxProps>
textScroll = (e: React.UIEvent) => {
if (this._textProxyDiv.current && this._textTargetDiv) {
this._textTargetDiv.scrollTop = (e as any)._targetInst.stateNode.scrollTop;
+ console.log(this._textTargetDiv.scrollTop + " != " + (e as any)._targetInst.stateNode.scrollTop + " != " + (this._textBox!.CurrentDiv ? this._textBox!.CurrentDiv.scrollTop : -1));
}
}
diff --git a/src/client/views/Templates.tsx b/src/client/views/Templates.tsx
index 3cd525afa..3d5f7b6ea 100644
--- a/src/client/views/Templates.tsx
+++ b/src/client/views/Templates.tsx
@@ -48,12 +48,12 @@ export namespace Templates {
</div>` );
export const Title = new Template("Title", TemplatePosition.InnerTop,
- `<div style="height:100%">
+ `<div>
<div style="height:25px; width:100%; background-color: rgba(0, 0, 0, .4); color: white; ">
<span style="text-align:center;width:100%;font-size:20px;position:absolute;overflow:hidden;white-space:nowrap;text-overflow:ellipsis">{props.Document.title}</span>
</div>
- <div style="display:flex; flex-direction:column; height:calc(100% - 25px);">
- <div style="height:min-content; width:100%;overflow:auto">{layout}</div>
+ <div style="height:calc(100% - 25px);">
+ <div style="width:100%;overflow:auto">{layout}</div>
</div>
</div>` );
@@ -62,7 +62,7 @@ export namespace Templates {
<div style="width:100%; background-color: rgba(0, 0, 0, .4); color: white; ">
<FormattedTextBox {...props} height={"min-content"} color={"white"} fieldKey={"header"} />
</div>
- <div style="width:100%;height:min-content;overflow:auto;">{layout}</div>
+ <div style="width:100%;height:100%;overflow:auto;">{layout}</div>
</div > ` );
export const Bullet = new Template("Bullet", TemplatePosition.InnerTop,