@codecademy/variance 0.21.4 → 0.21.5-alpha.3f5626.0
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/dist/core.js +111 -110
- package/dist/createTheme/createTheme.js +102 -132
- package/dist/createTheme/createTheme.test.js +45 -61
- package/dist/scales/createScale.js +1 -3
- package/dist/scales/createScaleLookup.js +5 -13
- package/dist/transforms/transformSize.js +8 -18
- package/dist/utils/flattenScale.js +23 -11
- package/dist/utils/getStaticProperties.js +1 -5
- package/dist/utils/propNames.js +33 -31
- package/dist/utils/responsive.js +45 -48
- package/dist/utils/serializeTokens.js +30 -21
- package/package.json +2 -2
package/dist/core.js
CHANGED
|
@@ -1,15 +1,3 @@
|
|
|
1
|
-
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
2
|
-
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
4
|
-
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
5
|
-
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
6
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
7
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
8
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
9
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
10
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
11
|
-
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
12
|
-
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
13
1
|
import get from 'lodash/get';
|
|
14
2
|
import identity from 'lodash/identity';
|
|
15
3
|
import isArray from 'lodash/isArray';
|
|
@@ -20,24 +8,27 @@ import { createScaleLookup } from './scales/createScaleLookup';
|
|
|
20
8
|
import { getStaticCss } from './utils/getStaticProperties';
|
|
21
9
|
import { orderPropNames } from './utils/propNames';
|
|
22
10
|
import { arrayParser, isMediaArray, isMediaMap, objectParser, orderBreakpoints, parseBreakpoints } from './utils/responsive';
|
|
23
|
-
export
|
|
11
|
+
export const variance = {
|
|
24
12
|
// Parser to handle any set of configured props
|
|
25
|
-
createParser
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
13
|
+
createParser(config) {
|
|
14
|
+
const propNames = orderPropNames(config);
|
|
15
|
+
let breakpoints;
|
|
16
|
+
const parser = props => {
|
|
17
|
+
const styles = {};
|
|
18
|
+
const {
|
|
19
|
+
theme
|
|
20
|
+
} = props;
|
|
21
|
+
// Attempt to cache the breakpoints if we have not yet or if theme has become available.
|
|
22
|
+
if (breakpoints === undefined || breakpoints === null && theme?.breakpoints) {
|
|
32
23
|
// Save the breakpoints if we can
|
|
33
|
-
breakpoints = parseBreakpoints(theme
|
|
24
|
+
breakpoints = parseBreakpoints(theme?.breakpoints);
|
|
34
25
|
}
|
|
35
26
|
|
|
36
27
|
// Loops over all prop names on the configured config to check for configured styles
|
|
37
|
-
propNames.forEach(
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
switch (
|
|
28
|
+
propNames.forEach(prop => {
|
|
29
|
+
const property = config[prop];
|
|
30
|
+
const value = get(props, prop);
|
|
31
|
+
switch (typeof value) {
|
|
41
32
|
case 'string':
|
|
42
33
|
case 'number':
|
|
43
34
|
case 'function':
|
|
@@ -61,38 +52,38 @@ export var variance = {
|
|
|
61
52
|
};
|
|
62
53
|
// return the parser function with the resulting meta information for further composition
|
|
63
54
|
return Object.assign(parser, {
|
|
64
|
-
propNames
|
|
65
|
-
config
|
|
55
|
+
propNames,
|
|
56
|
+
config
|
|
66
57
|
});
|
|
67
58
|
},
|
|
68
59
|
// Given a single property configuration enrich the config with a transform function
|
|
69
60
|
// that traverses the properties the function is responsible for.
|
|
70
|
-
createTransform
|
|
71
|
-
|
|
72
|
-
transform =
|
|
73
|
-
property
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
return
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
61
|
+
createTransform(prop, config) {
|
|
62
|
+
const {
|
|
63
|
+
transform = identity,
|
|
64
|
+
property,
|
|
65
|
+
properties = [property],
|
|
66
|
+
scale
|
|
67
|
+
} = config;
|
|
68
|
+
const getScaleValue = createScaleLookup(scale);
|
|
69
|
+
const alwaysTransform = scale === undefined || isArray(scale);
|
|
70
|
+
return {
|
|
71
|
+
...config,
|
|
72
|
+
prop,
|
|
73
|
+
styleFn: (value, prop, props) => {
|
|
74
|
+
const styles = {};
|
|
84
75
|
if (isUndefined(value)) {
|
|
85
76
|
return styles;
|
|
86
77
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
switch (
|
|
78
|
+
let useTransform = false;
|
|
79
|
+
let intermediateValue;
|
|
80
|
+
let scaleValue;
|
|
81
|
+
switch (typeof value) {
|
|
91
82
|
case 'number':
|
|
92
83
|
case 'string':
|
|
93
84
|
scaleValue = getScaleValue(value, props);
|
|
94
85
|
useTransform = scaleValue !== undefined || alwaysTransform;
|
|
95
|
-
intermediateValue =
|
|
86
|
+
intermediateValue = scaleValue ?? value;
|
|
96
87
|
break;
|
|
97
88
|
case 'function':
|
|
98
89
|
if (props.theme) {
|
|
@@ -105,12 +96,12 @@ export var variance = {
|
|
|
105
96
|
|
|
106
97
|
// for each property look up the scale value from theme if passed and apply any
|
|
107
98
|
// final transforms to the value
|
|
108
|
-
properties.forEach(
|
|
109
|
-
|
|
99
|
+
properties.forEach(property => {
|
|
100
|
+
let styleValue = intermediateValue;
|
|
110
101
|
if (useTransform && !isUndefined(styleValue)) {
|
|
111
102
|
styleValue = transform(styleValue, property, props);
|
|
112
103
|
}
|
|
113
|
-
switch (
|
|
104
|
+
switch (typeof styleValue) {
|
|
114
105
|
case 'number':
|
|
115
106
|
case 'string':
|
|
116
107
|
return styles[property] = styleValue;
|
|
@@ -122,100 +113,110 @@ export var variance = {
|
|
|
122
113
|
// return the resulting styles object
|
|
123
114
|
return styles;
|
|
124
115
|
}
|
|
125
|
-
}
|
|
116
|
+
};
|
|
126
117
|
},
|
|
127
|
-
compose
|
|
118
|
+
compose() {
|
|
128
119
|
for (var _len = arguments.length, parsers = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
129
120
|
parsers[_key] = arguments[_key];
|
|
130
121
|
}
|
|
131
|
-
return this.createParser(parsers.reduce(
|
|
132
|
-
|
|
133
|
-
|
|
122
|
+
return this.createParser(parsers.reduce((carry, parser) => ({
|
|
123
|
+
...carry,
|
|
124
|
+
...parser.config
|
|
125
|
+
}), {}));
|
|
134
126
|
},
|
|
135
|
-
createCss
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
return
|
|
139
|
-
|
|
140
|
-
|
|
127
|
+
createCss(config) {
|
|
128
|
+
const parser = this.create(config);
|
|
129
|
+
const filteredProps = parser.propNames;
|
|
130
|
+
return cssProps => {
|
|
131
|
+
let cache;
|
|
132
|
+
const allKeys = Object.keys(cssProps);
|
|
141
133
|
|
|
142
134
|
/** Any key of the CSSProps that is not a System Prop or a Static CSS Property is treated as a nested selector */
|
|
143
|
-
|
|
144
|
-
return !filteredProps.includes(key) && isObject(cssProps[key]);
|
|
145
|
-
});
|
|
135
|
+
const selectors = allKeys.filter(key => !filteredProps.includes(key) && isObject(cssProps[key]));
|
|
146
136
|
|
|
147
137
|
/** Static CSS Properties get extracted if they match neither syntax */
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
138
|
+
const staticCss = getStaticCss(cssProps, ['theme',
|
|
139
|
+
// Just in case this gets passed somehow
|
|
140
|
+
...selectors, ...filteredProps]);
|
|
141
|
+
return _ref => {
|
|
142
|
+
let {
|
|
143
|
+
theme
|
|
144
|
+
} = _ref;
|
|
151
145
|
if (cache) return cache;
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
css[selector] =
|
|
159
|
-
|
|
160
|
-
|
|
146
|
+
const css = parser({
|
|
147
|
+
...cssProps,
|
|
148
|
+
theme
|
|
149
|
+
});
|
|
150
|
+
selectors.forEach(selector => {
|
|
151
|
+
const selectorConfig = cssProps[selector] ?? {};
|
|
152
|
+
css[selector] = {
|
|
153
|
+
...getStaticCss(selectorConfig, filteredProps),
|
|
154
|
+
...parser({
|
|
155
|
+
...selectorConfig,
|
|
156
|
+
theme
|
|
157
|
+
})
|
|
158
|
+
};
|
|
161
159
|
});
|
|
162
160
|
|
|
163
161
|
/** Merge the static and generated css and save it to the cache */
|
|
164
|
-
cache =
|
|
162
|
+
cache = {
|
|
163
|
+
...staticCss,
|
|
164
|
+
...css
|
|
165
|
+
};
|
|
165
166
|
return cache;
|
|
166
167
|
};
|
|
167
168
|
};
|
|
168
169
|
},
|
|
169
|
-
createVariant
|
|
170
|
-
|
|
171
|
-
return
|
|
172
|
-
|
|
173
|
-
prop =
|
|
174
|
-
defaultVariant
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
Object.keys(variants).forEach(
|
|
181
|
-
|
|
182
|
-
|
|
170
|
+
createVariant(config) {
|
|
171
|
+
const css = this.createCss(config);
|
|
172
|
+
return _ref2 => {
|
|
173
|
+
let {
|
|
174
|
+
prop = 'variant',
|
|
175
|
+
defaultVariant,
|
|
176
|
+
base = {},
|
|
177
|
+
variants
|
|
178
|
+
} = _ref2;
|
|
179
|
+
const baseFn = css(base);
|
|
180
|
+
const variantFns = {};
|
|
181
|
+
Object.keys(variants).forEach(key => {
|
|
182
|
+
const variantKey = key;
|
|
183
|
+
const cssProps = variants[variantKey];
|
|
183
184
|
variantFns[variantKey] = css(cssProps);
|
|
184
185
|
});
|
|
185
|
-
return
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
186
|
+
return props => {
|
|
187
|
+
const {
|
|
188
|
+
[prop]: selected = defaultVariant
|
|
189
|
+
} = props;
|
|
190
|
+
const styles = {};
|
|
190
191
|
if (!selected) return styles;
|
|
191
|
-
return merge(styles, baseFn(props), variantFns
|
|
192
|
+
return merge(styles, baseFn(props), variantFns?.[selected]?.(props));
|
|
192
193
|
};
|
|
193
194
|
};
|
|
194
195
|
},
|
|
195
|
-
createStates
|
|
196
|
-
|
|
197
|
-
return
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
orderedStates.forEach(
|
|
201
|
-
|
|
202
|
-
|
|
196
|
+
createStates(config) {
|
|
197
|
+
const css = this.createCss(config);
|
|
198
|
+
return states => {
|
|
199
|
+
const orderedStates = Object.keys(states);
|
|
200
|
+
const stateFns = {};
|
|
201
|
+
orderedStates.forEach(key => {
|
|
202
|
+
const stateKey = key;
|
|
203
|
+
const cssProps = states[stateKey];
|
|
203
204
|
stateFns[stateKey] = css(cssProps);
|
|
204
205
|
});
|
|
205
|
-
return
|
|
206
|
-
|
|
207
|
-
orderedStates.forEach(
|
|
206
|
+
return props => {
|
|
207
|
+
const styles = {};
|
|
208
|
+
orderedStates.forEach(state => {
|
|
208
209
|
merge(styles, props[state] && stateFns[state](props));
|
|
209
210
|
});
|
|
210
211
|
return styles;
|
|
211
212
|
};
|
|
212
213
|
};
|
|
213
214
|
},
|
|
214
|
-
create
|
|
215
|
-
|
|
215
|
+
create(config) {
|
|
216
|
+
const transforms = {};
|
|
216
217
|
|
|
217
218
|
// Create a transform function for each of the props
|
|
218
|
-
for (
|
|
219
|
+
for (const prop in config) {
|
|
219
220
|
if (typeof prop === 'string') {
|
|
220
221
|
transforms[prop] = this.createTransform(prop, config[prop]);
|
|
221
222
|
}
|
|
@@ -1,151 +1,121 @@
|
|
|
1
|
-
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
3
|
-
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
4
|
-
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
|
|
5
|
-
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
6
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
7
|
-
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
8
|
-
function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
|
|
9
|
-
function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
|
|
10
|
-
function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
|
|
11
|
-
function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
|
|
12
|
-
function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
|
|
13
1
|
import mapValues from 'lodash/mapValues';
|
|
14
2
|
import merge from 'lodash/merge';
|
|
15
3
|
import { flattenScale } from '../utils/flattenScale';
|
|
16
4
|
import { serializeTokens } from '../utils/serializeTokens';
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
_theme.set(this, {
|
|
22
|
-
writable: true,
|
|
23
|
-
value: {}
|
|
24
|
-
});
|
|
25
|
-
_classPrivateFieldSet(this, _theme, baseTheme);
|
|
5
|
+
class ThemeBuilder {
|
|
6
|
+
#theme = (() => ({}))();
|
|
7
|
+
constructor(baseTheme) {
|
|
8
|
+
this.#theme = baseTheme;
|
|
26
9
|
}
|
|
27
10
|
/**
|
|
28
11
|
*
|
|
29
12
|
* @param key A key of the current theme to transform into CSS Variables and Variable References
|
|
30
13
|
* @example .createScaleVariables('fontSize')
|
|
31
14
|
*/
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
15
|
+
createScaleVariables(key) {
|
|
16
|
+
const {
|
|
17
|
+
variables,
|
|
18
|
+
tokens
|
|
19
|
+
} = serializeTokens(this.#theme[key], key, this.#theme);
|
|
20
|
+
this.#theme = merge({}, this.#theme, {
|
|
21
|
+
[key]: tokens,
|
|
22
|
+
_variables: {
|
|
40
23
|
root: variables
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
|
|
24
|
+
},
|
|
25
|
+
_tokens: {
|
|
26
|
+
[key]: this.#theme[key]
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
return this;
|
|
30
|
+
}
|
|
44
31
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
32
|
+
/**
|
|
33
|
+
*
|
|
34
|
+
* @param colors A map of color tokens to add to the theme. These tokens are immediately converted to CSS Variables `--color-${key}`.
|
|
35
|
+
* @example .addColors({ navy: 'navy', hyper: 'purple' })
|
|
36
|
+
*/
|
|
37
|
+
addColors(colors) {
|
|
38
|
+
const flatColors = flattenScale(colors);
|
|
39
|
+
const {
|
|
40
|
+
variables,
|
|
41
|
+
tokens
|
|
42
|
+
} = serializeTokens(flatColors, 'color', this.#theme);
|
|
43
|
+
this.#theme = merge({}, this.#theme, {
|
|
44
|
+
colors: tokens,
|
|
45
|
+
_variables: {
|
|
46
|
+
root: variables
|
|
47
|
+
},
|
|
48
|
+
_tokens: {
|
|
49
|
+
colors: flatColors
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
return this;
|
|
53
|
+
}
|
|
68
54
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
_getColorValue: getColorValue,
|
|
97
|
-
_variables: {
|
|
98
|
-
mode: variables
|
|
99
|
-
},
|
|
100
|
-
_tokens: {
|
|
101
|
-
modes: mapValues(modes, function (mode) {
|
|
102
|
-
return mapValues(mode, getColorValue);
|
|
103
|
-
})
|
|
104
|
-
}
|
|
105
|
-
}));
|
|
106
|
-
return this;
|
|
107
|
-
}
|
|
55
|
+
/**
|
|
56
|
+
*
|
|
57
|
+
* @param initialMode A key of the object passed for modes. This sets the default state for the theme and transforms the correct variables.
|
|
58
|
+
* @param modes A map of color modes with keys of each possible mode with a value of alias to color keys. This must be called after `addColors`
|
|
59
|
+
* @example .addColorModes('light', { light: { primary: 'hyper' }, { dark: { primary: 'navy' } } })
|
|
60
|
+
*/
|
|
61
|
+
addColorModes(initialMode, modeConfig) {
|
|
62
|
+
const modes = mapValues(modeConfig, mode => flattenScale(mode));
|
|
63
|
+
const {
|
|
64
|
+
tokens: colors,
|
|
65
|
+
variables
|
|
66
|
+
} = serializeTokens(mapValues(merge({}, this.#theme.modes?.[initialMode], modes[initialMode]), color => this.#theme.colors[color]), 'color', this.#theme);
|
|
67
|
+
const getColorValue = color => this.#theme._tokens?.colors?.[color];
|
|
68
|
+
this.#theme = merge({}, this.#theme, {
|
|
69
|
+
colors,
|
|
70
|
+
modes,
|
|
71
|
+
mode: initialMode,
|
|
72
|
+
_getColorValue: getColorValue,
|
|
73
|
+
_variables: {
|
|
74
|
+
mode: variables
|
|
75
|
+
},
|
|
76
|
+
_tokens: {
|
|
77
|
+
modes: mapValues(modes, mode => mapValues(mode, getColorValue))
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
return this;
|
|
81
|
+
}
|
|
108
82
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
83
|
+
/**
|
|
84
|
+
*
|
|
85
|
+
* @param key A new key of theme
|
|
86
|
+
* @param createScale A function that accepts the current theme and returns a new object of scale values.
|
|
87
|
+
* @example .addScale('fonts', () => ({ basic: 'Gotham', cool: 'Wingdings' }))
|
|
88
|
+
*/
|
|
89
|
+
addScale(key, createScale) {
|
|
90
|
+
this.#theme = merge({}, this.#theme, {
|
|
91
|
+
[key]: flattenScale(createScale(this.#theme))
|
|
92
|
+
});
|
|
93
|
+
return this;
|
|
94
|
+
}
|
|
121
95
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
96
|
+
/**
|
|
97
|
+
*
|
|
98
|
+
* @param key A current key of theme to be updated with new or computed values
|
|
99
|
+
* @param updateFn A function that accepts an argument of the current values at the specified keys an returns a map of new values to merge.
|
|
100
|
+
* @example .updateScale('fonts', ({ basic }) => ({ basicFallback: `{basic}, Montserrat` }))
|
|
101
|
+
*/
|
|
102
|
+
updateScale(key, updateFn) {
|
|
103
|
+
this.#theme = merge({}, this.#theme, {
|
|
104
|
+
[key]: updateFn(this.#theme[key])
|
|
105
|
+
});
|
|
106
|
+
return this;
|
|
107
|
+
}
|
|
134
108
|
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
}]);
|
|
147
|
-
return ThemeBuilder;
|
|
148
|
-
}();
|
|
109
|
+
/**
|
|
110
|
+
* This finalizes the theme build and returns the final theme and variables to be provided.
|
|
111
|
+
*/
|
|
112
|
+
build() {
|
|
113
|
+
return merge({}, this.#theme, {
|
|
114
|
+
_variables: {},
|
|
115
|
+
_tokens: {}
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
}
|
|
149
119
|
export function createTheme(base) {
|
|
150
120
|
return new ThemeBuilder(base);
|
|
151
121
|
}
|
|
@@ -1,13 +1,7 @@
|
|
|
1
|
-
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
-
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
1
|
import mapValues from 'lodash/mapValues';
|
|
8
2
|
import { createTheme } from './createTheme';
|
|
9
|
-
describe('createTheme',
|
|
10
|
-
|
|
3
|
+
describe('createTheme', () => {
|
|
4
|
+
const base = {
|
|
11
5
|
breakpoints: {
|
|
12
6
|
xs: '1',
|
|
13
7
|
sm: '2',
|
|
@@ -16,53 +10,46 @@ describe('createTheme', function () {
|
|
|
16
10
|
xl: '5'
|
|
17
11
|
}
|
|
18
12
|
};
|
|
19
|
-
it('works',
|
|
20
|
-
expect(createTheme(base).build()).toEqual(
|
|
13
|
+
it('works', () => {
|
|
14
|
+
expect(createTheme(base).build()).toEqual({
|
|
15
|
+
...base,
|
|
21
16
|
_variables: {},
|
|
22
17
|
_tokens: {}
|
|
23
|
-
})
|
|
18
|
+
});
|
|
24
19
|
});
|
|
25
|
-
it('adds a scale',
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
};
|
|
31
|
-
}).build();
|
|
20
|
+
it('adds a scale', () => {
|
|
21
|
+
const theme = createTheme(base).addScale('test', () => ({
|
|
22
|
+
test: 1,
|
|
23
|
+
test2: 2
|
|
24
|
+
})).build();
|
|
32
25
|
expect(theme.test).toEqual({
|
|
33
26
|
test: 1,
|
|
34
27
|
test2: 2
|
|
35
28
|
});
|
|
36
29
|
});
|
|
37
|
-
it('updates a scale',
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
};
|
|
43
|
-
});
|
|
30
|
+
it('updates a scale', () => {
|
|
31
|
+
const builder = createTheme(base).addScale('test', () => ({
|
|
32
|
+
test: 1,
|
|
33
|
+
test2: 2
|
|
34
|
+
}));
|
|
44
35
|
expect(builder.build().test).toEqual({
|
|
45
36
|
test: 1,
|
|
46
37
|
test2: 2
|
|
47
38
|
});
|
|
48
|
-
builder.updateScale('test',
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
};
|
|
52
|
-
});
|
|
39
|
+
builder.updateScale('test', () => ({
|
|
40
|
+
test3: 3
|
|
41
|
+
}));
|
|
53
42
|
expect(builder.build().test).toEqual({
|
|
54
43
|
test: 1,
|
|
55
44
|
test2: 2,
|
|
56
45
|
test3: 3
|
|
57
46
|
});
|
|
58
47
|
});
|
|
59
|
-
it('serializes variables',
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
};
|
|
65
|
-
}).createScaleVariables('test').build();
|
|
48
|
+
it('serializes variables', () => {
|
|
49
|
+
const theme = createTheme(base).addScale('test', () => ({
|
|
50
|
+
test: 1,
|
|
51
|
+
test2: 2
|
|
52
|
+
})).createScaleVariables('test').build();
|
|
66
53
|
expect(theme.test).toEqual({
|
|
67
54
|
test: 'var(--test-test)',
|
|
68
55
|
test2: 'var(--test-test2)'
|
|
@@ -72,24 +59,22 @@ describe('createTheme', function () {
|
|
|
72
59
|
'--test-test2': 2
|
|
73
60
|
});
|
|
74
61
|
});
|
|
75
|
-
describe('colors',
|
|
76
|
-
|
|
62
|
+
describe('colors', () => {
|
|
63
|
+
const staticColors = {
|
|
77
64
|
white: 'white',
|
|
78
65
|
black: 'black',
|
|
79
66
|
blue: 'blue',
|
|
80
67
|
green: 'green',
|
|
81
68
|
red: 'red'
|
|
82
69
|
};
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
it('creates color variables', function () {
|
|
88
|
-
var theme = builder.addColors(staticColors).build();
|
|
70
|
+
const cssVariableReferences = mapValues(staticColors, val => `var(--color-${val})`);
|
|
71
|
+
const builder = createTheme(base);
|
|
72
|
+
it('creates color variables', () => {
|
|
73
|
+
const theme = builder.addColors(staticColors).build();
|
|
89
74
|
expect(theme.colors).toEqual(cssVariableReferences);
|
|
90
75
|
});
|
|
91
|
-
it('adds colorModes',
|
|
92
|
-
|
|
76
|
+
it('adds colorModes', () => {
|
|
77
|
+
const theme = builder.addColors(staticColors).addColorModes('light', {
|
|
93
78
|
light: {
|
|
94
79
|
primary: 'red'
|
|
95
80
|
},
|
|
@@ -97,17 +82,16 @@ describe('createTheme', function () {
|
|
|
97
82
|
primary: 'blue'
|
|
98
83
|
}
|
|
99
84
|
}).build();
|
|
100
|
-
expect(theme.colors).toEqual(
|
|
101
|
-
|
|
102
|
-
})), {}, {
|
|
85
|
+
expect(theme.colors).toEqual({
|
|
86
|
+
...mapValues(staticColors, val => `var(--color-${val})`),
|
|
103
87
|
primary: 'var(--color-primary)'
|
|
104
|
-
})
|
|
88
|
+
});
|
|
105
89
|
expect(theme._variables.mode).toEqual({
|
|
106
90
|
'--color-primary': 'var(--color-red)'
|
|
107
91
|
});
|
|
108
92
|
});
|
|
109
|
-
it('returns value checker for colors',
|
|
110
|
-
|
|
93
|
+
it('returns value checker for colors', () => {
|
|
94
|
+
const theme = builder.addColors({
|
|
111
95
|
black: '#000000',
|
|
112
96
|
white: '#FFFFFF'
|
|
113
97
|
}).addColorModes('light', {
|
|
@@ -121,8 +105,8 @@ describe('createTheme', function () {
|
|
|
121
105
|
expect(theme._getColorValue('white')).toEqual('#FFFFFF');
|
|
122
106
|
expect(theme._getColorValue(theme.modes.light.primary)).toEqual('#000000');
|
|
123
107
|
});
|
|
124
|
-
it('returns value checker for colors with deep values',
|
|
125
|
-
|
|
108
|
+
it('returns value checker for colors with deep values', () => {
|
|
109
|
+
const theme = builder.addColors({
|
|
126
110
|
black: '#000000',
|
|
127
111
|
white: '#FFFFFF',
|
|
128
112
|
gray: {
|
|
@@ -132,7 +116,7 @@ describe('createTheme', function () {
|
|
|
132
116
|
}).addColorModes('light', {
|
|
133
117
|
light: {
|
|
134
118
|
primary: {
|
|
135
|
-
|
|
119
|
+
default: 'gray-200',
|
|
136
120
|
cool: {
|
|
137
121
|
_: 'gray-300',
|
|
138
122
|
town: 'black'
|
|
@@ -143,8 +127,8 @@ describe('createTheme', function () {
|
|
|
143
127
|
expect(theme._getColorValue('gray-300')).toEqual('#666666');
|
|
144
128
|
expect(theme._getColorValue(theme.modes.light['primary-default'])).toEqual('#eeeeee');
|
|
145
129
|
});
|
|
146
|
-
it('merges color mode configurations when overriden',
|
|
147
|
-
|
|
130
|
+
it('merges color mode configurations when overriden', () => {
|
|
131
|
+
const theme = builder.addColors({
|
|
148
132
|
black: '#000000',
|
|
149
133
|
white: '#FFFFFF'
|
|
150
134
|
}).addColorModes('light', {
|
|
@@ -155,7 +139,7 @@ describe('createTheme', function () {
|
|
|
155
139
|
}
|
|
156
140
|
}
|
|
157
141
|
}).build();
|
|
158
|
-
|
|
142
|
+
const override = createTheme(theme).addColorModes('light', {
|
|
159
143
|
light: {
|
|
160
144
|
primary: {
|
|
161
145
|
_: 'white',
|
|
@@ -165,8 +149,8 @@ describe('createTheme', function () {
|
|
|
165
149
|
}).build();
|
|
166
150
|
expect(override.modes.light.primary).toEqual('white');
|
|
167
151
|
});
|
|
168
|
-
it('returns the raw values of color mode colors on the tokens object',
|
|
169
|
-
|
|
152
|
+
it('returns the raw values of color mode colors on the tokens object', () => {
|
|
153
|
+
const theme = createTheme(base).addColors({
|
|
170
154
|
black: '#000000',
|
|
171
155
|
gray: {
|
|
172
156
|
300: '#666666'
|
|
@@ -2,23 +2,15 @@ import get from 'lodash/get';
|
|
|
2
2
|
import isArray from 'lodash/isArray';
|
|
3
3
|
import isObject from 'lodash/isObject';
|
|
4
4
|
import isString from 'lodash/isString';
|
|
5
|
-
export
|
|
5
|
+
export const createScaleLookup = scale => {
|
|
6
6
|
if (isString(scale)) {
|
|
7
|
-
return
|
|
8
|
-
return get(props, ['theme', scale, val]);
|
|
9
|
-
};
|
|
7
|
+
return (val, props) => get(props, ['theme', scale, val]);
|
|
10
8
|
}
|
|
11
9
|
if (isArray(scale)) {
|
|
12
|
-
return
|
|
13
|
-
return val;
|
|
14
|
-
};
|
|
10
|
+
return val => val;
|
|
15
11
|
}
|
|
16
12
|
if (isObject(scale)) {
|
|
17
|
-
return
|
|
18
|
-
return get(scale, val);
|
|
19
|
-
};
|
|
13
|
+
return val => get(scale, val);
|
|
20
14
|
}
|
|
21
|
-
return
|
|
22
|
-
return undefined;
|
|
23
|
-
};
|
|
15
|
+
return () => undefined;
|
|
24
16
|
};
|
|
@@ -1,35 +1,25 @@
|
|
|
1
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
2
|
-
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
4
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
5
|
-
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
6
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
7
1
|
import isNumber from 'lodash/isNumber';
|
|
8
|
-
export
|
|
2
|
+
export const percentageOrAbsolute = coordinate => {
|
|
9
3
|
if (coordinate === 0) {
|
|
10
4
|
return coordinate;
|
|
11
5
|
}
|
|
12
6
|
if (coordinate <= 1 && coordinate >= -1) {
|
|
13
|
-
return
|
|
7
|
+
return `${coordinate * 100}%`;
|
|
14
8
|
}
|
|
15
|
-
return
|
|
9
|
+
return `${coordinate}px`;
|
|
16
10
|
};
|
|
17
|
-
|
|
18
|
-
export
|
|
11
|
+
const valueWithUnit = /(-?\d*\.?\d+)(%|\w*)/;
|
|
12
|
+
export const transformSize = value => {
|
|
19
13
|
if (isNumber(value)) {
|
|
20
14
|
return percentageOrAbsolute(value);
|
|
21
15
|
}
|
|
22
16
|
if (value.includes('calc')) {
|
|
23
17
|
return value;
|
|
24
18
|
}
|
|
25
|
-
|
|
26
|
-
_ref2 = _slicedToArray(_ref, 3),
|
|
27
|
-
match = _ref2[0],
|
|
28
|
-
number = _ref2[1],
|
|
29
|
-
unit = _ref2[2];
|
|
19
|
+
const [match, number, unit] = valueWithUnit.exec(value) || [];
|
|
30
20
|
if (match === undefined) {
|
|
31
21
|
return value;
|
|
32
22
|
}
|
|
33
|
-
|
|
34
|
-
return !unit ? percentageOrAbsolute(numericValue) :
|
|
23
|
+
const numericValue = parseFloat(number);
|
|
24
|
+
return !unit ? percentageOrAbsolute(numericValue) : `${numericValue}${unit}`;
|
|
35
25
|
};
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
-
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
1
|
import isObject from 'lodash/isObject';
|
|
8
2
|
|
|
9
3
|
/**
|
|
@@ -11,13 +5,31 @@ import isObject from 'lodash/isObject';
|
|
|
11
5
|
* Possibilities are returned as `k1.k2.k3`.
|
|
12
6
|
*/
|
|
13
7
|
|
|
8
|
+
/** Returns valid paths of object T */
|
|
9
|
+
|
|
10
|
+
/** Returns the value of a valid path P `k1.k2.k3` in object T */
|
|
11
|
+
|
|
12
|
+
/** Check if path has a primitive end value and return only the union of end paths */
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Reduce all paths to a single map of paths with primitive values removing all extra non stateful paths
|
|
16
|
+
* { path: { sub: 1 } } => { 'path-sub': 1 }
|
|
17
|
+
*
|
|
18
|
+
*/
|
|
19
|
+
|
|
14
20
|
export function flattenScale(object, path) {
|
|
15
|
-
return Object.keys(object).reduce(
|
|
16
|
-
|
|
17
|
-
|
|
21
|
+
return Object.keys(object).reduce((carry, key) => {
|
|
22
|
+
const nextKey = path ? `${path}${key === '_' ? '' : `-${key}`}` : key;
|
|
23
|
+
const current = object[key];
|
|
18
24
|
if (isObject(current)) {
|
|
19
|
-
return
|
|
25
|
+
return {
|
|
26
|
+
...carry,
|
|
27
|
+
...flattenScale(current, nextKey)
|
|
28
|
+
};
|
|
20
29
|
}
|
|
21
|
-
return
|
|
30
|
+
return {
|
|
31
|
+
...carry,
|
|
32
|
+
[nextKey]: object[key]
|
|
33
|
+
};
|
|
22
34
|
}, {});
|
|
23
35
|
}
|
|
@@ -1,7 +1,3 @@
|
|
|
1
1
|
import keys from 'lodash/keys';
|
|
2
2
|
import pick from 'lodash/pick';
|
|
3
|
-
export
|
|
4
|
-
return pick(props, keys(props).filter(function (key) {
|
|
5
|
-
return !filteredKeys.includes(key);
|
|
6
|
-
}));
|
|
7
|
-
};
|
|
3
|
+
export const getStaticCss = (props, filteredKeys) => pick(props, keys(props).filter(key => !filteredKeys.includes(key)));
|
package/dist/utils/propNames.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
const SHORTHAND_PROPERTIES = ['border', 'borderTop', 'borderBottom', 'borderLeft', 'borderRight', 'borderWidth', 'borderStyle', 'borderColor', 'background', 'flex', 'margin', 'padding', 'transition', 'gap', 'grid', 'gridArea', 'gridColumn', 'gridRow', 'gridTemplate', 'overflow', 'transition'];
|
|
2
|
+
const SORT = {
|
|
3
3
|
A_BEFORE_B: -1,
|
|
4
4
|
B_BEFORE_A: 1,
|
|
5
5
|
EQUAL: 1
|
|
6
6
|
};
|
|
7
|
-
|
|
7
|
+
const compare = (a, b) => {
|
|
8
8
|
if (a < b) return SORT.A_BEFORE_B;
|
|
9
9
|
if (b < a) return SORT.B_BEFORE_A;
|
|
10
10
|
return SORT.EQUAL;
|
|
@@ -14,32 +14,34 @@ var compare = function compare(a, b) {
|
|
|
14
14
|
* Orders all properties by the most dependent props
|
|
15
15
|
* @param config
|
|
16
16
|
*/
|
|
17
|
-
export
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
if (bNum === 0) return SORT.B_BEFORE_A;
|
|
38
|
-
}
|
|
39
|
-
return compare(bNum, aNum);
|
|
17
|
+
export const orderPropNames = config => Object.keys(config).sort((a, b) => {
|
|
18
|
+
const {
|
|
19
|
+
[a]: aConf,
|
|
20
|
+
[b]: bConf
|
|
21
|
+
} = config;
|
|
22
|
+
const {
|
|
23
|
+
property: aProp,
|
|
24
|
+
properties: aProperties = []
|
|
25
|
+
} = aConf;
|
|
26
|
+
const {
|
|
27
|
+
property: bProp,
|
|
28
|
+
properties: bProperties = []
|
|
29
|
+
} = bConf;
|
|
30
|
+
const aIsShorthand = SHORTHAND_PROPERTIES.includes(aProp);
|
|
31
|
+
const bIsShorthand = SHORTHAND_PROPERTIES.includes(bProp);
|
|
32
|
+
if (aIsShorthand && bIsShorthand) {
|
|
33
|
+
const aNum = aProperties.length;
|
|
34
|
+
const bNum = bProperties.length;
|
|
35
|
+
if (aProp !== bProp) {
|
|
36
|
+
return compare(SHORTHAND_PROPERTIES.indexOf(aProp), SHORTHAND_PROPERTIES.indexOf(bProp));
|
|
40
37
|
}
|
|
41
|
-
if (
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
38
|
+
if (aProp === bProp) {
|
|
39
|
+
if (aNum === 0) return SORT.A_BEFORE_B;
|
|
40
|
+
if (bNum === 0) return SORT.B_BEFORE_A;
|
|
41
|
+
}
|
|
42
|
+
return compare(bNum, aNum);
|
|
43
|
+
}
|
|
44
|
+
if (aIsShorthand) return SORT.A_BEFORE_B;
|
|
45
|
+
if (bIsShorthand) return SORT.B_BEFORE_A;
|
|
46
|
+
return SORT.EQUAL;
|
|
47
|
+
});
|
package/dist/utils/responsive.js
CHANGED
|
@@ -1,79 +1,76 @@
|
|
|
1
|
-
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
-
function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
|
|
3
|
-
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
5
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
|
|
6
|
-
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
7
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
8
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
9
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
10
|
-
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
11
|
-
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
12
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
13
1
|
import intersection from 'lodash/intersection';
|
|
14
2
|
import omit from 'lodash/omit';
|
|
15
|
-
|
|
3
|
+
const BREAKPOINT_KEYS = ['_', 'xs', 'sm', 'md', 'lg', 'xl'];
|
|
16
4
|
|
|
17
5
|
/**
|
|
18
6
|
* Destructures the themes breakpoints into an ordered structure to traverse
|
|
19
7
|
*/
|
|
20
|
-
export
|
|
8
|
+
export const parseBreakpoints = breakpoints => {
|
|
21
9
|
if (breakpoints === undefined) return null;
|
|
22
|
-
|
|
23
|
-
xs
|
|
24
|
-
sm
|
|
25
|
-
md
|
|
26
|
-
lg
|
|
27
|
-
xl
|
|
10
|
+
const {
|
|
11
|
+
xs,
|
|
12
|
+
sm,
|
|
13
|
+
md,
|
|
14
|
+
lg,
|
|
15
|
+
xl
|
|
16
|
+
} = breakpoints ?? {};
|
|
17
|
+
|
|
18
|
+
// Ensure order for mapping
|
|
28
19
|
return {
|
|
29
20
|
map: breakpoints,
|
|
30
21
|
array: [xs, sm, md, lg, xl]
|
|
31
22
|
};
|
|
32
23
|
};
|
|
33
|
-
export
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
24
|
+
export const isMediaArray = val => Array.isArray(val);
|
|
25
|
+
export const isMediaMap = val => intersection(Object.keys(val), BREAKPOINT_KEYS).length > 0;
|
|
26
|
+
export const objectParser = (value, props, config, breakpoints) => {
|
|
27
|
+
const styles = {};
|
|
28
|
+
const {
|
|
29
|
+
styleFn,
|
|
30
|
+
prop
|
|
31
|
+
} = config;
|
|
32
|
+
const {
|
|
33
|
+
_,
|
|
34
|
+
...rest
|
|
35
|
+
} = value;
|
|
36
|
+
// the keyof 'base' is base styles
|
|
45
37
|
if (_) Object.assign(styles, styleFn(_, prop, props));
|
|
46
38
|
|
|
47
39
|
// Map over remaining keys and merge the corresponding breakpoint styles
|
|
48
40
|
// for that property.
|
|
49
|
-
Object.keys(breakpoints).forEach(
|
|
50
|
-
|
|
41
|
+
Object.keys(breakpoints).forEach(breakpointKey => {
|
|
42
|
+
const bpStyles = rest[breakpointKey];
|
|
51
43
|
if (typeof bpStyles === 'undefined') return;
|
|
52
|
-
Object.assign(styles,
|
|
44
|
+
Object.assign(styles, {
|
|
45
|
+
[breakpoints[breakpointKey]]: styleFn(bpStyles, prop, props)
|
|
46
|
+
});
|
|
53
47
|
});
|
|
54
48
|
return styles;
|
|
55
49
|
};
|
|
56
|
-
export
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
50
|
+
export const arrayParser = (value, props, config, breakpoints) => {
|
|
51
|
+
const styles = {};
|
|
52
|
+
const {
|
|
53
|
+
styleFn,
|
|
54
|
+
prop
|
|
55
|
+
} = config;
|
|
56
|
+
const [_, ...rest] = value;
|
|
57
|
+
// the first index is base styles
|
|
63
58
|
if (_) Object.assign(styles, styleFn(_, prop, props));
|
|
64
59
|
|
|
65
60
|
// Map over each value in the array and merge the corresponding breakpoint styles
|
|
66
61
|
// for that property.
|
|
67
|
-
rest.forEach(
|
|
68
|
-
|
|
62
|
+
rest.forEach((val, i) => {
|
|
63
|
+
const breakpointKey = breakpoints[i];
|
|
69
64
|
if (!breakpointKey || typeof val === 'undefined') return;
|
|
70
|
-
Object.assign(styles,
|
|
65
|
+
Object.assign(styles, {
|
|
66
|
+
[breakpointKey]: styleFn(val, prop, props)
|
|
67
|
+
});
|
|
71
68
|
});
|
|
72
69
|
return styles;
|
|
73
70
|
};
|
|
74
|
-
export
|
|
75
|
-
|
|
76
|
-
breakpoints.forEach(
|
|
71
|
+
export const orderBreakpoints = (styles, breakpoints) => {
|
|
72
|
+
const orderedStyles = omit(styles, breakpoints);
|
|
73
|
+
breakpoints.forEach(bp => {
|
|
77
74
|
if (styles[bp]) {
|
|
78
75
|
orderedStyles[bp] = styles[bp];
|
|
79
76
|
}
|
|
@@ -1,33 +1,42 @@
|
|
|
1
|
-
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
3
|
-
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
4
|
-
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
5
|
-
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
6
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
7
1
|
import isObject from 'lodash/isObject';
|
|
8
2
|
import merge from 'lodash/merge';
|
|
9
|
-
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Returns an type of any object with { key: 'var(--key) }
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
const templateBreakpoints = (value, alias, theme) => {
|
|
10
9
|
if (isObject(value)) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
const {
|
|
11
|
+
_,
|
|
12
|
+
base,
|
|
13
|
+
...rest
|
|
14
|
+
} = value;
|
|
15
|
+
const css = {
|
|
16
|
+
[alias]: _ ?? base
|
|
17
|
+
};
|
|
15
18
|
if (theme) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
const {
|
|
20
|
+
breakpoints
|
|
21
|
+
} = theme;
|
|
22
|
+
Object.keys(breakpoints).forEach(key => {
|
|
23
|
+
css[breakpoints[key]] = {
|
|
24
|
+
[alias]: rest[key]
|
|
25
|
+
};
|
|
19
26
|
});
|
|
20
27
|
}
|
|
21
28
|
return css;
|
|
22
29
|
}
|
|
23
|
-
return
|
|
30
|
+
return {
|
|
31
|
+
[alias]: value
|
|
32
|
+
};
|
|
24
33
|
};
|
|
25
|
-
export
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
Object.keys(tokens).forEach(
|
|
29
|
-
|
|
30
|
-
tokenReferences[key] =
|
|
34
|
+
export const serializeTokens = (tokens, prefix, theme) => {
|
|
35
|
+
const tokenReferences = {};
|
|
36
|
+
const tokenVariables = {};
|
|
37
|
+
Object.keys(tokens).forEach(key => {
|
|
38
|
+
const varName = `--${prefix}-${key}`;
|
|
39
|
+
tokenReferences[key] = `var(${varName})`;
|
|
31
40
|
merge(tokenVariables, templateBreakpoints(tokens[key], varName, theme));
|
|
32
41
|
});
|
|
33
42
|
return {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codecademy/variance",
|
|
3
3
|
"description": "Constraint based CSS in JS for building scalable design systems",
|
|
4
|
-
"version": "0.21.
|
|
4
|
+
"version": "0.21.5-alpha.3f5626.0",
|
|
5
5
|
"author": "codecaaron <aaron@codecademy.com>",
|
|
6
6
|
"dependencies": {
|
|
7
7
|
"csstype": "^3.0.7",
|
|
@@ -32,5 +32,5 @@
|
|
|
32
32
|
"build": "nx build @codecademy/variance"
|
|
33
33
|
},
|
|
34
34
|
"types": "dist/index.d.ts",
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "3756af8a935cee6d957c64fa96652dcf32663278"
|
|
36
36
|
}
|