@atlaskit/ds-explorations 3.2.1 → 3.2.3

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/components/text.partial.js +9 -6
  3. package/dist/es2019/components/text.partial.js +9 -6
  4. package/dist/esm/components/text.partial.js +9 -6
  5. package/dist/types/components/text.partial.d.ts +4 -3
  6. package/dist/types-ts4.5/components/text.partial.d.ts +4 -3
  7. package/package.json +3 -3
  8. package/src/components/text.partial.tsx +15 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @atlaskit/ds-explorations
2
2
 
3
+ ## 3.2.3
4
+
5
+ ### Patch Changes
6
+
7
+ - [#74836](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/74836) [`3963062ac997`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3963062ac997) - Codegen to add in new font family tokens. Not exposed in any components.
8
+ - Updated dependencies
9
+
10
+ ## 3.2.2
11
+
12
+ ### Patch Changes
13
+
14
+ - [#72557](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72557) [`0c78c9c18cb7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0c78c9c18cb7) - Fix font family not preferencing apple system fonts on macOS
15
+
3
16
  ## 3.2.1
4
17
 
5
18
  ### Patch Changes
package/dist/cjs/components/text.partial.js CHANGED
@@ -129,11 +129,11 @@ var Text = function Text(_ref) {
129
129
  var _default = exports.default = Text;
130
130
  /**
131
131
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
132
- * @codegen <<SignedSource::fe02dc1da6471f0cd0c93cb3fa16272e>>
132
+ * @codegen <<SignedSource::b4388d14310b7a04b2bbe7140abb8173>>
133
133
  * @codegenId typography
134
134
  * @codegenCommand yarn codegen-styles
135
135
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight"]
136
- * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::22351c8864d5ab21980c3493082fde9b>>
136
+ * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::2618e5da582e150e8ae1ad541ba35f9d>>
137
137
  */
138
138
  var fontSizeMap = {
139
139
  'size.050': (0, _react2.css)({
@@ -177,16 +177,19 @@ var fontWeightMap = {
177
177
  };
178
178
  var fontFamilyMap = {
179
179
  body: (0, _react2.css)({
180
- fontFamily: "var(--ds-font-family-body, ui-sans-serif, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
180
+ fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
181
181
  }),
182
- brand: (0, _react2.css)({
183
- fontFamily: "var(--ds-font-family-brand, Charlie Sans)"
182
+ 'brand.body': (0, _react2.css)({
183
+ fontFamily: "var(--ds-font-family-brand-body, \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
184
+ }),
185
+ 'brand.heading': (0, _react2.css)({
186
+ fontFamily: "var(--ds-font-family-brand-heading, \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
184
187
  }),
185
188
  code: (0, _react2.css)({
186
189
  fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
187
190
  }),
188
191
  heading: (0, _react2.css)({
189
- fontFamily: "var(--ds-font-family-heading, ui-sans-serif, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
192
+ fontFamily: "var(--ds-font-family-heading, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
190
193
  }),
191
194
  monospace: (0, _react2.css)({
192
195
  fontFamily: "var(--ds-font-family-monospace, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
package/dist/es2019/components/text.partial.js CHANGED
@@ -120,11 +120,11 @@ export default Text;
120
120
 
121
121
  /**
122
122
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
123
- * @codegen <<SignedSource::fe02dc1da6471f0cd0c93cb3fa16272e>>
123
+ * @codegen <<SignedSource::b4388d14310b7a04b2bbe7140abb8173>>
124
124
  * @codegenId typography
125
125
  * @codegenCommand yarn codegen-styles
126
126
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight"]
127
- * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::22351c8864d5ab21980c3493082fde9b>>
127
+ * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::2618e5da582e150e8ae1ad541ba35f9d>>
128
128
  */
129
129
  const fontSizeMap = {
130
130
  'size.050': css({
@@ -168,16 +168,19 @@ const fontWeightMap = {
168
168
  };
169
169
  const fontFamilyMap = {
170
170
  body: css({
171
- fontFamily: "var(--ds-font-family-body, ui-sans-serif, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
171
+ fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
172
172
  }),
173
- brand: css({
174
- fontFamily: "var(--ds-font-family-brand, Charlie Sans)"
173
+ 'brand.body': css({
174
+ fontFamily: "var(--ds-font-family-brand-body, \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
175
+ }),
176
+ 'brand.heading': css({
177
+ fontFamily: "var(--ds-font-family-brand-heading, \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
175
178
  }),
176
179
  code: css({
177
180
  fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
178
181
  }),
179
182
  heading: css({
180
- fontFamily: "var(--ds-font-family-heading, ui-sans-serif, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
183
+ fontFamily: "var(--ds-font-family-heading, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
181
184
  }),
182
185
  monospace: css({
183
186
  fontFamily: "var(--ds-font-family-monospace, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
package/dist/esm/components/text.partial.js CHANGED
@@ -123,11 +123,11 @@ export default Text;
123
123
 
124
124
  /**
125
125
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
126
- * @codegen <<SignedSource::fe02dc1da6471f0cd0c93cb3fa16272e>>
126
+ * @codegen <<SignedSource::b4388d14310b7a04b2bbe7140abb8173>>
127
127
  * @codegenId typography
128
128
  * @codegenCommand yarn codegen-styles
129
129
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight"]
130
- * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::22351c8864d5ab21980c3493082fde9b>>
130
+ * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::2618e5da582e150e8ae1ad541ba35f9d>>
131
131
  */
132
132
  var fontSizeMap = {
133
133
  'size.050': css({
@@ -171,16 +171,19 @@ var fontWeightMap = {
171
171
  };
172
172
  var fontFamilyMap = {
173
173
  body: css({
174
- fontFamily: "var(--ds-font-family-body, ui-sans-serif, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
174
+ fontFamily: "var(--ds-font-family-body, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
175
175
  }),
176
- brand: css({
177
- fontFamily: "var(--ds-font-family-brand, Charlie Sans)"
176
+ 'brand.body': css({
177
+ fontFamily: "var(--ds-font-family-brand-body, \"Charlie Text\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
178
+ }),
179
+ 'brand.heading': css({
180
+ fontFamily: "var(--ds-font-family-brand-heading, \"Charlie Display\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
178
181
  }),
179
182
  code: css({
180
183
  fontFamily: "var(--ds-font-family-code, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
181
184
  }),
182
185
  heading: css({
183
- fontFamily: "var(--ds-font-family-heading, ui-sans-serif, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
186
+ fontFamily: "var(--ds-font-family-heading, ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
184
187
  }),
185
188
  monospace: css({
186
189
  fontFamily: "var(--ds-font-family-monospace, ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace)"
package/dist/types/components/text.partial.d.ts CHANGED
@@ -81,11 +81,11 @@ declare const Text: FC<TextProps>;
81
81
  export default Text;
82
82
  /**
83
83
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
84
- * @codegen <<SignedSource::fe02dc1da6471f0cd0c93cb3fa16272e>>
84
+ * @codegen <<SignedSource::b4388d14310b7a04b2bbe7140abb8173>>
85
85
  * @codegenId typography
86
86
  * @codegenCommand yarn codegen-styles
87
87
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight"]
88
- * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::22351c8864d5ab21980c3493082fde9b>>
88
+ * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::2618e5da582e150e8ae1ad541ba35f9d>>
89
89
  */
90
90
  declare const fontSizeMap: {
91
91
  'size.050': import("@emotion/react").SerializedStyles;
@@ -107,7 +107,8 @@ declare const fontWeightMap: {
107
107
  export type FontWeight = keyof typeof fontWeightMap;
108
108
  declare const fontFamilyMap: {
109
109
  body: import("@emotion/react").SerializedStyles;
110
- brand: import("@emotion/react").SerializedStyles;
110
+ 'brand.body': import("@emotion/react").SerializedStyles;
111
+ 'brand.heading': import("@emotion/react").SerializedStyles;
111
112
  code: import("@emotion/react").SerializedStyles;
112
113
  heading: import("@emotion/react").SerializedStyles;
113
114
  monospace: import("@emotion/react").SerializedStyles;
package/dist/types-ts4.5/components/text.partial.d.ts CHANGED
@@ -86,11 +86,11 @@ declare const Text: FC<TextProps>;
86
86
  export default Text;
87
87
  /**
88
88
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
89
- * @codegen <<SignedSource::fe02dc1da6471f0cd0c93cb3fa16272e>>
89
+ * @codegen <<SignedSource::b4388d14310b7a04b2bbe7140abb8173>>
90
90
  * @codegenId typography
91
91
  * @codegenCommand yarn codegen-styles
92
92
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight"]
93
- * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::22351c8864d5ab21980c3493082fde9b>>
93
+ * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::2618e5da582e150e8ae1ad541ba35f9d>>
94
94
  */
95
95
  declare const fontSizeMap: {
96
96
  'size.050': import("@emotion/react").SerializedStyles;
@@ -112,7 +112,8 @@ declare const fontWeightMap: {
112
112
  export type FontWeight = keyof typeof fontWeightMap;
113
113
  declare const fontFamilyMap: {
114
114
  body: import("@emotion/react").SerializedStyles;
115
- brand: import("@emotion/react").SerializedStyles;
115
+ 'brand.body': import("@emotion/react").SerializedStyles;
116
+ 'brand.heading': import("@emotion/react").SerializedStyles;
116
117
  code: import("@emotion/react").SerializedStyles;
117
118
  heading: import("@emotion/react").SerializedStyles;
118
119
  monospace: import("@emotion/react").SerializedStyles;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/ds-explorations",
3
- "version": "3.2.1",
3
+ "version": "3.2.3",
4
4
  "description": "An experimental package for exploration and validation of spacing / typography foundations.",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -25,7 +25,7 @@
25
25
  "prepare": "yarn ak-postbuild"
26
26
  },
27
27
  "dependencies": {
28
- "@atlaskit/tokens": "^1.34.0",
28
+ "@atlaskit/tokens": "^1.38.0",
29
29
  "@babel/runtime": "^7.0.0",
30
30
  "@emotion/react": "^11.7.1",
31
31
  "tiny-invariant": "^1.2.0"
@@ -35,7 +35,7 @@
35
35
  },
36
36
  "devDependencies": {
37
37
  "@atlaskit/ds-lib": "*",
38
- "@atlaskit/primitives": "^1.18.0",
38
+ "@atlaskit/primitives": "^2.0.0",
39
39
  "@atlaskit/visual-regression": "*",
40
40
  "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
41
41
  "@atlassian/codegen": "^0.1.0",
package/src/components/text.partial.tsx CHANGED
@@ -189,11 +189,11 @@ export default Text;
189
189
 
190
190
  /**
191
191
  * THIS SECTION WAS CREATED VIA CODEGEN DO NOT MODIFY {@see http://go/af-codegen}
192
- * @codegen <<SignedSource::fe02dc1da6471f0cd0c93cb3fa16272e>>
192
+ * @codegen <<SignedSource::b4388d14310b7a04b2bbe7140abb8173>>
193
193
  * @codegenId typography
194
194
  * @codegenCommand yarn codegen-styles
195
195
  * @codegenParams ["fontSize", "fontWeight", "fontFamily", "lineHeight"]
196
- * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::22351c8864d5ab21980c3493082fde9b>>
196
+ * @codegenDependency ../../../tokens/src/artifacts/tokens-raw/atlassian-typography-adg3.tsx <<SignedSource::2618e5da582e150e8ae1ad541ba35f9d>>
197
197
  */
198
198
  const fontSizeMap = {
199
199
  'size.050': css({
@@ -245,11 +245,20 @@ const fontFamilyMap = {
245
245
  body: css({
246
246
  fontFamily: token(
247
247
  'font.family.body',
248
- 'ui-sans-serif, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
248
+ 'ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
249
249
  ),
250
250
  }),
251
- brand: css({
252
- fontFamily: token('font.family.brand', 'Charlie Sans'),
251
+ 'brand.body': css({
252
+ fontFamily: token(
253
+ 'font.family.brand.body',
254
+ '"Charlie Text", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
255
+ ),
256
+ }),
257
+ 'brand.heading': css({
258
+ fontFamily: token(
259
+ 'font.family.brand.heading',
260
+ '"Charlie Display", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
261
+ ),
253
262
  }),
254
263
  code: css({
255
264
  fontFamily: token(
@@ -260,7 +269,7 @@ const fontFamilyMap = {
260
269
  heading: css({
261
270
  fontFamily: token(
262
271
  'font.family.heading',
263
- 'ui-sans-serif, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
272
+ 'ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
264
273
  ),
265
274
  }),
266
275
  monospace: css({