Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 80 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"react-dates": "^21.8.0",
"react-dom": "^16.14.0",
"react-router-dom": "^5.3.0",
"react-tooltip": "^4.5.1",
"react-tooltip": "^5.29.1",
"style-loader": "^4.0.0",
"webpack": "^5.99.9",
"webpack-bundle-analyzer": "^4.10.2",
Expand Down
8 changes: 4 additions & 4 deletions src/components/annotation-form.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component } from 'react';
import StandardTooltip from './standard-tooltip';
import StandardTooltip from './standard-tooltip/standard-tooltip';

/**
* @typedef {Object} AnnotationFormProps
Expand Down Expand Up @@ -83,7 +83,7 @@ export default class AnnotationForm extends Component {

<StandardTooltip
id="annotation-tooltip"
disable={!this.props.collapsed}
hidden={!this.props.collapsed}
/>
</form>
);
Expand Down Expand Up @@ -123,8 +123,8 @@ function Checkbox ({ children, formValues, name, onChange, collapsed }) {
/>
<label
className="toggle-btn"
data-for="annotation-tooltip"
data-tip={children}
data-tooltip-id="annotation-tooltip"
data-tooltip-content={children}
data-fieldNumber={fieldNumber}
htmlFor={uuid}
>
Expand Down
6 changes: 3 additions & 3 deletions src/components/page-details/page-details.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Loading from '../loading';
import ExternalLink from '../external-link';
import PageUrlDetails from '../page-url-details/page-url-details';
import PageTag from '../page-tag/page-tag';
import StandardTooltip from '../standard-tooltip';
import StandardTooltip from '../standard-tooltip/standard-tooltip';
import { describeHttpStatus } from '../../scripts/http-info';
import { removeNonUserTags } from '../../scripts/tools';

Expand Down Expand Up @@ -141,8 +141,8 @@ export default class PageDetails extends Component {
<span
styleName={`pageStyles.info-item pageStyles.${statusError ? 'status-error' : 'status-ok'}`}
data-http-status={statusCode}
data-for="page-tooltip"
data-tip={describeHttpStatus(statusCode)}
data-tooltip-id="page-tooltip"
data-tooltip-content={describeHttpStatus(statusCode)}
>
{statusError ? '✘' : '•'} HTTP Status: {statusCode}
</span>
Expand Down
8 changes: 4 additions & 4 deletions src/components/page-list/page-list.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Loading from '../loading';
import { Component } from 'react';
import SearchBar from '../search-bar/search-bar';
import StandardTooltip from '../standard-tooltip';
import StandardTooltip from '../standard-tooltip/standard-tooltip';
import PageTag from '../page-tag/page-tag';
import {
getHttpStatusCategory,
Expand Down Expand Up @@ -56,7 +56,7 @@ export default class PageList extends Component {
renderPages () {
return (
<div styleName="listStyles.container">
<StandardTooltip id="list-tooltip" />
<StandardTooltip id="list-tooltip" delayHide={20_000} />
<table styleName="listStyles.table listStyles.page-list">
<thead>{this.renderHeader()}</thead>
<tbody>
Expand Down Expand Up @@ -94,8 +94,8 @@ export default class PageList extends Component {
<td>{tags.map(tag => <PageTag tag={tag} key={tag.name} />)}</td>
<td
data-status-category={statusCategory}
data-for="list-tooltip"
data-tip={describeHttpStatus(statusCode)}
data-tooltip-id="list-tooltip"
data-tooltip-content={describeHttpStatus(statusCode)}
>
{statusCode >= 400 ? '✘' : '•'} {record.status}
</td>
Expand Down
5 changes: 0 additions & 5 deletions src/components/standard-tooltip.jsx

This file was deleted.

3 changes: 3 additions & 0 deletions src/components/standard-tooltip/standard-tooltip.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.standard-tooltip {
z-index: 10;
}
10 changes: 10 additions & 0 deletions src/components/standard-tooltip/standard-tooltip.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Tooltip } from 'react-tooltip';
import styles from './standard-tooltip.css'; // eslint-disable-line

export default function StandardTooltip (props) {
return <Tooltip
place="top"
styleName="styles.standard-tooltip"
{...props}
/>;
}