react-redux-subspace
Advanced tools
Comparing version 6.1.0 to 6.2.0
@@ -5,3 +5,2 @@ import React, { useRef, useMemo, useContext } from 'react'; | ||
import hoistNonReactStatics from 'hoist-non-react-statics'; | ||
import wrapDisplayName from 'recompose/wrapDisplayName'; | ||
import PropTypes from 'prop-types'; | ||
@@ -126,3 +125,3 @@ | ||
}); | ||
return React.createElement(Provider, { | ||
return /*#__PURE__*/React.createElement(Provider, { | ||
store: subspacedStore, | ||
@@ -135,11 +134,5 @@ context: ChildContext | ||
children: PropTypes.element.isRequired, | ||
mapState: | ||
/*#__PURE__*/ | ||
PropTypes.oneOfType([PropTypes.func, PropTypes.string]), | ||
mapState: /*#__PURE__*/PropTypes.oneOfType([PropTypes.func, PropTypes.string]), | ||
namespace: PropTypes.string, | ||
context: | ||
/*#__PURE__*/ | ||
PropTypes.oneOfType([ | ||
/*#__PURE__*/ | ||
PropTypes.shape({ | ||
context: /*#__PURE__*/PropTypes.oneOfType([/*#__PURE__*/PropTypes.shape({ | ||
parent: PropTypes.object, | ||
@@ -150,2 +143,20 @@ child: PropTypes.object | ||
var createDisplayNameForWrappedComponent = function createDisplayNameForWrappedComponent(WrappedComponent, wrapperName) { | ||
if (!WrappedComponent || !wrapperName) { | ||
return undefined; | ||
} | ||
var componentName = "Component"; | ||
if (WrappedComponent.displayName) { | ||
componentName = WrappedComponent.displayName; | ||
} else if (WrappedComponent.name) { | ||
componentName = WrappedComponent.name; | ||
} else if (typeof WrappedComponent === "string") { | ||
componentName = WrappedComponent; | ||
} | ||
return wrapperName + "(" + componentName + ")"; | ||
}; | ||
var subspaced = function subspaced(mapState, namespace, subspaceOptions) { | ||
@@ -157,7 +168,7 @@ if (subspaceOptions === undefined && isObject(namespace)) { | ||
return function (WrappedComponent) { | ||
var SubspacedComponent = React.forwardRef(function (props, ref) { | ||
return React.createElement(SubspaceProvider, _extends({}, subspaceOptions, { | ||
var SubspacedComponent = /*#__PURE__*/React.forwardRef(function (props, ref) { | ||
return /*#__PURE__*/React.createElement(SubspaceProvider, _extends({}, subspaceOptions, { | ||
mapState: mapState, | ||
namespace: namespace | ||
}), React.createElement(WrappedComponent, _extends({}, props, { | ||
}), /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, { | ||
ref: ref | ||
@@ -167,3 +178,3 @@ }))); | ||
hoistNonReactStatics(SubspacedComponent, WrappedComponent); | ||
SubspacedComponent.displayName = wrapDisplayName(WrappedComponent, "Subspaced"); | ||
SubspacedComponent.displayName = createDisplayNameForWrappedComponent(WrappedComponent, "Subspaced"); | ||
return SubspacedComponent; | ||
@@ -192,3 +203,3 @@ }; | ||
}); | ||
return React.createElement(Provider, { | ||
return /*#__PURE__*/React.createElement(Provider, { | ||
store: parentStore, | ||
@@ -201,7 +212,3 @@ context: ChildContext | ||
children: PropTypes.element.isRequired, | ||
context: | ||
/*#__PURE__*/ | ||
PropTypes.oneOfType([ | ||
/*#__PURE__*/ | ||
PropTypes.shape({ | ||
context: /*#__PURE__*/PropTypes.oneOfType([/*#__PURE__*/PropTypes.shape({ | ||
parent: PropTypes.object, | ||
@@ -214,4 +221,4 @@ child: PropTypes.object | ||
return function (WrappedComponent) { | ||
var ParentSpacedComponent = React.forwardRef(function (props, ref) { | ||
return React.createElement(ParentSpaceProvider, parentSpaceOptions, React.createElement(WrappedComponent, _extends({}, props, { | ||
var ParentSpacedComponent = /*#__PURE__*/React.forwardRef(function (props, ref) { | ||
return /*#__PURE__*/React.createElement(ParentSpaceProvider, parentSpaceOptions, /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, { | ||
ref: ref | ||
@@ -221,3 +228,3 @@ }))); | ||
hoistNonReactStatics(ParentSpacedComponent, WrappedComponent); | ||
ParentSpacedComponent.displayName = wrapDisplayName(WrappedComponent, "ParentSpaced"); | ||
ParentSpacedComponent.displayName = createDisplayNameForWrappedComponent(WrappedComponent, "ParentSpaced"); | ||
return ParentSpacedComponent; | ||
@@ -224,0 +231,0 @@ }; |
@@ -5,12 +5,14 @@ 'use strict'; | ||
function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; } | ||
var React = require('react'); | ||
var React__default = _interopDefault(React); | ||
var reactRedux = require('react-redux'); | ||
var reduxSubspace = require('redux-subspace'); | ||
var hoistNonReactStatics = _interopDefault(require('hoist-non-react-statics')); | ||
var wrapDisplayName = _interopDefault(require('recompose/wrapDisplayName')); | ||
var PropTypes = _interopDefault(require('prop-types')); | ||
var hoistNonReactStatics = require('hoist-non-react-statics'); | ||
var PropTypes = require('prop-types'); | ||
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } | ||
var React__default = /*#__PURE__*/_interopDefaultLegacy(React); | ||
var hoistNonReactStatics__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatics); | ||
var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes); | ||
/** | ||
@@ -133,3 +135,3 @@ * Copyright 2017, IOOF Holdings Limited. | ||
}); | ||
return React__default.createElement(reactRedux.Provider, { | ||
return /*#__PURE__*/React__default['default'].createElement(reactRedux.Provider, { | ||
store: subspacedStore, | ||
@@ -141,17 +143,29 @@ context: ChildContext | ||
SubspaceProvider.propTypes = { | ||
children: PropTypes.element.isRequired, | ||
mapState: | ||
/*#__PURE__*/ | ||
PropTypes.oneOfType([PropTypes.func, PropTypes.string]), | ||
namespace: PropTypes.string, | ||
context: | ||
/*#__PURE__*/ | ||
PropTypes.oneOfType([ | ||
/*#__PURE__*/ | ||
PropTypes.shape({ | ||
parent: PropTypes.object, | ||
child: PropTypes.object | ||
}), PropTypes.object]) | ||
children: PropTypes__default['default'].element.isRequired, | ||
mapState: /*#__PURE__*/PropTypes__default['default'].oneOfType([PropTypes__default['default'].func, PropTypes__default['default'].string]), | ||
namespace: PropTypes__default['default'].string, | ||
context: /*#__PURE__*/PropTypes__default['default'].oneOfType([/*#__PURE__*/PropTypes__default['default'].shape({ | ||
parent: PropTypes__default['default'].object, | ||
child: PropTypes__default['default'].object | ||
}), PropTypes__default['default'].object]) | ||
}; | ||
var createDisplayNameForWrappedComponent = function createDisplayNameForWrappedComponent(WrappedComponent, wrapperName) { | ||
if (!WrappedComponent || !wrapperName) { | ||
return undefined; | ||
} | ||
var componentName = "Component"; | ||
if (WrappedComponent.displayName) { | ||
componentName = WrappedComponent.displayName; | ||
} else if (WrappedComponent.name) { | ||
componentName = WrappedComponent.name; | ||
} else if (typeof WrappedComponent === "string") { | ||
componentName = WrappedComponent; | ||
} | ||
return wrapperName + "(" + componentName + ")"; | ||
}; | ||
var subspaced = function subspaced(mapState, namespace, subspaceOptions) { | ||
@@ -163,12 +177,12 @@ if (subspaceOptions === undefined && isObject(namespace)) { | ||
return function (WrappedComponent) { | ||
var SubspacedComponent = React__default.forwardRef(function (props, ref) { | ||
return React__default.createElement(SubspaceProvider, _extends({}, subspaceOptions, { | ||
var SubspacedComponent = /*#__PURE__*/React__default['default'].forwardRef(function (props, ref) { | ||
return /*#__PURE__*/React__default['default'].createElement(SubspaceProvider, _extends({}, subspaceOptions, { | ||
mapState: mapState, | ||
namespace: namespace | ||
}), React__default.createElement(WrappedComponent, _extends({}, props, { | ||
}), /*#__PURE__*/React__default['default'].createElement(WrappedComponent, _extends({}, props, { | ||
ref: ref | ||
}))); | ||
}); | ||
hoistNonReactStatics(SubspacedComponent, WrappedComponent); | ||
SubspacedComponent.displayName = wrapDisplayName(WrappedComponent, "Subspaced"); | ||
hoistNonReactStatics__default['default'](SubspacedComponent, WrappedComponent); | ||
SubspacedComponent.displayName = createDisplayNameForWrappedComponent(WrappedComponent, "Subspaced"); | ||
return SubspacedComponent; | ||
@@ -197,3 +211,3 @@ }; | ||
}); | ||
return React__default.createElement(reactRedux.Provider, { | ||
return /*#__PURE__*/React__default['default'].createElement(reactRedux.Provider, { | ||
store: parentStore, | ||
@@ -205,11 +219,7 @@ context: ChildContext | ||
ParentSpaceProvider.propTypes = { | ||
children: PropTypes.element.isRequired, | ||
context: | ||
/*#__PURE__*/ | ||
PropTypes.oneOfType([ | ||
/*#__PURE__*/ | ||
PropTypes.shape({ | ||
parent: PropTypes.object, | ||
child: PropTypes.object | ||
}), PropTypes.object]) | ||
children: PropTypes__default['default'].element.isRequired, | ||
context: /*#__PURE__*/PropTypes__default['default'].oneOfType([/*#__PURE__*/PropTypes__default['default'].shape({ | ||
parent: PropTypes__default['default'].object, | ||
child: PropTypes__default['default'].object | ||
}), PropTypes__default['default'].object]) | ||
}; | ||
@@ -219,9 +229,9 @@ | ||
return function (WrappedComponent) { | ||
var ParentSpacedComponent = React__default.forwardRef(function (props, ref) { | ||
return React__default.createElement(ParentSpaceProvider, parentSpaceOptions, React__default.createElement(WrappedComponent, _extends({}, props, { | ||
var ParentSpacedComponent = /*#__PURE__*/React__default['default'].forwardRef(function (props, ref) { | ||
return /*#__PURE__*/React__default['default'].createElement(ParentSpaceProvider, parentSpaceOptions, /*#__PURE__*/React__default['default'].createElement(WrappedComponent, _extends({}, props, { | ||
ref: ref | ||
}))); | ||
}); | ||
hoistNonReactStatics(ParentSpacedComponent, WrappedComponent); | ||
ParentSpacedComponent.displayName = wrapDisplayName(WrappedComponent, "ParentSpaced"); | ||
hoistNonReactStatics__default['default'](ParentSpacedComponent, WrappedComponent); | ||
ParentSpacedComponent.displayName = createDisplayNameForWrappedComponent(WrappedComponent, "ParentSpaced"); | ||
return ParentSpacedComponent; | ||
@@ -228,0 +238,0 @@ }; |
{ | ||
"name": "react-redux-subspace", | ||
"version": "6.1.0", | ||
"version": "6.2.0", | ||
"description": "react-redux Provider extension for redux-subspace", | ||
@@ -34,8 +34,7 @@ "author": "Michael Peyper", | ||
"dependencies": { | ||
"@types/react": "^16.8.23", | ||
"@types/react": "^17.0.0", | ||
"@types/react-redux": "^7.1.1", | ||
"hoist-non-react-statics": "^3.3.0", | ||
"prop-types": "^15.7.2", | ||
"recompose": "^0.30.0", | ||
"redux-subspace": "^6.1.0" | ||
"redux-subspace": "^6.2.0" | ||
}, | ||
@@ -48,33 +47,33 @@ "peerDependencies": { | ||
"devDependencies": { | ||
"@babel/core": "7.6.2", | ||
"@babel/plugin-proposal-object-rest-spread": "7.6.2", | ||
"@babel/plugin-transform-modules-commonjs": "7.6.0", | ||
"@babel/preset-env": "7.6.2", | ||
"@babel/preset-react": "7.0.0", | ||
"@babel/register": "7.6.2", | ||
"@testing-library/react-hooks": "2.0.1", | ||
"babel-eslint": "10.0.3", | ||
"@babel/core": "7.12.9", | ||
"@babel/plugin-proposal-object-rest-spread": "7.12.1", | ||
"@babel/plugin-transform-modules-commonjs": "7.12.1", | ||
"@babel/preset-env": "7.12.7", | ||
"@babel/preset-react": "7.12.7", | ||
"@babel/register": "7.12.1", | ||
"@testing-library/react-hooks": "3.4.2", | ||
"babel-eslint": "10.1.0", | ||
"babel-plugin-annotate-pure-calls": "0.4.0", | ||
"chai": "4.2.0", | ||
"cross-env": "6.0.0", | ||
"enzyme": "3.10.0", | ||
"enzyme-adapter-react-16": "1.14.0", | ||
"eslint": "6.4.0", | ||
"eslint-plugin-react": "7.14.3", | ||
"jsdom": "15.1.1", | ||
"cross-env": "7.0.3", | ||
"enzyme": "3.11.0", | ||
"enzyme-adapter-react-16": "1.15.5", | ||
"eslint": "7.14.0", | ||
"eslint-plugin-react": "7.21.5", | ||
"jsdom": "16.4.0", | ||
"jsdom-global": "3.0.2", | ||
"mocha": "6.2.0", | ||
"nyc": "14.1.1", | ||
"react": "16.9.0", | ||
"react-dom": "16.9.0", | ||
"react-redux": "7.1.1", | ||
"react-test-renderer": "16.9.0", | ||
"redux": "4.0.4", | ||
"redux-mock-store": "1.5.3", | ||
"rimraf": "3.0.0", | ||
"rollup": "1.21.4", | ||
"rollup-plugin-babel": "4.3.3", | ||
"sinon": "7.5.0", | ||
"sinon-chai": "3.3.0", | ||
"typescript": "3.6.3", | ||
"mocha": "8.2.1", | ||
"nyc": "15.1.0", | ||
"react": "16.14.0", | ||
"react-dom": "16.14.0", | ||
"react-redux": "7.2.2", | ||
"react-test-renderer": "16.14.0", | ||
"redux": "4.0.5", | ||
"redux-mock-store": "1.5.4", | ||
"rimraf": "3.0.2", | ||
"rollup": "2.34.1", | ||
"rollup-plugin-babel": "4.4.0", | ||
"sinon": "9.2.1", | ||
"sinon-chai": "3.5.0", | ||
"typescript": "4.1.2", | ||
"typescript-definition-tester": "0.0.6" | ||
@@ -90,3 +89,3 @@ }, | ||
}, | ||
"gitHead": "93d779bc1fdcfac16608ec7c2a918566560f505c" | ||
"gitHead": "58d7add4f53a1c9af6cb7b40a4db41c89a89fa3b" | ||
} |
@@ -9,8 +9,8 @@ /** | ||
import React from "react" | ||
import hoistNonReactStatics from "hoist-non-react-statics" | ||
import wrapDisplayName from "recompose/wrapDisplayName" | ||
import ParentSpaceProvider from "./ParentSpaceProvider" | ||
import React from "react"; | ||
import hoistNonReactStatics from "hoist-non-react-statics"; | ||
import ParentSpaceProvider from "./ParentSpaceProvider"; | ||
import createDisplayName from "../utils/createDisplayName"; | ||
const parentSpaced = parentSpaceOptions => WrappedComponent => { | ||
const parentSpaced = (parentSpaceOptions) => (WrappedComponent) => { | ||
const ParentSpacedComponent = React.forwardRef((props, ref) => ( | ||
@@ -20,14 +20,14 @@ <ParentSpaceProvider {...parentSpaceOptions}> | ||
</ParentSpaceProvider> | ||
)) | ||
)); | ||
hoistNonReactStatics(ParentSpacedComponent, WrappedComponent) | ||
hoistNonReactStatics(ParentSpacedComponent, WrappedComponent); | ||
ParentSpacedComponent.displayName = wrapDisplayName( | ||
ParentSpacedComponent.displayName = createDisplayName( | ||
WrappedComponent, | ||
"ParentSpaced" | ||
) | ||
); | ||
return ParentSpacedComponent | ||
} | ||
return ParentSpacedComponent; | ||
}; | ||
export default parentSpaced | ||
export default parentSpaced; |
@@ -9,14 +9,14 @@ /** | ||
import React from "react" | ||
import hoistNonReactStatics from "hoist-non-react-statics" | ||
import wrapDisplayName from "recompose/wrapDisplayName" | ||
import SubspaceProvider from "./SubspaceProvider" | ||
import isObject from "../utils/isObject" | ||
import React from "react"; | ||
import hoistNonReactStatics from "hoist-non-react-statics"; | ||
import SubspaceProvider from "./SubspaceProvider"; | ||
import isObject from "../utils/isObject"; | ||
import createDisplayName from "../utils/createDisplayName"; | ||
const subspaced = (mapState, namespace, subspaceOptions) => { | ||
if (subspaceOptions === undefined && isObject(namespace)) { | ||
return subspaced(mapState, undefined, namespace) | ||
return subspaced(mapState, undefined, namespace); | ||
} | ||
return WrappedComponent => { | ||
return (WrappedComponent) => { | ||
const SubspacedComponent = React.forwardRef((props, ref) => ( | ||
@@ -30,15 +30,15 @@ <SubspaceProvider | ||
</SubspaceProvider> | ||
)) | ||
)); | ||
hoistNonReactStatics(SubspacedComponent, WrappedComponent) | ||
hoistNonReactStatics(SubspacedComponent, WrappedComponent); | ||
SubspacedComponent.displayName = wrapDisplayName( | ||
SubspacedComponent.displayName = createDisplayName( | ||
WrappedComponent, | ||
"Subspaced" | ||
) | ||
); | ||
return SubspacedComponent | ||
} | ||
} | ||
return SubspacedComponent; | ||
}; | ||
}; | ||
export default subspaced | ||
export default subspaced; |
34077
8
16
698
+ Added@types/react@17.0.80(transitive)
- Removedrecompose@^0.30.0
- Removed@types/react@16.14.60(transitive)
- Removedasap@2.0.6(transitive)
- Removedchange-emitter@0.1.6(transitive)
- Removedcore-js@1.2.7(transitive)
- Removedencoding@0.1.13(transitive)
- Removedfbjs@0.8.18(transitive)
- Removedhoist-non-react-statics@2.5.5(transitive)
- Removediconv-lite@0.6.3(transitive)
- Removedis-stream@1.1.0(transitive)
- Removedisomorphic-fetch@2.2.1(transitive)
- Removednode-fetch@1.7.3(transitive)
- Removedpromise@7.3.1(transitive)
- Removedreact-lifecycles-compat@3.0.4(transitive)
- Removedrecompose@0.30.0(transitive)
- Removedsafer-buffer@2.1.2(transitive)
- Removedsetimmediate@1.0.5(transitive)
- Removedsymbol-observable@1.2.0(transitive)
- Removedua-parser-js@0.7.38(transitive)
- Removedwhatwg-fetch@3.6.20(transitive)
Updated@types/react@^17.0.0
Updatedredux-subspace@^6.2.0