@uifabric/merge-styles - npm Package Compare versions

Comparing version 7.5.2 to 7.6.0

CHANGELOG.json

@@ -5,3 +5,17 @@ {
     {
-      "date": "Thu, 12 Sep 2019 12:32:13 GMT",
+      "date": "Fri, 20 Sep 2019 12:33:16 GMT",
+      "tag": "@uifabric/merge-styles_v7.6.0",
+      "version": "7.6.0",
+      "comments": {
+        "minor": [
+          {
+            "comment": "Adding `concatStyleSetsWithProps` to help resolve stylesets that are functional, resolving with props.",
+            "author": "[e-mail]",
+            "commit": "8065917a76a5e08b27721e34e13903adba3730f1"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 12 Sep 2019 12:34:15 GMT",
       "tag": "@uifabric/merge-styles_v7.5.2",
@@ -8,0 +22,0 @@ "version": "7.5.2",

CHANGELOG.md

 # Change Log - @uifabric/merge-styles
 
-This log was last generated on Thu, 12 Sep 2019 12:32:13 GMT and should not be manually modified.
+This log was last generated on Fri, 20 Sep 2019 12:33:16 GMT and should not be manually modified.
 
+## 7.6.0
+Fri, 20 Sep 2019 12:33:16 GMT
+
+### Minor changes
+
+- Adding `concatStyleSetsWithProps` to help resolve stylesets that are functional, resolving with props. ([e-mail])
 ## 7.5.2
-Thu, 12 Sep 2019 12:32:13 GMT
+Thu, 12 Sep 2019 12:34:15 GMT
 
@@ -8,0 +14,0 @@ ### Patches

dist/merge-styles.js

@@ -683,2 +683,44 @@ var MergeStyles =
 
+/***/ "./lib/concatStyleSetsWithProps.js":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatStyleSetsWithProps", function() { return concatStyleSetsWithProps; });
+/* harmony import */ var _concatStyleSets__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./lib/concatStyleSets.js");
+
+/**
+ * Concatenates style sets into one, but resolves functional sets using the given props.
+ * @param styleProps - Props used to resolve functional sets.
+ * @param allStyles - Style sets, which can be functions or objects.
+ */
+function concatStyleSetsWithProps(styleProps) {
+    var allStyles = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        allStyles[_i - 1] = arguments[_i];
+    }
+    var result = [];
+    for (var _a = 0, allStyles_1 = allStyles; _a < allStyles_1.length; _a++) {
+        var styles = allStyles_1[_a];
+        if (styles) {
+            result.push(typeof styles === 'function' ? styles(styleProps) : styles);
+        }
+    }
+    if (result.length === 1) {
+        return result[0];
+    }
+    else if (result.length) {
+        // cliffkoh: I cannot figure out how to avoid the cast to any here.
+        // It is something to do with the use of Omit in IStyleSet.
+        // It might not be necessary once  Omit becomes part of lib.d.ts (when we remove our own Omit and rely on
+        // the official version).
+        // tslint:disable-next-line:no-any
+        return _concatStyleSets__WEBPACK_IMPORTED_MODULE_0__["concatStyleSets"].apply(void 0, result);
+    }
+    return {};
+}
+
+
+/***/ }),
+
 /***/ "./lib/extractStyleParts.js":
@@ -821,18 +863,20 @@ /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _fontFace__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./lib/fontFace.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fontFace", function() { return _fontFace__WEBPACK_IMPORTED_MODULE_3__["fontFace"]; });
+/* harmony import */ var _concatStyleSetsWithProps__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./lib/concatStyleSetsWithProps.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatStyleSetsWithProps", function() { return _concatStyleSetsWithProps__WEBPACK_IMPORTED_MODULE_3__["concatStyleSetsWithProps"]; });
 
-/* harmony import */ var _keyframes__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./lib/keyframes.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "keyframes", function() { return _keyframes__WEBPACK_IMPORTED_MODULE_4__["keyframes"]; });
+/* harmony import */ var _fontFace__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./lib/fontFace.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fontFace", function() { return _fontFace__WEBPACK_IMPORTED_MODULE_4__["fontFace"]; });
 
-/* harmony import */ var _Stylesheet__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./lib/Stylesheet.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "InjectionMode", function() { return _Stylesheet__WEBPACK_IMPORTED_MODULE_5__["InjectionMode"]; });
+/* harmony import */ var _keyframes__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./lib/keyframes.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "keyframes", function() { return _keyframes__WEBPACK_IMPORTED_MODULE_5__["keyframes"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Stylesheet", function() { return _Stylesheet__WEBPACK_IMPORTED_MODULE_5__["Stylesheet"]; });
+/* harmony import */ var _Stylesheet__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./lib/Stylesheet.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "InjectionMode", function() { return _Stylesheet__WEBPACK_IMPORTED_MODULE_6__["InjectionMode"]; });
 
-/* harmony import */ var _transforms_rtlifyRules__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./lib/transforms/rtlifyRules.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "setRTL", function() { return _transforms_rtlifyRules__WEBPACK_IMPORTED_MODULE_6__["setRTL"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Stylesheet", function() { return _Stylesheet__WEBPACK_IMPORTED_MODULE_6__["Stylesheet"]; });
 
-/* harmony import */ var _version__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./lib/version.js");
+/* harmony import */ var _transforms_rtlifyRules__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("./lib/transforms/rtlifyRules.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "setRTL", function() { return _transforms_rtlifyRules__WEBPACK_IMPORTED_MODULE_7__["setRTL"]; });
 
+/* harmony import */ var _version__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("./lib/version.js");
 
@@ -847,2 +891,4 @@
 
+
+
 /***/ }),
@@ -1425,6 +1471,6 @@
 /* harmony import */ var _uifabric_set_version__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../set-version/lib/index.js");
-// @uifabric/merge-styles@7.5.2
+// @uifabric/merge-styles@7.6.0
 // Do not modify this file, the file is generated as part of publish. The checked in version is a placeholder only.
 
-Object(_uifabric_set_version__WEBPACK_IMPORTED_MODULE_0__["setVersion"])('@uifabric/merge-styles', '7.5.2');
+Object(_uifabric_set_version__WEBPACK_IMPORTED_MODULE_0__["setVersion"])('@uifabric/merge-styles', '7.6.0');
 
@@ -1431,0 +1477,0 @@

dist/merge-styles.min.js

@@ -1,2 +0,2 @@
-var MergeStyles=function(e){var t={};function n(r){if(t[r])return t[r].exports;var s=t[r]={i:r,l:!1,exports:{}};return e[r].call(s.exports,s,s.exports,n),s.l=!0,s.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var s in e)n.d(r,s,function(t){return e[t]}.bind(null,s));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";n.r(t);var r=function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var s in t=arguments[n])Object.prototype.hasOwnProperty.call(t,s)&&(e[s]=t[s]);return e}).apply(this,arguments)};var s,i={none:0,insertNode:1,appendChild:2},o="undefined"!=typeof navigator&&/rv:11.0/.test(navigator.userAgent),a={};try{a=window}catch(e){}var l,u=function(){function e(e){this._rules=[],this._preservedRules=[],this._rulesToInsert=[],this._counter=0,this._keyToClassName={},this._onResetCallbacks=[],this._classNameToArgs={},this._config=r({injectionMode:i.insertNode,defaultPrefix:"css",namespace:void 0,cspSettings:void 0},e)}return e.getInstance=function(){if(!(s=a.__stylesheet__)||s._lastStyleElement&&s._lastStyleElement.ownerDocument!==document){var t=a&&a.FabricConfig||{};s=a.__stylesheet__=new e(t.mergeStyles)}return s},e.prototype.setConfig=function(e){this._config=r({},this._config,e)},e.prototype.onReset=function(e){this._onResetCallbacks.push(e)},e.prototype.getClassName=function(e){var t=this._config.namespace;return(t?t+"-":"")+(e||this._config.defaultPrefix)+"-"+this._counter++},e.prototype.cacheClassName=function(e,t,n,r){this._keyToClassName[t]=e,this._classNameToArgs[e]={args:n,rules:r}},e.prototype.classNameFromKey=function(e){return this._keyToClassName[e]},e.prototype.argsFromClassName=function(e){var t=this._classNameToArgs[e];return t&&t.args},e.prototype.insertedRulesFromClassName=function(e){var t=this._classNameToArgs[e];return t&&t.rules},e.prototype.insertRule=function(e,t){var n=this._config.injectionMode!==i.none?this._getStyleElement():void 0;if(t&&this._preservedRules.push(e),n)switch(this._config.injectionMode){case i.insertNode:var r=n.sheet;try{r.insertRule(e,r.cssRules.length)}catch(e){}break;case i.appendChild:n.appendChild(document.createTextNode(e))}else this._rules.push(e);this._config.onInsertRule&&this._config.onInsertRule(e)},e.prototype.getRules=function(e){return(e?this._preservedRules.join(""):"")+this._rules.join("")+this._rulesToInsert.join("")},e.prototype.reset=function(){this._rules=[],this._rulesToInsert=[],this._counter=0,this._classNameToArgs={},this._keyToClassName={},this._onResetCallbacks.forEach(function(e){return e()})},e.prototype.resetKeys=function(){this._keyToClassName={}},e.prototype._getStyleElement=function(){var e=this;return this._styleElement||"undefined"==typeof document||(this._styleElement=this._createStyleElement(),o||window.requestAnimationFrame(function(){e._styleElement=void 0})),this._styleElement},e.prototype._createStyleElement=function(){var e=document.head,t=document.createElement("style");t.setAttribute("data-merge-styles","true");var n=this._config.cspSettings;if(n&&n.nonce&&t.setAttribute("nonce",n.nonce),this._lastStyleElement)e.insertBefore(t,this._lastStyleElement.nextElementSibling);else{var r=this._findPlaceholderStyleTag();r?e.insertBefore(t,r.nextElementSibling):e.insertBefore(t,e.childNodes[0])}return this._lastStyleElement=t,t},e.prototype._findPlaceholderStyleTag=function(){var e=document.head;return e?e.querySelector("style[data-merge-styles]"):null},e}(),f={};var c={"user-select":1};function p(e,t){var n=function(){if(!l){var e="undefined"!=typeof document?document:void 0,t="undefined"!=typeof navigator?navigator:void 0,n=t?t.userAgent.toLowerCase():void 0;l=e?{isWebkit:!!(e&&"WebkitAppearance"in e.documentElement.style),isMoz:!!(n&&n.indexOf("firefox")>-1),isOpera:!!(n&&n.indexOf("opera")>-1),isMs:!(!t||!/rv:11.0/i.test(t.userAgent)&&!/Edge\/\d./i.test(navigator.userAgent))}:{isWebkit:!0,isMoz:!0,isOpera:!0,isMs:!0}}return l}(),r=e[t];if(c[r]){var s=e[t+1];c[r]&&(n.isWebkit&&e.push("-webkit-"+r,s),n.isMoz&&e.push("-moz-"+r,s),n.isMs&&e.push("-ms-"+r,s),n.isOpera&&e.push("-o-"+r,s))}}var d,v=["column-count","font-weight","flex-basis","flex","flex-grow","flex-shrink","fill-opacity","opacity","order","z-index","zoom"];function h(e,t){var n=e[t],r=e[t+1];if("number"==typeof r){var s=-1===v.indexOf(n)?"px":"";e[t+1]=""+r+s}}var y="left",g="right",m="@noflip",_=((d={})[y]=g,d[g]=y,d),b={"w-resize":"e-resize","sw-resize":"se-resize","nw-resize":"ne-resize"},S=x();function O(e){S!==e&&(u.getInstance().resetKeys(),S=e)}function x(){return void 0===S&&(S="undefined"!=typeof document&&!!document.documentElement&&"rtl"===document.documentElement.getAttribute("dir")),S}function N(e,t){if(x()){var n=e[t];if(!n)return;var r=e[t+1];if("string"==typeof r&&r.indexOf(m)>=0)e[t+1]=r.replace(/\s*(?:\/\*\s*)?\@noflip\b(?:\s*\*\/)?\s*?/g,"");else if(n.indexOf(y)>=0)e[t]=n.replace(y,g);else if(n.indexOf(g)>=0)e[t]=n.replace(g,y);else if(String(r).indexOf(y)>=0)e[t+1]=r.replace(y,g);else if(String(r).indexOf(g)>=0)e[t+1]=r.replace(g,y);else if(_[n])e[t]=_[n];else if(b[r])e[t+1]=b[r];else switch(n){case"margin":case"padding":e[t+1]=function(e){if("string"==typeof e){var t=e.split(" ");if(4===t.length)return t[0]+" "+t[3]+" "+t[2]+" "+t[1]}return e}(r);break;case"box-shadow":e[t+1]=function(e,t){var n=e.split(" "),r=parseInt(n[t],10);return n[0]=n[0].replace(String(r),String(-1*r)),n.join(" ")}(r,0)}}}var C="displayName";var w=/\:global\((.+?)\)/g;function j(e){if(!w.test(e))return e;for(var t=[],n=/\:global\((.+?)\)/g,r=null;r=n.exec(e);)r[1].indexOf(",")>-1&&t.push([r.index,r.index+r[0].length,r[1].split(",").map(function(e){return":global("+e.trim()+")"}).join(", ")]);return t.reverse().reduce(function(e,t){var n=t[0],r=t[1],s=t[2];return e.slice(0,n)+s+e.slice(r)},e)}function k(e,t){return e.indexOf(":global(")>=0?e.replace(w,"$1"):0===e.indexOf(":")?t+e:e.indexOf("&")<0?t+" "+e:e}function A(e,t,n){var r="string"==typeof n?n.split(" "):[n];e[t+"Top"]=r[0],e[t+"Right"]=r[1]||r[0],e[t+"Bottom"]=r[2]||r[0],e[t+"Left"]=r[3]||r[1]||r[0]}function E(e){if(!e)return"";var t,n,r,s=[];for(var i in e)e.hasOwnProperty(i)&&i!==C&&void 0!==e[i]&&s.push(i,e[i]);for(var o=0;o<s.length;o+=2)r=void 0,r=(t=s)[n=o],t[n]=f[r]=f[r]||r.replace(/([A-Z])/g,"-$1").toLowerCase(),h(s,o),N(s,o),p(s,o);for(o=1;o<s.length;o+=4)s.splice(o,1,":",s[o],";");return s.join("")}function T(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=function e(t,n,r){void 0===n&&(n={__order:[]}),void 0===r&&(r="&");var s=u.getInstance(),i=n[r];i||(i={},n[r]=i,n.__order.push(r));for(var o=0,a=t;o<a.length;o++){var l=a[o];if("string"==typeof l){var f=s.argsFromClassName(l);f&&e(f,n,r)}else if(Array.isArray(l))e(l,n,r);else for(var c in l)if("selectors"===c){var p=l.selectors,d=function(t){if(p.hasOwnProperty(t)){var s=p[t];0===t.indexOf("@")?e([s],n,t=t+"{"+r):t.indexOf(",")>-1?j(t).split(",").map(function(e){return e.trim()}).forEach(function(t){return e([s],n,k(t,r))}):e([s],n,k(t,r))}};for(var v in p)d(v)}else void 0!==l[c]&&("margin"===c||"padding"===c?A(i,c,l[c]):i[c]=l[c])}return n}(e),r=function(e){for(var t=[],n=!1,r=0,s=e.__order;r<s.length;r++){var i=s[r];t.push(i);var o=e[i];for(var a in o)o.hasOwnProperty(a)&&void 0!==o[a]&&(n=!0,t.push(a,o[a]))}return n?t.join(""):void 0}(n);if(r){var s=u.getInstance(),i={className:s.classNameFromKey(r),key:r,args:e};if(!i.className){i.className=s.getClassName(function(e){var t=e&&e["&"];return t?t.displayName:void 0}(n));for(var o=[],a=0,l=n.__order;a<l.length;a++){var f=l[a];o.push(f,E(n[f]))}i.rulesToInsert=o}return i}}function P(e){var t=u.getInstance(),n=e.className,r=e.key,s=e.args,i=e.rulesToInsert;if(i){for(var o=0;o<i.length;o+=2){var a=i[o+1];if(a){var l=i[o],f=(l=l.replace(/&/g,"."+e.className))+"{"+a+"}"+(0===l.indexOf("@")?"}":"");t.insertRule(f)}}t.cacheClassName(n,r,s,i)}}function R(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=[],r=[],s=u.getInstance();return function e(t){for(var i=0,o=t;i<o.length;i++){var a=o[i];if(a)if("string"==typeof a)if(a.indexOf(" ")>=0)e(a.split(" "));else{var l=s.argsFromClassName(a);l?e(l):-1===n.indexOf(a)&&n.push(a)}else Array.isArray(a)?e(a):"object"==typeof a&&r.push(a)}}(e),{classes:n,objects:r}}function I(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=R(e),r=n.classes,s=n.objects;return s.length&&r.push(function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=T.apply(void 0,e);return n?(P(n),n.className):""}(s)),r.join(" ")}function M(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];if(e&&1===e.length&&e[0]&&!e[0].subComponentStyles)return e[0];for(var n={},r={},s=0,i=e;s<i.length;s++){var o=i[s];if(o)for(var a in o)if(o.hasOwnProperty(a)){if("subComponentStyles"===a&&void 0!==o.subComponentStyles){var l=o.subComponentStyles;for(var u in l)l.hasOwnProperty(u)&&(r.hasOwnProperty(u)?r[u].push(l[u]):r[u]=[l[u]]);continue}var f=n[a],c=o[a];n[a]=void 0===f?c:(Array.isArray(f)?f:[f]).concat(Array.isArray(c)?c:[c])}}if(Object.keys(r).length>0){n.subComponentStyles={};var p=n.subComponentStyles,d=function(e){if(r.hasOwnProperty(e)){var t=r[e];p[e]=function(e){return M.apply(void 0,t.map(function(t){return"function"==typeof t?t(e):t}))}}};for(var u in r)d(u)}return n}function z(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n={subComponentStyles:{}};if(!e[0]&&e.length<=1)return{subComponentStyles:{}};var r=M.apply(void 0,e),s=[];for(var i in r)if(r.hasOwnProperty(i)){if("subComponentStyles"===i){n.subComponentStyles=r.subComponentStyles||{};continue}var o=R(r[i]),a=o.classes,l=T({displayName:i},o.objects);s.push(l),l&&(n[i]=a.concat([l.className]).join(" "))}for(var u=0,f=s;u<f.length;u++){(l=f[u])&&P(l)}return n}function F(e){u.getInstance().insertRule("@font-face{"+E(e)+"}",!0)}function B(e){var t=u.getInstance(),n=t.getClassName(),r=[];for(var s in e)e.hasOwnProperty(s)&&r.push(s,"{",E(e[s]),"}");var i=r.join("");return t.insertRule("@keyframes "+n+"{"+i+"}",!0),t.cacheClassName(n,i,[],["keyframes",i]),n}var K={},L=void 0;try{L=window}catch(e){}function W(e,t){if(void 0!==L){var n=L.__packages__=L.__packages__||{};if(!n[e]||!K[e])K[e]=t,(n[e]=n[e]||[]).push(t)}}W("@uifabric/set-version","6.0.0"),W("@uifabric/merge-styles","7.5.2"),n.d(t,"mergeStyles",function(){return I}),n.d(t,"mergeStyleSets",function(){return z}),n.d(t,"concatStyleSets",function(){return M}),n.d(t,"fontFace",function(){return F}),n.d(t,"keyframes",function(){return B}),n.d(t,"InjectionMode",function(){return i}),n.d(t,"Stylesheet",function(){return u}),n.d(t,"setRTL",function(){return O})}]);
+var MergeStyles=function(e){var t={};function n(r){if(t[r])return t[r].exports;var s=t[r]={i:r,l:!1,exports:{}};return e[r].call(s.exports,s,s.exports,n),s.l=!0,s.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var s in e)n.d(r,s,function(t){return e[t]}.bind(null,s));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=0)}([function(e,t,n){"use strict";n.r(t);var r=function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var s in t=arguments[n])Object.prototype.hasOwnProperty.call(t,s)&&(e[s]=t[s]);return e}).apply(this,arguments)};var s,i={none:0,insertNode:1,appendChild:2},o="undefined"!=typeof navigator&&/rv:11.0/.test(navigator.userAgent),a={};try{a=window}catch(e){}var l,u=function(){function e(e){this._rules=[],this._preservedRules=[],this._rulesToInsert=[],this._counter=0,this._keyToClassName={},this._onResetCallbacks=[],this._classNameToArgs={},this._config=r({injectionMode:i.insertNode,defaultPrefix:"css",namespace:void 0,cspSettings:void 0},e)}return e.getInstance=function(){if(!(s=a.__stylesheet__)||s._lastStyleElement&&s._lastStyleElement.ownerDocument!==document){var t=a&&a.FabricConfig||{};s=a.__stylesheet__=new e(t.mergeStyles)}return s},e.prototype.setConfig=function(e){this._config=r({},this._config,e)},e.prototype.onReset=function(e){this._onResetCallbacks.push(e)},e.prototype.getClassName=function(e){var t=this._config.namespace;return(t?t+"-":"")+(e||this._config.defaultPrefix)+"-"+this._counter++},e.prototype.cacheClassName=function(e,t,n,r){this._keyToClassName[t]=e,this._classNameToArgs[e]={args:n,rules:r}},e.prototype.classNameFromKey=function(e){return this._keyToClassName[e]},e.prototype.argsFromClassName=function(e){var t=this._classNameToArgs[e];return t&&t.args},e.prototype.insertedRulesFromClassName=function(e){var t=this._classNameToArgs[e];return t&&t.rules},e.prototype.insertRule=function(e,t){var n=this._config.injectionMode!==i.none?this._getStyleElement():void 0;if(t&&this._preservedRules.push(e),n)switch(this._config.injectionMode){case i.insertNode:var r=n.sheet;try{r.insertRule(e,r.cssRules.length)}catch(e){}break;case i.appendChild:n.appendChild(document.createTextNode(e))}else this._rules.push(e);this._config.onInsertRule&&this._config.onInsertRule(e)},e.prototype.getRules=function(e){return(e?this._preservedRules.join(""):"")+this._rules.join("")+this._rulesToInsert.join("")},e.prototype.reset=function(){this._rules=[],this._rulesToInsert=[],this._counter=0,this._classNameToArgs={},this._keyToClassName={},this._onResetCallbacks.forEach(function(e){return e()})},e.prototype.resetKeys=function(){this._keyToClassName={}},e.prototype._getStyleElement=function(){var e=this;return this._styleElement||"undefined"==typeof document||(this._styleElement=this._createStyleElement(),o||window.requestAnimationFrame(function(){e._styleElement=void 0})),this._styleElement},e.prototype._createStyleElement=function(){var e=document.head,t=document.createElement("style");t.setAttribute("data-merge-styles","true");var n=this._config.cspSettings;if(n&&n.nonce&&t.setAttribute("nonce",n.nonce),this._lastStyleElement)e.insertBefore(t,this._lastStyleElement.nextElementSibling);else{var r=this._findPlaceholderStyleTag();r?e.insertBefore(t,r.nextElementSibling):e.insertBefore(t,e.childNodes[0])}return this._lastStyleElement=t,t},e.prototype._findPlaceholderStyleTag=function(){var e=document.head;return e?e.querySelector("style[data-merge-styles]"):null},e}(),f={};var c={"user-select":1};function p(e,t){var n=function(){if(!l){var e="undefined"!=typeof document?document:void 0,t="undefined"!=typeof navigator?navigator:void 0,n=t?t.userAgent.toLowerCase():void 0;l=e?{isWebkit:!!(e&&"WebkitAppearance"in e.documentElement.style),isMoz:!!(n&&n.indexOf("firefox")>-1),isOpera:!!(n&&n.indexOf("opera")>-1),isMs:!(!t||!/rv:11.0/i.test(t.userAgent)&&!/Edge\/\d./i.test(navigator.userAgent))}:{isWebkit:!0,isMoz:!0,isOpera:!0,isMs:!0}}return l}(),r=e[t];if(c[r]){var s=e[t+1];c[r]&&(n.isWebkit&&e.push("-webkit-"+r,s),n.isMoz&&e.push("-moz-"+r,s),n.isMs&&e.push("-ms-"+r,s),n.isOpera&&e.push("-o-"+r,s))}}var d,v=["column-count","font-weight","flex-basis","flex","flex-grow","flex-shrink","fill-opacity","opacity","order","z-index","zoom"];function h(e,t){var n=e[t],r=e[t+1];if("number"==typeof r){var s=-1===v.indexOf(n)?"px":"";e[t+1]=""+r+s}}var y="left",g="right",m="@noflip",_=((d={})[y]=g,d[g]=y,d),b={"w-resize":"e-resize","sw-resize":"se-resize","nw-resize":"ne-resize"},S=x();function O(e){S!==e&&(u.getInstance().resetKeys(),S=e)}function x(){return void 0===S&&(S="undefined"!=typeof document&&!!document.documentElement&&"rtl"===document.documentElement.getAttribute("dir")),S}function N(e,t){if(x()){var n=e[t];if(!n)return;var r=e[t+1];if("string"==typeof r&&r.indexOf(m)>=0)e[t+1]=r.replace(/\s*(?:\/\*\s*)?\@noflip\b(?:\s*\*\/)?\s*?/g,"");else if(n.indexOf(y)>=0)e[t]=n.replace(y,g);else if(n.indexOf(g)>=0)e[t]=n.replace(g,y);else if(String(r).indexOf(y)>=0)e[t+1]=r.replace(y,g);else if(String(r).indexOf(g)>=0)e[t+1]=r.replace(g,y);else if(_[n])e[t]=_[n];else if(b[r])e[t+1]=b[r];else switch(n){case"margin":case"padding":e[t+1]=function(e){if("string"==typeof e){var t=e.split(" ");if(4===t.length)return t[0]+" "+t[3]+" "+t[2]+" "+t[1]}return e}(r);break;case"box-shadow":e[t+1]=function(e,t){var n=e.split(" "),r=parseInt(n[t],10);return n[0]=n[0].replace(String(r),String(-1*r)),n.join(" ")}(r,0)}}}var C="displayName";var w=/\:global\((.+?)\)/g;function j(e){if(!w.test(e))return e;for(var t=[],n=/\:global\((.+?)\)/g,r=null;r=n.exec(e);)r[1].indexOf(",")>-1&&t.push([r.index,r.index+r[0].length,r[1].split(",").map(function(e){return":global("+e.trim()+")"}).join(", ")]);return t.reverse().reduce(function(e,t){var n=t[0],r=t[1],s=t[2];return e.slice(0,n)+s+e.slice(r)},e)}function k(e,t){return e.indexOf(":global(")>=0?e.replace(w,"$1"):0===e.indexOf(":")?t+e:e.indexOf("&")<0?t+" "+e:e}function A(e,t,n){var r="string"==typeof n?n.split(" "):[n];e[t+"Top"]=r[0],e[t+"Right"]=r[1]||r[0],e[t+"Bottom"]=r[2]||r[0],e[t+"Left"]=r[3]||r[1]||r[0]}function E(e){if(!e)return"";var t,n,r,s=[];for(var i in e)e.hasOwnProperty(i)&&i!==C&&void 0!==e[i]&&s.push(i,e[i]);for(var o=0;o<s.length;o+=2)r=void 0,r=(t=s)[n=o],t[n]=f[r]=f[r]||r.replace(/([A-Z])/g,"-$1").toLowerCase(),h(s,o),N(s,o),p(s,o);for(o=1;o<s.length;o+=4)s.splice(o,1,":",s[o],";");return s.join("")}function T(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=function e(t,n,r){void 0===n&&(n={__order:[]}),void 0===r&&(r="&");var s=u.getInstance(),i=n[r];i||(i={},n[r]=i,n.__order.push(r));for(var o=0,a=t;o<a.length;o++){var l=a[o];if("string"==typeof l){var f=s.argsFromClassName(l);f&&e(f,n,r)}else if(Array.isArray(l))e(l,n,r);else for(var c in l)if("selectors"===c){var p=l.selectors,d=function(t){if(p.hasOwnProperty(t)){var s=p[t];0===t.indexOf("@")?e([s],n,t=t+"{"+r):t.indexOf(",")>-1?j(t).split(",").map(function(e){return e.trim()}).forEach(function(t){return e([s],n,k(t,r))}):e([s],n,k(t,r))}};for(var v in p)d(v)}else void 0!==l[c]&&("margin"===c||"padding"===c?A(i,c,l[c]):i[c]=l[c])}return n}(e),r=function(e){for(var t=[],n=!1,r=0,s=e.__order;r<s.length;r++){var i=s[r];t.push(i);var o=e[i];for(var a in o)o.hasOwnProperty(a)&&void 0!==o[a]&&(n=!0,t.push(a,o[a]))}return n?t.join(""):void 0}(n);if(r){var s=u.getInstance(),i={className:s.classNameFromKey(r),key:r,args:e};if(!i.className){i.className=s.getClassName(function(e){var t=e&&e["&"];return t?t.displayName:void 0}(n));for(var o=[],a=0,l=n.__order;a<l.length;a++){var f=l[a];o.push(f,E(n[f]))}i.rulesToInsert=o}return i}}function P(e){var t=u.getInstance(),n=e.className,r=e.key,s=e.args,i=e.rulesToInsert;if(i){for(var o=0;o<i.length;o+=2){var a=i[o+1];if(a){var l=i[o],f=(l=l.replace(/&/g,"."+e.className))+"{"+a+"}"+(0===l.indexOf("@")?"}":"");t.insertRule(f)}}t.cacheClassName(n,r,s,i)}}function R(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=[],r=[],s=u.getInstance();return function e(t){for(var i=0,o=t;i<o.length;i++){var a=o[i];if(a)if("string"==typeof a)if(a.indexOf(" ")>=0)e(a.split(" "));else{var l=s.argsFromClassName(a);l?e(l):-1===n.indexOf(a)&&n.push(a)}else Array.isArray(a)?e(a):"object"==typeof a&&r.push(a)}}(e),{classes:n,objects:r}}function I(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=R(e),r=n.classes,s=n.objects;return s.length&&r.push(function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=T.apply(void 0,e);return n?(P(n),n.className):""}(s)),r.join(" ")}function M(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];if(e&&1===e.length&&e[0]&&!e[0].subComponentStyles)return e[0];for(var n={},r={},s=0,i=e;s<i.length;s++){var o=i[s];if(o)for(var a in o)if(o.hasOwnProperty(a)){if("subComponentStyles"===a&&void 0!==o.subComponentStyles){var l=o.subComponentStyles;for(var u in l)l.hasOwnProperty(u)&&(r.hasOwnProperty(u)?r[u].push(l[u]):r[u]=[l[u]]);continue}var f=n[a],c=o[a];n[a]=void 0===f?c:(Array.isArray(f)?f:[f]).concat(Array.isArray(c)?c:[c])}}if(Object.keys(r).length>0){n.subComponentStyles={};var p=n.subComponentStyles,d=function(e){if(r.hasOwnProperty(e)){var t=r[e];p[e]=function(e){return M.apply(void 0,t.map(function(t){return"function"==typeof t?t(e):t}))}}};for(var u in r)d(u)}return n}function z(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n={subComponentStyles:{}};if(!e[0]&&e.length<=1)return{subComponentStyles:{}};var r=M.apply(void 0,e),s=[];for(var i in r)if(r.hasOwnProperty(i)){if("subComponentStyles"===i){n.subComponentStyles=r.subComponentStyles||{};continue}var o=R(r[i]),a=o.classes,l=T({displayName:i},o.objects);s.push(l),l&&(n[i]=a.concat([l.className]).join(" "))}for(var u=0,f=s;u<f.length;u++){(l=f[u])&&P(l)}return n}function F(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];for(var r=[],s=0,i=t;s<i.length;s++){var o=i[s];o&&r.push("function"==typeof o?o(e):o)}return 1===r.length?r[0]:r.length?M.apply(void 0,r):{}}function W(e){u.getInstance().insertRule("@font-face{"+E(e)+"}",!0)}function B(e){var t=u.getInstance(),n=t.getClassName(),r=[];for(var s in e)e.hasOwnProperty(s)&&r.push(s,"{",E(e[s]),"}");var i=r.join("");return t.insertRule("@keyframes "+n+"{"+i+"}",!0),t.cacheClassName(n,i,[],["keyframes",i]),n}var K={},L=void 0;try{L=window}catch(e){}function q(e,t){if(void 0!==L){var n=L.__packages__=L.__packages__||{};if(!n[e]||!K[e])K[e]=t,(n[e]=n[e]||[]).push(t)}}q("@uifabric/set-version","6.0.0"),q("@uifabric/merge-styles","7.6.0"),n.d(t,"mergeStyles",function(){return I}),n.d(t,"mergeStyleSets",function(){return z}),n.d(t,"concatStyleSets",function(){return M}),n.d(t,"concatStyleSetsWithProps",function(){return F}),n.d(t,"fontFace",function(){return W}),n.d(t,"keyframes",function(){return B}),n.d(t,"InjectionMode",function(){return i}),n.d(t,"Stylesheet",function(){return u}),n.d(t,"setRTL",function(){return O})}]);
 //# sourceMappingURL=merge-styles.min.js.map

