with-style 5.0.187 → 5.0.188
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 +15 -15
- package/lib/style/media.js +15 -15
- package/package.json +1 -1
- package/src/style/media.js +15 -15
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/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
|
}
|