@marigold/system 2.1.1 → 2.2.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/index.d.ts +1 -1
- package/dist/index.js +10 -7
- package/dist/index.mjs +10 -7
- package/package.json +5 -5
package/dist/index.d.ts
CHANGED
|
@@ -208,7 +208,7 @@ interface Theme {
|
|
|
208
208
|
interface StyleProps extends Pick<CSSObject, 'display' | 'height' | 'width' | 'minWidth' | 'maxWidth' | 'position' | 'top' | 'bottom' | 'right' | 'left' | 'zIndex' | 'p' | 'px' | 'py' | 'pt' | 'pb' | 'pl' | 'pr' | 'm' | 'mx' | 'my' | 'mt' | 'mb' | 'ml' | 'mr' | 'flexDirection' | 'flexWrap' | 'flexShrink' | 'flexGrow' | 'alignItems' | 'justifyContent' | 'bg' | 'border' | 'borderRadius' | 'boxShadow' | 'opacity' | 'overflow' | 'transition'> {
|
|
209
209
|
}
|
|
210
210
|
interface BoxOwnProps extends StyleProps {
|
|
211
|
-
css?: CSSObject;
|
|
211
|
+
css?: CSSObject | CSSObject[];
|
|
212
212
|
/**
|
|
213
213
|
* Use to set base styles for the component
|
|
214
214
|
* @internal
|
package/dist/index.js
CHANGED
|
@@ -119,11 +119,11 @@ var transformPseudos = (styles) => {
|
|
|
119
119
|
};
|
|
120
120
|
|
|
121
121
|
// src/components/Box/Box.tsx
|
|
122
|
-
var createThemedStyle = ({
|
|
122
|
+
var createThemedStyle = ({ __baseCSS, styles, css }) => (theme) => {
|
|
123
123
|
const themedStyles = import_deepmerge.default.all([
|
|
124
124
|
(0, import_css.css)(__baseCSS)(theme),
|
|
125
125
|
(0, import_css.css)(styles)(theme),
|
|
126
|
-
(0, import_css.css)(css)(theme)
|
|
126
|
+
...Array.isArray(css) ? css.map((c) => (0, import_css.css)(c)(theme)) : [(0, import_css.css)(css)(theme)]
|
|
127
127
|
]);
|
|
128
128
|
return transformPseudos(themedStyles);
|
|
129
129
|
};
|
|
@@ -177,7 +177,6 @@ var Box = (0, import_react.forwardRef)(
|
|
|
177
177
|
{
|
|
178
178
|
...props,
|
|
179
179
|
css: createThemedStyle({
|
|
180
|
-
as,
|
|
181
180
|
__baseCSS,
|
|
182
181
|
css,
|
|
183
182
|
styles: {
|
|
@@ -295,6 +294,10 @@ var element = {
|
|
|
295
294
|
display: "block",
|
|
296
295
|
maxWidth: "100%"
|
|
297
296
|
},
|
|
297
|
+
svg: {
|
|
298
|
+
display: "block",
|
|
299
|
+
fill: "currentColor"
|
|
300
|
+
},
|
|
298
301
|
button: {
|
|
299
302
|
display: "block",
|
|
300
303
|
appearance: "none",
|
|
@@ -389,9 +392,9 @@ var emptyBreakpoints = ["40em", "52em", "64em"];
|
|
|
389
392
|
var useResponsiveValue = (values, defaultIndex = 0) => {
|
|
390
393
|
const { theme } = useTheme();
|
|
391
394
|
const breakpoints = theme.breakpoints || emptyBreakpoints;
|
|
392
|
-
if (defaultIndex < 0 || defaultIndex >= breakpoints.length) {
|
|
395
|
+
if (defaultIndex < 0 || defaultIndex >= breakpoints.length + 1) {
|
|
393
396
|
throw new RangeError(
|
|
394
|
-
`Default breakpoint index is out of bounds. Theme has ${breakpoints.length} breakpoints, default is ${defaultIndex}.`
|
|
397
|
+
`Default breakpoint index is out of bounds. Theme has ${breakpoints.length + 1} breakpoints, default is ${defaultIndex}.`
|
|
395
398
|
);
|
|
396
399
|
}
|
|
397
400
|
const [index, setIndex] = (0, import_react8.useState)(defaultIndex);
|
|
@@ -434,9 +437,9 @@ var useStateProps = (states) => {
|
|
|
434
437
|
|
|
435
438
|
// src/components/SVG/SVG.tsx
|
|
436
439
|
var toDimension = (value) => Array.isArray(value) ? value.map(ensureNumberOrToken) : ensureNumberOrToken(value);
|
|
437
|
-
var ensureNumberOrToken = (value) => typeof value === "string" &&
|
|
440
|
+
var ensureNumberOrToken = (value) => typeof value === "string" && /^[0-9]+$/.test(value) ? Number(value) : value;
|
|
438
441
|
var SVG = (0, import_react10.forwardRef)(
|
|
439
|
-
({ size = 24, fill
|
|
442
|
+
({ size = 24, fill, children, css: styles, ...props }, ref) => {
|
|
440
443
|
const { css } = useTheme();
|
|
441
444
|
return (0, import_react11.jsx)(
|
|
442
445
|
"svg",
|
package/dist/index.mjs
CHANGED
|
@@ -79,11 +79,11 @@ var transformPseudos = (styles) => {
|
|
|
79
79
|
};
|
|
80
80
|
|
|
81
81
|
// src/components/Box/Box.tsx
|
|
82
|
-
var createThemedStyle = ({
|
|
82
|
+
var createThemedStyle = ({ __baseCSS, styles, css }) => (theme) => {
|
|
83
83
|
const themedStyles = merge.all([
|
|
84
84
|
transformStyleObject(__baseCSS)(theme),
|
|
85
85
|
transformStyleObject(styles)(theme),
|
|
86
|
-
transformStyleObject(css)(theme)
|
|
86
|
+
...Array.isArray(css) ? css.map((c) => transformStyleObject(c)(theme)) : [transformStyleObject(css)(theme)]
|
|
87
87
|
]);
|
|
88
88
|
return transformPseudos(themedStyles);
|
|
89
89
|
};
|
|
@@ -137,7 +137,6 @@ var Box = forwardRef(
|
|
|
137
137
|
{
|
|
138
138
|
...props,
|
|
139
139
|
css: createThemedStyle({
|
|
140
|
-
as,
|
|
141
140
|
__baseCSS,
|
|
142
141
|
css,
|
|
143
142
|
styles: {
|
|
@@ -262,6 +261,10 @@ var element = {
|
|
|
262
261
|
display: "block",
|
|
263
262
|
maxWidth: "100%"
|
|
264
263
|
},
|
|
264
|
+
svg: {
|
|
265
|
+
display: "block",
|
|
266
|
+
fill: "currentColor"
|
|
267
|
+
},
|
|
265
268
|
button: {
|
|
266
269
|
display: "block",
|
|
267
270
|
appearance: "none",
|
|
@@ -356,9 +359,9 @@ var emptyBreakpoints = ["40em", "52em", "64em"];
|
|
|
356
359
|
var useResponsiveValue = (values, defaultIndex = 0) => {
|
|
357
360
|
const { theme } = useTheme();
|
|
358
361
|
const breakpoints = theme.breakpoints || emptyBreakpoints;
|
|
359
|
-
if (defaultIndex < 0 || defaultIndex >= breakpoints.length) {
|
|
362
|
+
if (defaultIndex < 0 || defaultIndex >= breakpoints.length + 1) {
|
|
360
363
|
throw new RangeError(
|
|
361
|
-
`Default breakpoint index is out of bounds. Theme has ${breakpoints.length} breakpoints, default is ${defaultIndex}.`
|
|
364
|
+
`Default breakpoint index is out of bounds. Theme has ${breakpoints.length + 1} breakpoints, default is ${defaultIndex}.`
|
|
362
365
|
);
|
|
363
366
|
}
|
|
364
367
|
const [index, setIndex] = useState(defaultIndex);
|
|
@@ -401,9 +404,9 @@ var useStateProps = (states) => {
|
|
|
401
404
|
|
|
402
405
|
// src/components/SVG/SVG.tsx
|
|
403
406
|
var toDimension = (value) => Array.isArray(value) ? value.map(ensureNumberOrToken) : ensureNumberOrToken(value);
|
|
404
|
-
var ensureNumberOrToken = (value) => typeof value === "string" &&
|
|
407
|
+
var ensureNumberOrToken = (value) => typeof value === "string" && /^[0-9]+$/.test(value) ? Number(value) : value;
|
|
405
408
|
var SVG = forwardRef2(
|
|
406
|
-
({ size = 24, fill
|
|
409
|
+
({ size = 24, fill, children, css: styles, ...props }, ref) => {
|
|
407
410
|
const { css } = useTheme();
|
|
408
411
|
return jsx2(
|
|
409
412
|
"svg",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@marigold/system",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "Marigold System Library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"keywords": [
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"directory": "packages/system"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@emotion/react": "11.10.
|
|
30
|
-
"@marigold/types": "0.5.
|
|
29
|
+
"@emotion/react": "11.10.4",
|
|
30
|
+
"@marigold/types": "0.5.3",
|
|
31
31
|
"@theme-ui/css": "0.14.7",
|
|
32
32
|
"csstype": "3.1.0",
|
|
33
33
|
"deepmerge": "^4.2.2",
|
|
@@ -38,10 +38,10 @@
|
|
|
38
38
|
"react-dom": "16.x || 17.x || 18.x"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@babel/core": "7.
|
|
41
|
+
"@babel/core": "7.19.0",
|
|
42
42
|
"@marigold/tsconfig": "0.3.0",
|
|
43
43
|
"react": "18.2.0",
|
|
44
|
-
"tsup": "6.2.
|
|
44
|
+
"tsup": "6.2.3"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|
|
47
47
|
"build": "tsup src/index.ts",
|