@ttoss/ui 1.2.0 → 1.3.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/esm/index.js
CHANGED
|
@@ -76,17 +76,14 @@ var defaultTheme = {
|
|
|
76
76
|
};
|
|
77
77
|
|
|
78
78
|
// src/theme/ThemeProvider.tsx
|
|
79
|
-
var ThemeProvider = ({
|
|
80
|
-
children,
|
|
81
|
-
theme = {}
|
|
82
|
-
}) => {
|
|
79
|
+
var ThemeProvider = ({ children, theme = {} }) => {
|
|
83
80
|
const mergedTheme = React2.useMemo(() => {
|
|
84
81
|
if (typeof theme === "function") {
|
|
85
82
|
return theme;
|
|
86
83
|
}
|
|
87
84
|
return merge(defaultTheme, theme);
|
|
88
85
|
}, [theme]);
|
|
89
|
-
return /* @__PURE__ */ React2.createElement(ThemeUiProvider, {
|
|
86
|
+
return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(ThemeUiProvider, {
|
|
90
87
|
theme: mergedTheme
|
|
91
88
|
}, /* @__PURE__ */ React2.createElement(Global, {
|
|
92
89
|
styles: {
|
|
@@ -94,7 +91,7 @@ var ThemeProvider = ({
|
|
|
94
91
|
margin: 0
|
|
95
92
|
}
|
|
96
93
|
}
|
|
97
|
-
}), children);
|
|
94
|
+
}), children));
|
|
98
95
|
};
|
|
99
96
|
var ThemeProvider_default = ThemeProvider;
|
|
100
97
|
|
package/dist/index.d.ts
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import * as color from '@theme-ui/color';
|
|
2
2
|
export { color };
|
|
3
3
|
import * as _theme_ui_core from '@theme-ui/core';
|
|
4
|
-
import { ThemeProviderProps } from '@theme-ui/core';
|
|
5
|
-
export { Theme
|
|
4
|
+
import { ThemeProviderProps as ThemeProviderProps$1 } from '@theme-ui/core';
|
|
5
|
+
export { Theme } from '@theme-ui/core';
|
|
6
6
|
export { Themed } from '@theme-ui/mdx';
|
|
7
7
|
import * as React from 'react';
|
|
8
8
|
import { ButtonProps } from '@theme-ui/components';
|
|
9
9
|
export { Box, BoxProps, ButtonProps, Card, CardProps, Flex, FlexProps, Image, ImageProps, Input, InputProps, Link, LinkProps, Text, TextProps } from '@theme-ui/components';
|
|
10
10
|
|
|
11
|
-
declare
|
|
11
|
+
declare type ThemeProviderProps = ThemeProviderProps$1 & {
|
|
12
|
+
children?: React.ReactNode;
|
|
13
|
+
};
|
|
14
|
+
declare const ThemeProvider: ({ children, theme }: ThemeProviderProps) => JSX.Element;
|
|
12
15
|
|
|
13
16
|
declare const useTheme: () => _theme_ui_core.ThemeUIContextValue;
|
|
14
17
|
|
|
@@ -21,4 +24,4 @@ declare type FormFieldProps = {
|
|
|
21
24
|
};
|
|
22
25
|
declare const FormField: ({ children, label, error }: FormFieldProps) => JSX.Element;
|
|
23
26
|
|
|
24
|
-
export { Button, FormField, FormFieldProps, ThemeProvider, useTheme };
|
|
27
|
+
export { Button, FormField, FormFieldProps, ThemeProvider, ThemeProviderProps, useTheme };
|
package/dist/index.js
CHANGED
|
@@ -116,17 +116,14 @@ var defaultTheme = {
|
|
|
116
116
|
};
|
|
117
117
|
|
|
118
118
|
// src/theme/ThemeProvider.tsx
|
|
119
|
-
var ThemeProvider = ({
|
|
120
|
-
children,
|
|
121
|
-
theme = {}
|
|
122
|
-
}) => {
|
|
119
|
+
var ThemeProvider = ({ children, theme = {} }) => {
|
|
123
120
|
const mergedTheme = React2.useMemo(() => {
|
|
124
121
|
if (typeof theme === "function") {
|
|
125
122
|
return theme;
|
|
126
123
|
}
|
|
127
124
|
return (0, import_core.merge)(defaultTheme, theme);
|
|
128
125
|
}, [theme]);
|
|
129
|
-
return /* @__PURE__ */ React2.createElement(import_core.ThemeProvider, {
|
|
126
|
+
return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(import_core.ThemeProvider, {
|
|
130
127
|
theme: mergedTheme
|
|
131
128
|
}, /* @__PURE__ */ React2.createElement(import_react.Global, {
|
|
132
129
|
styles: {
|
|
@@ -134,7 +131,7 @@ var ThemeProvider = ({
|
|
|
134
131
|
margin: 0
|
|
135
132
|
}
|
|
136
133
|
}
|
|
137
|
-
}), children);
|
|
134
|
+
}), children));
|
|
138
135
|
};
|
|
139
136
|
var ThemeProvider_default = ThemeProvider;
|
|
140
137
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ttoss/ui",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "Primitive layout, typographic, and other components for styling applications.",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"publishConfig": {
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"react": ">=17.0.2"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@ttoss/config": "^1.
|
|
47
|
-
"@ttoss/test-utils": "^1.
|
|
46
|
+
"@ttoss/config": "^1.3.0",
|
|
47
|
+
"@ttoss/test-utils": "^1.3.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "c709beaea1ad270f740d860e91b1a42641ebccda"
|
|
50
50
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { render, screen } from '@ttoss/test-utils';
|
|
2
2
|
|
|
3
3
|
import Input from '../Input/Input';
|
|
4
4
|
|
|
@@ -8,7 +8,7 @@ const label = 'Label';
|
|
|
8
8
|
const value = 'Value';
|
|
9
9
|
|
|
10
10
|
test('check if label is rendered on screen', () => {
|
|
11
|
-
|
|
11
|
+
render(
|
|
12
12
|
<FormField label={label}>
|
|
13
13
|
<Input defaultValue={value} />
|
|
14
14
|
</FormField>
|
|
@@ -18,7 +18,7 @@ test('check if label is rendered on screen', () => {
|
|
|
18
18
|
});
|
|
19
19
|
|
|
20
20
|
test('check if label is associated with input', () => {
|
|
21
|
-
|
|
21
|
+
render(
|
|
22
22
|
<FormField label={label}>
|
|
23
23
|
<Input defaultValue={value} />
|
|
24
24
|
</FormField>
|
|
@@ -30,7 +30,7 @@ test('check if label is associated with input', () => {
|
|
|
30
30
|
test('check if renders a single error', () => {
|
|
31
31
|
const error = 'Error';
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
render(
|
|
34
34
|
<FormField label={label} error={error}>
|
|
35
35
|
<Input defaultValue={value} />
|
|
36
36
|
</FormField>
|
|
@@ -42,7 +42,7 @@ test('check if renders a single error', () => {
|
|
|
42
42
|
test('check if renders multiple errors', () => {
|
|
43
43
|
const errors = ['Error1', 'Error2', 'Error3'];
|
|
44
44
|
|
|
45
|
-
|
|
45
|
+
render(
|
|
46
46
|
<FormField label={label} error={errors}>
|
|
47
47
|
<Input defaultValue={value} />
|
|
48
48
|
</FormField>
|
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
import { Global } from '@emotion/react';
|
|
2
2
|
import {
|
|
3
3
|
ThemeProvider as ThemeUiProvider,
|
|
4
|
-
ThemeProviderProps,
|
|
4
|
+
ThemeProviderProps as ThemeUiProviderProps,
|
|
5
5
|
merge,
|
|
6
6
|
} from '@theme-ui/core';
|
|
7
7
|
import * as React from 'react';
|
|
8
8
|
|
|
9
9
|
import { defaultTheme } from './defaultTheme';
|
|
10
10
|
|
|
11
|
-
export type
|
|
11
|
+
export type ThemeProviderProps = ThemeUiProviderProps & {
|
|
12
|
+
children?: React.ReactNode;
|
|
13
|
+
};
|
|
12
14
|
|
|
13
|
-
const ThemeProvider:
|
|
14
|
-
children,
|
|
15
|
-
theme = {},
|
|
16
|
-
}) => {
|
|
15
|
+
const ThemeProvider = ({ children, theme = {} }: ThemeProviderProps) => {
|
|
17
16
|
const mergedTheme = React.useMemo(() => {
|
|
18
17
|
if (typeof theme === 'function') {
|
|
19
18
|
return theme;
|
|
@@ -23,16 +22,18 @@ const ThemeProvider: React.FC<Partial<ThemeProviderProps>> = ({
|
|
|
23
22
|
}, [theme]);
|
|
24
23
|
|
|
25
24
|
return (
|
|
26
|
-
|
|
27
|
-
<
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
<>
|
|
26
|
+
<ThemeUiProvider theme={mergedTheme}>
|
|
27
|
+
<Global
|
|
28
|
+
styles={{
|
|
29
|
+
'*': {
|
|
30
|
+
margin: 0,
|
|
31
|
+
},
|
|
32
|
+
}}
|
|
33
|
+
/>
|
|
34
|
+
{children}
|
|
35
|
+
</ThemeUiProvider>
|
|
36
|
+
</>
|
|
36
37
|
);
|
|
37
38
|
};
|
|
38
39
|
|