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
2 changes: 1 addition & 1 deletion packages/patternfly-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"react-ellipsis-with-tooltip": "^1.0.8",
"react-fontawesome": "^1.6.1",
"react-motion": "^0.5.2",
"react-recompose": "^0.31.1",
"reactabular-table": "^8.14.0",
"recompose": "^0.26.0",
"uuid": "^3.3.2"
},
"optionalDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-react/src/components/Chart/BarChart.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import C3Chart from 'react-c3js';
import { compose, mapProps } from 'recompose';
import { compose, mapProps } from 'react-recompose';
import { getComposer } from './ChartConstants';
import { c3ChartDefaults } from '../../common/patternfly';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import { compose, setDisplayName, mapProps, defaultProps, setPropTypes } from 'recompose';
import { compose, setDisplayName, mapProps, defaultProps, setPropTypes } from 'react-recompose';
import C3Chart from 'react-c3js';

import { c3ChartDefaults } from '../../common/patternfly';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import C3Chart from 'react-c3js';
import { findDOMNode } from 'react-dom';
import { lifecycle, compose } from 'recompose';
import { lifecycle, compose } from 'react-recompose';

import { patternfly } from '../../common/patternfly';
import { getComposer } from './ChartConstants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ exports[`DecadeView is working properly 1`] = `
colspan="7"
>
<span
class="year active"
class="year "
>
2020
</span>
<span
class="year "
class="year active"
>
2021
</span>
Expand Down
2 changes: 1 addition & 1 deletion packages/patternfly-react/src/components/Filter/Filter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classNames from 'classnames';
import React from 'react';
import PropTypes from 'prop-types';
import { getContext } from 'recompose';
import { getContext } from 'react-recompose';
import { toolbarContextTypes } from '../Toolbar/ToolbarConstants';
import FilterTypeSelector from './FilterTypeSelector';
import FilterValueSelector from './FilterValueSelector';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { orderBy } from 'lodash';
import classNames from 'classnames';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import {
actionHeaderCellFormatter,
customHeaderFormattersDefinition,
Expand Down Expand Up @@ -440,7 +440,7 @@ import {
import { MenuItem } from '../../MenuItem';
import { Grid } from '../../Grid';
import { PaginationRow, paginate, PAGINATION_VIEW } from '../../Pagination';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import { mockRows } from './mockRows';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { orderBy } from 'lodash';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import {
actionHeaderCellFormatter,
customHeaderFormattersDefinition,
Expand Down Expand Up @@ -263,7 +263,7 @@ import {
TABLE_SORT_DIRECTION
} from '../index';
import { MenuItem } from '../../MenuItem';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import { mockRows } from './mockRows';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import { cloneDeep, findIndex, orderBy } from 'lodash';
import { KEY_CODES } from '../../../common/helpers';
import {
Expand Down Expand Up @@ -338,7 +338,7 @@ export const mockInlineEditCellTableSource = `
import React from 'react';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import { cloneDeep, findIndex, orderBy } from 'lodash';
import { KEY_CODES } from '../../../common/helpers';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { cloneDeep, findIndex, orderBy } from 'lodash';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import {
customHeaderFormattersDefinition,
defaultSortingOrder,
Expand Down Expand Up @@ -289,7 +289,7 @@ import React from 'react';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { cloneDeep, findIndex, orderBy } from 'lodash';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import {
customHeaderFormattersDefinition,
defaultSortingOrder,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { cloneDeep, findIndex, orderBy } from 'lodash';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import {
actionHeaderCellFormatter,
customHeaderFormattersDefinition,
Expand Down Expand Up @@ -321,7 +321,7 @@ import React from 'react';
import * as sort from 'sortabular';
import * as resolve from 'table-resolver';
import { cloneDeep, findIndex, orderBy } from 'lodash';
import { compose } from 'recompose';
import { compose } from 'react-recompose';
import {
actionHeaderCellFormatter,
customHeaderFormattersDefinition,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { withContext } from 'recompose';
import { withContext } from 'react-recompose';
import { hasDisplayName, filterChildren } from '../../common/helpers';
import { Grid } from '../Grid';
import ToolbarResults from './ToolbarResults';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { withContext } from 'recompose';
import { withContext } from 'react-recompose';

const toolbarContextTypes = { isDescendantOfToolbar: PropTypes.bool };

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { withContext } from 'recompose';
import { withContext } from 'react-recompose';
import { selectKeys, filterChildren } from '../../common/helpers';
import { VerticalNavItem, VerticalNavSecondaryItem, VerticalNavTertiaryItem } from './index';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { getContext } from 'recompose';
import { getContext } from 'react-recompose';
import { wrongDepth, correctDepth, navContextTypes } from './VerticalNavConstants';
import VerticalNavItemHelper from './VerticalNavItemHelper';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { getContext } from 'recompose';
import { getContext } from 'react-recompose';
import { ListGroup, ListGroupItem } from '../ListGroup';
import { OverlayTrigger } from '../OverlayTrigger';
import { Tooltip } from '../Tooltip';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { getContext } from 'recompose';
import { getContext } from 'react-recompose';
import { Navbar } from 'react-bootstrap';
import VerticalNavBrand from './VerticalNavBrand';
import { navContextTypes } from './VerticalNavConstants';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { getContext } from 'recompose';
import { getContext } from 'react-recompose';
import { wrongDepth, correctDepth, navContextTypes } from './VerticalNavConstants';
import VerticalNavItemHelper from './VerticalNavItemHelper';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { getContext } from 'recompose';
import { getContext } from 'react-recompose';
import { wrongDepth, correctDepth, navContextTypes } from './VerticalNavConstants';
import VerticalNavItemHelper from './VerticalNavItemHelper';

Expand Down
25 changes: 13 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7184,7 +7184,7 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"

fbjs@^0.8.1, fbjs@^0.8.4:
fbjs@^0.8.4:
version "0.8.17"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
Expand Down Expand Up @@ -13675,7 +13675,7 @@ react-is@^16.12.0, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-i
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==

react-lifecycles-compat@^3.0.4:
react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
Expand Down Expand Up @@ -13741,6 +13741,17 @@ react-prop-types@^0.4.0:
dependencies:
warning "^3.0.0"

react-recompose@^0.31.1:
version "0.31.1"
resolved "https://registry.yarnpkg.com/react-recompose/-/react-recompose-0.31.1.tgz#8946fd499634183a6b0fa3adbf42e2342debe08b"
integrity sha512-FzKNgEO9aDfW4NWqKv/0QhmXXDr6qHEZRo3oyahNdJjWRSGo06KVGcvSCBZQckIcxP9o2f91eIfQmtyjwiuSGQ==
dependencies:
"@babel/runtime" "^7.0.0"
change-emitter "^0.1.2"
hoist-non-react-statics "^2.3.1"
react-lifecycles-compat "^3.0.2"
symbol-observable "^1.0.4"

react-select@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.8.tgz#06ff764e29db843bcec439ef13e196865242e0c1"
Expand Down Expand Up @@ -14048,16 +14059,6 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"

recompose@^0.26.0:
version "0.26.0"
resolved "https://registry.yarnpkg.com/recompose/-/recompose-0.26.0.tgz#9babff039cb72ba5bd17366d55d7232fbdfb2d30"
integrity sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog==
dependencies:
change-emitter "^0.1.2"
fbjs "^0.8.1"
hoist-non-react-statics "^2.3.1"
symbol-observable "^1.0.4"

recursive-readdir@2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
Expand Down