aboutsummaryrefslogtreecommitdiff
path: root/src/client/util
diff options
context:
space:
mode:
authorab <abdullah_ahmed@brown.edu>2019-06-20 16:54:16 -0400
committerab <abdullah_ahmed@brown.edu>2019-06-20 16:54:16 -0400
commit7ef1f39703a378df3f1116d046f9b57a4427d64d (patch)
tree65a647e1b9e7b8fbc3142e5f076f3e455260e98d /src/client/util
parent6259738cf77c2749f556e6d57addae8dac1b32d2 (diff)
div moved, but z-index is fd
Diffstat (limited to 'src/client/util')
-rw-r--r--src/client/util/TooltipTextMenu.scss12
-rw-r--r--src/client/util/TooltipTextMenu.tsx13
2 files changed, 16 insertions, 9 deletions
diff --git a/src/client/util/TooltipTextMenu.scss b/src/client/util/TooltipTextMenu.scss
index 456953fb6..d19ded68f 100644
--- a/src/client/util/TooltipTextMenu.scss
+++ b/src/client/util/TooltipTextMenu.scss
@@ -18,6 +18,7 @@
.ProseMirror-menuitem {
margin-right: 3px;
display: inline-block;
+ z-index: 100000;
}
.ProseMirror-menuseparator {
@@ -67,7 +68,7 @@
}
.ProseMirror-menu-dropdown-menu {
- z-index: 15;
+ z-index: 100000;
min-width: 6em;
background: white;
}
@@ -80,6 +81,7 @@
cursor: pointer;
padding: 2px 8px 2px 4px;
width: auto;
+ z-index: 100000;
}
.ProseMirror-menu-dropdown-item:hover {
@@ -233,8 +235,8 @@
}
.tooltipMenu {
- position: absolute;
- // z-index: 50;
+ position: relative;
+ z-index: 2000;
background: #121721;
border: 1px solid silver;
border-radius: 15px;
@@ -245,8 +247,8 @@
//transform: translateX(-50%);
transform: translateY(-85px);
pointer-events: all;
- // height: 100;
- // width:250;
+ height: 30px;
+ width:500px;
.ProseMirror-example-setup-style hr {
padding: 2px 10px;
border: none;
diff --git a/src/client/util/TooltipTextMenu.tsx b/src/client/util/TooltipTextMenu.tsx
index 641514af9..06c8bbc1a 100644
--- a/src/client/util/TooltipTextMenu.tsx
+++ b/src/client/util/TooltipTextMenu.tsx
@@ -29,6 +29,7 @@ import { CollectionDockingView } from "../views/collections/CollectionDockingVie
import { DocumentManager } from "./DocumentManager";
import { Id } from "../../new_fields/FieldSymbols";
import { Utils } from "../../Utils";
+import { FormattedTextBoxProps } from "../views/nodes/FormattedTextBox";
// import { wrap } from "module";
const SVG = "http://www.w3.org/2000/svg";
@@ -42,7 +43,7 @@ export class TooltipTextMenu {
private fontStyles: MarkType[];
private fontSizes: MarkType[];
private listTypes: NodeType[];
- private editorProps: FieldViewProps;
+ private editorProps: FieldViewProps & FormattedTextBoxProps;
private state: EditorState;
private fontSizeToNum: Map<MarkType, number>;
private fontStylesToName: Map<MarkType, string>;
@@ -58,7 +59,7 @@ export class TooltipTextMenu {
private fontStyleDom?: Node;
private listTypeBtnDom?: Node;
- constructor(view: EditorView, editorProps: FieldViewProps) {
+ constructor(view: EditorView, editorProps: FieldViewProps & FormattedTextBoxProps) {
this.view = view;
this.state = view.state;
this.editorProps = editorProps;
@@ -139,9 +140,13 @@ export class TooltipTextMenu {
this.update(view, undefined);
- view.dom.parentNode!.parentNode!.insertBefore(this.tooltip, view.dom.parentNode);
+ //view.dom.parentNode!.parentNode!.insertBefore(this.tooltip, view.dom.parentNode);
- //console.log("hi");
+ // quick and dirty null check
+ const outer_div = this.editorProps.outer_div;
+ outer_div && outer_div(this.tooltip);
+
+ console.log("hi");
}
//label of dropdown will change to given label