@uifabric/merge-styles - npm Package Compare versions

Comparing version 5.0.0-beta.16 to 5.0.0-beta.17

dist/merge-styles.js

@@ -208,13 +208,14 @@ var MergeStyles =
 function getDisplayName(rules) {
-    var rootStyle = rules && rules.get('&');
+    var rootStyle = rules && rules['&'];
     return rootStyle ? rootStyle.displayName : undefined;
 }
 function extractRules(args, rules, currentSelector) {
-    if (rules === void 0) { rules = new Map(); }
+    if (rules === void 0) { rules = { __order: [] }; }
     if (currentSelector === void 0) { currentSelector = '&'; }
     var stylesheet = Stylesheet_1.Stylesheet.getInstance();
-    var currentRules = rules.get(currentSelector);
+    var currentRules = rules[currentSelector];
     if (!currentRules) {
         currentRules = {};
-        rules.set(currentSelector, currentRules);
+        rules[currentSelector] = currentRules;
+        rules.__order.push(currentSelector);
     }
@@ -276,11 +277,13 @@ for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
     var hasProps = false;
-    rules.forEach(function (ruleEntries, selector) {
+    for (var _i = 0, _a = rules.__order; _i < _a.length; _i++) {
+        var selector = _a[_i];
         serialized.push(selector);
-        for (var propName in ruleEntries) {
-            if (ruleEntries.hasOwnProperty(propName)) {
+        var rulesForSelector = rules[selector];
+        for (var propName in rulesForSelector) {
+            if (rulesForSelector.hasOwnProperty(propName)) {
                 hasProps = true;
-                serialized.push(propName, ruleEntries[propName]);
+                serialized.push(propName, rulesForSelector[propName]);
             }
         }
-    });
+    }
     return hasProps ? serialized.join('') : undefined;
@@ -326,6 +329,5 @@ }
             stylesheet.cacheClassName(className, key, args);
-            var ruleSelectors = rules.keys();
-            var selector = ruleSelectors.next().value;
-            while (selector) {
-                var rulesToInsert = serializeRuleEntries(rules.get(selector));
+            for (var _a = 0, _b = rules.__order; _a < _b.length; _a++) {
+                var selector = _b[_a];
+                var rulesToInsert = serializeRuleEntries(rules[selector]);
                 if (rulesToInsert) {
@@ -335,3 +337,2 @@ selector = selector.replace(/\&/g, "." + className);
                 }
-                selector = ruleSelectors.next().value;
             }
@@ -338,0 +339,0 @@ }

dist/merge-styles.min.js

@@ -1,2 +0,2 @@
-var MergeStyles=function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=4)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n,o=r(10),i=function(){function e(e){this._config=o.__assign({async:!1,injectionMode:1},e),this.reset()}return e.getInstance=function(){var t="undefined"!=typeof window?window:{};return n=t.__stylesheet__,n||(n=t.__stylesheet__=new e),n},e.prototype.setConfig=function(e){this._config=o.__assign({},this._config,e)},e.prototype.getClassName=function(e){return(e||"css")+"-"+this._counter++},e.prototype.cacheClassName=function(e,t,r){this._keyToClassName[t]=e,this._classNameToArgs[e]=r},e.prototype.classNameFromKey=function(e){return this._keyToClassName[e]},e.prototype.argsFromClassName=function(e){return this._classNameToArgs[e]},e.prototype.insertRule=function(e){var t=this._getElement();switch(t?this._config.injectionMode:0){case 1:var r=t.sheet;try{r.insertRule(e,r.cssRules.length)}catch(e){}break;default:this._rules.push(e)}},e.prototype.getRules=function(){return(this._rules.join("")||"")+(this._rulesToInsert.join("")||"")},e.prototype.reset=function(){this._rules=[],this._rulesToInsert=[],this._counter=0,this._classNameToArgs={},this._keyToClassName={},this._timerId&&(clearTimeout(this._timerId),this._timerId=0)},e.prototype._getElement=function(){return this._styleElement||"undefined"==typeof document||(this._styleElement=document.createElement("style"),document.head.appendChild(this._styleElement)),this._styleElement},e}();t.Stylesheet=i},function(e,t,r){"use strict";function n(e){var t=e&&e.get("&");return t?t.displayName:void 0}function o(e,t,r){void 0===t&&(t=new Map),void 0===r&&(r="&");var n=p.Stylesheet.getInstance(),s=t.get(r);s||(s={},t.set(r,s));for(var a=0,u=e;a<u.length;a++){var c=u[a];if("string"==typeof c){var f=n.argsFromClassName(c);f&&o(f,t)}else if(Array.isArray(c))o(c,t,r);else for(var l in c)if("selectors"===l){var y=c.selectors;for(var h in y)if(y.hasOwnProperty(h)){var v=y[h];h.indexOf("&")<0&&(h=r+h),o([v],t,h)}}else"margin"===l||"padding"===l?i(s,l,c[l]):s[l]=c[l]}return t}function i(e,t,r){var n="string"==typeof r?r.split(" "):[r];e[t+"Top"]=n[0],e[t+"Right"]=n[1]||n[0],e[t+"Bottom"]=n[2]||n[0],e[t+"Left"]=n[3]||n[1]||n[0]}function s(e){var t=[],r=!1;return e.forEach(function(e,n){t.push(n);for(var o in e)e.hasOwnProperty(o)&&(r=!0,t.push(o,e[o]))}),r?t.join(""):void 0}function a(e){if(!e)return"";var t=[];for(var r in e)e.hasOwnProperty(r)&&r!==h&&t.push(r,e[r]);for(var n=0;n<t.length;n+=2)y.kebabRules(t,n),f.provideUnits(t,n),c.rtlifyRules(t,n),l.prefixRules(t,n);for(var n=1;n<t.length;n+=4)t.splice(n,1,":",t[n],";");return t.join("")}function u(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var r=o(e),i=s(r),u="";if(i){var c=p.Stylesheet.getInstance();if(!(u=c.classNameFromKey(i))){u=c.getClassName(n(r)),c.cacheClassName(u,i,e);for(var f=r.keys(),l=f.next().value;l;){var y=a(r.get(l));y&&(l=l.replace(/\&/g,"."+u),c.insertRule(l+"{"+y+"}")),l=f.next().value}}}return u}Object.defineProperty(t,"__esModule",{value:!0});var c=r(5),f=r(6),l=r(7),y=r(9),p=r(0),h="displayName";t.serializeRuleEntries=a,t.styleToClassName=u},function(e,t,r){"use strict";function n(){function e(t){for(var r=0,o=t;r<o.length;r++){var i=o[r];if(i)if("string"==typeof i){var u=a.argsFromClassName(i);u?s.push(u):n.push(i)}else Array.isArray(i)?e(i):"object"==typeof i&&s.push(i)}}for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var n=[],s=[],a=i.Stylesheet.getInstance();return e(t),s.length&&n.push(o.styleToClassName(s)),n.join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=r(1),i=r(0);t.mergeStyles=n},function(e,t,r){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];for(var r={},n=0,o=e;n<o.length;n++){var i=o[n];if(i)for(var s in i)if(i.hasOwnProperty(s)){var a=r[s],u=i[s];r[s]=void 0===a?u:(Array.isArray(a)?a:[a]).concat(Array.isArray(u)?u:[u])}}return r}Object.defineProperty(t,"__esModule",{value:!0}),t.concatStyleSets=n},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(2);t.mergeStyles=n.mergeStyles;var o=r(11);t.mergeStyleSets=o.mergeStyleSets;var i=r(3);t.concatStyleSets=i.concatStyleSets;var s=r(12);t.fontFace=s.fontFace;var a=r(13);t.keyframes=a.keyframes;var u=r(0);t.Stylesheet=u.Stylesheet},function(e,t,r){"use strict";function n(e){l=e}function o(){return void 0===l&&(l="undefined"!=typeof document&&!!document.documentElement&&"rtl"===document.documentElement.getAttribute("dir")),l}function i(e,t){if(o()){var r=e[t],n=e[t+1];if(n.indexOf(f)>=0)e[t+1]=n.replace(/\s*(?:\/\*\s*)?\@noflip\b(?:\s*\*\/)?\s*?/g,"");else if(r.indexOf("left")>=0)e[t]=r.replace("left","right");else if(r.indexOf("right")>=0)e[t]=r.replace("right","left");else if(String(n).indexOf("left")>=0)e[t+1]=n.replace("left","right");else if(String(n).indexOf("right")>=0)e[t+1]=n.replace("right","left");else if(u[r])e[t]=u[r];else if(c[n])e[t+1]=c[n];else switch(r){case"margin":case"padding":e[t+1]=a(n);break;case"box-shadow":e[t+1]=s(n,0)}}}function s(e,t){var r=e.split(" "),n=parseInt(r[t],10);return r[0]=r[0].replace(String(n),String(-1*n)),r.join(" ")}function a(e){if("string"==typeof e){var t=e.split(" ");if(4===t.length)return t[0]+" "+t[3]+" "+t[2]+" "+t[1]}return e}Object.defineProperty(t,"__esModule",{value:!0});var u={left:"right",right:"left"},c={"w-resize":"e-resize","sw-resize":"se-resize","nw-resize":"ne-resize"},f="@noflip",l=o();t.setRTL=n,t.getRTL=o,t.rtlifyRules=i},function(e,t,r){"use strict";function n(e,t){var r=e[t],n=e[t+1];"number"==typeof n&&-1===o.indexOf(r)&&(e[t+1]=n+"px")}Object.defineProperty(t,"__esModule",{value:!0});var o=["column-count","font-weight","flex-basis","flex","flex-grow","flex-shrink","opacity","order","z-index","zoom"];t.provideUnits=n},function(e,t,r){"use strict";function n(e,t){var r=o.getVendorSettings(),n=e[t];if(i[n]){var s=e[t+1];i[n]&&(r.isWebkit&&e.push("-webkit-"+n,s),r.isMoz&&e.push("-moz-"+n,s),r.isMs&&e.push("-ms-"+n,s),r.isOpera&&e.push("-o-"+n,s))}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(8),i={"user-select":1};t.prefixRules=n},function(e,t,r){"use strict";function n(){if(!i){var e="undefined"!=typeof document?document:void 0,t="undefined"!=typeof navigator?navigator:void 0,r=t?t.userAgent.toLowerCase():void 0;i=e?{isWebkit:!!(e&&"WebkitAppearance"in e.documentElement.style),isMoz:!!(r&&r.indexOf("firefox")>-1),isOpera:!!(r&&r.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 i}function o(e){i=e}Object.defineProperty(t,"__esModule",{value:!0});var i;t.getVendorSettings=n,t.setVendorSettings=o},function(e,t,r){"use strict";function n(e,t){e[t]=e[t].replace(/([A-Z])/g,"-$1").toLowerCase()}Object.defineProperty(t,"__esModule",{value:!0}),t.kebabRules=n},function(e,t,r){"use strict";function n(e,t){function r(){this.constructor=e}_(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function o(e,t){var r={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.indexOf(n)<0&&(r[n]=e[n]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols)for(var o=0,n=Object.getOwnPropertySymbols(e);o<n.length;o++)t.indexOf(n[o])<0&&(r[n[o]]=e[n[o]]);return r}function i(e,t,r,n){var o,i=arguments.length,s=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(s=(i<3?o(s):i>3?o(t,r,s):o(t,r))||s);return i>3&&s&&Object.defineProperty(t,r,s),s}function s(e,t){return function(r,n){t(r,n,e)}}function a(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function u(e,t,r,n){return new(r||(r=Promise))(function(o,i){function s(e){try{u(n.next(e))}catch(e){i(e)}}function a(e){try{u(n.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new r(function(t){t(e.value)}).then(s,a)}u((n=n.apply(e,t||[])).next())})}function c(e,t){function r(e){return function(t){return n([e,t])}}function n(r){if(o)throw new TypeError("Generator is already executing.");for(;u;)try{if(o=1,i&&(s=i[2&r[0]?"return":r[0]?"throw":"next"])&&!(s=s.call(i,r[1])).done)return s;switch(i=0,s&&(r=[0,s.value]),r[0]){case 0:case 1:s=r;break;case 4:return u.label++,{value:r[1],done:!1};case 5:u.label++,i=r[1],r=[0];continue;case 7:r=u.ops.pop(),u.trys.pop();continue;default:if(s=u.trys,!(s=s.length>0&&s[s.length-1])&&(6===r[0]||2===r[0])){u=0;continue}if(3===r[0]&&(!s||r[1]>s[0]&&r[1]<s[3])){u.label=r[1];break}if(6===r[0]&&u.label<s[1]){u.label=s[1],s=r;break}if(s&&u.label<s[2]){u.label=s[2],u.ops.push(r);break}s[2]&&u.ops.pop(),u.trys.pop();continue}r=t.call(e,u)}catch(e){r=[6,e],i=0}finally{o=s=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}var o,i,s,a,u={label:0,sent:function(){if(1&s[0])throw s[1];return s[1]},trys:[],ops:[]};return a={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a}function f(e,t){for(var r in e)t.hasOwnProperty(r)||(t[r]=e[r])}function l(e){var t="function"==typeof Symbol&&e[Symbol.iterator],r=0;return t?t.call(e):{next:function(){return e&&r>=e.length&&(e=void 0),{value:e&&e[r++],done:!e}}}}function y(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,i=r.call(e),s=[];try{for(;(void 0===t||t-- >0)&&!(n=i.next()).done;)s.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=i.return)&&r.call(i)}finally{if(o)throw o.error}}return s}function p(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(y(arguments[t]));return e}function h(e){return this instanceof h?(this.v=e,this):new h(e)}function v(e,t,r){function n(e){f[e]&&(c[e]=function(t){return new Promise(function(r,n){l.push([e,t,r,n])>1||o(e,t)})})}function o(e,t){try{i(f[e](t))}catch(e){u(l[0][3],e)}}function i(e){e.value instanceof h?Promise.resolve(e.value.v).then(s,a):u(l[0][2],e)}function s(e){o("next",e)}function a(e){o("throw",e)}function u(e,t){e(t),l.shift(),l.length&&o(l[0][0],l[0][1])}if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var c,f=r.apply(e,t||[]),l=[];return c={},n("next"),n("throw"),n("return"),c[Symbol.asyncIterator]=function(){return this},c}function d(e){function t(t,o){e[t]&&(r[t]=function(r){return(n=!n)?{value:h(e[t](r)),done:"return"===t}:o?o(r):r})}var r,n;return r={},t("next"),t("throw",function(e){throw e}),t("return"),r[Symbol.iterator]=function(){return this},r}function g(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t=e[Symbol.asyncIterator];return t?t.call(e):"function"==typeof l?l(e):e[Symbol.iterator]()}Object.defineProperty(t,"__esModule",{value:!0}),t.__extends=n,r.d(t,"__assign",function(){return m}),t.__rest=o,t.__decorate=i,t.__param=s,t.__metadata=a,t.__awaiter=u,t.__generator=c,t.__exportStar=f,t.__values=l,t.__read=y,t.__spread=p,t.__await=h,t.__asyncGenerator=v,t.__asyncDelegator=d,t.__asyncValues=g;/*! *****************************************************************************
+var MergeStyles=function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}var r={};return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=4)}([function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n,o=r(10),i=function(){function e(e){this._config=o.__assign({async:!1,injectionMode:1},e),this.reset()}return e.getInstance=function(){var t="undefined"!=typeof window?window:{};return n=t.__stylesheet__,n||(n=t.__stylesheet__=new e),n},e.prototype.setConfig=function(e){this._config=o.__assign({},this._config,e)},e.prototype.getClassName=function(e){return(e||"css")+"-"+this._counter++},e.prototype.cacheClassName=function(e,t,r){this._keyToClassName[t]=e,this._classNameToArgs[e]=r},e.prototype.classNameFromKey=function(e){return this._keyToClassName[e]},e.prototype.argsFromClassName=function(e){return this._classNameToArgs[e]},e.prototype.insertRule=function(e){var t=this._getElement();switch(t?this._config.injectionMode:0){case 1:var r=t.sheet;try{r.insertRule(e,r.cssRules.length)}catch(e){}break;default:this._rules.push(e)}},e.prototype.getRules=function(){return(this._rules.join("")||"")+(this._rulesToInsert.join("")||"")},e.prototype.reset=function(){this._rules=[],this._rulesToInsert=[],this._counter=0,this._classNameToArgs={},this._keyToClassName={},this._timerId&&(clearTimeout(this._timerId),this._timerId=0)},e.prototype._getElement=function(){return this._styleElement||"undefined"==typeof document||(this._styleElement=document.createElement("style"),document.head.appendChild(this._styleElement)),this._styleElement},e}();t.Stylesheet=i},function(e,t,r){"use strict";function n(e){var t=e&&e["&"];return t?t.displayName:void 0}function o(e,t,r){void 0===t&&(t={__order:[]}),void 0===r&&(r="&");var n=p.Stylesheet.getInstance(),s=t[r];s||(s={},t[r]=s,t.__order.push(r));for(var a=0,u=e;a<u.length;a++){var c=u[a];if("string"==typeof c){var f=n.argsFromClassName(c);f&&o(f,t)}else if(Array.isArray(c))o(c,t,r);else for(var l in c)if("selectors"===l){var y=c.selectors;for(var h in y)if(y.hasOwnProperty(h)){var d=y[h];h.indexOf("&")<0&&(h=r+h),o([d],t,h)}}else"margin"===l||"padding"===l?i(s,l,c[l]):s[l]=c[l]}return t}function i(e,t,r){var n="string"==typeof r?r.split(" "):[r];e[t+"Top"]=n[0],e[t+"Right"]=n[1]||n[0],e[t+"Bottom"]=n[2]||n[0],e[t+"Left"]=n[3]||n[1]||n[0]}function s(e){for(var t=[],r=!1,n=0,o=e.__order;n<o.length;n++){var i=o[n];t.push(i);var s=e[i];for(var a in s)s.hasOwnProperty(a)&&(r=!0,t.push(a,s[a]))}return r?t.join(""):void 0}function a(e){if(!e)return"";var t=[];for(var r in e)e.hasOwnProperty(r)&&r!==h&&t.push(r,e[r]);for(var n=0;n<t.length;n+=2)y.kebabRules(t,n),f.provideUnits(t,n),c.rtlifyRules(t,n),l.prefixRules(t,n);for(var n=1;n<t.length;n+=4)t.splice(n,1,":",t[n],";");return t.join("")}function u(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var r=o(e),i=s(r),u="";if(i){var c=p.Stylesheet.getInstance();if(!(u=c.classNameFromKey(i))){u=c.getClassName(n(r)),c.cacheClassName(u,i,e);for(var f=0,l=r.__order;f<l.length;f++){var y=l[f],h=a(r[y]);h&&(y=y.replace(/\&/g,"."+u),c.insertRule(y+"{"+h+"}"))}}}return u}Object.defineProperty(t,"__esModule",{value:!0});var c=r(5),f=r(6),l=r(7),y=r(9),p=r(0),h="displayName";t.serializeRuleEntries=a,t.styleToClassName=u},function(e,t,r){"use strict";function n(){function e(t){for(var r=0,o=t;r<o.length;r++){var i=o[r];if(i)if("string"==typeof i){var u=a.argsFromClassName(i);u?s.push(u):n.push(i)}else Array.isArray(i)?e(i):"object"==typeof i&&s.push(i)}}for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var n=[],s=[],a=i.Stylesheet.getInstance();return e(t),s.length&&n.push(o.styleToClassName(s)),n.join(" ")}Object.defineProperty(t,"__esModule",{value:!0});var o=r(1),i=r(0);t.mergeStyles=n},function(e,t,r){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];for(var r={},n=0,o=e;n<o.length;n++){var i=o[n];if(i)for(var s in i)if(i.hasOwnProperty(s)){var a=r[s],u=i[s];r[s]=void 0===a?u:(Array.isArray(a)?a:[a]).concat(Array.isArray(u)?u:[u])}}return r}Object.defineProperty(t,"__esModule",{value:!0}),t.concatStyleSets=n},function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r(2);t.mergeStyles=n.mergeStyles;var o=r(11);t.mergeStyleSets=o.mergeStyleSets;var i=r(3);t.concatStyleSets=i.concatStyleSets;var s=r(12);t.fontFace=s.fontFace;var a=r(13);t.keyframes=a.keyframes;var u=r(0);t.Stylesheet=u.Stylesheet},function(e,t,r){"use strict";function n(e){l=e}function o(){return void 0===l&&(l="undefined"!=typeof document&&!!document.documentElement&&"rtl"===document.documentElement.getAttribute("dir")),l}function i(e,t){if(o()){var r=e[t],n=e[t+1];if(n.indexOf(f)>=0)e[t+1]=n.replace(/\s*(?:\/\*\s*)?\@noflip\b(?:\s*\*\/)?\s*?/g,"");else if(r.indexOf("left")>=0)e[t]=r.replace("left","right");else if(r.indexOf("right")>=0)e[t]=r.replace("right","left");else if(String(n).indexOf("left")>=0)e[t+1]=n.replace("left","right");else if(String(n).indexOf("right")>=0)e[t+1]=n.replace("right","left");else if(u[r])e[t]=u[r];else if(c[n])e[t+1]=c[n];else switch(r){case"margin":case"padding":e[t+1]=a(n);break;case"box-shadow":e[t+1]=s(n,0)}}}function s(e,t){var r=e.split(" "),n=parseInt(r[t],10);return r[0]=r[0].replace(String(n),String(-1*n)),r.join(" ")}function a(e){if("string"==typeof e){var t=e.split(" ");if(4===t.length)return t[0]+" "+t[3]+" "+t[2]+" "+t[1]}return e}Object.defineProperty(t,"__esModule",{value:!0});var u={left:"right",right:"left"},c={"w-resize":"e-resize","sw-resize":"se-resize","nw-resize":"ne-resize"},f="@noflip",l=o();t.setRTL=n,t.getRTL=o,t.rtlifyRules=i},function(e,t,r){"use strict";function n(e,t){var r=e[t],n=e[t+1];"number"==typeof n&&-1===o.indexOf(r)&&(e[t+1]=n+"px")}Object.defineProperty(t,"__esModule",{value:!0});var o=["column-count","font-weight","flex-basis","flex","flex-grow","flex-shrink","opacity","order","z-index","zoom"];t.provideUnits=n},function(e,t,r){"use strict";function n(e,t){var r=o.getVendorSettings(),n=e[t];if(i[n]){var s=e[t+1];i[n]&&(r.isWebkit&&e.push("-webkit-"+n,s),r.isMoz&&e.push("-moz-"+n,s),r.isMs&&e.push("-ms-"+n,s),r.isOpera&&e.push("-o-"+n,s))}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(8),i={"user-select":1};t.prefixRules=n},function(e,t,r){"use strict";function n(){if(!i){var e="undefined"!=typeof document?document:void 0,t="undefined"!=typeof navigator?navigator:void 0,r=t?t.userAgent.toLowerCase():void 0;i=e?{isWebkit:!!(e&&"WebkitAppearance"in e.documentElement.style),isMoz:!!(r&&r.indexOf("firefox")>-1),isOpera:!!(r&&r.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 i}function o(e){i=e}Object.defineProperty(t,"__esModule",{value:!0});var i;t.getVendorSettings=n,t.setVendorSettings=o},function(e,t,r){"use strict";function n(e,t){e[t]=e[t].replace(/([A-Z])/g,"-$1").toLowerCase()}Object.defineProperty(t,"__esModule",{value:!0}),t.kebabRules=n},function(e,t,r){"use strict";function n(e,t){function r(){this.constructor=e}g(e,t),e.prototype=null===t?Object.create(t):(r.prototype=t.prototype,new r)}function o(e,t){var r={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.indexOf(n)<0&&(r[n]=e[n]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols)for(var o=0,n=Object.getOwnPropertySymbols(e);o<n.length;o++)t.indexOf(n[o])<0&&(r[n[o]]=e[n[o]]);return r}function i(e,t,r,n){var o,i=arguments.length,s=i<3?t:null===n?n=Object.getOwnPropertyDescriptor(t,r):n;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)s=Reflect.decorate(e,t,r,n);else for(var a=e.length-1;a>=0;a--)(o=e[a])&&(s=(i<3?o(s):i>3?o(t,r,s):o(t,r))||s);return i>3&&s&&Object.defineProperty(t,r,s),s}function s(e,t){return function(r,n){t(r,n,e)}}function a(e,t){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(e,t)}function u(e,t,r,n){return new(r||(r=Promise))(function(o,i){function s(e){try{u(n.next(e))}catch(e){i(e)}}function a(e){try{u(n.throw(e))}catch(e){i(e)}}function u(e){e.done?o(e.value):new r(function(t){t(e.value)}).then(s,a)}u((n=n.apply(e,t||[])).next())})}function c(e,t){function r(e){return function(t){return n([e,t])}}function n(r){if(o)throw new TypeError("Generator is already executing.");for(;u;)try{if(o=1,i&&(s=i[2&r[0]?"return":r[0]?"throw":"next"])&&!(s=s.call(i,r[1])).done)return s;switch(i=0,s&&(r=[0,s.value]),r[0]){case 0:case 1:s=r;break;case 4:return u.label++,{value:r[1],done:!1};case 5:u.label++,i=r[1],r=[0];continue;case 7:r=u.ops.pop(),u.trys.pop();continue;default:if(s=u.trys,!(s=s.length>0&&s[s.length-1])&&(6===r[0]||2===r[0])){u=0;continue}if(3===r[0]&&(!s||r[1]>s[0]&&r[1]<s[3])){u.label=r[1];break}if(6===r[0]&&u.label<s[1]){u.label=s[1],s=r;break}if(s&&u.label<s[2]){u.label=s[2],u.ops.push(r);break}s[2]&&u.ops.pop(),u.trys.pop();continue}r=t.call(e,u)}catch(e){r=[6,e],i=0}finally{o=s=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}var o,i,s,a,u={label:0,sent:function(){if(1&s[0])throw s[1];return s[1]},trys:[],ops:[]};return a={next:r(0),throw:r(1),return:r(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a}function f(e,t){for(var r in e)t.hasOwnProperty(r)||(t[r]=e[r])}function l(e){var t="function"==typeof Symbol&&e[Symbol.iterator],r=0;return t?t.call(e):{next:function(){return e&&r>=e.length&&(e=void 0),{value:e&&e[r++],done:!e}}}}function y(e,t){var r="function"==typeof Symbol&&e[Symbol.iterator];if(!r)return e;var n,o,i=r.call(e),s=[];try{for(;(void 0===t||t-- >0)&&!(n=i.next()).done;)s.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(r=i.return)&&r.call(i)}finally{if(o)throw o.error}}return s}function p(){for(var e=[],t=0;t<arguments.length;t++)e=e.concat(y(arguments[t]));return e}function h(e){return this instanceof h?(this.v=e,this):new h(e)}function d(e,t,r){function n(e){f[e]&&(c[e]=function(t){return new Promise(function(r,n){l.push([e,t,r,n])>1||o(e,t)})})}function o(e,t){try{i(f[e](t))}catch(e){u(l[0][3],e)}}function i(e){e.value instanceof h?Promise.resolve(e.value.v).then(s,a):u(l[0][2],e)}function s(e){o("next",e)}function a(e){o("throw",e)}function u(e,t){e(t),l.shift(),l.length&&o(l[0][0],l[0][1])}if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var c,f=r.apply(e,t||[]),l=[];return c={},n("next"),n("throw"),n("return"),c[Symbol.asyncIterator]=function(){return this},c}function v(e){function t(t,o){e[t]&&(r[t]=function(r){return(n=!n)?{value:h(e[t](r)),done:"return"===t}:o?o(r):r})}var r,n;return r={},t("next"),t("throw",function(e){throw e}),t("return"),r[Symbol.iterator]=function(){return this},r}function _(e){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var t=e[Symbol.asyncIterator];return t?t.call(e):"function"==typeof l?l(e):e[Symbol.iterator]()}Object.defineProperty(t,"__esModule",{value:!0}),t.__extends=n,r.d(t,"__assign",function(){return m}),t.__rest=o,t.__decorate=i,t.__param=s,t.__metadata=a,t.__awaiter=u,t.__generator=c,t.__exportStar=f,t.__values=l,t.__read=y,t.__spread=p,t.__await=h,t.__asyncGenerator=d,t.__asyncDelegator=v,t.__asyncValues=_;/*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -15,2 +15,2 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 ***************************************************************************** */
-var _=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])},m=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++){t=arguments[r];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e}},function(e,t,r){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var r={},n=e[0];if(n){e.length>1&&(n=i.concatStyleSets.apply(void 0,e));for(var s in n)n.hasOwnProperty(s)&&(r[s]=o.mergeStyles(n[s]))}return r}Object.defineProperty(t,"__esModule",{value:!0});var o=r(2),i=r(3);t.mergeStyleSets=n},function(e,t,r){"use strict";function n(e){o.Stylesheet.getInstance().insertRule("@font-face{"+i.serializeRuleEntries(e)+"}")}Object.defineProperty(t,"__esModule",{value:!0});var o=r(0),i=r(1);t.fontFace=n},function(e,t,r){"use strict";function n(e){var t=o.Stylesheet.getInstance(),r=t.getClassName(),n=[];for(var s in e)e.hasOwnProperty(s)&&n.push(s,"{",i.serializeRuleEntries(e[s]),"}");var a=n.join("");return t.insertRule("@keyframes "+r+"{"+a+"}"),r}Object.defineProperty(t,"__esModule",{value:!0});var o=r(0),i=r(1);t.keyframes=n}]);
+var g=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var r in t)t.hasOwnProperty(r)&&(e[r]=t[r])},m=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++){t=arguments[r];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e}},function(e,t,r){"use strict";function n(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var r={},n=e[0];if(n){e.length>1&&(n=i.concatStyleSets.apply(void 0,e));for(var s in n)n.hasOwnProperty(s)&&(r[s]=o.mergeStyles(n[s]))}return r}Object.defineProperty(t,"__esModule",{value:!0});var o=r(2),i=r(3);t.mergeStyleSets=n},function(e,t,r){"use strict";function n(e){o.Stylesheet.getInstance().insertRule("@font-face{"+i.serializeRuleEntries(e)+"}")}Object.defineProperty(t,"__esModule",{value:!0});var o=r(0),i=r(1);t.fontFace=n},function(e,t,r){"use strict";function n(e){var t=o.Stylesheet.getInstance(),r=t.getClassName(),n=[];for(var s in e)e.hasOwnProperty(s)&&n.push(s,"{",i.serializeRuleEntries(e[s]),"}");var a=n.join("");return t.insertRule("@keyframes "+r+"{"+a+"}"),r}Object.defineProperty(t,"__esModule",{value:!0});var o=r(0),i=r(1);t.keyframes=n}]);

