@gympass/yoga 7.110.2 → 7.111.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.
@@ -124,7 +124,7 @@ const Banner = (0, import_react.forwardRef)((props, ref) => {
124
124
  marginRight: "xxsmall"
125
125
  }
126
126
  ),
127
- /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Text.default.Small, { flex: 1, marginTop: "xxsmall", marginBottom: "xxsmall", children: message }),
127
+ /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Text.default.Body2, { flex: 1, marginTop: "xxsmall", marginBottom: "xxsmall", children: message }),
128
128
  primaryButton && !secondaryButton && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BannerActionButton, { button: primaryButton, marginLeft: "xxsmall" })
129
129
  ] }),
130
130
  primaryButton && secondaryButton && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
@@ -126,7 +126,7 @@ const Banner = (0, import_react.forwardRef)((props, ref) => {
126
126
  marginRight: "xxsmall"
127
127
  }
128
128
  ),
129
- /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Text.default.Small, { flex: 1, marginVertical: "xxsmall", children: message }),
129
+ /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Text.default.Body2, { flex: 1, marginVertical: "xxsmall", children: message }),
130
130
  primaryButton && !secondaryButton && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(BannerActionButton, { button: primaryButton, marginLeft: "xxsmall" })
131
131
  ] }),
132
132
  primaryButton && secondaryButton && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
