Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions browsers.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"BS_Safari": {
"BS_Safari Yosemite": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Yosemite",
"browser": "safari",
"browser_version": "8.0"
},
"BS_Safari": {
"BS_Safari Mavericks": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Mavericks",
"browser": "safari",
"browser_version": "7.0"
},
"BS_Chrome": {
"BS_Chrome MacOS": {
"base": "BrowserStack",
"os": "OS X",
"os_version": "Yosemite",
Expand All @@ -30,18 +30,11 @@
"BS_MobileSafari": {
"base": "BrowserStack",
"os": "ios",
"os_version": "8.0",
"os_version": "10.3",
"browser": "iphone",
"real_mobile": false
},
"BS_MobileSafari": {
"base": "BrowserStack",
"os": "ios",
"os_version": "9.0",
"browser": "iphone",
"real_mobile": false
},
"BS_Chrome": {
"BS_Chrome Windows": {
"base": "BrowserStack",
"os": "Windows",
"os_version": "8.1",
Expand Down
3 changes: 2 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ module.exports = config => {
browserDisconnectTolerance: 3,
// My current OS plan allows max 10 parallel connections.
concurrency: 10,
retryLimit: 5
retryLimit: 5,
browserNoActivityTimeout: 100000
})

config.browserStack = {
Expand Down
12 changes: 6 additions & 6 deletions packages/css-jss/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dist/css-jss.js": {
"bundled": 57609,
"minified": 20272,
"gzipped": 6826
"bundled": 57635,
"minified": 20287,
"gzipped": 6833
},
"dist/css-jss.min.js": {
"bundled": 56847,
"minified": 19810,
"gzipped": 6612
"bundled": 56873,
"minified": 19825,
"gzipped": 6619
},
"dist/css-jss.cjs.js": {
"bundled": 2919,
Expand Down
12 changes: 6 additions & 6 deletions packages/jss-plugin-vendor-prefixer/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dist/jss-plugin-vendor-prefixer.js": {
"bundled": 17752,
"minified": 5687,
"gzipped": 2218
"bundled": 17778,
"minified": 5702,
"gzipped": 2224
},
"dist/jss-plugin-vendor-prefixer.min.js": {
"bundled": 17752,
"minified": 5687,
"gzipped": 2218
"bundled": 17778,
"minified": 5702,
"gzipped": 2224
},
"dist/jss-plugin-vendor-prefixer.cjs.js": {
"bundled": 1375,
Expand Down
12 changes: 6 additions & 6 deletions packages/jss-preset-default/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dist/jss-preset-default.js": {
"bundled": 54853,
"minified": 19506,
"gzipped": 6479
"bundled": 54879,
"minified": 19521,
"gzipped": 6486
},
"dist/jss-preset-default.min.js": {
"bundled": 54091,
"minified": 19044,
"gzipped": 6264
"bundled": 54117,
"minified": 19059,
"gzipped": 6271
},
"dist/jss-preset-default.cjs.js": {
"bundled": 1329,
Expand Down
12 changes: 6 additions & 6 deletions packages/jss-starter-kit/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dist/jss-starter-kit.js": {
"bundled": 70395,
"minified": 29546,
"gzipped": 9102
"bundled": 70421,
"minified": 29561,
"gzipped": 9109
},
"dist/jss-starter-kit.min.js": {
"bundled": 69633,
"minified": 29084,
"gzipped": 8889
"bundled": 69659,
"minified": 29099,
"gzipped": 8896
},
"dist/jss-starter-kit.cjs.js": {
"bundled": 2592,
Expand Down
28 changes: 14 additions & 14 deletions packages/jss/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"dist/jss.js": {
"bundled": 60687,
"minified": 22508,
"gzipped": 6791
"bundled": 60970,
"minified": 22613,
"gzipped": 6824
},
"dist/jss.min.js": {
"bundled": 59310,
"minified": 21739,
"gzipped": 6432
"bundled": 59593,
"minified": 21844,
"gzipped": 6463
},
"dist/jss.cjs.js": {
"bundled": 55476,
"minified": 24408,
"gzipped": 6785
"bundled": 55751,
"minified": 24513,
"gzipped": 6812
},
"dist/jss.esm.js": {
"bundled": 54944,
"minified": 23973,
"gzipped": 6695,
"bundled": 55219,
"minified": 24078,
"gzipped": 6723,
"treeshaked": {
"rollup": {
"code": 19736,
"code": 19841,
"import_statements": 352
},
"webpack": {
"code": 21203
"code": 21308
}
}
}
Expand Down
14 changes: 10 additions & 4 deletions packages/jss/src/DomRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,9 @@ export default class DomRenderer {
insertStyle(this.element, this.sheet.options)

// When rules are inserted using `insertRule` API, after `sheet.detach().attach()`
// browsers remove those rules.
// TODO figure out if its a bug and if it is known.
// Workaround is to redeploy the sheet.
if (this.hasInsertedRules && !(this.sheet && !this.sheet.deployed)) {
// most browsers create a new CSSStyleSheet, except of all IEs.
const deployed = Boolean(this.sheet && this.sheet.deployed)
if (this.hasInsertedRules && deployed) {
this.hasInsertedRules = false
this.deploy()
}
Expand Down Expand Up @@ -397,6 +396,13 @@ export default class DomRenderer {
return latestNativeParent
}

// IE keeps the CSSStyleSheet after style node has been reattached,
// so we need to check if the `renderable` reference the right style sheet and not
// rerender those rules.
if (rule.renderable && rule.renderable.parentStyleSheet === this.element.sheet) {
return rule.renderable
}

const ruleStr = rule.toString()

if (!ruleStr) return false
Expand Down
12 changes: 6 additions & 6 deletions packages/react-jss/.size-snapshot.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dist/react-jss.js": {
"bundled": 169130,
"minified": 58285,
"gzipped": 19051
"bundled": 169156,
"minified": 58300,
"gzipped": 19059
},
"dist/react-jss.min.js": {
"bundled": 112454,
"minified": 41676,
"gzipped": 14130
"bundled": 112480,
"minified": 41691,
"gzipped": 14139
},
"dist/react-jss.cjs.js": {
"bundled": 27019,
Expand Down