@fluentui/styles
Advanced tools
Comparing version 0.46.0 to 0.47.0
@@ -6,3 +6,3 @@ "use strict"; | ||
}); | ||
exports["default"] = void 0; | ||
exports.default = void 0; | ||
@@ -16,3 +16,3 @@ var callable = function callable(possibleFunction) { | ||
var _default = callable; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=callable.js.map |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
exports["default"] = void 0; | ||
exports.default = void 0; | ||
@@ -14,7 +14,7 @@ var _withDebugId = _interopRequireDefault(require("./withDebugId")); | ||
var createTheme = function createTheme(themeInput, debugId) { | ||
return (0, _withDebugId["default"])(themeInput, debugId); | ||
return (0, _withDebugId.default)(themeInput, debugId); | ||
}; | ||
var _default = createTheme; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=createTheme.js.map |
@@ -19,6 +19,6 @@ "use strict"; | ||
/* eslint-disable-next-line no-console */ | ||
console.warn(['@fluentui/react:', "CSSinJS Debug data collection is enabled.", 'To remove this override paste `delete window.localStorage.fluentUIDebug` to your browser console and reload the page.'].join(' ')); | ||
console.warn(['@fluentui/react-northstar:', "CSSinJS Debug data collection is enabled.", 'To remove this override paste `delete window.localStorage.fluentUIDebug` to your browser console and reload the page.'].join(' ')); | ||
} else { | ||
/* eslint-disable-next-line no-console */ | ||
console.warn(['@fluentui/react:', "CSSinJS Debug data collection is disabled.", 'To enable data collection paste `window.localStorage.fluentUIDebug = true` to your browser console and reload the page.'].join(' ')); | ||
console.warn(['@fluentui/react-northstar:', "CSSinJS Debug data collection is disabled.", 'To enable data collection paste `window.localStorage.fluentUIDebug = true` to your browser console and reload the page.'].join(' ')); | ||
} | ||
@@ -25,0 +25,0 @@ } |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
exports["default"] = void 0; | ||
exports.default = void 0; | ||
@@ -14,3 +14,3 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")); | ||
var isObject = function isObject(o) { | ||
return o !== null && (0, _typeof2["default"])(o) === 'object' && !Array.isArray(o); | ||
return o !== null && (0, _typeof2.default)(o) === 'object' && !Array.isArray(o); | ||
}; // Heads Up! | ||
@@ -47,3 +47,3 @@ // Changes here need to consider breaking all object references. | ||
var _default = deepmerge; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=deepmerge.js.map |
@@ -31,3 +31,3 @@ "use strict"; | ||
get: function get() { | ||
return _callable["default"]; | ||
return _callable.default; | ||
} | ||
@@ -38,3 +38,3 @@ }); | ||
get: function get() { | ||
return _createTheme["default"]; | ||
return _createTheme.default; | ||
} | ||
@@ -51,3 +51,3 @@ }); | ||
get: function get() { | ||
return _deepmerge["default"]; | ||
return _deepmerge.default; | ||
} | ||
@@ -58,3 +58,3 @@ }); | ||
get: function get() { | ||
return _mergeThemes["default"]; | ||
return _mergeThemes.default; | ||
} | ||
@@ -119,3 +119,3 @@ }); | ||
get: function get() { | ||
return _objectKeysToValues["default"]; | ||
return _objectKeysToValues.default; | ||
} | ||
@@ -126,3 +126,3 @@ }); | ||
get: function get() { | ||
return _withDebugId["default"]; | ||
return _withDebugId.default; | ||
} | ||
@@ -129,0 +129,0 @@ }); |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
exports["default"] = exports.mergeStyles = exports.mergeAnimations = exports.mergeIcons = exports.mergeStaticStyles = exports.mergeFontFaces = exports.mergeThemeStyles = exports.mergeThemeVariables = exports.mergeThemeVariables__DEV = exports.mergeThemeVariables__PROD = exports.mergeSiteVariables = exports.mergeSiteVariables__DEV = exports.mergeSiteVariables__PROD = exports.mergeComponentVariables = exports.mergeComponentVariables__DEV = exports.mergeComponentVariables__PROD = exports.mergeComponentStyles = exports.mergeComponentStyles__DEV = exports.mergeComponentStyles__PROD = exports.emptyTheme = void 0; | ||
exports.default = exports.mergeStyles = exports.mergeAnimations = exports.mergeIcons = exports.mergeStaticStyles = exports.mergeFontFaces = exports.mergeThemeStyles = exports.mergeThemeVariables = exports.mergeThemeVariables__DEV = exports.mergeThemeVariables__PROD = exports.mergeSiteVariables = exports.mergeSiteVariables__DEV = exports.mergeSiteVariables__PROD = exports.mergeComponentVariables = exports.mergeComponentVariables__DEV = exports.mergeComponentVariables__PROD = exports.mergeComponentStyles = exports.mergeComponentStyles__DEV = exports.mergeComponentStyles__PROD = exports.emptyTheme = void 0; | ||
@@ -67,3 +67,3 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray")); | ||
return sources.reduce(function (partStylesPrepared, stylesByPart) { | ||
(0, _forEach2["default"])(stylesByPart, function (partStyle, partName) { | ||
(0, _forEach2.default)(stylesByPart, function (partStyle, partName) { | ||
// Break references to avoid an infinite loop. | ||
@@ -74,3 +74,3 @@ // We are replacing functions with a new ones that calls the originals. | ||
if (typeof originalSource === 'undefined' || originalSource === null || (0, _typeof2["default"])(originalSource) === 'object' && Object.keys(originalSource).length === 0) { | ||
if (typeof originalSource === 'undefined' || originalSource === null || (0, _typeof2.default)(originalSource) === 'object' && Object.keys(originalSource).length === 0) { | ||
return; | ||
@@ -82,3 +82,3 @@ } // no target means source doesn't need to merge onto anything | ||
if (typeof originalTarget === 'undefined') { | ||
partStylesPrepared[partName] = (0, _callable["default"])(originalSource); | ||
partStylesPrepared[partName] = (0, _callable.default)(originalSource); | ||
return; | ||
@@ -90,3 +90,3 @@ } // We have both target and source, replace with merge fn | ||
// originalTarget is always prepared, fn is guaranteed | ||
return (0, _merge2["default"])(originalTarget(styleParam), (0, _callable["default"])(originalSource)(styleParam)); | ||
return (0, _merge2.default)(originalTarget(styleParam), (0, _callable.default)(originalSource)(styleParam)); | ||
}; | ||
@@ -111,3 +111,3 @@ }); | ||
return sources.reduce(function (partStylesPrepared, stylesByPart) { | ||
(0, _forEach2["default"])(stylesByPart, function (partStyle, partName) { | ||
(0, _forEach2.default)(stylesByPart, function (partStyle, partName) { | ||
// Break references to avoid an infinite loop. | ||
@@ -118,3 +118,3 @@ // We are replacing functions with a new ones that calls the originals. | ||
if (typeof originalSource === 'undefined' || originalSource === null || (0, _typeof2["default"])(originalSource) === 'object' && Object.keys(originalSource).length === 0) { | ||
if (typeof originalSource === 'undefined' || originalSource === null || (0, _typeof2.default)(originalSource) === 'object' && Object.keys(originalSource).length === 0) { | ||
return; | ||
@@ -128,6 +128,6 @@ } // no target means source doesn't need to merge onto anything | ||
// originalTarget is always prepared, fn is guaranteed, _debug always exists | ||
var _ref = (0, _callable["default"])(originalSource)(styleParam) || {}, | ||
var _ref = (0, _callable.default)(originalSource)(styleParam) || {}, | ||
_ref$_debug = _ref._debug, | ||
_debug = _ref$_debug === void 0 ? undefined : _ref$_debug, | ||
styles = (0, _objectWithoutProperties2["default"])(_ref, ["_debug"]); // new object required to prevent circular JSON structure error in <Debug /> | ||
styles = (0, _objectWithoutProperties2.default)(_ref, ["_debug"]); // new object required to prevent circular JSON structure error in <Debug /> | ||
@@ -151,10 +151,10 @@ | ||
targetDebug = _originalTarget._debug, | ||
targetStyles = (0, _objectWithoutProperties2["default"])(_originalTarget, ["_debug"]); | ||
targetStyles = (0, _objectWithoutProperties2.default)(_originalTarget, ["_debug"]); | ||
var _ref2 = (0, _callable["default"])(originalSource)(styleParam) || {}, | ||
var _ref2 = (0, _callable.default)(originalSource)(styleParam) || {}, | ||
_ref2$_debug = _ref2._debug, | ||
sourceDebug = _ref2$_debug === void 0 ? undefined : _ref2$_debug, | ||
sourceStyles = (0, _objectWithoutProperties2["default"])(_ref2, ["_debug"]); | ||
sourceStyles = (0, _objectWithoutProperties2.default)(_ref2, ["_debug"]); | ||
var merged = (0, _merge2["default"])(targetStyles, sourceStyles); | ||
var merged = (0, _merge2.default)(targetStyles, sourceStyles); | ||
merged._debug = targetDebug.concat(sourceDebug || { | ||
@@ -191,4 +191,4 @@ styles: sourceStyles, | ||
var accumulatedVariables = acc.apply(void 0, arguments); | ||
var computedComponentVariables = (0, _callable["default"])(next).apply(void 0, arguments); | ||
return (0, _deepmerge["default"])(accumulatedVariables, computedComponentVariables); | ||
var computedComponentVariables = (0, _callable.default)(next).apply(void 0, arguments); | ||
return (0, _deepmerge.default)(accumulatedVariables, computedComponentVariables); | ||
}; | ||
@@ -218,5 +218,5 @@ }, initial); | ||
_debug = _acc$_debug === void 0 ? [] : _acc$_debug, | ||
accumulatedVariables = (0, _objectWithoutProperties2["default"])(_acc, ["_debug"]); | ||
accumulatedVariables = (0, _objectWithoutProperties2.default)(_acc, ["_debug"]); | ||
var _ref3 = (0, _callable["default"])(next)(siteVariables) || {}, | ||
var _ref3 = (0, _callable.default)(next)(siteVariables) || {}, | ||
_ref3$_debug = _ref3._debug, | ||
@@ -226,9 +226,9 @@ computedDebug = _ref3$_debug === void 0 ? undefined : _ref3$_debug, | ||
_debugId = _ref3$_debugId === void 0 ? undefined : _ref3$_debugId, | ||
computedComponentVariables = (0, _objectWithoutProperties2["default"])(_ref3, ["_debug", "_debugId"]); | ||
computedComponentVariables = (0, _objectWithoutProperties2.default)(_ref3, ["_debug", "_debugId"]); | ||
var merged = (0, _deepmerge["default"])(accumulatedVariables, computedComponentVariables); | ||
var merged = (0, _deepmerge.default)(accumulatedVariables, computedComponentVariables); | ||
merged._debug = _debug.concat(computedDebug || { | ||
resolved: computedComponentVariables, | ||
debugId: _debugId, | ||
input: siteVariables ? siteVariables._invertedKeys && (0, _callable["default"])(next)(siteVariables._invertedKeys) : (0, _callable["default"])(next)() | ||
input: siteVariables ? siteVariables._invertedKeys && (0, _callable.default)(next)(siteVariables._invertedKeys) : (0, _callable.default)(next)() | ||
}); | ||
@@ -261,3 +261,3 @@ return merged; | ||
return _deepmerge["default"].apply(void 0, [initial].concat(sources)); | ||
return _deepmerge.default.apply(void 0, [initial].concat(sources)); | ||
}; | ||
@@ -282,3 +282,3 @@ | ||
_debug = _acc$_debug2 === void 0 ? [] : _acc$_debug2, | ||
accumulatedSiteVariables = (0, _objectWithoutProperties2["default"])(acc, ["_debug"]); | ||
accumulatedSiteVariables = (0, _objectWithoutProperties2.default)(acc, ["_debug"]); | ||
@@ -292,5 +292,5 @@ var _ref4 = next || {}, | ||
_debugId = _ref4$_debugId === void 0 ? undefined : _ref4$_debugId, | ||
nextSiteVariables = (0, _objectWithoutProperties2["default"])(_ref4, ["_debug", "_invertedKeys", "_debugId"]); | ||
nextSiteVariables = (0, _objectWithoutProperties2.default)(_ref4, ["_debug", "_invertedKeys", "_debugId"]); | ||
var merged = (0, _deepmerge["default"])(Object.assign({}, accumulatedSiteVariables, { | ||
var merged = (0, _deepmerge.default)(Object.assign({}, accumulatedSiteVariables, { | ||
_invertedKeys: undefined | ||
@@ -302,3 +302,3 @@ }), nextSiteVariables); | ||
}); | ||
merged._invertedKeys = _invertedKeys || (0, _objectKeysToValues["default"])(merged, function (key) { | ||
merged._invertedKeys = _invertedKeys || (0, _objectKeysToValues.default)(merged, function (key) { | ||
return "siteVariables.".concat(key); | ||
@@ -327,6 +327,6 @@ }); | ||
var displayNames = _union2["default"].apply(void 0, (0, _toConsumableArray2["default"])((0, _map2["default"])(sources, _keys2["default"]))); | ||
var displayNames = _union2.default.apply(void 0, (0, _toConsumableArray2.default)((0, _map2.default)(sources, _keys2.default))); | ||
return displayNames.reduce(function (componentVariables, displayName) { | ||
componentVariables[displayName] = mergeComponentVariables.apply(void 0, (0, _toConsumableArray2["default"])((0, _map2["default"])(sources, displayName))); | ||
componentVariables[displayName] = mergeComponentVariables.apply(void 0, (0, _toConsumableArray2.default)((0, _map2.default)(sources, displayName))); | ||
return componentVariables; | ||
@@ -347,7 +347,7 @@ }, {}); | ||
var displayNames = _union2["default"].apply(void 0, (0, _toConsumableArray2["default"])((0, _map2["default"])(sources, _keys2["default"]))); | ||
var displayNames = _union2.default.apply(void 0, (0, _toConsumableArray2.default)((0, _map2.default)(sources, _keys2.default))); | ||
return displayNames.reduce(function (componentVariables, displayName) { | ||
componentVariables[displayName] = mergeComponentVariables.apply(void 0, (0, _toConsumableArray2["default"])((0, _map2["default"])(sources, function (source) { | ||
return source && (0, _withDebugId["default"])(source[displayName], source._debugId); | ||
componentVariables[displayName] = mergeComponentVariables.apply(void 0, (0, _toConsumableArray2.default)((0, _map2.default)(sources, function (source) { | ||
return source && (0, _withDebugId.default)(source[displayName], source._debugId); | ||
}))); | ||
@@ -376,4 +376,4 @@ return componentVariables; | ||
return sources.reduce(function (themeComponentStyles, next) { | ||
(0, _forEach2["default"])(next, function (stylesByPart, displayName) { | ||
themeComponentStyles[displayName] = mergeComponentStyles(themeComponentStyles[displayName], (0, _withDebugId["default"])(stylesByPart, next._debugId)); | ||
(0, _forEach2.default)(next, function (stylesByPart, displayName) { | ||
themeComponentStyles[displayName] = mergeComponentStyles(themeComponentStyles[displayName], (0, _withDebugId.default)(stylesByPart, next._debugId)); | ||
}); | ||
@@ -387,3 +387,3 @@ return themeComponentStyles; | ||
var mergeFontFaces = function mergeFontFaces() { | ||
return _toCompactArray["default"].apply(void 0, arguments); | ||
return _toCompactArray.default.apply(void 0, arguments); | ||
}; | ||
@@ -394,3 +394,3 @@ | ||
var mergeStaticStyles = function mergeStaticStyles() { | ||
return _toCompactArray["default"].apply(void 0, arguments); | ||
return _toCompactArray.default.apply(void 0, arguments); | ||
}; | ||
@@ -431,3 +431,3 @@ | ||
return sources.reduce(function (acc, next) { | ||
return (0, _merge2["default"])(acc, (0, _callable["default"])(next).apply(void 0, args)); | ||
return (0, _merge2.default)(acc, (0, _callable.default)(next).apply(void 0, args)); | ||
}, {}); | ||
@@ -447,9 +447,9 @@ }; | ||
var nextDebugId = next['_debugId']; | ||
acc.siteVariables = mergeSiteVariables(acc.siteVariables, (0, _withDebugId["default"])(next.siteVariables, nextDebugId)); | ||
acc.componentVariables = mergeThemeVariables(acc.componentVariables, (0, _withDebugId["default"])(next.componentVariables, nextDebugId)); | ||
acc.componentStyles = mergeThemeStyles(acc.componentStyles, (0, _withDebugId["default"])(next.componentStyles, nextDebugId)); // Merge icons set, last one wins in case of collisions | ||
acc.siteVariables = mergeSiteVariables(acc.siteVariables, (0, _withDebugId.default)(next.siteVariables, nextDebugId)); | ||
acc.componentVariables = mergeThemeVariables(acc.componentVariables, (0, _withDebugId.default)(next.componentVariables, nextDebugId)); | ||
acc.componentStyles = mergeThemeStyles(acc.componentStyles, (0, _withDebugId.default)(next.componentStyles, nextDebugId)); // Merge icons set, last one wins in case of collisions | ||
acc.icons = mergeIcons(acc.icons, next.icons); | ||
acc.fontFaces = mergeFontFaces.apply(void 0, (0, _toConsumableArray2["default"])(acc.fontFaces).concat((0, _toConsumableArray2["default"])(next.fontFaces || []))); | ||
acc.staticStyles = mergeStaticStyles.apply(void 0, (0, _toConsumableArray2["default"])(acc.staticStyles).concat((0, _toConsumableArray2["default"])(next.staticStyles || []))); | ||
acc.fontFaces = mergeFontFaces.apply(void 0, (0, _toConsumableArray2.default)(acc.fontFaces).concat((0, _toConsumableArray2.default)(next.fontFaces || []))); | ||
acc.staticStyles = mergeStaticStyles.apply(void 0, (0, _toConsumableArray2.default)(acc.staticStyles).concat((0, _toConsumableArray2.default)(next.staticStyles || []))); | ||
acc.animations = mergeAnimations(acc.animations, next.animations); | ||
@@ -462,3 +462,3 @@ return acc; | ||
var _default = mergeThemes; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=mergeThemes.js.map |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
exports["default"] = void 0; | ||
exports.default = void 0; | ||
@@ -14,3 +14,3 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")); | ||
var isObject = function isObject(o) { | ||
return o !== null && (0, _typeof2["default"])(o) === 'object' && !Array.isArray(o); | ||
return o !== null && (0, _typeof2.default)(o) === 'object' && !Array.isArray(o); | ||
}; | ||
@@ -43,3 +43,3 @@ | ||
var _default = objectKeyToValues; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=objectKeysToValues.js.map |
@@ -6,3 +6,3 @@ "use strict"; | ||
}); | ||
exports["default"] = void 0; | ||
exports.default = void 0; | ||
@@ -16,3 +16,3 @@ var toCompactArray = function toCompactArray() { | ||
var _default = toCompactArray; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=toCompactArray.js.map |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
exports["default"] = void 0; | ||
exports.default = void 0; | ||
@@ -22,3 +22,3 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof")); | ||
if ((0, _typeof2["default"])(data) === 'object' && data !== null) { | ||
if ((0, _typeof2.default)(data) === 'object' && data !== null) { | ||
if (!Object.prototype.hasOwnProperty.call(data, '_debugId')) { | ||
@@ -45,3 +45,3 @@ var copy = Object.assign({}, data); | ||
var _default = withDebugId; | ||
exports["default"] = _default; | ||
exports.default = _default; | ||
//# sourceMappingURL=withDebugId.js.map |
@@ -13,5 +13,5 @@ "use strict"; | ||
console.warn([ | ||
'@fluentui/react:', | ||
'@fluentui/react-northstar:', | ||
"CSSinJS Debug data collection is enabled.", | ||
'To remove this override paste `delete window.localStorage.fluentUIDebug` to your browser console and reload the page.' | ||
'To remove this override paste `delete window.localStorage.fluentUIDebug` to your browser console and reload the page.', | ||
].join(' ')); | ||
@@ -22,5 +22,5 @@ } | ||
console.warn([ | ||
'@fluentui/react:', | ||
'@fluentui/react-northstar:', | ||
"CSSinJS Debug data collection is disabled.", | ||
'To enable data collection paste `window.localStorage.fluentUIDebug = true` to your browser console and reload the page.' | ||
'To enable data collection paste `window.localStorage.fluentUIDebug = true` to your browser console and reload the page.', | ||
].join(' ')); | ||
@@ -27,0 +27,0 @@ } |
@@ -5,5 +5,5 @@ export { default as callable } from './callable'; | ||
export { default as deepmerge } from './deepmerge'; | ||
export { default as mergeThemes, emptyTheme, mergeComponentVariables, mergeComponentStyles, mergeFontFaces, mergeStaticStyles, mergeStyles, mergeThemeStyles, mergeThemeVariables, mergeSiteVariables } from './mergeThemes'; | ||
export { default as mergeThemes, emptyTheme, mergeComponentVariables, mergeComponentStyles, mergeFontFaces, mergeStaticStyles, mergeStyles, mergeThemeStyles, mergeThemeVariables, mergeSiteVariables, } from './mergeThemes'; | ||
export { default as objectKeyToValues } from './objectKeysToValues'; | ||
export { default as withDebugId } from './withDebugId'; | ||
export * from './types'; |
@@ -13,3 +13,3 @@ "use strict"; | ||
siteVariables: { | ||
fontSizes: {} | ||
fontSizes: {}, | ||
}, | ||
@@ -21,3 +21,3 @@ componentVariables: {}, | ||
icons: {}, | ||
animations: {} | ||
animations: {}, | ||
}; | ||
@@ -147,3 +147,5 @@ // ---------------------------------------- | ||
debugId: _debugId, | ||
input: siteVariables ? siteVariables._invertedKeys && callable_1.default(next)(siteVariables._invertedKeys) : callable_1.default(next)() | ||
input: siteVariables | ||
? siteVariables._invertedKeys && callable_1.default(next)(siteVariables._invertedKeys) | ||
: callable_1.default(next)(), | ||
}); | ||
@@ -168,3 +170,3 @@ return merged; | ||
var initial = { | ||
fontSizes: {} | ||
fontSizes: {}, | ||
}; | ||
@@ -182,3 +184,3 @@ return deepmerge_1.default.apply(void 0, tslib_1.__spreadArrays([initial], sources)); | ||
var initial = { | ||
fontSizes: {} | ||
fontSizes: {}, | ||
}; | ||
@@ -185,0 +187,0 @@ return sources.reduce(function (acc, next) { |
@@ -103,3 +103,2 @@ import * as CSS from 'csstype'; | ||
export interface ComponentStyleFunctionParam<TProps extends PropsWithVarsAndStyles = PropsWithVarsAndStyles, TVars extends ComponentVariablesObject = ComponentVariablesObject> { | ||
displayName: string; | ||
props: TProps; | ||
@@ -106,0 +105,0 @@ variables: TVars; |
@@ -17,3 +17,3 @@ "use strict"; | ||
writable: false, | ||
enumerable: false | ||
enumerable: false, | ||
}); | ||
@@ -20,0 +20,0 @@ return copy; |
@@ -38,3 +38,3 @@ "use strict"; | ||
keep: true, | ||
add: true | ||
add: true, | ||
}); | ||
@@ -57,5 +57,5 @@ }); | ||
deepValueToNull: 'targetDVTN', | ||
deepValueToUndefined: 'targetDVTU' | ||
} | ||
} | ||
deepValueToUndefined: 'targetDVTU', | ||
}, | ||
}, | ||
}; | ||
@@ -76,5 +76,5 @@ var source = { | ||
deepValueToNull: null, | ||
deepValueToUndefined: undefined | ||
} | ||
} | ||
deepValueToUndefined: undefined, | ||
}, | ||
}, | ||
}; | ||
@@ -97,5 +97,5 @@ expect(styles_1.deepmerge(target, source)).toStrictEqual({ | ||
deepValueToNull: null, | ||
deepValueToUndefined: undefined | ||
} | ||
} | ||
deepValueToUndefined: undefined, | ||
}, | ||
}, | ||
}); | ||
@@ -107,3 +107,3 @@ }); | ||
expect(styles_1.deepmerge(target, source)).toStrictEqual({ | ||
overridden: [4, 5] | ||
overridden: [4, 5], | ||
}); | ||
@@ -113,15 +113,15 @@ }); | ||
expect(styles_1.deepmerge({ color: 'black' }, { color: ['green', 'red'] })).toStrictEqual({ | ||
color: ['green', 'red'] | ||
color: ['green', 'red'], | ||
}); | ||
expect(styles_1.deepmerge({ color: ['green', 'red'] }, { color: 'black' })).toStrictEqual({ | ||
color: 'black' | ||
color: 'black', | ||
}); | ||
expect(styles_1.deepmerge({ color: { nested: 'object' } }, { color: ['green', 'red'] })).toStrictEqual({ | ||
color: ['green', 'red'] | ||
color: ['green', 'red'], | ||
}); | ||
expect(styles_1.deepmerge({ color: ['green', 'red'] }, { color: { nested: 'object' } })).toStrictEqual({ | ||
color: { nested: 'object' } | ||
color: { nested: 'object' }, | ||
}); | ||
expect(styles_1.deepmerge({ color: { nested: 'object' } }, { color: undefined })).toStrictEqual({ | ||
color: undefined | ||
color: undefined, | ||
}); | ||
@@ -142,5 +142,5 @@ }); | ||
cc: 'bbS2', | ||
dd: 'bbS3' | ||
dd: 'bbS3', | ||
}); | ||
}); | ||
}); |
@@ -9,7 +9,6 @@ "use strict"; | ||
disableAnimations: false, | ||
displayName: 'Test', | ||
props: {}, | ||
rtl: false, | ||
theme: styles_1.emptyTheme, | ||
variables: {} | ||
variables: {}, | ||
}; | ||
@@ -23,3 +22,3 @@ describe('mergeComponentStyles', function () { | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: function () { return originalDebugEnabled; } | ||
get: function () { return originalDebugEnabled; }, | ||
}); | ||
@@ -29,3 +28,3 @@ }); | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: jest.fn(function () { return enabled; }) | ||
get: jest.fn(function () { return enabled; }), | ||
}); | ||
@@ -89,5 +88,5 @@ } | ||
'::before': { | ||
content: 'before content' | ||
} | ||
} | ||
content: 'before content', | ||
}, | ||
}, | ||
}; | ||
@@ -98,5 +97,5 @@ var source = { | ||
'::before': { | ||
color: 'red' | ||
} | ||
} | ||
color: 'red', | ||
}, | ||
}, | ||
}; | ||
@@ -109,4 +108,4 @@ var merged = mergeComponentStyles(target, source); | ||
content: 'before content', | ||
color: 'red' | ||
} | ||
color: 'red', | ||
}, | ||
}); | ||
@@ -120,3 +119,3 @@ }); | ||
variables: { iconSize: 'large' }, | ||
props: { primary: true } | ||
props: { primary: true }, | ||
}; | ||
@@ -165,3 +164,3 @@ expect(merged.root(styleParam)).toMatchObject(tslib_1.__assign({ source: true, target: true }, styleParam)); | ||
}, | ||
icon: { d: 'sD' } | ||
icon: { d: 'sD' }, | ||
}; | ||
@@ -171,7 +170,7 @@ var merged = mergeThemes_1.mergeComponentStyles__DEV(target, source); | ||
expect(resolvedRoot).toMatchObject({ | ||
_debug: [{ styles: { a: 'tA', b: 'tB' } }, { styles: { a: 'sA', c: { deep: 'vC' } } }] | ||
_debug: [{ styles: { a: 'tA', b: 'tB' } }, { styles: { a: 'sA', c: { deep: 'vC' } } }], | ||
}); | ||
var resolvedIcon = merged.icon(styleParam); | ||
expect(resolvedIcon).toMatchObject({ | ||
_debug: [{ styles: { d: 'sD' } }] | ||
_debug: [{ styles: { d: 'sD' } }], | ||
}); | ||
@@ -185,3 +184,3 @@ }); | ||
expect(resolvedRoot).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }], | ||
}); | ||
@@ -192,14 +191,14 @@ }); | ||
root: { | ||
a: 'tA' | ||
} | ||
a: 'tA', | ||
}, | ||
}, 'target'); | ||
var source1 = styles_1.withDebugId({ | ||
root: { | ||
a: 'tB' | ||
} | ||
a: 'tB', | ||
}, | ||
}, 'source1'); | ||
var source2 = styles_1.withDebugId({ | ||
root: { | ||
a: 'tC' | ||
} | ||
a: 'tC', | ||
}, | ||
}, 'source2'); | ||
@@ -209,3 +208,3 @@ var merged1 = mergeThemes_1.mergeComponentStyles__DEV(target, source1, source2); | ||
expect(resolvedRoot1).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }], | ||
}); | ||
@@ -215,3 +214,3 @@ var merged2 = mergeThemes_1.mergeComponentStyles__DEV(mergeThemes_1.mergeComponentStyles__DEV(target, source1), source2); | ||
expect(resolvedRoot2).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }], | ||
}); | ||
@@ -221,3 +220,3 @@ var merged3 = mergeThemes_1.mergeComponentStyles__DEV(target, mergeThemes_1.mergeComponentStyles__DEV(source1, source2)); | ||
expect(resolvedRoot3).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }], | ||
}); | ||
@@ -224,0 +223,0 @@ }); |
@@ -14,3 +14,3 @@ "use strict"; | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: function () { return originalDebugEnabled; } | ||
get: function () { return originalDebugEnabled; }, | ||
}); | ||
@@ -20,3 +20,3 @@ }); | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: jest.fn(function () { return enabled; }) | ||
get: jest.fn(function () { return enabled; }), | ||
}); | ||
@@ -49,3 +49,3 @@ } | ||
expect(merged()).toMatchObject({ | ||
color: undefined | ||
color: undefined, | ||
}); | ||
@@ -56,3 +56,3 @@ }); | ||
expect(merged()).toMatchObject({ | ||
color: null | ||
color: null, | ||
}); | ||
@@ -67,3 +67,3 @@ }); | ||
two: 'two', | ||
three: 3 | ||
three: 3, | ||
}); | ||
@@ -80,3 +80,3 @@ }); | ||
source: true, | ||
target: true | ||
target: true, | ||
}); | ||
@@ -91,3 +91,3 @@ }); | ||
target: true, | ||
foo: { bar: true, baz: false, deep: { dOne: 1, dTwo: 'two' } } | ||
foo: { bar: true, baz: false, deep: { dOne: 1, dTwo: 'two' } }, | ||
}); | ||
@@ -98,4 +98,4 @@ }); | ||
colors: { | ||
colorForC: 'c_color' | ||
} | ||
colorForC: 'c_color', | ||
}, | ||
}; | ||
@@ -114,3 +114,3 @@ var target = { a: 1, b: 2, c: 3, d: 4, e: 5 }; | ||
cc: 'bbS2', | ||
dd: 'bbS3' | ||
dd: 'bbS3', | ||
}); | ||
@@ -155,3 +155,6 @@ }); | ||
expect(merged(siteVariables)).toMatchObject({ | ||
_debug: [{ resolved: { target: true, one: 'one', a: 'tA' } }, { resolved: { source: true, two: 'two', a: 'sA' } }] | ||
_debug: [ | ||
{ resolved: { target: true, one: 'one', a: 'tA' } }, | ||
{ resolved: { source: true, two: 'two', a: 'sA' } }, | ||
], | ||
}); | ||
@@ -164,3 +167,3 @@ }); | ||
expect(merged()).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }], | ||
}); | ||
@@ -175,3 +178,3 @@ }); | ||
expect(merged(siteVariables)).toMatchObject({ | ||
_debug: [{ input: { a: 'siteVariables.varA' } }, { input: { a: 'siteVariables.nested.varA' } }] | ||
_debug: [{ input: { a: 'siteVariables.varA' } }, { input: { a: 'siteVariables.nested.varA' } }], | ||
}); | ||
@@ -182,4 +185,4 @@ }); | ||
colors: { | ||
colorForC: 'c_color' | ||
} | ||
colorForC: 'c_color', | ||
}, | ||
}; | ||
@@ -193,9 +196,9 @@ var target = styles_1.withDebugId({ a: 1, b: 2, c: 3, d: 4, e: 5 }, 'target'); | ||
expect(merged1).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }], | ||
}); | ||
expect(merged2).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }], | ||
}); | ||
expect(merged3).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source1' }, { debugId: 'source2' }], | ||
}); | ||
@@ -202,0 +205,0 @@ }); |
@@ -9,11 +9,11 @@ "use strict"; | ||
paths: ['public/fonts/segoe-ui-regular.woff2'], | ||
props: { fontWeight: 400 } | ||
props: { fontWeight: 400 }, | ||
}, { | ||
name: 'Segoe UI', | ||
paths: ['public/fonts/segoe-ui-semibold.woff2'], | ||
props: { fontWeight: 600 } | ||
props: { fontWeight: 600 }, | ||
}, { | ||
name: 'Segoe UI', | ||
paths: ['public/fonts/segoe-ui-bold.woff2'], | ||
props: { fontWeight: 700 } | ||
props: { fontWeight: 700 }, | ||
})).toEqual([ | ||
@@ -23,3 +23,3 @@ { | ||
paths: ['public/fonts/segoe-ui-regular.woff2'], | ||
props: { fontWeight: 400 } | ||
props: { fontWeight: 400 }, | ||
}, | ||
@@ -29,3 +29,3 @@ { | ||
paths: ['public/fonts/segoe-ui-semibold.woff2'], | ||
props: { fontWeight: 600 } | ||
props: { fontWeight: 600 }, | ||
}, | ||
@@ -35,6 +35,6 @@ { | ||
paths: ['public/fonts/segoe-ui-bold.woff2'], | ||
props: { fontWeight: 700 } | ||
} | ||
props: { fontWeight: 700 }, | ||
}, | ||
]); | ||
}); | ||
}); |
@@ -13,3 +13,3 @@ "use strict"; | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: function () { return originalDebugEnabled; } | ||
get: function () { return originalDebugEnabled; }, | ||
}); | ||
@@ -19,3 +19,3 @@ }); | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: jest.fn(function () { return enabled; }) | ||
get: jest.fn(function () { return enabled; }), | ||
}); | ||
@@ -53,3 +53,3 @@ } | ||
expect(merged).toMatchObject({ | ||
color: undefined | ||
color: undefined, | ||
}); | ||
@@ -60,3 +60,3 @@ }); | ||
expect(merged).toMatchObject({ | ||
color: null | ||
color: null, | ||
}); | ||
@@ -70,3 +70,3 @@ }); | ||
keep: true, | ||
add: true | ||
add: true, | ||
}); | ||
@@ -78,3 +78,3 @@ }); | ||
expect(mergeSiteVariables(target, source)).toMatchObject({ | ||
nested: { replaced: false, other: 'value', deep: { dOne: 1, dTwo: 'two' } } | ||
nested: { replaced: false, other: 'value', deep: { dOne: 1, dTwo: 'two' } }, | ||
}); | ||
@@ -118,3 +118,3 @@ }); | ||
expect(merged).toMatchObject({ | ||
_debug: [{ resolved: { one: 1, a: 'tA' } }, { resolved: { two: 2, a: 'sA' } }] | ||
_debug: [{ resolved: { one: 1, a: 'tA' } }, { resolved: { two: 2, a: 'sA' } }], | ||
}); | ||
@@ -127,3 +127,3 @@ }); | ||
expect(merged).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }], | ||
}); | ||
@@ -130,0 +130,0 @@ }); |
@@ -8,5 +8,5 @@ "use strict"; | ||
{ body: { color: 'red' } }, | ||
'*{box-sizing:border-box;}' | ||
'*{box-sizing:border-box;}', | ||
]); | ||
}); | ||
}); |
@@ -8,7 +8,6 @@ "use strict"; | ||
disableAnimations: false, | ||
displayName: 'Test', | ||
props: {}, | ||
rtl: false, | ||
theme: styles_1.emptyTheme, | ||
variables: {} | ||
variables: {}, | ||
}; | ||
@@ -32,3 +31,3 @@ describe('mergeThemes', function () { | ||
componentStyles: { Button: { root: { color: 'black' } } }, | ||
rtl: true | ||
rtl: true, | ||
}; | ||
@@ -39,3 +38,3 @@ var source = { | ||
componentStyles: undefined, | ||
rtl: undefined | ||
rtl: undefined, | ||
}; | ||
@@ -49,3 +48,3 @@ expect(function () { return styles_1.mergeThemes(target, source); }).not.toThrow(); | ||
componentStyles: undefined, | ||
rtl: undefined | ||
rtl: undefined, | ||
}; | ||
@@ -56,3 +55,3 @@ var source = { | ||
componentStyles: { Button: { root: { color: 'black' } } }, | ||
rtl: true | ||
rtl: true, | ||
}; | ||
@@ -66,3 +65,3 @@ expect(function () { return styles_1.mergeThemes(target, source); }).not.toThrow(); | ||
expect(styles_1.mergeThemes(target, source)).toMatchObject({ | ||
siteVariables: { overridden: true, keep: true, add: true } | ||
siteVariables: { overridden: true, keep: true, add: true }, | ||
}); | ||
@@ -75,4 +74,4 @@ }); | ||
siteVariables: { | ||
nested: { replaced: false, other: 'value', deep: { dOne: 1, dTwo: 'two' } } | ||
} | ||
nested: { replaced: false, other: 'value', deep: { dOne: 1, dTwo: 'two' } }, | ||
}, | ||
}); | ||
@@ -99,3 +98,3 @@ }); | ||
var source = { | ||
componentVariables: { Button: function () { return ({ one: 'one', two: 'two' }); } } | ||
componentVariables: { Button: function () { return ({ one: 'one', two: 'two' }); } }, | ||
}; | ||
@@ -106,3 +105,3 @@ var merged = styles_1.mergeThemes(target, source); | ||
two: 'two', | ||
three: 3 | ||
three: 3, | ||
}); | ||
@@ -113,9 +112,9 @@ }); | ||
componentVariables: { | ||
Button: function () { return ({ one: { nestedOne: 1, nestedThree: 3, deep: { dOne: 1 } } }); } | ||
} | ||
Button: function () { return ({ one: { nestedOne: 1, nestedThree: 3, deep: { dOne: 1 } } }); }, | ||
}, | ||
}; | ||
var source = { | ||
componentVariables: { | ||
Button: function () { return ({ one: { nestedOne: 'one', nestedTwo: 'two', deep: { dTwo: 'two' } } }); } | ||
} | ||
Button: function () { return ({ one: { nestedOne: 'one', nestedTwo: 'two', deep: { dTwo: 'two' } } }); }, | ||
}, | ||
}; | ||
@@ -128,4 +127,4 @@ var merged = styles_1.mergeThemes(target, source); | ||
nestedThree: 3, | ||
deep: { dOne: 1, dTwo: 'two' } | ||
} | ||
deep: { dOne: 1, dTwo: 'two' }, | ||
}, | ||
}); | ||
@@ -136,9 +135,9 @@ }); | ||
componentVariables: { | ||
Button: function (siteVariables) { return (tslib_1.__assign({ one: 1, target: true }, siteVariables)); } | ||
} | ||
Button: function (siteVariables) { return (tslib_1.__assign({ one: 1, target: true }, siteVariables)); }, | ||
}, | ||
}; | ||
var source = { | ||
componentVariables: { | ||
Button: function (siteVariables) { return (tslib_1.__assign({ two: 2, source: true }, siteVariables)); } | ||
} | ||
Button: function (siteVariables) { return (tslib_1.__assign({ two: 2, source: true }, siteVariables)); }, | ||
}, | ||
}; | ||
@@ -151,3 +150,3 @@ var merged = styles_1.mergeThemes(target, source); | ||
source: true, | ||
target: true | ||
target: true, | ||
}); | ||
@@ -198,7 +197,7 @@ }); | ||
'::before': { | ||
content: 'before content' | ||
} | ||
} | ||
} | ||
} | ||
content: 'before content', | ||
}, | ||
}, | ||
}, | ||
}, | ||
}; | ||
@@ -211,7 +210,7 @@ var source = { | ||
'::before': { | ||
color: 'red' | ||
} | ||
} | ||
} | ||
} | ||
color: 'red', | ||
}, | ||
}, | ||
}, | ||
}, | ||
}; | ||
@@ -224,4 +223,4 @@ var merged = styles_1.mergeThemes(target, source); | ||
content: 'before content', | ||
color: 'red' | ||
} | ||
color: 'red', | ||
}, | ||
}); | ||
@@ -233,5 +232,5 @@ }); | ||
Button: { | ||
root: function (param) { return (tslib_1.__assign({ target: true }, param)); } | ||
} | ||
} | ||
root: function (param) { return (tslib_1.__assign({ target: true }, param)); }, | ||
}, | ||
}, | ||
}; | ||
@@ -241,5 +240,5 @@ var source = { | ||
Button: { | ||
root: function (param) { return (tslib_1.__assign({ source: true }, param)); } | ||
} | ||
} | ||
root: function (param) { return (tslib_1.__assign({ source: true }, param)); }, | ||
}, | ||
}, | ||
}; | ||
@@ -249,3 +248,3 @@ var merged = styles_1.mergeThemes(target, source); | ||
variables: { iconSize: 'large' }, | ||
props: { primary: true } | ||
props: { primary: true }, | ||
}; | ||
@@ -262,5 +261,5 @@ expect(merged.componentStyles.Button.root(styleParam)).toMatchObject(tslib_1.__assign({ source: true, target: true }, styleParam)); | ||
paths: ['public/fonts/segoe-ui-regular.woff2'], | ||
props: { fontWeight: 400 } | ||
} | ||
] | ||
props: { fontWeight: 400 }, | ||
}, | ||
], | ||
}, { | ||
@@ -271,5 +270,5 @@ fontFaces: [ | ||
paths: ['public/fonts/segoe-ui-semibold.woff2'], | ||
props: { fontWeight: 600 } | ||
} | ||
] | ||
props: { fontWeight: 600 }, | ||
}, | ||
], | ||
}, { | ||
@@ -280,5 +279,5 @@ fontFaces: [ | ||
paths: ['public/fonts/segoe-ui-bold.woff2'], | ||
props: { fontWeight: 700 } | ||
} | ||
] | ||
props: { fontWeight: 700 }, | ||
}, | ||
], | ||
})).toMatchObject({ | ||
@@ -289,3 +288,3 @@ fontFaces: [ | ||
paths: ['public/fonts/segoe-ui-regular.woff2'], | ||
props: { fontWeight: 400 } | ||
props: { fontWeight: 400 }, | ||
}, | ||
@@ -295,3 +294,3 @@ { | ||
paths: ['public/fonts/segoe-ui-semibold.woff2'], | ||
props: { fontWeight: 600 } | ||
props: { fontWeight: 600 }, | ||
}, | ||
@@ -301,5 +300,5 @@ { | ||
paths: ['public/fonts/segoe-ui-bold.woff2'], | ||
props: { fontWeight: 700 } | ||
} | ||
] | ||
props: { fontWeight: 700 }, | ||
}, | ||
], | ||
}); | ||
@@ -311,3 +310,3 @@ }); | ||
expect(styles_1.mergeThemes({ staticStyles: null }, { staticStyles: undefined }, { staticStyles: [''] }, { staticStyles: [{ body: { color: 'red' } }] }, { staticStyles: ['*{box-sizing:border-box;}'] })).toMatchObject({ | ||
staticStyles: [{ body: { color: 'red' } }, '*{box-sizing:border-box;}'] | ||
staticStyles: [{ body: { color: 'red' } }, '*{box-sizing:border-box;}'], | ||
}); | ||
@@ -323,4 +322,4 @@ }); | ||
margin: '0px', | ||
color: 'override' | ||
} | ||
color: 'override', | ||
}, | ||
}; | ||
@@ -330,4 +329,4 @@ var stylesAsFunction = function () { return ({ | ||
':hover': { | ||
color: 'blue' | ||
} | ||
color: 'blue', | ||
}, | ||
}); }; | ||
@@ -339,4 +338,4 @@ expect(styles_1.mergeStyles(stylesAsObject, stylesAsFunction)()).toMatchObject({ | ||
margin: '0px', | ||
color: 'blue' | ||
} | ||
color: 'blue', | ||
}, | ||
}); | ||
@@ -350,4 +349,4 @@ }); | ||
margin: '0px', | ||
color: 'override' | ||
} | ||
color: 'override', | ||
}, | ||
}); }; | ||
@@ -357,4 +356,4 @@ var stylesAsObject = { | ||
':hover': { | ||
color: 'blue' | ||
} | ||
color: 'blue', | ||
}, | ||
}; | ||
@@ -366,4 +365,4 @@ expect(styles_1.mergeStyles(stylesAsFunction, stylesAsObject)()).toMatchObject({ | ||
margin: '0px', | ||
color: 'blue' | ||
} | ||
color: 'blue', | ||
}, | ||
}); | ||
@@ -379,3 +378,3 @@ }); | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: function () { return originalDebugEnabled; } | ||
get: function () { return originalDebugEnabled; }, | ||
}); | ||
@@ -385,3 +384,3 @@ }); | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: jest.fn(function () { return enabled; }) | ||
get: jest.fn(function () { return enabled; }), | ||
}); | ||
@@ -394,3 +393,3 @@ } | ||
componentVariables: { Button: { btnVar: 'tBtnVar' } }, | ||
componentStyles: { Button: { root: { style: 'tStyleA' } } } | ||
componentStyles: { Button: { root: { style: 'tStyleA' } } }, | ||
}; | ||
@@ -403,3 +402,3 @@ var source = { | ||
return ({ style: variables.btnVar }); | ||
} } } | ||
} } }, | ||
}; | ||
@@ -413,4 +412,4 @@ var merged = styles_1.mergeThemes(target, source); | ||
{ resolved: { varA: 'tVarA' } }, | ||
{ resolved: { varA: 'sVarA' } } | ||
] | ||
{ resolved: { varA: 'sVarA' } }, | ||
], | ||
}); | ||
@@ -424,10 +423,10 @@ var buttonVariables = merged.componentVariables.Button(merged.siteVariables); | ||
{ resolved: { btnVar: 'tBtnVar' } }, | ||
{ resolved: { btnVar: 'sVarA' } } | ||
] | ||
{ resolved: { btnVar: 'sVarA' } }, | ||
], | ||
}); | ||
var buttonRootStyles = merged.componentStyles.Button.root({ | ||
variables: buttonVariables | ||
variables: buttonVariables, | ||
}); | ||
expect(buttonRootStyles).toMatchObject({ | ||
_debug: [{ styles: { style: 'tStyleA' } }, { styles: { style: 'sVarA' } }] | ||
_debug: [{ styles: { style: 'tStyleA' } }, { styles: { style: 'sVarA' } }], | ||
}); | ||
@@ -440,3 +439,3 @@ }); | ||
componentVariables: { Button: { btnVar: 'tBtnVar' } }, | ||
componentStyles: { Button: { root: { style: 'tStyleA' } } } | ||
componentStyles: { Button: { root: { style: 'tStyleA' } } }, | ||
}; | ||
@@ -449,3 +448,3 @@ var source = { | ||
return ({ style: variables.btnVar }); | ||
} } } | ||
} } }, | ||
}; | ||
@@ -457,3 +456,3 @@ var merged = styles_1.mergeThemes(target, source); | ||
var buttonRootStyles = merged.componentStyles.Button.root({ | ||
variables: buttonVariables | ||
variables: buttonVariables, | ||
}); | ||
@@ -467,3 +466,3 @@ expect(buttonRootStyles._debug).toBe(undefined); | ||
componentVariables: { Button: { btnVar: 'tBtnVar' } }, | ||
componentStyles: { Button: { root: { style: 'tStyleA' } } } | ||
componentStyles: { Button: { root: { style: 'tStyleA' } } }, | ||
}, 'target'); | ||
@@ -476,3 +475,3 @@ var source = styles_1.withDebugId({ | ||
return ({ style: variables.btnVar }); | ||
} } } | ||
} } }, | ||
}, 'source'); | ||
@@ -486,4 +485,4 @@ var merged = styles_1.mergeThemes(target, source); | ||
{ debugId: 'target' }, | ||
{ debugId: 'source' } | ||
] | ||
{ debugId: 'source' }, | ||
], | ||
}); | ||
@@ -497,10 +496,10 @@ var buttonVariables = merged.componentVariables.Button(merged.siteVariables); | ||
{ debugId: 'target' }, | ||
{ debugId: 'source' } | ||
] | ||
{ debugId: 'source' }, | ||
], | ||
}); | ||
var buttonRootStyles = merged.componentStyles.Button.root({ | ||
variables: buttonVariables | ||
variables: buttonVariables, | ||
}); | ||
expect(buttonRootStyles).toMatchObject({ | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }] | ||
_debug: [{ debugId: 'target' }, { debugId: 'source' }], | ||
}); | ||
@@ -507,0 +506,0 @@ }); |
@@ -14,3 +14,3 @@ "use strict"; | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: function () { return originalDebugEnabled; } | ||
get: function () { return originalDebugEnabled; }, | ||
}); | ||
@@ -20,3 +20,3 @@ }); | ||
Object.defineProperty(debugEnabled, 'isEnabled', { | ||
get: jest.fn(function () { return enabled; }) | ||
get: jest.fn(function () { return enabled; }), | ||
}); | ||
@@ -42,3 +42,3 @@ } | ||
var source1 = styles_1.withDebugId({ | ||
Button: function (siteVariables) { return ({ b: siteVariables.colors.colorForB }); } | ||
Button: function (siteVariables) { return ({ b: siteVariables.colors.colorForB }); }, | ||
}, 's1'); | ||
@@ -51,4 +51,4 @@ var source2 = { Button: { c: 'cS2' } }; | ||
colorForB: 'b_color', | ||
colorForC: 'c_color' | ||
} | ||
colorForC: 'c_color', | ||
}, | ||
}; | ||
@@ -58,3 +58,3 @@ var merged = mergeThemeVariables(target, mergeThemeVariables(source1, source2), source3); | ||
expect(resolved).toMatchObject({ | ||
Button: { a: 'a', b: 'b_color', c: 'cS2', d: 'dS3', e: 'e' } | ||
Button: { a: 'a', b: 'b_color', c: 'cS2', d: 'dS3', e: 'e' }, | ||
}); | ||
@@ -61,0 +61,0 @@ }); |
@@ -9,4 +9,4 @@ "use strict"; | ||
b: { | ||
c: [3, 4] | ||
} | ||
c: [3, 4], | ||
}, | ||
}; | ||
@@ -16,6 +16,6 @@ expect(styles_1.objectKeyToValues(input)).toStrictEqual({ | ||
b: { | ||
c: 'b.c' | ||
} | ||
c: 'b.c', | ||
}, | ||
}); | ||
}); | ||
}); |
@@ -12,6 +12,6 @@ var isDebugEnabled = function isDebugEnabled() { | ||
/* eslint-disable-next-line no-console */ | ||
console.warn(['@fluentui/react:', "CSSinJS Debug data collection is enabled.", 'To remove this override paste `delete window.localStorage.fluentUIDebug` to your browser console and reload the page.'].join(' ')); | ||
console.warn(['@fluentui/react-northstar:', "CSSinJS Debug data collection is enabled.", 'To remove this override paste `delete window.localStorage.fluentUIDebug` to your browser console and reload the page.'].join(' ')); | ||
} else { | ||
/* eslint-disable-next-line no-console */ | ||
console.warn(['@fluentui/react:', "CSSinJS Debug data collection is disabled.", 'To enable data collection paste `window.localStorage.fluentUIDebug = true` to your browser console and reload the page.'].join(' ')); | ||
console.warn(['@fluentui/react-northstar:', "CSSinJS Debug data collection is disabled.", 'To enable data collection paste `window.localStorage.fluentUIDebug = true` to your browser console and reload the page.'].join(' ')); | ||
} | ||
@@ -18,0 +18,0 @@ } |
@@ -5,5 +5,5 @@ export { default as callable } from './callable'; | ||
export { default as deepmerge } from './deepmerge'; | ||
export { default as mergeThemes, emptyTheme, mergeComponentVariables, mergeComponentStyles, mergeFontFaces, mergeStaticStyles, mergeStyles, mergeThemeStyles, mergeThemeVariables, mergeSiteVariables } from './mergeThemes'; | ||
export { default as mergeThemes, emptyTheme, mergeComponentVariables, mergeComponentStyles, mergeFontFaces, mergeStaticStyles, mergeStyles, mergeThemeStyles, mergeThemeVariables, mergeSiteVariables, } from './mergeThemes'; | ||
export { default as objectKeyToValues } from './objectKeysToValues'; | ||
export { default as withDebugId } from './withDebugId'; | ||
export * from './types'; |
@@ -103,3 +103,2 @@ import * as CSS from 'csstype'; | ||
export interface ComponentStyleFunctionParam<TProps extends PropsWithVarsAndStyles = PropsWithVarsAndStyles, TVars extends ComponentVariablesObject = ComponentVariablesObject> { | ||
displayName: string; | ||
props: TProps; | ||
@@ -106,0 +105,0 @@ variables: TVars; |
{ | ||
"name": "@fluentui/styles", | ||
"description": "A set of styling utilities for CSS-in-JS.", | ||
"version": "0.46.0", | ||
"version": "0.47.0", | ||
"author": "Marija Najdova <mnajdova@gmail.com>", | ||
@@ -41,3 +41,3 @@ "bugs": "https://github.com/OfficeDev/office-ui-fabric-react/issues", | ||
"types": "dist/es/index.d.ts", | ||
"gitHead": "04b131d5bd3209f5d3daf8c6d5c49f2cc0894730" | ||
"gitHead": "36ed94b0250ee3316e9aaec4697ced1cf229dcb1" | ||
} |
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
341559
3376