Comparing version 8.0.0 to 9.0.0
@@ -14,3 +14,3 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty"; | ||
import { hoistModifierStylesRecursive, pickNestedStyles } from './pickStyles'; | ||
import { assign, compact, isPlainObject, keys, merge, values } from './utils'; | ||
import { compact, isPlainObject, keys, merge, values } from './utils'; | ||
@@ -46,3 +46,3 @@ var guessBaseClassName = function guessBaseClassName(classNames) { | ||
var propsDecorator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultPropsDecorator; | ||
var baseClassName = className || guessBaseClassName(classNames); | ||
var baseClassName = className || guessBaseClassName(classNames) || (style === null || style === void 0 ? void 0 : style.className); | ||
var substyle = typeof style === 'function' ? style : memoize(function (select, defaultStyle) { | ||
@@ -87,3 +87,3 @@ var selectedKeys = coerceSelection(select); | ||
assign(substyle, propsForSpread); | ||
Object.assign(substyle, propsForSpread); | ||
return substyle; | ||
@@ -90,0 +90,0 @@ } |
@@ -0,7 +1,7 @@ | ||
import PropsDecoratorProvider from './PropsDecoratorProvider'; | ||
import createSubstyle from './createSubstyle'; | ||
import createUseStyle from './createUseStyle'; | ||
import PropsDecoratorProvider from './PropsDecoratorProvider'; | ||
import defaultPropsDecorator from './defaultPropsDecorator'; | ||
import inline from './inline'; | ||
export { createUseStyle, createSubstyle, PropsDecoratorProvider, defaultPropsDecorator, inline }; | ||
export default createUseStyle(); | ||
import useStyles from './useStyles'; | ||
export { createSubstyle, PropsDecoratorProvider, defaultPropsDecorator, inline }; | ||
export default useStyles; |
@@ -10,3 +10,3 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty"; | ||
function mergeDeep(target, source) { | ||
var output = assign({}, target); | ||
var output = Object.assign({}, target); | ||
@@ -16,5 +16,5 @@ if (isPlainObject(target) && isPlainObject(source)) { | ||
if (isPlainObject(source[key])) { | ||
if (!(key in target)) assign(output, _defineProperty({}, key, source[key]));else output[key] = mergeDeep(target[key], source[key]); | ||
if (!(key in target)) Object.assign(output, _defineProperty({}, key, source[key]));else output[key] = mergeDeep(target[key], source[key]); | ||
} else { | ||
assign(output, _defineProperty({}, key, source[key])); | ||
Object.assign(output, _defineProperty({}, key, source[key])); | ||
} | ||
@@ -36,9 +36,2 @@ }); | ||
}; | ||
export var assign = function assign(target) { | ||
for (var _len2 = arguments.length, sources = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) { | ||
sources[_key2 - 1] = arguments[_key2]; | ||
} | ||
return Object.assign.apply(Object, [target].concat(sources)); | ||
}; | ||
export var identity = function identity(value) { | ||
@@ -45,0 +38,0 @@ return value; |
@@ -61,3 +61,3 @@ "use strict"; | ||
var propsDecorator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _defaultPropsDecorator.default; | ||
var baseClassName = className || guessBaseClassName(classNames); | ||
var baseClassName = className || guessBaseClassName(classNames) || (style === null || style === void 0 ? void 0 : style.className); | ||
var substyle = typeof style === 'function' ? style : (0, _memoize.default)(function (select, defaultStyle) { | ||
@@ -102,3 +102,3 @@ var selectedKeys = (0, _coerceSelection.default)(select); | ||
(0, _utils.assign)(substyle, propsForSpread); | ||
Object.assign(substyle, propsForSpread); | ||
return substyle; | ||
@@ -105,0 +105,0 @@ } |
@@ -8,20 +8,14 @@ "use strict"; | ||
}); | ||
Object.defineProperty(exports, "createSubstyle", { | ||
Object.defineProperty(exports, "PropsDecoratorProvider", { | ||
enumerable: true, | ||
get: function get() { | ||
return _createSubstyle.default; | ||
return _PropsDecoratorProvider.default; | ||
} | ||
}); | ||
Object.defineProperty(exports, "createUseStyle", { | ||
Object.defineProperty(exports, "createSubstyle", { | ||
enumerable: true, | ||
get: function get() { | ||
return _createUseStyle.default; | ||
return _createSubstyle.default; | ||
} | ||
}); | ||
Object.defineProperty(exports, "PropsDecoratorProvider", { | ||
enumerable: true, | ||
get: function get() { | ||
return _PropsDecoratorProvider.default; | ||
} | ||
}); | ||
Object.defineProperty(exports, "defaultPropsDecorator", { | ||
@@ -41,8 +35,6 @@ enumerable: true, | ||
var _PropsDecoratorProvider = _interopRequireDefault(require("./PropsDecoratorProvider")); | ||
var _createSubstyle = _interopRequireDefault(require("./createSubstyle")); | ||
var _createUseStyle = _interopRequireDefault(require("./createUseStyle")); | ||
var _PropsDecoratorProvider = _interopRequireDefault(require("./PropsDecoratorProvider")); | ||
var _defaultPropsDecorator = _interopRequireDefault(require("./defaultPropsDecorator")); | ||
@@ -52,4 +44,5 @@ | ||
var _default = (0, _createUseStyle.default)(); | ||
var _useStyles = _interopRequireDefault(require("./useStyles")); | ||
var _default = _useStyles.default; | ||
exports.default = _default; |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
exports.compact = exports.isPlainObject = exports.omit = exports.identity = exports.assign = exports.merge = exports.values = exports.keys = void 0; | ||
exports.compact = exports.isPlainObject = exports.omit = exports.identity = exports.merge = exports.values = exports.keys = void 0; | ||
@@ -26,3 +26,3 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty")); | ||
function mergeDeep(target, source) { | ||
var output = assign({}, target); | ||
var output = Object.assign({}, target); | ||
@@ -32,5 +32,5 @@ if (isPlainObject(target) && isPlainObject(source)) { | ||
if (isPlainObject(source[key])) { | ||
if (!(key in target)) assign(output, (0, _defineProperty2.default)({}, key, source[key]));else output[key] = mergeDeep(target[key], source[key]); | ||
if (!(key in target)) Object.assign(output, (0, _defineProperty2.default)({}, key, source[key]));else output[key] = mergeDeep(target[key], source[key]); | ||
} else { | ||
assign(output, (0, _defineProperty2.default)({}, key, source[key])); | ||
Object.assign(output, (0, _defineProperty2.default)({}, key, source[key])); | ||
} | ||
@@ -55,12 +55,2 @@ }); | ||
var assign = function assign(target) { | ||
for (var _len2 = arguments.length, sources = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) { | ||
sources[_key2 - 1] = arguments[_key2]; | ||
} | ||
return Object.assign.apply(Object, [target].concat(sources)); | ||
}; | ||
exports.assign = assign; | ||
var identity = function identity(value) { | ||
@@ -67,0 +57,0 @@ return value; |
{ | ||
"name": "substyle", | ||
"version": "8.0.0", | ||
"version": "9.0.0", | ||
"description": "Universal styling for reusable React components", | ||
@@ -60,3 +60,3 @@ "main": "lib/index.js", | ||
}, | ||
"gitHead": "952071124e023fe71133bbed0f43826f795a49ac" | ||
"gitHead": "a43976cf1ed36ac1417bd508df5016a5f82729ce" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
66
76789
645