)
) : null}
- {this.props.editing ? (
-
-
this._handleCopy(e, this.props.slate.id)}
+ {this.props.external ? null : (
+
{
+ this._test = c;
+ }}
+ >
+
- Copy ID
-
+
+
+
+
- ) : null}
+ )}
{this.props.slate.data.body ? (
@@ -237,14 +346,6 @@ export default class SlatePreviewBlock extends React.Component {
Add Files
)}
-
{
- this._ref = c;
- }}
- value={this.state.copyable}
- css={STYLES_COPY_INPUT}
- />
);
}
diff --git a/components/system/components/GlobalModal.js b/components/system/components/GlobalModal.js
index b9bc89b3..6275d0d6 100644
--- a/components/system/components/GlobalModal.js
+++ b/components/system/components/GlobalModal.js
@@ -39,12 +39,20 @@ export class GlobalModal extends React.Component {
window.addEventListener("create-modal", this._handleCreate);
window.addEventListener("delete-modal", this._handleDelete);
window.addEventListener("keydown", this._handleDocumentKeydown);
+ window.addEventListener("scroll", this._handleScroll);
};
componentWillUnmount = () => {
window.removeEventListener("create-modal", this._handleCreate);
window.removeEventListener("delete-modal", this._handleDelete);
window.removeEventListener("keydown", this._handleDocumentKeydown);
+ window.removeEventListener("scroll", this._handleScroll);
+ };
+
+ _handleScroll = (e) => {
+ if (this.state.modal) {
+ e.stopPropagation();
+ }
};
_handleCreate = (e) => {
diff --git a/components/system/components/PopoverNavigation.js b/components/system/components/PopoverNavigation.js
index 18f077d0..58013495 100644
--- a/components/system/components/PopoverNavigation.js
+++ b/components/system/components/PopoverNavigation.js
@@ -7,13 +7,13 @@ const STYLES_POPOVER = css`
z-index: ${Constants.zindex.tooltip};
box-sizing: border-box;
font-family: ${Constants.font.text};
- position: absolute;
width: 204px;
border-radius: 4px;
user-select: none;
background-color: ${Constants.system.white};
color: ${Constants.system.pitchBlack};
- box-shadow: inset 0 0 0 1px ${Constants.system.border}, 0 1px 4px rgba(0, 0, 0, 0.07);
+ box-shadow: inset 0 0 0 1px ${Constants.system.border},
+ 0 1px 4px rgba(0, 0, 0, 0.07);
`;
const STYLES_POPOVER_ITEM = css`
@@ -38,30 +38,14 @@ const STYLES_POPOVER_ITEM = css`
`;
export class PopoverNavigation extends React.Component {
- static defaultProps = {
- onNavigateTo: () => {
- console.error("requires onNavigateTo");
- },
- };
-
render() {
return (
- {this.props.navigation.map((each) => {
- if (each.action === "SIGN_OUT") {
- return (
-
- {each.text}
-
- );
- }
-
- return (
-
this.props.onNavigateTo({ id: each.value })}>
- {each.text}
-
- );
- })}
+ {this.props.navigation.map((each) => (
+
+ {each.text}
+
+ ))}
);
}
diff --git a/components/system/components/fragments/GlobalTooltip.js b/components/system/components/fragments/GlobalTooltip.js
index 9e9fca5f..512b45f7 100644
--- a/components/system/components/fragments/GlobalTooltip.js
+++ b/components/system/components/fragments/GlobalTooltip.js
@@ -135,6 +135,7 @@ export class GlobalTooltip extends React.Component {
horizontal: e.detail.horizontal,
};
this.setState({ tooltips });
+ console.log(tooltips);
};
_handleRemove = (e) => {
@@ -152,11 +153,14 @@ export class GlobalTooltip extends React.Component {
}
};
- _handleShow = (e) => {
+ _handleShow = async (e) => {
if (this.state.tooltips[e.detail.id]) {
let tooltips = this.state.tooltips;
if (!tooltips[e.detail.id].style) {
let rect = tooltips[e.detail.id].root.getBoundingClientRect();
+ console.log(tooltips[e.detail.id]);
+ console.log(tooltips[e.detail.id].root);
+ console.log(rect);
let style = this.getOrientation(
rect,
tooltips[e.detail.id].bubbleRect,
@@ -211,6 +215,7 @@ export class TooltipWrapper extends React.Component {
componentDidMount = async () => {
let bubbleRect = this._bubble.getBoundingClientRect();
+ console.log(this._bubble);
dispatchCustomEvent({
name: "add-tooltip",