with-style 5.0.187 → 5.0.189
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/example.js +27 -21
- package/lib/style/declaration.js +2 -2
- package/lib/style/declarations.js +12 -6
- package/lib/style/media.js +15 -15
- package/package.json +1 -1
- package/src/style/declaration.js +1 -1
- package/src/style/declarations.js +5 -3
- package/src/style/media.js +15 -15
package/lib/style/declaration.js
CHANGED
|
@@ -70,7 +70,7 @@ var Declaration = /*#__PURE__*/ function() {
|
|
|
70
70
|
key: "matchDeclarations",
|
|
71
71
|
value: function matchDeclarations(declarations) {
|
|
72
72
|
var _this = this;
|
|
73
|
-
var matches1 = declarations.
|
|
73
|
+
var matches1 = declarations.someDeclaration(function(declaration) {
|
|
74
74
|
var matches = _this.matchDeclaration(declaration);
|
|
75
75
|
if (matches) {
|
|
76
76
|
return true;
|
|
@@ -99,4 +99,4 @@ var Declaration = /*#__PURE__*/ function() {
|
|
|
99
99
|
}();
|
|
100
100
|
exports.default = Declaration;
|
|
101
101
|
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHlsZS9kZWNsYXJhdGlvbi5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHlsZS9kZWNsYXJhdGlvbi5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgUXVlcnkgfSBmcm9tIFwib2NjYW0tcXVlcnlcIjtcblxuaW1wb3J0IHsgRU1QVFlfU1RSSU5HIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuaW1wb3J0IHsgY29udGVudEZyb21RdWVyeU5vZGVBbmRUb2tlbnMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL2NvbnRlbnRcIjtcblxuY29uc3QgaW1wb3J0YW50UXVlcnkgPSBRdWVyeS5mcm9tRXhwcmVzc2lvbihcIi8qL2ltcG9ydGFudFwiKSxcbiAgICAgIHByb3BlcnR5TmFtZVF1ZXJ5ID0gUXVlcnkuZnJvbUV4cHJlc3Npb24oXCIvKi9wcm9wZXJ0eU5hbWVcIiksXG4gICAgICBwcm9wZXJ0eVZhbHVlc1F1ZXJ5ID0gUXVlcnkuZnJvbUV4cHJlc3Npb24oXCIvKi9wcm9wZXJ0eVZhbHVlc1wiKTtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgRGVjbGFyYXRpb24ge1xuICBjb25zdHJ1Y3Rvcihwcm9wZXJ0eVZhbHVlcywgcHJvcGVydHlOYW1lLCBpbXBvcnRhbnQpIHtcbiAgICB0aGlzLnByb3BlcnR5VmFsdWVzID0gcHJvcGVydHlWYWx1ZXM7XG4gICAgdGhpcy5wcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0eU5hbWU7XG4gICAgdGhpcy5pbXBvcnRhbnQgPSBpbXBvcnRhbnQ7XG4gIH1cblxuICBnZXRQcm9wZXJ0eVZhbHVlcygpIHtcbiAgICByZXR1cm4gdGhpcy5wcm9wZXJ0eVZhbHVlcztcbiAgfVxuXG4gIGdldE5hbWVQcm9wZXJ0eSgpIHtcbiAgICByZXR1cm4gdGhpcy5wcm9wZXJ0eU5hbWU7XG4gIH1cblxuICBnZXRJbXBvcnRhbnQoKSB7XG4gICAgcmV0dXJuIHRoaXMuaW1wb3J0YW50O1xuICB9XG5cbiAgbWF0Y2hQcm9wZXJ0eU5hbWUocHJvcGVydHlOYW1lKSB7XG4gICAgY29uc3QgbWF0Y2hlcyA9ICh0aGlzLnByb3BlcnR5TmFtZSA9PT0gcHJvcGVydHlOYW1lKTtcblxuICAgIHJldHVybiBtYXRjaGVzO1xuICB9XG5cbiAgbWF0Y2hEZWNsYXJhdGlvbihkZWNsYXJhdGlvbikge1xuICAgIGNvbnN0IHByb3BlcnR5TmFtZSA9IGRlY2xhcmF0aW9uLmdldFByb3BlcnR5TmFtZSgpLFxuICAgICAgICAgIG1hdGNoZXMgPSB0aGlzLm1hdGNoUHJvcGVydHlOYW1lKHByb3BlcnR5TmFtZSk7IC8vL1xuXG4gICAgcmV0dXJuIG1hdGNoZXM7XG4gIH1cblxuICBtYXRjaERlY2xhcmF0aW9ucyhkZWNsYXJhdGlvbnMpIHtcbiAgICBjb25zdCBtYXRjaGVzID0gZGVjbGFyYXRpb25zLnNvbWVEZWNsYXJhdGlvbigoZGVjbGFyYXRpb24pID0+IHtcbiAgICAgIGNvbnN0IG1hdGNoZXMgPSB0aGlzLm1hdGNoRGVjbGFyYXRpb24oZGVjbGFyYXRpb24pO1xuXG4gICAgICBpZiAobWF0Y2hlcykge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcblxuICAgIHJldHVybiBtYXRjaGVzO1xuICB9XG5cbiAgYXNDU1MoaW5kZW50LCBsYXN0KSB7XG4gICAgY29uc3QgY3NzID0gbGFzdCA/XG4gICAgICAgICAgICAgICAgICBgJHtpbmRlbnR9JHt0aGlzLnByb3BlcnR5TmFtZX06ICR7dGhpcy5wcm9wZXJ0eVZhbHVlc30ke3RoaXMuaW1wb3J0YW50fTtgIDpcbiAgICAgICAgICAgICAgICAgICAgYCR7aW5kZW50fSR7dGhpcy5wcm9wZXJ0eU5hbWV9OiAke3RoaXMucHJvcGVydHlWYWx1ZXN9JHt0aGlzLmltcG9ydGFudH07XFxuYDtcblxuICAgIHJldHVybiBjc3M7XG4gIH1cblxuICBzdGF0aWMgZnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gICAgY29uc3QgcHJvcGVydHlWYWx1ZXNDb250ZW50ID0gY29udGVudEZyb21RdWVyeU5vZGVBbmRUb2tlbnMocHJvcGVydHlWYWx1ZXNRdWVyeSwgbm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBwcm9wZXJ0eU5hbWVDb250ZW50ID0gY29udGVudEZyb21RdWVyeU5vZGVBbmRUb2tlbnMocHJvcGVydHlOYW1lUXVlcnksIG5vZGUsIHRva2VucyksXG4gICAgICAgICAgaW1wb3J0YW50Q29udGVudCA9IGNvbnRlbnRGcm9tUXVlcnlOb2RlQW5kVG9rZW5zKGltcG9ydGFudFF1ZXJ5LCBub2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHByb3BlcnR5VmFsdWVzID0gcHJvcGVydHlWYWx1ZXNDb250ZW50LCAvLy9cbiAgICAgICAgICBwcm9wZXJ0eU5hbWUgPSBwcm9wZXJ0eU5hbWVDb250ZW50LCAvLy9cbiAgICAgICAgICBpbXBvcnRhbnQgPSAoaW1wb3J0YW50Q29udGVudCA9PT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgICAgICAgRU1QVFlfU1RSSU5HIDpcbiAgICAgICAgICAgICAgICAgICAgICAgICBgICR7aW1wb3J0YW50Q29udGVudH1gLFxuICAgICAgICAgIGRlY2xhcmF0aW9uID0gbmV3IERlY2xhcmF0aW9uKHByb3BlcnR5VmFsdWVzLCBwcm9wZXJ0eU5hbWUsIGltcG9ydGFudCk7XG5cbiAgICByZXR1cm4gZGVjbGFyYXRpb247XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiaW1wb3J0YW50UXVlcnkiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uIiwicHJvcGVydHlOYW1lUXVlcnkiLCJwcm9wZXJ0eVZhbHVlc1F1ZXJ5IiwiRGVjbGFyYXRpb24iLCJwcm9wZXJ0eVZhbHVlcyIsInByb3BlcnR5TmFtZSIsImltcG9ydGFudCIsImdldFByb3BlcnR5VmFsdWVzIiwiZ2V0TmFtZVByb3BlcnR5IiwiZ2V0SW1wb3J0YW50IiwibWF0Y2hQcm9wZXJ0eU5hbWUiLCJtYXRjaGVzIiwibWF0Y2hEZWNsYXJhdGlvbiIsImRlY2xhcmF0aW9uIiwiZ2V0UHJvcGVydHlOYW1lIiwibWF0Y2hEZWNsYXJhdGlvbnMiLCJkZWNsYXJhdGlvbnMiLCJzb21lRGVjbGFyYXRpb24iLCJhc0NTUyIsImluZGVudCIsImxhc3QiLCJjc3MiLCJmcm9tTm9kZUFuZFRva2VucyIsIm5vZGUiLCJ0b2tlbnMiLCJwcm9wZXJ0eVZhbHVlc0NvbnRlbnQiLCJjb250ZW50RnJvbVF1ZXJ5Tm9kZUFuZFRva2VucyIsInByb3BlcnR5TmFtZUNvbnRlbnQiLCJpbXBvcnRhbnRDb250ZW50IiwiRU1QVFlfU1RSSU5HIl0sIm1hcHBpbmdzIjoiQUFBQSxZQUFZLENBQUM7Ozs7O0FBRVMsSUFBQSxXQUFhLFdBQWIsYUFBYSxDQUFBO0FBRU4sSUFBQSxVQUFjLFdBQWQsY0FBYyxDQUFBO0FBQ0csSUFBQSxRQUFzQixXQUF0QixzQkFBc0IsQ0FBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFcEUsSUFBTUEsY0FBYyxHQUFHQyxXQUFLLE1BQUEsQ0FBQ0MsY0FBYyxDQUFDLGNBQWMsQ0FBQyxFQUNyREMsaUJBQWlCLEdBQUdGLFdBQUssTUFBQSxDQUFDQyxjQUFjLENBQUMsaUJBQWlCLENBQUMsRUFDM0RFLG1CQUFtQixHQUFHSCxXQUFLLE1BQUEsQ0FBQ0MsY0FBYyxDQUFDLG1CQUFtQixDQUFDLEFBQUM7QUFFdkQsSUFBQSxBQUFNRyxXQUFXLGlCQUFqQjthQUFNQSxXQUFXLENBQ2xCQyxjQUFjLEVBQUVDLFlBQVksRUFBRUMsU0FBUzs7UUFDakQsSUFBSSxDQUFDRixjQUFjLEdBQUdBLGNBQWMsQ0FBQztRQUNyQyxJQUFJLENBQUNDLFlBQVksR0FBR0EsWUFBWSxDQUFDO1FBQ2pDLElBQUksQ0FBQ0MsU0FBUyxHQUFHQSxTQUFTLENBQUM7Ozs7WUFHN0JDLEdBQWlCLEVBQWpCQSxtQkFBaUI7bUJBQWpCQSxTQUFBQSxpQkFBaUIsR0FBRztnQkFDbEIsT0FBTyxJQUFJLENBQUNILGNBQWMsQ0FBQzthQUM1Qjs7O1lBRURJLEdBQWUsRUFBZkEsaUJBQWU7bUJBQWZBLFNBQUFBLGVBQWUsR0FBRztnQkFDaEIsT0FBTyxJQUFJLENBQUNILFlBQVksQ0FBQzthQUMxQjs7O1lBRURJLEdBQVksRUFBWkEsY0FBWTttQkFBWkEsU0FBQUEsWUFBWSxHQUFHO2dCQUNiLE9BQU8sSUFBSSxDQUFDSCxTQUFTLENBQUM7YUFDdkI7OztZQUVESSxHQUFpQixFQUFqQkEsbUJBQWlCO21CQUFqQkEsU0FBQUEsaUJBQWlCLENBQUNMLFlBQVksRUFBRTtnQkFDOUIsSUFBTU0sT0FBTyxHQUFJLElBQUksQ0FBQ04sWUFBWSxLQUFLQSxZQUFZLEFBQUMsQUFBQztnQkFFckQsT0FBT00sT0FBTyxDQUFDO2FBQ2hCOzs7WUFFREMsR0FBZ0IsRUFBaEJBLGtCQUFnQjttQkFBaEJBLFNBQUFBLGdCQUFnQixDQUFDQyxXQUFXLEVBQUU7Z0JBQzVCLElBQU1SLFlBQVksR0FBR1EsV0FBVyxDQUFDQyxlQUFlLEVBQUUsRUFDNUNILE9BQU8sR0FBRyxJQUFJLENBQUNELGlCQUFpQixDQUFDTCxZQUFZLENBQUMsQUFBQyxFQUFDLEdBQUc7Z0JBRXpELE9BQU9NLE9BQU8sQ0FBQzthQUNoQjs7O1lBRURJLEdBQWlCLEVBQWpCQSxtQkFBaUI7bUJBQWpCQSxTQUFBQSxpQkFBaUIsQ0FBQ0MsWUFBWSxFQUFFOztnQkFDOUIsSUFBTUwsUUFBTyxHQUFHSyxZQUFZLENBQUNDLGVBQWUsQ0FBQyxTQUFDSixXQUFXLEVBQUs7b0JBQzVELElBQU1GLE9BQU8sR0FBRyxNQUFLQyxnQkFBZ0IsQ0FBQ0MsV0FBVyxDQUFDLEFBQUM7b0JBRW5ELElBQUlGLE9BQU8sRUFBRTt3QkFDWCxPQUFPLElBQUksQ0FBQztxQkFDYjtpQkFDRixDQUFDLEFBQUM7Z0JBRUgsT0FBT0EsUUFBTyxDQUFDO2FBQ2hCOzs7WUFFRE8sR0FBSyxFQUFMQSxPQUFLO21CQUFMQSxTQUFBQSxLQUFLLENBQUNDLE1BQU0sRUFBRUMsSUFBSSxFQUFFO2dCQUNsQixJQUFNQyxHQUFHLEdBQUdELElBQUksR0FDRixBQUFDLEVBQUEsQ0FBVyxNQUFpQixDQUExQkQsTUFBTSxDQUFxQixDQUFJLE1BQW1CLENBQXpDLElBQUksQ0FBQ2QsWUFBWSxFQUFDLElBQUUsQ0FBc0IsQ0FBRSxNQUFjLENBQXBDLElBQUksQ0FBQ0QsY0FBYyxDQUFrQixDQUFBLE1BQUMsQ0FBaEIsSUFBSSxDQUFDRSxTQUFTLEVBQUMsR0FBQyxDQUFDLEdBQ3ZFLEFBQUMsRUFBQSxDQUFXLE1BQWlCLENBQTFCYSxNQUFNLENBQXFCLENBQUksTUFBbUIsQ0FBekMsSUFBSSxDQUFDZCxZQUFZLEVBQUMsSUFBRSxDQUFzQixDQUFFLE1BQWMsQ0FBcEMsSUFBSSxDQUFDRCxjQUFjLENBQWtCLENBQUEsTUFBRyxDQUFsQixJQUFJLENBQUNFLFNBQVMsRUFBQyxLQUFHLENBQUMsQUFBQztnQkFFNUYsT0FBT2UsR0FBRyxDQUFDO2FBQ1o7Ozs7WUFFTUMsR0FBaUIsRUFBakJBLG1CQUFpQjttQkFBeEIsU0FBT0EsaUJBQWlCLENBQUNDLElBQUksRUFBRUMsTUFBTSxFQUFFO2dCQUNyQyxJQUFNQyxxQkFBcUIsR0FBR0MsQ0FBQUEsR0FBQUEsUUFBNkIsQUFBbUMsQ0FBQSw4QkFBbkMsQ0FBQ3hCLG1CQUFtQixFQUFFcUIsSUFBSSxFQUFFQyxNQUFNLENBQUMsRUFDeEZHLG1CQUFtQixHQUFHRCxDQUFBQSxHQUFBQSxRQUE2QixBQUFpQyxDQUFBLDhCQUFqQyxDQUFDekIsaUJBQWlCLEVBQUVzQixJQUFJLEVBQUVDLE1BQU0sQ0FBQyxFQUNwRkksZ0JBQWdCLEdBQUdGLENBQUFBLEdBQUFBLFFBQTZCLEFBQThCLENBQUEsOEJBQTlCLENBQUM1QixjQUFjLEVBQUV5QixJQUFJLEVBQUVDLE1BQU0sQ0FBQyxFQUM5RXBCLGNBQWMsR0FBR3FCLHFCQUFxQixFQUN0Q3BCLFlBQVksR0FBR3NCLG1CQUFtQixFQUNsQ3JCLFNBQVMsR0FBRyxBQUFDc0IsZ0JBQWdCLEtBQUssSUFBSSxHQUN4QkMsVUFBWSxhQUFBLEdBQ1gsQUFBQyxHQUFDLENBQW1CLE1BQUEsQ0FBakJELGdCQUFnQixDQUFFLEVBQ3JDZixXQUFXLEdBQUcsSUFBSVYsV0FBVyxDQUFDQyxjQUFjLEVBQUVDLFlBQVksRUFBRUMsU0FBUyxDQUFDLEFBQUM7Z0JBRTdFLE9BQU9PLFdBQVcsQ0FBQzthQUNwQjs7OztDQUNGLEVBQUE7a0JBakVvQlYsV0FBVyJ9
|
|
@@ -40,14 +40,20 @@ var Declarations = /*#__PURE__*/ function() {
|
|
|
40
40
|
}
|
|
41
41
|
_createClass(Declarations, [
|
|
42
42
|
{
|
|
43
|
-
key: "
|
|
44
|
-
value: function
|
|
43
|
+
key: "someDeclaration",
|
|
44
|
+
value: function someDeclaration(callback) {
|
|
45
|
+
return this.array.some(callback);
|
|
46
|
+
}
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
key: "forwardsForEachDeclaration",
|
|
50
|
+
value: function forwardsForEachDeclaration(callback) {
|
|
45
51
|
forwardsForEach(this.array, callback);
|
|
46
52
|
}
|
|
47
53
|
},
|
|
48
54
|
{
|
|
49
|
-
key: "
|
|
50
|
-
value: function
|
|
55
|
+
key: "backwardsForEachDeclaration",
|
|
56
|
+
value: function backwardsForEachDeclaration(callback) {
|
|
51
57
|
backwardsForEach(this.array, callback);
|
|
52
58
|
}
|
|
53
59
|
},
|
|
@@ -55,7 +61,7 @@ var Declarations = /*#__PURE__*/ function() {
|
|
|
55
61
|
key: "unshift",
|
|
56
62
|
value: function unshift(declarations) {
|
|
57
63
|
var _this = this;
|
|
58
|
-
declarations.
|
|
64
|
+
declarations.backwardsForEachDeclaration(function(declaration) {
|
|
59
65
|
var matches = declaration.matchDeclarations(_this); ///
|
|
60
66
|
if (!matches) {
|
|
61
67
|
_this.array.unshift(declaration);
|
|
@@ -103,4 +109,4 @@ var Declarations = /*#__PURE__*/ function() {
|
|
|
103
109
|
}();
|
|
104
110
|
exports.default = Declarations;
|
|
105
111
|
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHlsZS9kZWNsYXJhdGlvbnMuanMiLCI8PGpzeC1jb25maWctcHJhZ21hLmpzPj4iXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFF1ZXJ5IH0gZnJvbSBcIm9jY2FtLXF1ZXJ5XCI7XG5pbXBvcnQgeyBhcnJheVV0aWxpdGllcyB9IGZyb20gXCJuZWNlc3NhcnlcIjtcblxuaW1wb3J0IERlY2xhcmF0aW9uIGZyb20gXCIuL2RlY2xhcmF0aW9uXCI7XG5cbmltcG9ydCB7IEVNUFRZX1NUUklORyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcblxuY29uc3QgeyBmb3J3YXJkc0ZvckVhY2gsIGJhY2t3YXJkc0ZvckVhY2ggfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5jb25zdCBkZWNsYXJhdGlvblF1ZXJ5ID0gUXVlcnkuZnJvbUV4cHJlc3Npb24oXCIvKi9kZWNsYXJhdGlvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgRGVjbGFyYXRpb25zIHtcbiAgY29uc3RydWN0b3IoYXJyYXkpIHtcbiAgICB0aGlzLmFycmF5ID0gYXJyYXk7XG4gIH1cblxuICBzb21lRGVjbGFyYXRpb24oY2FsbGJhY2spIHsgcmV0dXJuIHRoaXMuYXJyYXkuc29tZShjYWxsYmFjayk7IH1cblxuICBmb3J3YXJkc0ZvckVhY2hEZWNsYXJhdGlvbihjYWxsYmFjaykgeyBmb3J3YXJkc0ZvckVhY2godGhpcy5hcnJheSwgY2FsbGJhY2spOyB9XG5cbiAgYmFja3dhcmRzRm9yRWFjaERlY2xhcmF0aW9uKGNhbGxiYWNrKSB7IGJhY2t3YXJkc0ZvckVhY2godGhpcy5hcnJheSwgY2FsbGJhY2spOyB9XG5cbiAgdW5zaGlmdChkZWNsYXJhdGlvbnMpIHtcbiAgICBkZWNsYXJhdGlvbnMuYmFja3dhcmRzRm9yRWFjaERlY2xhcmF0aW9uKChkZWNsYXJhdGlvbikgPT4ge1xuICAgICAgY29uc3QgbWF0Y2hlcyA9IGRlY2xhcmF0aW9uLm1hdGNoRGVjbGFyYXRpb25zKHRoaXMpOyAvLy9cblxuICAgICAgaWYgKCFtYXRjaGVzKSB7XG4gICAgICAgIHRoaXMuYXJyYXkudW5zaGlmdChkZWNsYXJhdGlvbik7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICBhc0NTUyhjbGFzc05hbWUsIGluZGVudCkge1xuICAgIGlmIChpbmRlbnQgPT09IHVuZGVmaW5lZCkge1xuICAgICAgaW5kZW50ID0gY2xhc3NOYW1lOyAvLy9cblxuICAgICAgY2xhc3NOYW1lID0gbnVsbDsgLy8vXG4gICAgfVxuXG4gICAgbGV0IGNzcyA9IEVNUFRZX1NUUklORztcblxuICAgIGNvbnN0IGxlbmd0aCA9IHRoaXMuYXJyYXkubGVuZ3RoO1xuXG4gICAgaWYgKGxlbmd0aCA+IDApIHtcbiAgICAgIGNvbnN0IGxhc3RJbmRleCA9IGxlbmd0aCAtIDEsXG4gICAgICAgICAgICBkZWNsYXJhdGlvbnNDU1MgPSB0aGlzLmFycmF5LnJlZHVjZSgoZGVjbGFyYXRpb25zQ1NTLCBkZWNsYXJhdGlvbiwgaW5kZXgpID0+IHtcbiAgICAgICAgICAgICAgY29uc3QgbGFzdCA9IChpbmRleCA9PT0gbGFzdEluZGV4KSxcbiAgICAgICAgICAgICAgICAgICAgZGVjbGFyYXRpb25DU1MgPSBkZWNsYXJhdGlvbi5hc0NTUyhpbmRlbnQsIGxhc3QpO1xuXG4gICAgICAgICAgICAgIGRlY2xhcmF0aW9uc0NTUyArPSBkZWNsYXJhdGlvbkNTUztcblxuICAgICAgICAgICAgICByZXR1cm4gZGVjbGFyYXRpb25zQ1NTO1xuICAgICAgICAgICAgfSwgRU1QVFlfU1RSSU5HKTtcblxuICAgICAgaWYgKGNsYXNzTmFtZSA9PT0gbnVsbCkge1xuICAgICAgICBjc3MgPSBkZWNsYXJhdGlvbnNDU1M7ICAvLy9cbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIGNzcyA9IGAuJHtjbGFzc05hbWV9IHtcbiR7ZGVjbGFyYXRpb25zQ1NTfVxufVxuXG5gO1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiBjc3M7XG4gIH1cblxuICBzdGF0aWMgZnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gICAgY29uc3QgZGVjbGFyYXRpb25Ob2RlcyA9IGRlY2xhcmF0aW9uUXVlcnkuZXhlY3V0ZShub2RlKSxcbiAgICAgICAgICBhcnJheSA9IGRlY2xhcmF0aW9uTm9kZXMubWFwKChkZWNsYXJhdGlvbk5vZGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IG5vZGUgPSBkZWNsYXJhdGlvbk5vZGUsIC8vL1xuICAgICAgICAgICAgICAgICAgZGVjbGFyYXRpb24gPSBEZWNsYXJhdGlvbi5mcm9tTm9kZUFuZFRva2Vucyhub2RlLCB0b2tlbnMpO1xuXG4gICAgICAgICAgICByZXR1cm4gZGVjbGFyYXRpb247XG4gICAgICAgICAgfSksXG4gICAgICAgICAgZGVjbGFyYXRpb25zID0gbmV3IERlY2xhcmF0aW9ucyhhcnJheSk7XG5cbiAgICByZXR1cm4gZGVjbGFyYXRpb25zO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbImZvcndhcmRzRm9yRWFjaCIsImFycmF5VXRpbGl0aWVzIiwiYmFja3dhcmRzRm9yRWFjaCIsImRlY2xhcmF0aW9uUXVlcnkiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uIiwiRGVjbGFyYXRpb25zIiwiYXJyYXkiLCJzb21lRGVjbGFyYXRpb24iLCJjYWxsYmFjayIsInNvbWUiLCJmb3J3YXJkc0ZvckVhY2hEZWNsYXJhdGlvbiIsImJhY2t3YXJkc0ZvckVhY2hEZWNsYXJhdGlvbiIsInVuc2hpZnQiLCJkZWNsYXJhdGlvbnMiLCJkZWNsYXJhdGlvbiIsIm1hdGNoZXMiLCJtYXRjaERlY2xhcmF0aW9ucyIsImFzQ1NTIiwiY2xhc3NOYW1lIiwiaW5kZW50IiwidW5kZWZpbmVkIiwiY3NzIiwiRU1QVFlfU1RSSU5HIiwibGVuZ3RoIiwibGFzdEluZGV4IiwiZGVjbGFyYXRpb25zQ1NTIiwicmVkdWNlIiwiaW5kZXgiLCJsYXN0IiwiZGVjbGFyYXRpb25DU1MiLCJmcm9tTm9kZUFuZFRva2VucyIsIm5vZGUiLCJ0b2tlbnMiLCJkZWNsYXJhdGlvbk5vZGVzIiwiZXhlY3V0ZSIsIm1hcCIsImRlY2xhcmF0aW9uTm9kZSIsIkRlY2xhcmF0aW9uIl0sIm1hcHBpbmdzIjoiQUFBQSxZQUFZLENBQUM7Ozs7O0FBRVMsSUFBQSxXQUFhLFdBQWIsYUFBYSxDQUFBO0FBQ0osSUFBQSxVQUFXLFdBQVgsV0FBVyxDQUFBO0FBRWxCLElBQUEsWUFBZSxrQ0FBZixlQUFlLEVBQUE7QUFFVixJQUFBLFVBQWMsV0FBZCxjQUFjLENBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFM0MsSUFBUUEsZUFBZSxHQUF1QkMsVUFBYyxlQUFBLENBQXBERCxlQUFlLEVBQUVFLGdCQUFnQixHQUFLRCxVQUFjLGVBQUEsQ0FBbkNDLGdCQUFnQixBQUFvQjtBQUU3RCxJQUFNQyxnQkFBZ0IsR0FBR0MsV0FBSyxNQUFBLENBQUNDLGNBQWMsQ0FBQyxnQkFBZ0IsQ0FBQyxBQUFDO0FBRWpELElBQUEsQUFBTUMsWUFBWSxpQkFBbEI7YUFBTUEsWUFBWSxDQUNuQkMsS0FBSzs7UUFDZixJQUFJLENBQUNBLEtBQUssR0FBR0EsS0FBSyxDQUFDOzs7O1lBR3JCQyxHQUFlLEVBQWZBLGlCQUFlO21CQUFmQSxTQUFBQSxlQUFlLENBQUNDLFFBQVEsRUFBRTtnQkFBRSxPQUFPLElBQUksQ0FBQ0YsS0FBSyxDQUFDRyxJQUFJLENBQUNELFFBQVEsQ0FBQyxDQUFDO2FBQUU7OztZQUUvREUsR0FBMEIsRUFBMUJBLDRCQUEwQjttQkFBMUJBLFNBQUFBLDBCQUEwQixDQUFDRixRQUFRLEVBQUU7Z0JBQUVULGVBQWUsQ0FBQyxJQUFJLENBQUNPLEtBQUssRUFBRUUsUUFBUSxDQUFDLENBQUM7YUFBRTs7O1lBRS9FRyxHQUEyQixFQUEzQkEsNkJBQTJCO21CQUEzQkEsU0FBQUEsMkJBQTJCLENBQUNILFFBQVEsRUFBRTtnQkFBRVAsZ0JBQWdCLENBQUMsSUFBSSxDQUFDSyxLQUFLLEVB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
|
package/lib/style/media.js
CHANGED
|
@@ -32,21 +32,15 @@ function _interopRequireDefault(obj) {
|
|
|
32
32
|
default: obj
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
-
var
|
|
35
|
+
var queriesQuery = _occamQuery.Query.fromExpression("/media/mediaQueries"); ///
|
|
36
36
|
var Media = /*#__PURE__*/ function() {
|
|
37
|
-
function Media(
|
|
37
|
+
function Media(declarations, ruleSets, queries) {
|
|
38
38
|
_classCallCheck(this, Media);
|
|
39
|
-
this.mediaQueries = mediaQueries;
|
|
40
39
|
this.declarations = declarations;
|
|
41
40
|
this.ruleSets = ruleSets;
|
|
41
|
+
this.queries = queries;
|
|
42
42
|
}
|
|
43
43
|
_createClass(Media, [
|
|
44
|
-
{
|
|
45
|
-
key: "getMediaQueries",
|
|
46
|
-
value: function getMediaQueries() {
|
|
47
|
-
return this.mediaQueries;
|
|
48
|
-
}
|
|
49
|
-
},
|
|
50
44
|
{
|
|
51
45
|
key: "getDeclarations",
|
|
52
46
|
value: function getDeclarations() {
|
|
@@ -59,13 +53,19 @@ var Media = /*#__PURE__*/ function() {
|
|
|
59
53
|
return this.ruleSets;
|
|
60
54
|
}
|
|
61
55
|
},
|
|
56
|
+
{
|
|
57
|
+
key: "getQueries",
|
|
58
|
+
value: function getQueries() {
|
|
59
|
+
return this.queries;
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
62
|
{
|
|
63
63
|
key: "asCSS",
|
|
64
64
|
value: function asCSS(className) {
|
|
65
65
|
var css = "";
|
|
66
66
|
var ruleSetsCSS = this.ruleSets.asCSS(className, _constants.TWO_SPACES), declarationsCSS = this.declarations.asCSS(className, _constants.FOUR_SPACES);
|
|
67
67
|
if (ruleSetsCSS !== null || declarationsCSS !== null) {
|
|
68
|
-
css = "@media ".concat(this.
|
|
68
|
+
css = "@media ".concat(this.queries, " {\n").concat(declarationsCSS).concat(ruleSetsCSS, "\n}\n\n");
|
|
69
69
|
}
|
|
70
70
|
return css;
|
|
71
71
|
}
|
|
@@ -74,17 +74,17 @@ var Media = /*#__PURE__*/ function() {
|
|
|
74
74
|
{
|
|
75
75
|
key: "fromNodeAndTokens",
|
|
76
76
|
value: function fromNodeAndTokens(node, tokens) {
|
|
77
|
-
var
|
|
77
|
+
var declarations = _declarations.default.fromNodeAndTokens(node, tokens), ruleSets = _ruleSets.default.fromNodeAndTokens(node, tokens), queries = queriesFromNodeAndTokens(node, tokens), media = new Media(declarations, ruleSets, queries);
|
|
78
78
|
return media;
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
]);
|
|
82
82
|
return Media;
|
|
83
83
|
}();
|
|
84
|
-
function
|
|
85
|
-
var
|
|
86
|
-
return
|
|
84
|
+
function queriesFromNodeAndTokens(node, tokens) {
|
|
85
|
+
var queriesNodeContent = (0, _content).contentFromQueryNodeAndTokens(queriesQuery, node, tokens), queries = "".concat(queriesNodeContent);
|
|
86
|
+
return queries;
|
|
87
87
|
}
|
|
88
88
|
exports.default = Media;
|
|
89
89
|
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHlsZS9tZWRpYS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgUXVlcnkgfSBmcm9tIFwib2NjYW0tcXVlcnlcIjtcblxuaW1wb3J0IFJ1bGVTZXRzIGZyb20gXCIuL3J1bGVTZXRzXCI7XG5pbXBvcnQgRGVjbGFyYXRpb25zIGZyb20gXCIuL2RlY2xhcmF0aW9uc1wiO1xuXG5pbXBvcnQgeyBUV09fU1BBQ0VTLCBGT1VSX1NQQUNFUyB9IGZyb20gXCIuLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IGNvbnRlbnRGcm9tUXVlcnlOb2RlQW5kVG9rZW5zIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9jb250ZW50XCI7XG5cbmNvbnN0IHF1ZXJpZXNRdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uKFwiL21lZGlhL21lZGlhUXVlcmllc1wiKTsgLy8vXG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIE1lZGlhIHtcbiAgY29uc3RydWN0b3IoZGVjbGFyYXRpb25zLCBydWxlU2V0cywgcXVlcmllcykge1xuICAgIHRoaXMuZGVjbGFyYXRpb25zID0gZGVjbGFyYXRpb25zO1xuICAgIHRoaXMucnVsZVNldHMgPSBydWxlU2V0cztcbiAgICB0aGlzLnF1ZXJpZXMgPSBxdWVyaWVzO1xuICB9XG5cbiAgZ2V0RGVjbGFyYXRpb25zKCkge1xuICAgIHJldHVybiB0aGlzLmRlY2xhcmF0aW9ucztcbiAgfVxuXG4gIGdldFJ1bGVTZXRzKCkge1xuICAgIHJldHVybiB0aGlzLnJ1bGVTZXRzO1xuICB9XG5cbiAgZ2V0UXVlcmllcygpIHtcbiAgICByZXR1cm4gdGhpcy5xdWVyaWVzO1xuICB9XG5cbiAgYXNDU1MoY2xhc3NOYW1lKSB7XG4gICAgbGV0IGNzcyA9IFwiXCI7XG5cbiAgICBjb25zdCBydWxlU2V0c0NTUyA9IHRoaXMucnVsZVNldHMuYXNDU1MoY2xhc3NOYW1lLCBUV09fU1BBQ0VTKSxcbiAgICAgICAgICBkZWNsYXJhdGlvbnNDU1MgPSB0aGlzLmRlY2xhcmF0aW9ucy5hc0NTUyhjbGFzc05hbWUsIEZPVVJfU1BBQ0VTKTtcblxuICAgIGlmICgocnVsZVNldHNDU1MgIT09IG51bGwpIHx8IChkZWNsYXJhdGlvbnNDU1MgIT09IG51bGwpKSB7XG4gICAgICBjc3MgPSBgQG1lZGlhICR7dGhpcy5xdWVyaWVzfSB7XG4ke2RlY2xhcmF0aW9uc0NTU30ke3J1bGVTZXRzQ1NTfVxufVxuXG5gO1xuICAgIH1cblxuICAgIHJldHVybiBjc3M7XG4gIH1cblxuICBzdGF0aWMgZnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gICAgY29uc3QgZGVjbGFyYXRpb25zID0gRGVjbGFyYXRpb25zLmZyb21Ob2RlQW5kVG9rZW5zKG5vZGUsIHRva2VucyksXG4gICAgICAgICAgcnVsZVNldHMgPSBSdWxlU2V0cy5mcm9tTm9kZUFuZFRva2Vucyhub2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHF1ZXJpZXMgPSBxdWVyaWVzRnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBtZWRpYSA9IG5ldyBNZWRpYShkZWNsYXJhdGlvbnMsIHJ1bGVTZXRzLCBxdWVyaWVzKTtcblxuICAgIHJldHVybiBtZWRpYTtcbiAgfVxufVxuXG5mdW5jdGlvbiBxdWVyaWVzRnJvbU5vZGVBbmRUb2tlbnMobm9kZSwgdG9rZW5zKSB7XG4gIGNvbnN0IHF1ZXJpZXNOb2RlQ29udGVudCA9IGNvbnRlbnRGcm9tUXVlcnlOb2RlQW5kVG9rZW5zKHF1ZXJpZXNRdWVyeSwgbm9kZSwgdG9rZW5zKSxcbiAgICAgICAgcXVlcmllcyA9IGAke3F1ZXJpZXNOb2RlQ29udGVudH1gO1xuXG4gIHJldHVybiBxdWVyaWVzO1xufVxuIl0sIm5hbWVzIjpbInF1ZXJpZXNRdWVyeSIsIlF1ZXJ5IiwiZnJvbUV4cHJlc3Npb24iLCJNZWRpYSIsImRlY2xhcmF0aW9ucyIsInJ1bGVTZXRzIiwicXVlcmllcyIsImdldERlY2xhcmF0aW9ucyIsImdldFJ1bGVTZXRzIiwiZ2V0UXVlcmllcyIsImFzQ1NTIiwiY2xhc3NOYW1lIiwiY3NzIiwicnVsZVNldHNDU1MiLCJUV09fU1BBQ0VTIiwiZGVjbGFyYXRpb25zQ1NTIiwiRk9VUl9TUEFDRVMiLCJmcm9tTm9kZUFuZFRva2VucyIsIm5vZGUiLCJ0b2tlbnMiLCJEZWNsYXJhdGlvbnMiLCJSdWxlU2V0cyIsInF1ZXJpZXNGcm9tTm9kZUFuZFRva2VucyIsIm1lZGlhIiwicXVlcmllc05vZGVDb250ZW50IiwiY29udGVudEZyb21RdWVyeU5vZGVBbmRUb2tlbnMiXSwibWFwcGluZ3MiOiJBQUFBLFlBQVksQ0FBQzs7Ozs7QUFFUyxJQUFBLFdBQWEsV0FBYixhQUFhLENBQUE7QUFFZCxJQUFBLFNBQVksa0NBQVosWUFBWSxFQUFBO0FBQ1IsSUFBQSxhQUFnQixrQ0FBaEIsZ0JBQWdCLEVBQUE7QUFFRCxJQUFBLFVBQWMsV0FBZCxjQUFjLENBQUE7QUFDUixJQUFBLFFBQXNCLFdBQXRCLHNCQUFzQixDQUFBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXBFLElBQU1BLFlBQVksR0FBR0MsV0FBSyxNQUFBLENBQUNDLGNBQWMsQ0FBQyxxQkFBcUIsQ0FBQyxBQUFDLEVBQUMsR0FBRztBQUV0RCxJQUFBLEFBQU1DLEtBQUssaUJBOEN2QixBQTlDWTthQUFNQSxLQUFLLENBQ1pDLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxPQUFPOztRQUN6QyxJQUFJLENBQUNGLFlBQVksR0FBR0EsWUFBWSxDQUFDO1FBQ2pDLElBQUksQ0FBQ0MsUUFBUSxHQUFHQSxRQUFRLENBQUM7UUFDekIsSUFBSSxDQUFDQyxPQUFPLEdBQUdBLE9BQU8sQ0FBQzs7OztZQUd6QkMsR0FBZSxFQUFmQSxpQkFBZTttQkFBZkEsU0FBQUEsZUFBZSxHQUFHO2dCQUNoQixPQUFPLElBQUksQ0FBQ0gsWUFBWSxDQUFDO2FBQzFCOzs7WUFFREksR0FBVyxFQUFYQSxhQUFXO21CQUFYQSxTQUFBQSxXQUFXLEdBQUc7Z0JBQ1osT0FBTyxJQUFJLENBQUNILFFBQVEsQ0FBQzthQUN0Qjs7O1lBRURJLEdBQVUsRUFBVkEsWUFBVTttQkFBVkEsU0FBQUEsVUFBVSxHQUFHO2dCQUNYLE9BQU8sSUFBSSxDQUFDSCxPQUFPLENBQUM7YUFDckI7OztZQUVESSxHQUFLLEVBQUxBLE9BQUs7bUJBQUxBLFNBQUFBLEtBQUssQ0FBQ0MsU0FBUyxFQUFFO2dCQUNmLElBQUlDLEdBQUcsR0FBRyxFQUFFLEFBQUM7Z0JBRWIsSUFBTUMsV0FBVyxHQUFHLElBQUksQ0FBQ1IsUUFBUSxDQUFDSyxLQUFLLENBQUNDLFNBQVMsRUFBRUcsVUFBVSxXQUFBLENBQUMsRUFDeERDLGVBQWUsR0FBRyxJQUFJLENBQUNYLFlBQVksQ0FBQ00sS0FBSyxDQUFDQyxTQUFTLEVBQUVLLFVBQVcsWUFBQSxDQUFDLEFBQUM7Z0JBRXhFLElBQUksQUFBQ0gsV0FBVyxLQUFLLElBQUksSUFBTUUsZUFBZSxLQUFLLElBQUksQUFBQyxFQUFFO29CQUN4REgsR0FBRyxHQUFHLEFBQUMsU0FBTyxDQUNsQkcsTUFBZSxDQURLLElBQUksQ0FBQ1QsT0FBTyxFQUFDLE1BQ25DLENBQWtCLENBQUVPLE1BQVcsQ0FBN0JFLGVBQWUsQ0FBZSxDQUFBLE1BR2hDLENBSG9CRixXQUFXLEVBQUMsU0FHaEMsQ0FBQyxDQUFDO2lCQUNHO2dCQUVELE9BQU9ELEdBQUcsQ0FBQzthQUNaOzs7O1lBRU1LLEdBQWlCLEVBQWpCQSxtQkFBaUI7bUJBQXhCLFNBQU9BLGlCQUFpQixDQUFDQyxJQUFJLEVBQUVDLE1BQU0sRUFBRTtnQkFDckMsSUFBTWYsWUFBWSxHQUFHZ0IsYUFBWSxRQUFBLENBQUNILGlCQUFpQixDQUFDQyxJQUFJLEVBQUVDLE1BQU0sQ0FBQyxFQUMzRGQsUUFBUSxHQUFHZ0IsU0FBUSxRQUFBLENBQUNKLGlCQUFpQixDQUFDQyxJQUFJLEVBQUVDLE1BQU0sQ0FBQyxFQUNuRGIsT0FBTyxHQUFHZ0Isd0JBQXdCLENBQUNKLElBQUksRUFBRUMsTUFBTSxDQUFDLEVBQ2hESSxLQUFLLEdBQUcsSUFBSXBCLEtBQUssQ0FBQ0MsWUFBWSxFQUFFQyxRQUFRLEVBQUVDLE9BQU8sQ0FBQyxBQUFDO2dCQUV6RCxPQUFPaUIsS0FBSyxDQUFDO2FBQ2Q7Ozs7Q0FDRixFQUFBO0FBRUQsU0FBU0Qsd0JBQXdCLENBQUNKLElBQUksRUFBRUMsTUFBTSxFQUFFO0lBQzlDLElBQU1LLGtCQUFrQixHQUFHQyxDQUFBQSxHQUFBQSxRQUE2QixBQUE0QixDQUFBLDhCQUE1QixDQUFDekIsWUFBWSxFQUFFa0IsSUFBSSxFQUFFQyxNQUFNLENBQUMsRUFDOUViLE9BQU8sR0FBRyxBQUFDLEVBQUEsQ0FBcUIsTUFBQSxDQUFuQmtCLGtCQUFrQixDQUFFLEFBQUM7SUFFeEMsT0FBT2xCLE9BQU8sQ0FBQztDQUNoQjtrQkFuRG9CSCxLQUFLIn0=
|
package/package.json
CHANGED
package/src/style/declaration.js
CHANGED
|
@@ -42,7 +42,7 @@ export default class Declaration {
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
matchDeclarations(declarations) {
|
|
45
|
-
const matches = declarations.
|
|
45
|
+
const matches = declarations.someDeclaration((declaration) => {
|
|
46
46
|
const matches = this.matchDeclaration(declaration);
|
|
47
47
|
|
|
48
48
|
if (matches) {
|
|
@@ -16,12 +16,14 @@ export default class Declarations {
|
|
|
16
16
|
this.array = array;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
someDeclaration(callback) { return this.array.some(callback); }
|
|
20
20
|
|
|
21
|
-
|
|
21
|
+
forwardsForEachDeclaration(callback) { forwardsForEach(this.array, callback); }
|
|
22
|
+
|
|
23
|
+
backwardsForEachDeclaration(callback) { backwardsForEach(this.array, callback); }
|
|
22
24
|
|
|
23
25
|
unshift(declarations) {
|
|
24
|
-
declarations.
|
|
26
|
+
declarations.backwardsForEachDeclaration((declaration) => {
|
|
25
27
|
const matches = declaration.matchDeclarations(this); ///
|
|
26
28
|
|
|
27
29
|
if (!matches) {
|
package/src/style/media.js
CHANGED
|
@@ -8,17 +8,13 @@ import Declarations from "./declarations";
|
|
|
8
8
|
import { TWO_SPACES, FOUR_SPACES } from "../constants";
|
|
9
9
|
import { contentFromQueryNodeAndTokens } from "../utilities/content";
|
|
10
10
|
|
|
11
|
-
const
|
|
11
|
+
const queriesQuery = Query.fromExpression("/media/mediaQueries"); ///
|
|
12
12
|
|
|
13
13
|
export default class Media {
|
|
14
|
-
constructor(
|
|
15
|
-
this.mediaQueries = mediaQueries;
|
|
14
|
+
constructor(declarations, ruleSets, queries) {
|
|
16
15
|
this.declarations = declarations;
|
|
17
16
|
this.ruleSets = ruleSets;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
getMediaQueries() {
|
|
21
|
-
return this.mediaQueries;
|
|
17
|
+
this.queries = queries;
|
|
22
18
|
}
|
|
23
19
|
|
|
24
20
|
getDeclarations() {
|
|
@@ -29,6 +25,10 @@ export default class Media {
|
|
|
29
25
|
return this.ruleSets;
|
|
30
26
|
}
|
|
31
27
|
|
|
28
|
+
getQueries() {
|
|
29
|
+
return this.queries;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
32
|
asCSS(className) {
|
|
33
33
|
let css = "";
|
|
34
34
|
|
|
@@ -36,7 +36,7 @@ export default class Media {
|
|
|
36
36
|
declarationsCSS = this.declarations.asCSS(className, FOUR_SPACES);
|
|
37
37
|
|
|
38
38
|
if ((ruleSetsCSS !== null) || (declarationsCSS !== null)) {
|
|
39
|
-
css = `@media ${this.
|
|
39
|
+
css = `@media ${this.queries} {
|
|
40
40
|
${declarationsCSS}${ruleSetsCSS}
|
|
41
41
|
}
|
|
42
42
|
|
|
@@ -47,18 +47,18 @@ ${declarationsCSS}${ruleSetsCSS}
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
static fromNodeAndTokens(node, tokens) {
|
|
50
|
-
const
|
|
51
|
-
declarations = Declarations.fromNodeAndTokens(node, tokens),
|
|
50
|
+
const declarations = Declarations.fromNodeAndTokens(node, tokens),
|
|
52
51
|
ruleSets = RuleSets.fromNodeAndTokens(node, tokens),
|
|
53
|
-
|
|
52
|
+
queries = queriesFromNodeAndTokens(node, tokens),
|
|
53
|
+
media = new Media(declarations, ruleSets, queries);
|
|
54
54
|
|
|
55
55
|
return media;
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
function
|
|
60
|
-
const
|
|
61
|
-
|
|
59
|
+
function queriesFromNodeAndTokens(node, tokens) {
|
|
60
|
+
const queriesNodeContent = contentFromQueryNodeAndTokens(queriesQuery, node, tokens),
|
|
61
|
+
queries = `${queriesNodeContent}`;
|
|
62
62
|
|
|
63
|
-
return
|
|
63
|
+
return queries;
|
|
64
64
|
}
|