@@ -25,6 +25,7 @@ const Input = ({
25
25
  colors,
26
26
  fontSizes,
27
27
  fontWeights,
28
+ lineHeights,
28
29
  borders,
29
30
  radii,
30
31
  spacing
@@ -37,7 +38,8 @@ const Input = ({
37
38
  focus: colors.text.primary
38
39
  },
39
40
  size: fontSizes.small,
40
- weight: fontWeights.regular
41
+ weight: fontWeights.regular,
42
+ lineHeight: lineHeights.small
41
43
  },
42
44
  border: {
43
45
  width: borders.small,
@@ -67,7 +69,11 @@ const Input = ({
67
69
  default: fontSizes.small,
68
70
  typed: fontSizes.xsmall
69
71
  },
70
- weight: fontWeights.regular
72
+ weight: fontWeights.regular,
73
+ lineHeight: {
74
+ default: lineHeights.small,
75
+ typed: lineHeights.xsmall
76
+ }
71
77
  }
72
78
  },
73
79
  helper: {
@@ -79,7 +85,9 @@ const Input = ({
79
85
  top: spacing.xxxsmall
80
86
  },
81
87
  font: {
82
- size: fontSizes.xsmall
88
+ size: fontSizes.xsmall,
89
+ weight: fontWeights.regular,
90
+ lineHeight: lineHeights.xsmall
83
91
  }
84
92
  }
85
93
  });
@@ -53,13 +53,14 @@ const HelperWrapper = import_styled_components.default.View(
53
53
  margin-top: ${input.helper.margin.top}px;
54
54
  `
55
55
  );
56
- const Info = (0, import_styled_components.default)(import_Text.default.Regular)(
56
+ const Info = (0, import_styled_components.default)(import_Text.default.Caption)(
57
57
  ({
58
58
  disabled,
59
59
  focused,
60
60
  error,
61
61
  theme: {
62
62
  yoga: {
63
+ baseFont,
63
64
  colors,
64
65
  components: { input }
65
66
  }
@@ -67,8 +68,8 @@ const Info = (0, import_styled_components.default)(import_Text.default.Regular)(
67
68
  }) => `
68
69
  flex-wrap: wrap;
69
70
 
71
+ font-family: ${baseFont.family};
70
72
  color: ${input.helper.color.default};
71
- font-size: ${input.helper.font.size}px;
72
73
 
73
74
  ${disabled ? `color: ${colors.text.disabled};` : ""}
74
75
  ${focused ? `color: ${input.helper.color.focus};` : ""}
@@ -111,6 +111,8 @@ const Field = import_styled_components.default.TextInput(
111
111
  color: ${input.font.color.default};
112
112
  font-family: ${baseFont.family};
113
113
  font-size: ${input.font.size}px;
114
+ font-weight: ${input.font.weight};
115
+ line-height: ${input.font.lineHeight}px;
114
116
 
115
117
  ${focus ? `border-color: ${input.border.color.typed};` : ""}
116
118
  ${focus || typed ? `color: ${input.font.color.focus};` : ""}
@@ -157,6 +159,9 @@ const Label = (0, import_styled_components.default)(import_react_native.Animated
157
159
  background-color: ${colors.white};
158
160
 
159
161
  font-family: ${baseFont.family};
162
+ font-size: ${input.font.size}px;
163
+ font-weight: ${input.font.weight};
164
+ line-height: ${input.font.lineHeight}px;
160
165
  color: ${input.label.color.default};
161
166
 
162
167
  ${focus ? `
@@ -48,6 +48,7 @@ const labelTransition = import_styled_components.css`
48
48
  transition-timing-function: cubic-bezier(${transition.timing[0].join()});
49
49
 
50
50
  font-size: ${input.label.font.size.typed}px;
51
+ line-height: ${input.label.font.lineHeight.typed}px;
51
52
  `}
52
53
  `;
53
54
  const Field = import_styled_components.default.input`
@@ -89,6 +90,7 @@ const Field = import_styled_components.default.input`
89
90
  font-family: ${baseFont.family}, sans-serif;
90
91
  font-size: ${input.font.size}px;
91
92
  font-weight: ${input.font.weight};
93
+ line-height: ${input.font.lineHeight}px;
92
94
 
93
95
  &:focus {
94
96
  color: ${input.font.color.focus};
@@ -102,7 +104,6 @@ const Field = import_styled_components.default.input`
102
104
  & ~ label {
103
105
  ${labelTransition}
104
106
 
105
- font-weight: ${input.label.font.weight};
106
107
  color: ${error ? `${colors.feedback.attention[1]}` : `${colors.text.primary}`};
107
108
  }
108
109
 
@@ -65,13 +65,13 @@ const Fieldset = import_styled_components.default.fieldset`
65
65
 
66
66
  ${disabled ? `border-color: ${colors.elements.lineAndBorders};` : ""}
67
67
 
68
- &:hover, &:focus-within {
68
+ &:hover, &:focus-within {
69
69
  &:not(:disabled) {
70
70
  border-color: ${error ? colors.feedback.attention[1] : input.border.color.typed};
71
- }
71
+ }
72
72
  }
73
73
 
74
-
74
+
75
75
  `}
76
76
  `;
77
77
  var Fieldset_default = Fieldset;
@@ -73,17 +73,15 @@ const Wrapper = import_styled_components.default.div`
73
73
  ${disabled ? `color: ${colors.text.disabled};` : ""}
74
74
  `}
75
75
  `;
76
- const Info = (0, import_styled_components.default)(import_Text.default.Small)`
76
+ const Info = (0, import_styled_components.default)(import_Text.default.Caption)`
77
77
  color: currentColor;
78
78
  ${({
79
79
  hideMaxLength,
80
80
  theme: {
81
- yoga: {
82
- components: { input }
83
- }
81
+ yoga: { baseFont }
84
82
  }
85
83
  }) => `
86
- font-size: ${input.helper.font.size}px;
84
+ font-family: ${baseFont.family};
87
85
 
88
86
  ${hideMaxLength ? "display: none;" : ""}
89
87
  `}
@@ -44,6 +44,7 @@ const Label = import_styled_components.default.label`
44
44
  yoga: {
45
45
  transition,
46
46
  colors,
47
+ baseFont,
47
48
  components: { input }
48
49
  }
49
50
  }
@@ -51,8 +52,10 @@ const Label = import_styled_components.default.label`
51
52
  top: ${input.padding.top}px;
52
53
  left: ${input.padding.left}px;
53
54
 
55
+ font-family: ${baseFont.family};
54
56
  font-size: ${input.label.font.size.default}px;
55
57
  font-weight: ${input.label.font.weight};
58
+ line-height: ${input.label.font.lineHeight.default}px;
56
59
  color: ${input.label.color.default};
57
60
 
58
61
  transition-property: transform, font-size;
@@ -70,18 +70,21 @@ const StyledLegend = import_styled_components.default.legend`
70
70
  max-width: 0;
71
71
  width: auto;
72
72
  height: 0;
73
- font-weight: normal;
74
73
  visibility: hidden;
75
74
  transition-property: max-width, padding;
76
75
 
77
76
  ${({
78
77
  theme: {
79
78
  yoga: {
79
+ baseFont,
80
80
  components: { input }
81
81
  }
82
82
  }
83
83
  }) => `
84
+ font-family: ${baseFont.family};
84
85
  font-size: ${input.label.font.size.typed}px;
86
+ font-weight: ${input.label.font.weight};
87
+ line-height: ${input.label.font.lineHeight.typed}px;
85
88
  letter-spacing: normal;
86
89
 
87
90
  transition-duration: 100ms;
@@ -251,6 +251,16 @@ const v3theme = (0, import_themeGenerator.default)((tokens) => ({
251
251
  small: tokens.lineHeights.xsmall
252
252
  }
253
253
  }
254
+ },
255
+ input: {
256
+ font: {
257
+ weight: tokens.fontWeights.medium
258
+ },
259
+ label: {
260
+ font: {
261
+ weight: tokens.fontWeights.medium
262
+ }
263
+ }
254
264
  }
255
265
  }
256
266
  }));
@@ -100,7 +100,7 @@ const Banner = forwardRef((props, ref) => {
100
100
  marginRight: "xxsmall"
101
101
  }
102
102
  ),
103
- /* @__PURE__ */ jsx(Text.Small, { flex: 1, marginTop: "xxsmall", marginBottom: "xxsmall", children: message }),
103
+ /* @__PURE__ */ jsx(Text.Body2, { flex: 1, marginTop: "xxsmall", marginBottom: "xxsmall", children: message }),
104
104
  primaryButton && !secondaryButton && /* @__PURE__ */ jsx(BannerActionButton, { button: primaryButton, marginLeft: "xxsmall" })
105
105
  ] }),
106
106
  primaryButton && secondaryButton && /* @__PURE__ */ jsxs(
@@ -104,7 +104,7 @@ const Banner = forwardRef((props, ref) => {
104
104
  marginRight: "xxsmall"
105
105
  }
106
106
  ),
107
- /* @__PURE__ */ jsx(Text.Small, { flex: 1, marginVertical: "xxsmall", children: message }),
107
+ /* @__PURE__ */ jsx(Text.Body2, { flex: 1, marginVertical: "xxsmall", children: message }),
108
108
  primaryButton && !secondaryButton && /* @__PURE__ */ jsx(BannerActionButton, { button: primaryButton, marginLeft: "xxsmall" })
109
109
  ] }),
110
110
  primaryButton && secondaryButton && /* @__PURE__ */ jsxs(
@@ -2,6 +2,7 @@ const Input = ({
2
2
  colors,
3
3
  fontSizes,
4
4
  fontWeights,
5
+ lineHeights,
5
6
  borders,
6
7
  radii,
7
8
  spacing
@@ -14,7 +15,8 @@ const Input = ({
14
15
  focus: colors.text.primary
15
16
  },
16
17
  size: fontSizes.small,
17
- weight: fontWeights.regular
18
+ weight: fontWeights.regular,
19
+ lineHeight: lineHeights.small
18
20
  },
19
21
  border: {
20
22
  width: borders.small,
@@ -44,7 +46,11 @@ const Input = ({
44
46
  default: fontSizes.small,
45
47
  typed: fontSizes.xsmall
46
48
  },
47
- weight: fontWeights.regular
49
+ weight: fontWeights.regular,
50
+ lineHeight: {
51
+ default: lineHeights.small,
52
+ typed: lineHeights.xsmall
53
+ }
48
54
  }
49
55
  },
50
56
  helper: {
@@ -56,7 +62,9 @@ const Input = ({
56
62
  top: spacing.xxxsmall
57
63
  },
58
64
  font: {
59
- size: fontSizes.xsmall
65
+ size: fontSizes.xsmall,
66
+ weight: fontWeights.regular,
67
+ lineHeight: lineHeights.xsmall
60
68
  }
61
69
  }
62
70
  });
@@ -20,13 +20,14 @@ const HelperWrapper = styled.View(
20
20
  margin-top: ${input.helper.margin.top}px;
21
21
  `
22
22
  );
23
- const Info = styled(Text.Regular)(
23
+ const Info = styled(Text.Caption)(
24
24
  ({
25
25
  disabled,
26
26
  focused,
27
27
  error,
28
28
  theme: {
29
29
  yoga: {
30
+ baseFont,
30
31
  colors,
31
32
  components: { input }
32
33
  }
@@ -34,8 +35,8 @@ const Info = styled(Text.Regular)(
34
35
  }) => `
35
36
  flex-wrap: wrap;
36
37
 
38
+ font-family: ${baseFont.family};
37
39
  color: ${input.helper.color.default};
38
- font-size: ${input.helper.font.size}px;
39
40
 
40
41
  ${disabled ? `color: ${colors.text.disabled};` : ""}
41
42
  ${focused ? `color: ${input.helper.color.focus};` : ""}
@@ -88,6 +88,8 @@ const Field = styled.TextInput(
88
88
  color: ${input.font.color.default};
89
89
  font-family: ${baseFont.family};
90
90
  font-size: ${input.font.size}px;
91
+ font-weight: ${input.font.weight};
92
+ line-height: ${input.font.lineHeight}px;
91
93
 
92
94
  ${focus ? `border-color: ${input.border.color.typed};` : ""}
93
95
  ${focus || typed ? `color: ${input.font.color.focus};` : ""}
@@ -134,6 +136,9 @@ const Label = styled(Animated.Text)(
134
136
  background-color: ${colors.white};
135
137
 
136
138
  font-family: ${baseFont.family};
139
+ font-size: ${input.font.size}px;
140
+ font-weight: ${input.font.weight};
141
+ line-height: ${input.font.lineHeight}px;
137
142
  color: ${input.label.color.default};
138
143
 
139
144
  ${focus ? `
@@ -15,6 +15,7 @@ const labelTransition = css`
15
15
  transition-timing-function: cubic-bezier(${transition.timing[0].join()});
16
16
 
17
17
  font-size: ${input.label.font.size.typed}px;
18
+ line-height: ${input.label.font.lineHeight.typed}px;
18
19
  `}
19
20
  `;
20
21
  const Field = styled.input`
@@ -56,6 +57,7 @@ const Field = styled.input`
56
57
  font-family: ${baseFont.family}, sans-serif;
57
58
  font-size: ${input.font.size}px;
58
59
  font-weight: ${input.font.weight};
60
+ line-height: ${input.font.lineHeight}px;
59
61
 
60
62
  &:focus {
61
63
  color: ${input.font.color.focus};
@@ -69,7 +71,6 @@ const Field = styled.input`
69
71
  & ~ label {
70
72
  ${labelTransition}
71
73
 
72
- font-weight: ${input.label.font.weight};
73
74
  color: ${error ? `${colors.feedback.attention[1]}` : `${colors.text.primary}`};
74
75
  }
75
76
 
@@ -32,13 +32,13 @@ const Fieldset = styled.fieldset`
32
32
 
33
33
  ${disabled ? `border-color: ${colors.elements.lineAndBorders};` : ""}
34
34
 
35
- &:hover, &:focus-within {
35
+ &:hover, &:focus-within {
36
36
  &:not(:disabled) {
37
37
  border-color: ${error ? colors.feedback.attention[1] : input.border.color.typed};
38
- }
38
+ }
39
39
  }
40
40
 
41
-
41
+
42
42
  `}
43
43
  `;
44
44
  var Fieldset_default = Fieldset;
@@ -41,17 +41,15 @@ const Wrapper = styled.div`
41
41
  ${disabled ? `color: ${colors.text.disabled};` : ""}
42
42
  `}
43
43
  `;
44
- const Info = styled(Text.Small)`
44
+ const Info = styled(Text.Caption)`
45
45
  color: currentColor;
46
46
  ${({
47
47
  hideMaxLength,
48
48
  theme: {
49
- yoga: {
50
- components: { input }
51
- }
49
+ yoga: { baseFont }
52
50
  }
53
51
  }) => `
54
- font-size: ${input.helper.font.size}px;
52
+ font-family: ${baseFont.family};
55
53
 
56
54
  ${hideMaxLength ? "display: none;" : ""}
57
55
  `}
@@ -11,6 +11,7 @@ const Label = styled.label`
11
11
  yoga: {
12
12
  transition,
13
13
  colors,
14
+ baseFont,
14
15
  components: { input }
15
16
  }
16
17
  }
@@ -18,8 +19,10 @@ const Label = styled.label`
18
19
  top: ${input.padding.top}px;
19
20
  left: ${input.padding.left}px;
20
21
 
22
+ font-family: ${baseFont.family};
21
23
  font-size: ${input.label.font.size.default}px;
22
24
  font-weight: ${input.label.font.weight};
25
+ line-height: ${input.label.font.lineHeight.default}px;
23
26
  color: ${input.label.color.default};
24
27
 
25
28
  transition-property: transform, font-size;
@@ -39,18 +39,21 @@ const StyledLegend = styled.legend`
39
39
  max-width: 0;
40
40
  width: auto;
41
41
  height: 0;
42
- font-weight: normal;
43
42
  visibility: hidden;
44
43
  transition-property: max-width, padding;
45
44
 
46
45
  ${({
47
46
  theme: {
48
47
  yoga: {
48
+ baseFont,
49
49
  components: { input }
50
50
  }
51
51
  }
52
52
  }) => `
53
+ font-family: ${baseFont.family};
53
54
  font-size: ${input.label.font.size.typed}px;
55
+ font-weight: ${input.label.font.weight};
56
+ line-height: ${input.label.font.lineHeight.typed}px;
54
57
  letter-spacing: normal;
55
58
 
56
59
  transition-duration: 100ms;
@@ -218,6 +218,16 @@ const v3theme = createTheme((tokens) => ({
218
218
  small: tokens.lineHeights.xsmall
219
219
  }
220
220
  }
221
+ },
222
+ input: {
223
+ font: {
224
+ weight: tokens.fontWeights.medium
225
+ },
226
+ label: {
227
+ font: {
228
+ weight: tokens.fontWeights.medium
229
+ }
230
+ }
221
231
  }
222
232
  }
223
233
  }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gympass/yoga",
3
- "version": "7.110.2",
3
+ "version": "7.111.0",
4
4
  "description": "Gympass component library",
5
5
  "main": "./cjs",
6
6
  "types": "./typings/index.d.ts",
@@ -57,7 +57,7 @@
57
57
  "react-native": "0.72.3",
58
58
  "styled-components": "^4.4.0"
59
59
  },
60
- "gitHead": "688077f280ef227940f13967f1d3f503e954a134",
60
+ "gitHead": "2b021eb53a54d8efe7c309117b22d9cc42dc805f",
61
61
  "module": "./esm",
62
62
  "private": false,
63
63
  "react-native": "./cjs/index.native.js"