lib-amd/styleToClassName.js

@@ -6,13 +6,14 @@ define(["require", "exports", "./transforms/rtlifyRules", "./transforms/provideUnits", "./transforms/prefixRules", "./transforms/kebabRules", "./Stylesheet"], function (require, exports, rtlifyRules_1, provideUnits_1, prefixRules_1, kebabRules_1, Stylesheet_1) {
     function getDisplayName(rules) {
-        var rootStyle = rules && rules.get('&');
+        var rootStyle = rules && rules['&'];
         return rootStyle ? rootStyle.displayName : undefined;
     }
     function extractRules(args, rules, currentSelector) {
-        if (rules === void 0) { rules = new Map(); }
+        if (rules === void 0) { rules = { __order: [] }; }
         if (currentSelector === void 0) { currentSelector = '&'; }
         var stylesheet = Stylesheet_1.Stylesheet.getInstance();
-        var currentRules = rules.get(currentSelector);
+        var currentRules = rules[currentSelector];
         if (!currentRules) {
             currentRules = {};
-            rules.set(currentSelector, currentRules);
+            rules[currentSelector] = currentRules;
+            rules.__order.push(currentSelector);
         }
@@ -74,11 +75,13 @@ for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
         var hasProps = false;
-        rules.forEach(function (ruleEntries, selector) {
+        for (var _i = 0, _a = rules.__order; _i < _a.length; _i++) {
+            var selector = _a[_i];
             serialized.push(selector);
-            for (var propName in ruleEntries) {
-                if (ruleEntries.hasOwnProperty(propName)) {
+            var rulesForSelector = rules[selector];
+            for (var propName in rulesForSelector) {
+                if (rulesForSelector.hasOwnProperty(propName)) {
                     hasProps = true;
-                    serialized.push(propName, ruleEntries[propName]);
+                    serialized.push(propName, rulesForSelector[propName]);
                 }
             }
-        });
+        }
         return hasProps ? serialized.join('') : undefined;
@@ -124,6 +127,5 @@ }
                 stylesheet.cacheClassName(className, key, args);
-                var ruleSelectors = rules.keys();
-                var selector = ruleSelectors.next().value;
-                while (selector) {
-                    var rulesToInsert = serializeRuleEntries(rules.get(selector));
+                for (var _a = 0, _b = rules.__order; _a < _b.length; _a++) {
+                    var selector = _b[_a];
+                    var rulesToInsert = serializeRuleEntries(rules[selector]);
                     if (rulesToInsert) {
@@ -133,3 +135,2 @@ selector = selector.replace(/\&/g, "." + className);
                     }
-                    selector = ruleSelectors.next().value;
                 }
@@ -136,0 +137,0 @@ }

lib/styleToClassName.js

@@ -10,13 +10,14 @@ "use strict";
 function getDisplayName(rules) {
-    var rootStyle = rules && rules.get('&');
+    var rootStyle = rules && rules['&'];
     return rootStyle ? rootStyle.displayName : undefined;
 }
 function extractRules(args, rules, currentSelector) {
-    if (rules === void 0) { rules = new Map(); }
+    if (rules === void 0) { rules = { __order: [] }; }
     if (currentSelector === void 0) { currentSelector = '&'; }
     var stylesheet = Stylesheet_1.Stylesheet.getInstance();
-    var currentRules = rules.get(currentSelector);
+    var currentRules = rules[currentSelector];
     if (!currentRules) {
         currentRules = {};
-        rules.set(currentSelector, currentRules);
+        rules[currentSelector] = currentRules;
+        rules.__order.push(currentSelector);
     }
@@ -78,11 +79,13 @@ for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
     var hasProps = false;
-    rules.forEach(function (ruleEntries, selector) {
+    for (var _i = 0, _a = rules.__order; _i < _a.length; _i++) {
+        var selector = _a[_i];
         serialized.push(selector);
-        for (var propName in ruleEntries) {
-            if (ruleEntries.hasOwnProperty(propName)) {
+        var rulesForSelector = rules[selector];
+        for (var propName in rulesForSelector) {
+            if (rulesForSelector.hasOwnProperty(propName)) {
                 hasProps = true;
-                serialized.push(propName, ruleEntries[propName]);
+                serialized.push(propName, rulesForSelector[propName]);
             }
         }
-    });
+    }
     return hasProps ? serialized.join('') : undefined;
@@ -128,6 +131,5 @@ }
             stylesheet.cacheClassName(className, key, args);
-            var ruleSelectors = rules.keys();
-            var selector = ruleSelectors.next().value;
-            while (selector) {
-                var rulesToInsert = serializeRuleEntries(rules.get(selector));
+            for (var _a = 0, _b = rules.__order; _a < _b.length; _a++) {
+                var selector = _b[_a];
+                var rulesToInsert = serializeRuleEntries(rules[selector]);
                 if (rulesToInsert) {
@@ -137,3 +139,2 @@ selector = selector.replace(/\&/g, "." + className);
                 }
-                selector = ruleSelectors.next().value;
             }
@@ -140,0 +141,0 @@ }

package-deps.json

@@ -12,3 +12,3 @@ {
     "packages/merge-styles/package.json": "9111fe3efe71d0aa7154e890d5114a9886858c43",
-    "packages/merge-styles/src/IRawStyleBase.ts": "34362b0e6058055bf35d71f06e7b1346ce62e7c9",
+    "packages/merge-styles/src/IRawStyleBase.ts": "50e747f24540f4e513525b05c9603354539fd53b",
     "packages/merge-styles/src/IStyle.ts": "770aa641a178f4ade3e75c36c663919cb65d00f9",
@@ -32,3 +32,3 @@ "packages/merge-styles/src/IStyleSet.ts": "82926ab5b49a81a0b4e55f47b1f03f55bdbb4a9e",
     "packages/merge-styles/src/styleToClassName.test.ts": "e7ceed1f053270d2f1f43b60d4ce7ff8c00404b3",
-    "packages/merge-styles/src/styleToClassName.ts": "3e2824996a6833e6d751a952745a7bd054afa256",
+    "packages/merge-styles/src/styleToClassName.ts": "dc2874b5baba3efc70d367fb4f3c831839384f7a",
     "packages/merge-styles/src/transforms/kebabRules.test.ts": "210a236ff754d59dc8ebe1469a62a043f3549377",
@@ -35,0 +35,0 @@ "packages/merge-styles/src/transforms/kebabRules.ts": "33ad7b88e0aaaf85ce5765a76141c639362af1a9",

package.json

 {
   "name": "@uifabric/merge-styles",
-  "version": "5.0.0-beta.16",
+  "version": "5.0.0-beta.17",
   "description": "Office UI Fabric style loading utilities.",
@@ -36,3 +36,3 @@ "main": "lib/index.js",
     "es6-weak-map": "^2.0.2",
-    "office-ui-fabric-react-tslint": "5.0.0-beta.16"
+    "office-ui-fabric-react-tslint": "5.0.0-beta.17"
   },
@@ -39,0 +39,0 @@ "dependencies": {

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

646231

increased by0.16%

Lines of code

7297

increased by0.15%

No dependency changes