etc/merge-styles.api.md

@@ -32,2 +32,5 @@ ## API Report File for "@uifabric/merge-styles"
 // @public
+export function concatStyleSetsWithProps<TStyleProps, TStyleSet extends IStyleSet<TStyleSet>>(styleProps: TStyleProps, ...allStyles: (IStyleFunctionOrObject<TStyleProps, TStyleSet> | undefined)[]): Partial<TStyleSet>;
+
+// @public
 export function fontFace(font: IFontFace): void;
@@ -34,0 +37,0 @@

lib-amd/index.d.ts

@@ -8,2 +8,3 @@ export { IRawStyle, IStyle, IStyleBase, IStyleBaseArray } from './IStyle';
 export { concatStyleSets } from './concatStyleSets';
+export { concatStyleSetsWithProps } from './concatStyleSetsWithProps';
 export { fontFace } from './fontFace';
@@ -10,0 +11,0 @@ export { keyframes } from './keyframes';

lib-amd/index.js

@@ -1,2 +0,2 @@
-define(["require", "exports", "./mergeStyles", "./mergeStyleSets", "./concatStyleSets", "./fontFace", "./keyframes", "./Stylesheet", "./transforms/rtlifyRules", "./version"], function (require, exports, mergeStyles_1, mergeStyleSets_1, concatStyleSets_1, fontFace_1, keyframes_1, Stylesheet_1, rtlifyRules_1) {
+define(["require", "exports", "./mergeStyles", "./mergeStyleSets", "./concatStyleSets", "./concatStyleSetsWithProps", "./fontFace", "./keyframes", "./Stylesheet", "./transforms/rtlifyRules", "./version"], function (require, exports, mergeStyles_1, mergeStyleSets_1, concatStyleSets_1, concatStyleSetsWithProps_1, fontFace_1, keyframes_1, Stylesheet_1, rtlifyRules_1) {
     "use strict";
@@ -7,2 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
     exports.concatStyleSets = concatStyleSets_1.concatStyleSets;
+    exports.concatStyleSetsWithProps = concatStyleSetsWithProps_1.concatStyleSetsWithProps;
     exports.fontFace = fontFace_1.fontFace;
@@ -9,0 +10,0 @@ exports.keyframes = keyframes_1.keyframes;

lib-amd/version.js

 define(["require", "exports", "@uifabric/set-version"], function (require, exports, set_version_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    set_version_1.setVersion('@uifabric/merge-styles', '7.5.2');
+    set_version_1.setVersion('@uifabric/merge-styles', '7.6.0');
 });
 //# sourceMappingURL=version.js.map

lib-commonjs/index.d.ts

@@ -8,2 +8,3 @@ export { IRawStyle, IStyle, IStyleBase, IStyleBaseArray } from './IStyle';
 export { concatStyleSets } from './concatStyleSets';
+export { concatStyleSetsWithProps } from './concatStyleSetsWithProps';
 export { fontFace } from './fontFace';
@@ -10,0 +11,0 @@ export { keyframes } from './keyframes';

lib-commonjs/index.js

@@ -9,2 +9,4 @@ "use strict";
 exports.concatStyleSets = concatStyleSets_1.concatStyleSets;
+var concatStyleSetsWithProps_1 = require("./concatStyleSetsWithProps");
+exports.concatStyleSetsWithProps = concatStyleSetsWithProps_1.concatStyleSetsWithProps;
 var fontFace_1 = require("./fontFace");
@@ -11,0 +13,0 @@ exports.fontFace = fontFace_1.fontFace;

lib-commonjs/version.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @uifabric/merge-styles@7.5.2
+// @uifabric/merge-styles@7.6.0
 // Do not modify this file, the file is generated as part of publish. The checked in version is a placeholder only.
 var set_version_1 = require("@uifabric/set-version");
-set_version_1.setVersion('@uifabric/merge-styles', '7.5.2');
+set_version_1.setVersion('@uifabric/merge-styles', '7.6.0');
 //# sourceMappingURL=version.js.map

lib/index.d.ts

@@ -8,2 +8,3 @@ export { IRawStyle, IStyle, IStyleBase, IStyleBaseArray } from './IStyle';
 export { concatStyleSets } from './concatStyleSets';
+export { concatStyleSetsWithProps } from './concatStyleSetsWithProps';
 export { fontFace } from './fontFace';
@@ -10,0 +11,0 @@ export { keyframes } from './keyframes';

lib/index.js

 export { mergeStyles } from './mergeStyles';
 export { mergeStyleSets } from './mergeStyleSets';
 export { concatStyleSets } from './concatStyleSets';
+export { concatStyleSetsWithProps } from './concatStyleSetsWithProps';
 export { fontFace } from './fontFace';
@@ -5,0 +6,0 @@ export { keyframes } from './keyframes';

lib/version.js

@@ -1,5 +0,5 @@
-// @uifabric/merge-styles@7.5.2
+// @uifabric/merge-styles@7.6.0
 // Do not modify this file, the file is generated as part of publish. The checked in version is a placeholder only.
 import { setVersion } from '@uifabric/set-version';
-setVersion('@uifabric/merge-styles', '7.5.2');
+setVersion('@uifabric/merge-styles', '7.6.0');
 //# sourceMappingURL=version.js.map

package.json

 {
   "name": "@uifabric/merge-styles",
-  "version": "7.5.2",
+  "version": "7.6.0",
   "description": "Style loading utilities.",
@@ -5,0 +5,0 @@ "main": "lib-commonjs/index.js",

README.md

@@ -62,4 +62,16 @@ # @uifabric/merge-styles
 
-`concatStyleSet(...args[]: IStyleSet[]): IStyleSet` - In some cases you simply need to combine style sets, without actually generating class names (it is costs in performance to generate class names.) This tool returns a single set merging many together.
+`concatStyleSets(...args[]: IStyleSet[]): IStyleSet` - In some cases you simply need to combine style sets, without actually generating class names (it is costs in performance to generate class names.) This tool returns a single set merging many together.
 
+`concatStyleSetsWithProps(props: {}, ...args[]: IStyleSet[]): IStyleSet` - Similar to `concatStyleSet` except that style sets which contain functional evaluation of styles are evaluated prior to concatenating.
+
+Example:
+
+```tsx
+const result = concatStyleSetsWithProps<IFooProps, IFooStyles>(
+  { foo: 'bar' },
+  (props: IFooProps) => ({ root: { background: props.foo } }),
+  (props: IFooProps) => ({ root: { color: props.foo } })
+);
+```
+
 ## Vocabulary
@@ -66,0 +78,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1207533

increased by1.59%

Number of package files

202

increased by4.66%

Lines of code

14048

increased by1.38%

Number of lines in readme file

492

increased by2.5%

No dependency changes