Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dom-helpers #446

Merged
merged 5 commits into from Sep 9, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -58,7 +58,7 @@
"dependencies": {
"@babel/runtime": "^7.4.5",
"@restart/hooks": "^0.3.12",
"dom-helpers": "^3.4.0",
"dom-helpers": "^5.1.0",
"popper.js": "^1.15.0",
"prop-types": "^15.7.2",
"uncontrollable": "^7.0.0",
Expand Down Expand Up @@ -114,7 +114,7 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-live": "^2.1.2",
"react-transition-group": "^4.2.2",
"react-transition-group": "^4.3.0",
"rimraf": "^3.0.0",
"simulant": "^0.2.2",
"sinon": "^7.3.2",
Expand Down
4 changes: 2 additions & 2 deletions src/Dropdown.js
@@ -1,5 +1,5 @@
import matches from 'dom-helpers/query/matches';
import qsa from 'dom-helpers/query/querySelectorAll';
import matches from 'dom-helpers/matches';
import qsa from 'dom-helpers/querySelectorAll';
import React, { useCallback, useRef, useEffect, useMemo } from 'react';
import PropTypes from 'prop-types';
import { useUncontrolled } from 'uncontrollable';
Expand Down
8 changes: 4 additions & 4 deletions src/Modal.js
@@ -1,9 +1,9 @@
/* eslint-disable react/prop-types */

import activeElement from 'dom-helpers/activeElement';
import contains from 'dom-helpers/query/contains';
import canUseDom from 'dom-helpers/util/inDOM';
import listen from 'dom-helpers/events/listen';
import contains from 'dom-helpers/contains';
import canUseDOM from 'dom-helpers/canUseDOM';
import listen from 'dom-helpers/listen';
import PropTypes from 'prop-types';
import React from 'react';
import ReactDOM from 'react-dom';
Expand Down Expand Up @@ -260,7 +260,7 @@ class Modal extends React.Component {
}

getSnapshotBeforeUpdate(prevProps) {
if (canUseDom && !prevProps.show && this.props.show) {
if (canUseDOM && !prevProps.show && this.props.show) {
this.lastFocus = activeElement();
}
return null;
Expand Down
11 changes: 6 additions & 5 deletions src/ModalManager.js
@@ -1,6 +1,7 @@
import classes from 'dom-helpers/class';
import css from 'dom-helpers/style';
import getScrollbarSize from 'dom-helpers/util/scrollbarSize';
import addClass from 'dom-helpers/addClass';
import removeClass from 'dom-helpers/removeClass';
import css from 'dom-helpers/css';
import getScrollbarSize from 'dom-helpers/scrollbarSize';

import isOverflowing from './utils/isOverflowing';
import {
Expand Down Expand Up @@ -109,7 +110,7 @@ class ModalManager {
this.setContainerStyle(data, container);
}

data.classes.forEach(classes.addClass.bind(null, container));
data.classes.forEach(addClass.bind(null, container));

this.containers.push(container);
this.data.push(data);
Expand All @@ -135,7 +136,7 @@ class ModalManager {
// if that was the last modal in a container,
// clean up the container
if (data.modals.length === 0) {
data.classes.forEach(classes.removeClass.bind(null, container));
data.classes.forEach(removeClass.bind(null, container));

if (this.handleContainerOverflow) {
this.removeContainerStyle(data, container);
Expand Down
4 changes: 2 additions & 2 deletions src/useRootClose.js
@@ -1,5 +1,5 @@
import contains from 'dom-helpers/query/contains';
import listen from 'dom-helpers/events/listen';
import contains from 'dom-helpers/contains';
import listen from 'dom-helpers/listen';
import { useCallback, useEffect, useRef } from 'react';

import useEventCallback from '@restart/hooks/useEventCallback';
Expand Down
2 changes: 1 addition & 1 deletion src/utils/isOverflowing.js
@@ -1,4 +1,4 @@
import isWindow from 'dom-helpers/query/isWindow';
import isWindow from 'dom-helpers/isWindow';
import ownerDocument from 'dom-helpers/ownerDocument';

function isBody(node) {
Expand Down
4 changes: 2 additions & 2 deletions test/ModalManagerSpec.js
@@ -1,5 +1,5 @@
import css from 'dom-helpers/style';
import getScrollbarSize from 'dom-helpers/util/scrollbarSize';
import css from 'dom-helpers/css';
import getScrollbarSize from 'dom-helpers/scrollbarSize';

import ModalContainer from '../src/Modal';
import ModalManager from '../src/ModalManager';
Expand Down
2 changes: 1 addition & 1 deletion www/src/components/Playground.js
Expand Up @@ -12,7 +12,7 @@ import * as Babel from '@babel/standalone';
import { LiveProvider, LiveEditor, LiveError, LivePreview } from 'react-live';
import * as ReactOverlays from 'react-overlays';

import getOffset from 'dom-helpers/query/offset';
import getOffset from 'dom-helpers/offset';

import { css as emotionCss } from '@emotion/core';
import emotionStyled from '@emotion/styled';
Expand Down