Comparing version 10.1.3 to 10.2.0
@@ -7,2 +7,3 @@ import objectReduce from 'fast-loops/lib/objectReduce'; | ||
support = _ref.support; | ||
var id = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ''; | ||
@@ -15,2 +16,6 @@ var head = document.head || {}; | ||
if (id.length > 0) { | ||
node.setAttribute('data-fela-id', id); | ||
} | ||
if (support) { | ||
@@ -17,0 +22,0 @@ node.setAttribute('data-fela-support', 'true'); |
@@ -20,3 +20,3 @@ import calculateNodeScore from './calculateNodeScore'; | ||
var score = calculateNodeScore(attributes, renderer.mediaQueryOrder); | ||
var node = queryNode(attributes) || createNode(renderer.nodes, score, attributes); | ||
var node = queryNode(attributes, renderer.rendererId) || createNode(renderer.nodes, score, attributes, renderer.rendererId); | ||
@@ -23,0 +23,0 @@ renderer.nodes[reference] = { |
@@ -7,7 +7,9 @@ | ||
support = _ref.support; | ||
var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; | ||
var idQuery = id.length > 0 ? '[data-fela-id="' + id + '"]' : ''; | ||
var mediaQuery = media ? '[media="' + media + '"]' : ':not([media])'; | ||
var supportQuery = support ? '[data-fela-support="true"]' : ':not([data-fela-support="true"])'; | ||
return document.querySelector('[data-fela-type="' + type + '"]' + supportQuery + mediaQuery); | ||
return document.querySelector('[data-fela-type="' + type + '"]' + idQuery + supportQuery + mediaQuery); | ||
} |
@@ -17,3 +17,5 @@ import arrayEach from 'fast-loops/lib/arrayEach'; | ||
arrayEach(document.querySelectorAll('[data-fela-type]'), function (node) { | ||
var idQuery = renderer.rendererId.length > 0 ? '[data-fela-id="' + renderer.rendererId + '"]' : ''; | ||
arrayEach(document.querySelectorAll('[data-fela-type]' + idQuery), function (node) { | ||
var rehydrationAttribute = node.getAttribute('data-fela-rehydration') || -1; | ||
@@ -20,0 +22,0 @@ var rehydrationIndex = renderer.uniqueRuleIdentifier || parseInt(rehydrationAttribute, 10); |
export default function createStyleMarkup(css, type) { | ||
var media = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; | ||
var rehydrationIndex = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : -1; | ||
var support = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false; | ||
export default function createStyleTagMarkup(css, type) { | ||
var rendererId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; | ||
var media = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ''; | ||
var rehydrationIndex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1; | ||
var support = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false; | ||
var idAttribute = rendererId.length > 0 ? ' data-fela-id="' + rendererId + '"' : ''; | ||
var mediaAttribute = media.length > 0 ? ' media="' + media + '"' : ''; | ||
var supportAttribute = support ? ' data-fela-support="true"' : ''; | ||
return '<style type="text/css" data-fela-rehydration="' + rehydrationIndex + '" data-fela-type="' + type + '"' + supportAttribute + mediaAttribute + '>' + css + '</style>'; | ||
return '<style type="text/css" data-fela-rehydration="' + rehydrationIndex + '" data-fela-type="' + type + '"' + idAttribute + supportAttribute + mediaAttribute + '>' + css + '</style>'; | ||
} |
@@ -17,3 +17,3 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; | ||
if (cacheCluster[key].length > 0) { | ||
markup += createStyleTagMarkup(cacheCluster[key], type, '', rehydrationIndex); | ||
markup += createStyleTagMarkup(cacheCluster[key], type, renderer.rendererId, '', rehydrationIndex); | ||
} | ||
@@ -27,3 +27,3 @@ | ||
if (support) { | ||
styleMarkup += createStyleTagMarkup(support, RULE_TYPE, '', rehydrationIndex, true); | ||
styleMarkup += createStyleTagMarkup(support, RULE_TYPE, renderer.rendererId, '', rehydrationIndex, true); | ||
} | ||
@@ -36,3 +36,3 @@ | ||
if (cacheCluster.mediaRules[media] && cacheCluster.mediaRules[media].length > 0) { | ||
markup += createStyleTagMarkup(cacheCluster.mediaRules[media], RULE_TYPE, media, rehydrationIndex); | ||
markup += createStyleTagMarkup(cacheCluster.mediaRules[media], RULE_TYPE, renderer.rendererId, media, rehydrationIndex); | ||
} | ||
@@ -45,3 +45,3 @@ | ||
if (mediaSupport.length > 0) { | ||
markup += createStyleTagMarkup(mediaSupport, RULE_TYPE, media, rehydrationIndex, true); | ||
markup += createStyleTagMarkup(mediaSupport, RULE_TYPE, renderer.rendererId, media, rehydrationIndex, true); | ||
} | ||
@@ -48,0 +48,0 @@ } |
@@ -18,2 +18,3 @@ 'use strict'; | ||
support = _ref.support; | ||
var id = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ''; | ||
@@ -26,2 +27,6 @@ var head = document.head || {}; | ||
if (id.length > 0) { | ||
node.setAttribute('data-fela-id', id); | ||
} | ||
if (support) { | ||
@@ -28,0 +33,0 @@ node.setAttribute('data-fela-support', 'true'); |
@@ -36,3 +36,3 @@ 'use strict'; | ||
var score = (0, _calculateNodeScore2.default)(attributes, renderer.mediaQueryOrder); | ||
var node = (0, _queryNode2.default)(attributes) || (0, _createNode2.default)(renderer.nodes, score, attributes); | ||
var node = (0, _queryNode2.default)(attributes, renderer.rendererId) || (0, _createNode2.default)(renderer.nodes, score, attributes, renderer.rendererId); | ||
@@ -39,0 +39,0 @@ renderer.nodes[reference] = { |
@@ -11,7 +11,9 @@ 'use strict'; | ||
support = _ref.support; | ||
var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; | ||
var idQuery = id.length > 0 ? '[data-fela-id="' + id + '"]' : ''; | ||
var mediaQuery = media ? '[media="' + media + '"]' : ':not([media])'; | ||
var supportQuery = support ? '[data-fela-support="true"]' : ':not([data-fela-support="true"])'; | ||
return document.querySelector('[data-fela-type="' + type + '"]' + supportQuery + mediaQuery); | ||
return document.querySelector('[data-fela-type="' + type + '"]' + idQuery + supportQuery + mediaQuery); | ||
} |
@@ -39,3 +39,5 @@ 'use strict'; | ||
(0, _arrayEach2.default)(document.querySelectorAll('[data-fela-type]'), function (node) { | ||
var idQuery = renderer.rendererId.length > 0 ? '[data-fela-id="' + renderer.rendererId + '"]' : ''; | ||
(0, _arrayEach2.default)(document.querySelectorAll('[data-fela-type]' + idQuery), function (node) { | ||
var rehydrationAttribute = node.getAttribute('data-fela-rehydration') || -1; | ||
@@ -42,0 +44,0 @@ var rehydrationIndex = renderer.uniqueRuleIdentifier || parseInt(rehydrationAttribute, 10); |
@@ -6,12 +6,14 @@ 'use strict'; | ||
}); | ||
exports.default = createStyleMarkup; | ||
function createStyleMarkup(css, type) { | ||
var media = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; | ||
var rehydrationIndex = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : -1; | ||
var support = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false; | ||
exports.default = createStyleTagMarkup; | ||
function createStyleTagMarkup(css, type) { | ||
var rendererId = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; | ||
var media = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ''; | ||
var rehydrationIndex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1; | ||
var support = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false; | ||
var idAttribute = rendererId.length > 0 ? ' data-fela-id="' + rendererId + '"' : ''; | ||
var mediaAttribute = media.length > 0 ? ' media="' + media + '"' : ''; | ||
var supportAttribute = support ? ' data-fela-support="true"' : ''; | ||
return '<style type="text/css" data-fela-rehydration="' + rehydrationIndex + '" data-fela-type="' + type + '"' + supportAttribute + mediaAttribute + '>' + css + '</style>'; | ||
return '<style type="text/css" data-fela-rehydration="' + rehydrationIndex + '" data-fela-type="' + type + '"' + idAttribute + supportAttribute + mediaAttribute + '>' + css + '</style>'; | ||
} |
@@ -38,3 +38,3 @@ 'use strict'; | ||
if (cacheCluster[key].length > 0) { | ||
markup += (0, _createStyleTagMarkup2.default)(cacheCluster[key], type, '', rehydrationIndex); | ||
markup += (0, _createStyleTagMarkup2.default)(cacheCluster[key], type, renderer.rendererId, '', rehydrationIndex); | ||
} | ||
@@ -48,3 +48,3 @@ | ||
if (support) { | ||
styleMarkup += (0, _createStyleTagMarkup2.default)(support, _felaUtils.RULE_TYPE, '', rehydrationIndex, true); | ||
styleMarkup += (0, _createStyleTagMarkup2.default)(support, _felaUtils.RULE_TYPE, renderer.rendererId, '', rehydrationIndex, true); | ||
} | ||
@@ -57,3 +57,3 @@ | ||
if (cacheCluster.mediaRules[media] && cacheCluster.mediaRules[media].length > 0) { | ||
markup += (0, _createStyleTagMarkup2.default)(cacheCluster.mediaRules[media], _felaUtils.RULE_TYPE, media, rehydrationIndex); | ||
markup += (0, _createStyleTagMarkup2.default)(cacheCluster.mediaRules[media], _felaUtils.RULE_TYPE, renderer.rendererId, media, rehydrationIndex); | ||
} | ||
@@ -66,3 +66,3 @@ | ||
if (mediaSupport.length > 0) { | ||
markup += (0, _createStyleTagMarkup2.default)(mediaSupport, _felaUtils.RULE_TYPE, media, rehydrationIndex, true); | ||
markup += (0, _createStyleTagMarkup2.default)(mediaSupport, _felaUtils.RULE_TYPE, renderer.rendererId, media, rehydrationIndex, true); | ||
} | ||
@@ -69,0 +69,0 @@ } |
{ | ||
"name": "fela-dom", | ||
"version": "10.1.3", | ||
"version": "10.2.0", | ||
"description": "Fela package for working with the DOM", | ||
@@ -28,10 +28,10 @@ "main": "lib/index.js", | ||
"fast-loops": "^1.0.1", | ||
"fela-utils": "^10.1.3" | ||
"fela-utils": "^10.2.0" | ||
}, | ||
"devDependencies": { | ||
"fela": "^10.1.3", | ||
"fela-preset-web": "^10.1.3", | ||
"fela-tools": "^10.1.3" | ||
"fela": "^10.2.0", | ||
"fela-preset-web": "^10.2.0", | ||
"fela-tools": "^10.2.0" | ||
}, | ||
"gitHead": "05e0b56bc70926e5389114720066d0ce02bf68ec" | ||
"gitHead": "2271df3339a3c3a22e8fd4c457f5cc5a1729a1a8" | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
52756
1116
Updatedfela-utils@^10.2.0