easy-with-style 3.0.568 → 3.0.570
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/lib/withStyle.js +7 -8
- package/package.json +2 -2
- package/src/withStyle.js +7 -8
- package/lib/utilities/class.js +0 -20
- package/src/utilities/class.js +0 -11
package/lib/withStyle.js
CHANGED
|
@@ -10,7 +10,6 @@ Object.defineProperty(exports, "default", {
|
|
|
10
10
|
});
|
|
11
11
|
const _easy = require("easy");
|
|
12
12
|
const _withstyle = require("with-style");
|
|
13
|
-
const _class = require("./utilities/class");
|
|
14
13
|
const _constants = require("./constants");
|
|
15
14
|
const { generateClassName } = _withstyle.classNameUtilities, { renderStyle, renderStyles, generateStyle, retrieveStyle } = _withstyle.stylesUtilities;
|
|
16
15
|
function withStyle(ClassOrFunction) {
|
|
@@ -22,13 +21,13 @@ function withStyle(ClassOrFunction) {
|
|
|
22
21
|
const superStyle = retrieveStyle(className);
|
|
23
22
|
className = generateClassName();
|
|
24
23
|
generateStyle(args, className, superStyle);
|
|
25
|
-
const
|
|
26
|
-
if (
|
|
27
|
-
const
|
|
28
|
-
ClassOrFunction = class extends
|
|
29
|
-
static fromClass(
|
|
24
|
+
const ClassOrFunctionElementClass = _easy.Element.isPrototypeOf(ClassOrFunction);
|
|
25
|
+
if (ClassOrFunctionElementClass) {
|
|
26
|
+
const ElementClass = ClassOrFunction; ///
|
|
27
|
+
ClassOrFunction = class extends ElementClass {
|
|
28
|
+
static fromClass(Class, properties, ...remainingArguments) {
|
|
30
29
|
properties = appendClassNameToProperties(className, properties);
|
|
31
|
-
return
|
|
30
|
+
return ElementClass.fromClass(Class, properties, ...remainingArguments);
|
|
32
31
|
}
|
|
33
32
|
};
|
|
34
33
|
} else {
|
|
@@ -75,4 +74,4 @@ function appendClassNameToProperties(className, properties) {
|
|
|
75
74
|
return properties;
|
|
76
75
|
}
|
|
77
76
|
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy93aXRoU3R5bGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFJlYWN0LCBFbGVtZW50IH0gZnJvbSBcImVhc3lcIjtcbmltcG9ydCB7IHRhZ05hbWVzLCBzdHlsZXNVdGlsaXRpZXMsIGNsYXNzTmFtZVV0aWxpdGllcyB9IGZyb20gXCJ3aXRoLXN0eWxlXCI7XG5cbmltcG9ydCB7IENMQVNTX05BTUUgfSBmcm9tIFwiLi9jb25zdGFudHNcIjtcblxuY29uc3QgeyBnZW5lcmF0ZUNsYXNzTmFtZSB9ID0gY2xhc3NOYW1lVXRpbGl0aWVzLFxuICAgICAgeyByZW5kZXJTdHlsZSwgcmVuZGVyU3R5bGVzLCBnZW5lcmF0ZVN0eWxlLCByZXRyaWV2ZVN0eWxlIH0gPSBzdHlsZXNVdGlsaXRpZXM7XG5cbmZ1bmN0aW9uIHdpdGhTdHlsZShDbGFzc09yRnVuY3Rpb24pIHtcbiAgcmV0dXJuIGZ1bmN0aW9uKCkge1xuICAgIGNvbnN0IGFyZ3MgPSBbIC4uLmFyZ3VtZW50cyBdOyAgLy8vXG5cbiAgICBsZXQgeyBjbGFzc05hbWUgPSBudWxsIH0gPSBDbGFzc09yRnVuY3Rpb247XG5cbiAgICBjb25zdCBzdXBlclN0eWxlID0gcmV0cmlldmVTdHlsZShjbGFzc05hbWUpO1xuXG4gICAgY2xhc3NOYW1lID0gZ2VuZXJhdGVDbGFzc05hbWUoKTtcblxuICAgIGdlbmVyYXRlU3R5bGUoYXJncywgY2xhc3NOYW1lLCBzdXBlclN0eWxlKTtcblxuICAgIGNvbnN0IENsYXNzT3JGdW5jdGlvbkVsZW1lbnRDbGFzcyA9IEVsZW1lbnQuaXNQcm90b3R5cGVPZihDbGFzc09yRnVuY3Rpb24pO1xuXG4gICAgaWYgKENsYXNzT3JGdW5jdGlvbkVsZW1lbnRDbGFzcykge1xuICAgICAgY29uc3QgRWxlbWVudENsYXNzID0gQ2xhc3NPckZ1bmN0aW9uOyAgLy8vXG5cbiAgICAgIENsYXNzT3JGdW5jdGlvbiA9IGNsYXNzIGV4dGVuZHMgRWxlbWVudENsYXNzIHtcbiAgICAgICAgc3RhdGljIGZyb21DbGFzcyhDbGFzcywgcHJvcGVydGllcywgLi4ucmVtYWluaW5nQXJndW1lbnRzKSB7XG4gICAgICAgICAgcHJvcGVydGllcyA9IGFwcGVuZENsYXNzTmFtZVRvUHJvcGVydGllcyhjbGFzc05hbWUsIHByb3BlcnRpZXMpO1xuXG4gICAgICAgICAgcmV0dXJuIEVsZW1lbnRDbGFzcy5mcm9tQ2xhc3MoQ2xhc3MsIHByb3BlcnRpZXMsIC4uLnJlbWFpbmluZ0FyZ3VtZW50cyk7XG4gICAgICAgIH1cbiAgICAgIH07XG5cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgRnVuY3Rpb24gPSBDbGFzc09yRnVuY3Rpb247IC8vL1xuXG4gICAgICBDbGFzc09yRnVuY3Rpb24gPSAocHJvcGVydGllcykgPT4ge1xuICAgICAgICBwcm9wZXJ0aWVzID0gYXBwZW5kQ2xhc3NOYW1lVG9Qcm9wZXJ0aWVzKGNsYXNzTmFtZSwgcHJvcGVydGllcyk7XG5cbiAgICAgICAgcmV0dXJuIEZ1bmN0aW9uKHByb3BlcnRpZXMpO1xuICAgICAgfTtcbiAgICB9XG5cbiAgICBPYmplY3QuYXNzaWduKENsYXNzT3JGdW5jdGlvbiwge1xuICAgICAgY2xhc3NOYW1lXG4gICAgfSk7XG5cbiAgICByZXR1cm4gQ2xhc3NPckZ1bmN0aW9uO1xuICB9O1xufVxuXG5PYmplY3QuYXNzaWduKHdpdGhTdHlsZSwge1xuICByZW5kZXJTdHlsZSxcbiAgcmVuZGVyU3R5bGVzXG59KTtcblxuZXhwb3J0IGRlZmF1bHQgd2l0aFN0eWxlO1xuXG50YWdOYW1lcy5mb3JFYWNoKCh0YWdOYW1lKSA9PiB7XG4gIE9iamVjdC5kZWZpbmVQcm9wZXJ0eSh3aXRoU3R5bGUsIHRhZ05hbWUsIHtcbiAgICBnZXQ6ICgpID0+IGZ1bmN0aW9uKCkge1xuICAgICAgY29uc3QgYXJncyA9IFsuLi5hcmd1bWVudHNdLCAgLy8vXG4gICAgICAgICAgICBjbGFzc05hbWUgPSBnZW5lcmF0ZUNsYXNzTmFtZSgpO1xuXG4gICAgICBnZW5lcmF0ZVN0eWxlKGFyZ3MsIGNsYXNzTmFtZSk7XG5cbiAgICAgIGNvbnN0IEZ1bmN0aW9uID0gKHByb3BlcnRpZXMpID0+IHtcbiAgICAgICAgcHJvcGVydGllcyA9IGFwcGVuZENsYXNzTmFtZVRvUHJvcGVydGllcyhjbGFzc05hbWUsIHByb3BlcnRpZXMpO1xuXG4gICAgICAgIHJldHVybiBSZWFjdC5jcmVhdGVFbGVtZW50KHRhZ05hbWUsIHByb3BlcnRpZXMpO1xuICAgICAgfTtcblxuICAgICAgT2JqZWN0LmFzc2lnbihGdW5jdGlvbiwge1xuICAgICAgICBjbGFzc05hbWVcbiAgICAgIH0pO1xuXG4gICAgICByZXR1cm4gRnVuY3Rpb247XG4gICAgfVxuICB9KTtcbn0pO1xuXG5mdW5jdGlvbiBhcHBlbmRDbGFzc05hbWVUb1Byb3BlcnRpZXMoY2xhc3NOYW1lLCBwcm9wZXJ0aWVzKSB7XG4gIHByb3BlcnRpZXMgPSBwcm9wZXJ0aWVzLmhhc093blByb3BlcnR5KENMQVNTX05BTUUpID8gcHJvcGVydGllcyA6IHsgLi4ucHJvcGVydGllcywgY2xhc3NOYW1lIH07IC8vL1xuXG4gIHJldHVybiBwcm9wZXJ0aWVzO1xufVxuIl0sIm5hbWVzIjpbImdlbmVyYXRlQ2xhc3NOYW1lIiwiY2xhc3NOYW1lVXRpbGl0aWVzIiwicmVuZGVyU3R5bGUiLCJyZW5kZXJTdHlsZXMiLCJnZW5lcmF0ZVN0eWxlIiwicmV0cmlldmVTdHlsZSIsInN0eWxlc1V0aWxpdGllcyIsIndpdGhTdHlsZSIsIkNsYXNzT3JGdW5jdGlvbiIsImFyZ3MiLCJhcmd1bWVudHMiLCJjbGFzc05hbWUiLCJzdXBlclN0eWxlIiwiQ2xhc3NPckZ1bmN0aW9uRWxlbWVudENsYXNzIiwiRWxlbWVudCIsImlzUHJvdG90eXBlT2YiLCJFbGVtZW50Q2xhc3MiLCJmcm9tQ2xhc3MiLCJDbGFzcyIsInByb3BlcnRpZXMiLCJyZW1haW5pbmdBcmd1bWVudHMiLCJhcHBlbmRDbGFzc05hbWVUb1Byb3BlcnRpZXMiLCJGdW5jdGlvbiIsIk9iamVjdCIsImFzc2lnbiIsInRhZ05hbWVzIiwiZm9yRWFjaCIsInRhZ05hbWUiLCJkZWZpbmVQcm9wZXJ0eSIsImdldCIsIlJlYWN0IiwiY3JlYXRlRWxlbWVudCIsImhhc093blByb3BlcnR5IiwiQ0xBU1NfTkFNRSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBMERBOzs7ZUFBQTs7O3NCQXhEK0I7MkJBQytCOzJCQUVuQztBQUUzQixNQUFNLEVBQUVBLGlCQUFpQixFQUFFLEdBQUdDLDZCQUFrQixFQUMxQyxFQUFFQyxXQUFXLEVBQUVDLFlBQVksRUFBRUMsYUFBYSxFQUFFQyxhQUFhLEVBQUUsR0FBR0MsMEJBQWU7QUFFbkYsU0FBU0MsVUFBVUMsZUFBZTtJQUNoQyxPQUFPO1FBQ0wsTUFBTUMsT0FBTztlQUFLQztTQUFXLEVBQUcsR0FBRztRQUVuQyxJQUFJLEVBQUVDLFlBQVksSUFBSSxFQUFFLEdBQUdIO1FBRTNCLE1BQU1JLGFBQWFQLGNBQWNNO1FBRWpDQSxZQUFZWDtRQUVaSSxjQUFjSyxNQUFNRSxXQUFXQztRQUUvQixNQUFNQyw4QkFBOEJDLGFBQU8sQ0FBQ0MsYUFBYSxDQUFDUDtRQUUxRCxJQUFJSyw2QkFBNkI7WUFDL0IsTUFBTUcsZUFBZVIsaUJBQWtCLEdBQUc7WUFFMUNBLGtCQUFrQixjQUFjUTtnQkFDOUIsT0FBT0MsVUFBVUMsS0FBSyxFQUFFQyxVQUFVLEVBQUUsR0FBR0Msa0JBQWtCLEVBQUU7b0JBQ3pERCxhQUFhRSw0QkFBNEJWLFdBQVdRO29CQUVwRCxPQUFPSCxhQUFhQyxTQUFTLENBQUNDLE9BQU9DLGVBQWVDO2dCQUN0RDtZQUNGO1FBRUYsT0FBTztZQUNMLE1BQU1FLFdBQVdkLGlCQUFpQixHQUFHO1lBRXJDQSxrQkFBa0IsQ0FBQ1c7Z0JBQ2pCQSxhQUFhRSw0QkFBNEJWLFdBQVdRO2dCQUVwRCxPQUFPRyxTQUFTSDtZQUNsQjtRQUNGO1FBRUFJLE9BQU9DLE1BQU0sQ0FBQ2hCLGlCQUFpQjtZQUM3Qkc7UUFDRjtRQUVBLE9BQU9IO0lBQ1Q7QUFDRjtBQUVBZSxPQUFPQyxNQUFNLENBQUNqQixXQUFXO0lBQ3ZCTDtJQUNBQztBQUNGO01BRUEsV0FBZUk7QUFFZmtCLG1CQUFRLENBQUNDLE9BQU8sQ0FBQyxDQUFDQztJQUNoQkosT0FBT0ssY0FBYyxDQUFDckIsV0FBV29CLFNBQVM7UUFDeENFLEtBQUssSUFBTTtnQkFDVCxNQUFNcEIsT0FBTzt1QkFBSUM7aUJBQVUsRUFDckJDLFlBQVlYO2dCQUVsQkksY0FBY0ssTUFBTUU7Z0JBRXBCLE1BQU1XLFdBQVcsQ0FBQ0g7b0JBQ2hCQSxhQUFhRSw0QkFBNEJWLFdBQVdRO29CQUVwRCxPQUFPVyxXQUFLLENBQUNDLGFBQWEsQ0FBQ0osU0FBU1I7Z0JBQ3RDO2dCQUVBSSxPQUFPQyxNQUFNLENBQUNGLFVBQVU7b0JBQ3RCWDtnQkFDRjtnQkFFQSxPQUFPVztZQUNUO0lBQ0Y7QUFDRjtBQUVBLFNBQVNELDRCQUE0QlYsU0FBUyxFQUFFUSxVQUFVO0lBQ3hEQSxhQUFhQSxXQUFXYSxjQUFjLENBQUNDLHFCQUFVLElBQUlkLGFBQWE7UUFBRSxHQUFHQSxVQUFVO1FBQUVSO0lBQVUsR0FBRyxHQUFHO0lBRW5HLE9BQU9RO0FBQ1QifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "easy-with-style",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "3.0.
|
|
4
|
+
"version": "3.0.570",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/easy-with-style",
|
|
7
7
|
"description": "Programmatic styles for Easy.",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"url": "https://github.com/djalbat/easy-with-style"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"easy": "^25.0.
|
|
13
|
+
"easy": "^25.0.8",
|
|
14
14
|
"with-style": "^5.0.316"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
package/src/withStyle.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { React } from "easy";
|
|
3
|
+
import { React, Element } from "easy";
|
|
4
4
|
import { tagNames, stylesUtilities, classNameUtilities } from "with-style";
|
|
5
5
|
|
|
6
|
-
import { isClass } from "./utilities/class";
|
|
7
6
|
import { CLASS_NAME } from "./constants";
|
|
8
7
|
|
|
9
8
|
const { generateClassName } = classNameUtilities,
|
|
@@ -21,16 +20,16 @@ function withStyle(ClassOrFunction) {
|
|
|
21
20
|
|
|
22
21
|
generateStyle(args, className, superStyle);
|
|
23
22
|
|
|
24
|
-
const
|
|
23
|
+
const ClassOrFunctionElementClass = Element.isPrototypeOf(ClassOrFunction);
|
|
25
24
|
|
|
26
|
-
if (
|
|
27
|
-
const
|
|
25
|
+
if (ClassOrFunctionElementClass) {
|
|
26
|
+
const ElementClass = ClassOrFunction; ///
|
|
28
27
|
|
|
29
|
-
ClassOrFunction = class extends
|
|
30
|
-
static fromClass(
|
|
28
|
+
ClassOrFunction = class extends ElementClass {
|
|
29
|
+
static fromClass(Class, properties, ...remainingArguments) {
|
|
31
30
|
properties = appendClassNameToProperties(className, properties);
|
|
32
31
|
|
|
33
|
-
return
|
|
32
|
+
return ElementClass.fromClass(Class, properties, ...remainingArguments);
|
|
34
33
|
}
|
|
35
34
|
};
|
|
36
35
|
|
package/lib/utilities/class.js
DELETED
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "isClass", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return isClass;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
const _easy = require("easy");
|
|
12
|
-
function isClass(argument) {
|
|
13
|
-
return isSubclassOf(argument, _easy.Element);
|
|
14
|
-
} ///
|
|
15
|
-
function isSubclassOf(argument, Class) {
|
|
16
|
-
const subclassOf = argument.prototype instanceof Class;
|
|
17
|
-
return subclassOf;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY2xhc3MuanMiXSwic291cmNlc0NvbnRlbnQiOlsiJ3VzZSBzdHJpY3QnO1xuXG5pbXBvcnQgeyBFbGVtZW50IH0gZnJvbSBcImVhc3lcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIGlzQ2xhc3MoYXJndW1lbnQpIHsgcmV0dXJuIGlzU3ViY2xhc3NPZihhcmd1bWVudCwgRWxlbWVudCk7IH0gIC8vL1xuXG5mdW5jdGlvbiBpc1N1YmNsYXNzT2YoYXJndW1lbnQsIENsYXNzKSB7XG4gIGNvbnN0IHN1YmNsYXNzT2YgPSAoYXJndW1lbnQucHJvdG90eXBlIGluc3RhbmNlb2YgQ2xhc3MpO1xuXG4gIHJldHVybiBzdWJjbGFzc09mO1xufVxuIl0sIm5hbWVzIjpbImlzQ2xhc3MiLCJhcmd1bWVudCIsImlzU3ViY2xhc3NPZiIsIkVsZW1lbnQiLCJDbGFzcyIsInN1YmNsYXNzT2YiLCJwcm90b3R5cGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUlnQkE7OztlQUFBQTs7O3NCQUZRO0FBRWpCLFNBQVNBLFFBQVFDLFFBQVE7SUFBSSxPQUFPQyxhQUFhRCxVQUFVRSxhQUFPO0FBQUcsRUFBRyxHQUFHO0FBRWxGLFNBQVNELGFBQWFELFFBQVEsRUFBRUcsS0FBSztJQUNuQyxNQUFNQyxhQUFjSixTQUFTSyxTQUFTLFlBQVlGO0lBRWxELE9BQU9DO0FBQ1QifQ==
|
package/src/utilities/class.js
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
|
|
3
|
-
import { Element } from "easy";
|
|
4
|
-
|
|
5
|
-
export function isClass(argument) { return isSubclassOf(argument, Element); } ///
|
|
6
|
-
|
|
7
|
-
function isSubclassOf(argument, Class) {
|
|
8
|
-
const subclassOf = (argument.prototype instanceof Class);
|
|
9
|
-
|
|
10
|
-
return subclassOf;
|
|
11
|
-
}
|