@cognitap/radiant 0.0.4 → 0.0.6
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/CHANGELOG.md +44 -0
- package/README.md +17 -0
- package/dist/library/Button.d.ts +3 -1
- package/dist/library/Button.d.ts.map +1 -1
- package/dist/library/Button.js +43 -2
- package/dist/library/Button.js.map +1 -1
- package/dist/library/Card.d.ts.map +1 -1
- package/dist/library/Card.js +8 -6
- package/dist/library/Card.js.map +1 -1
- package/dist/library/Checkbox.js +2 -2
- package/dist/library/Checkbox.js.map +1 -1
- package/dist/library/Collapsible.d.ts +2 -1
- package/dist/library/Collapsible.d.ts.map +1 -1
- package/dist/library/Collapsible.js +10 -6
- package/dist/library/Collapsible.js.map +1 -1
- package/dist/library/Dialog.d.ts +2 -1
- package/dist/library/Dialog.d.ts.map +1 -1
- package/dist/library/Dialog.js +13 -8
- package/dist/library/Dialog.js.map +1 -1
- package/dist/library/Field.js +4 -4
- package/dist/library/Field.js.map +1 -1
- package/dist/library/Input.d.ts.map +1 -1
- package/dist/library/Input.js +4 -3
- package/dist/library/Input.js.map +1 -1
- package/dist/library/Link.d.ts.map +1 -1
- package/dist/library/Link.js +0 -1
- package/dist/library/Link.js.map +1 -1
- package/dist/library/RadioGroup.js +2 -2
- package/dist/library/RadioGroup.js.map +1 -1
- package/dist/library/ThemeScope.d.ts.map +1 -1
- package/dist/library/ThemeScope.js +11 -10
- package/dist/library/ThemeScope.js.map +1 -1
- package/dist/library/actionStyles.js +2 -2
- package/dist/library/actionStyles.js.map +1 -1
- package/dist/library/cn.d.ts +2 -1
- package/dist/library/cn.d.ts.map +1 -1
- package/dist/library/cn.js +22 -1
- package/dist/library/cn.js.map +1 -1
- package/dist/library/index.d.ts +5 -1
- package/dist/library/index.d.ts.map +1 -1
- package/dist/library/index.js +2 -0
- package/dist/library/index.js.map +1 -1
- package/dist/library/motion/MotionLink.d.ts +7 -0
- package/dist/library/motion/MotionLink.d.ts.map +1 -0
- package/dist/library/motion/MotionLink.js +45 -0
- package/dist/library/motion/MotionLink.js.map +1 -0
- package/dist/library/motion/browser.d.ts +5 -0
- package/dist/library/motion/browser.d.ts.map +1 -0
- package/dist/library/motion/browser.js +35 -0
- package/dist/library/motion/browser.js.map +1 -0
- package/dist/library/motion/config.d.ts +26 -0
- package/dist/library/motion/config.d.ts.map +1 -0
- package/dist/library/motion/config.js +58 -0
- package/dist/library/motion/config.js.map +1 -0
- package/dist/library/motion/context.d.ts +2 -0
- package/dist/library/motion/context.d.ts.map +1 -0
- package/dist/library/motion/context.js +5 -0
- package/dist/library/motion/context.js.map +1 -0
- package/dist/library/motion/drag.d.ts +20 -0
- package/dist/library/motion/drag.d.ts.map +1 -0
- package/dist/library/motion/drag.js +138 -0
- package/dist/library/motion/drag.js.map +1 -0
- package/dist/library/motion/dragBrowser.d.ts +4 -0
- package/dist/library/motion/dragBrowser.d.ts.map +1 -0
- package/dist/library/motion/dragBrowser.js +156 -0
- package/dist/library/motion/dragBrowser.js.map +1 -0
- package/dist/library/motion/follow.d.ts +9 -0
- package/dist/library/motion/follow.d.ts.map +1 -0
- package/dist/library/motion/follow.js +26 -0
- package/dist/library/motion/follow.js.map +1 -0
- package/dist/library/motion/host.d.ts +27 -0
- package/dist/library/motion/host.d.ts.map +1 -0
- package/dist/library/motion/host.js +62 -0
- package/dist/library/motion/host.js.map +1 -0
- package/dist/library/motion/index.d.ts +16 -0
- package/dist/library/motion/index.d.ts.map +1 -0
- package/dist/library/motion/index.js +9 -0
- package/dist/library/motion/index.js.map +1 -0
- package/dist/library/motion/layout.d.ts +20 -0
- package/dist/library/motion/layout.d.ts.map +1 -0
- package/dist/library/motion/layout.js +67 -0
- package/dist/library/motion/layout.js.map +1 -0
- package/dist/library/motion/layoutDom.d.ts +17 -0
- package/dist/library/motion/layoutDom.d.ts.map +1 -0
- package/dist/library/motion/layoutDom.js +272 -0
- package/dist/library/motion/layoutDom.js.map +1 -0
- package/dist/library/motion/press.d.ts +5 -0
- package/dist/library/motion/press.d.ts.map +1 -0
- package/dist/library/motion/press.js +72 -0
- package/dist/library/motion/press.js.map +1 -0
- package/dist/library/motion/pressPolicy.d.ts +5 -0
- package/dist/library/motion/pressPolicy.d.ts.map +1 -0
- package/dist/library/motion/pressPolicy.js +8 -0
- package/dist/library/motion/pressPolicy.js.map +1 -0
- package/dist/library/motion/react.d.ts +35 -0
- package/dist/library/motion/react.d.ts.map +1 -0
- package/dist/library/motion/react.js +224 -0
- package/dist/library/motion/react.js.map +1 -0
- package/dist/library/motion/runtime.d.ts +22 -0
- package/dist/library/motion/runtime.d.ts.map +1 -0
- package/dist/library/motion/runtime.js +117 -0
- package/dist/library/motion/runtime.js.map +1 -0
- package/dist/library/motion/transitions.d.ts +5 -0
- package/dist/library/motion/transitions.d.ts.map +1 -0
- package/dist/library/motion/transitions.js +211 -0
- package/dist/library/motion/transitions.js.map +1 -0
- package/dist/library/styles.css +1 -1
- package/dist/library/themes/defineTheme.d.ts +3 -0
- package/dist/library/themes/defineTheme.d.ts.map +1 -1
- package/dist/library/themes/defineTheme.js +9 -3
- package/dist/library/themes/defineTheme.js.map +1 -1
- package/dist/library/themes/index.d.ts +1 -1
- package/dist/library/themes/index.d.ts.map +1 -1
- package/dist/library/themes/index.js.map +1 -1
- package/dist/library/themes/themeDocument.d.ts.map +1 -1
- package/dist/library/themes/themeDocument.js +39 -8
- package/dist/library/themes/themeDocument.js.map +1 -1
- package/dist/library/themes/themeDocumentTypes.d.ts +16 -1
- package/dist/library/themes/themeDocumentTypes.d.ts.map +1 -1
- package/dist/library/themes/themeDocumentTypes.js.map +1 -1
- package/dist/library/themes/tokens.d.ts +7 -0
- package/dist/library/themes/tokens.d.ts.map +1 -1
- package/dist/library/themes/tokens.js +99 -0
- package/dist/library/themes/tokens.js.map +1 -1
- package/dist/library/typography/index.d.ts +72 -0
- package/dist/library/typography/index.d.ts.map +1 -0
- package/dist/library/typography/index.js +160 -0
- package/dist/library/typography/index.js.map +1 -0
- package/dist/library/typography/types.d.ts +78 -0
- package/dist/library/typography/types.d.ts.map +1 -0
- package/dist/library/typography/types.js +2 -0
- package/dist/library/typography/types.js.map +1 -0
- package/docs/motion.md +434 -0
- package/docs/system.md +33 -0
- package/docs/theming.md +204 -0
- package/package.json +20 -4
- package/src/Button.tsx +49 -1
- package/src/Card.tsx +8 -6
- package/src/Checkbox.tsx +2 -2
- package/src/Collapsible.tsx +18 -5
- package/src/Dialog.tsx +18 -7
- package/src/Field.tsx +4 -4
- package/src/Input.tsx +4 -3
- package/src/Link.tsx +0 -1
- package/src/RadioGroup.tsx +2 -2
- package/src/ThemeScope.tsx +22 -18
- package/src/actionStyles.ts +2 -2
- package/src/cn.ts +25 -1
- package/src/index.ts +12 -0
- package/src/motion/MotionLink.tsx +64 -0
- package/src/motion/browser.ts +45 -0
- package/src/motion/config.ts +79 -0
- package/src/motion/context.ts +4 -0
- package/src/motion/drag.ts +151 -0
- package/src/motion/dragBrowser.ts +159 -0
- package/src/motion/follow.ts +28 -0
- package/src/motion/host.ts +88 -0
- package/src/motion/index.ts +28 -0
- package/src/motion/layout.ts +78 -0
- package/src/motion/layoutDom.ts +293 -0
- package/src/motion/press.ts +77 -0
- package/src/motion/pressPolicy.ts +12 -0
- package/src/motion/react.ts +272 -0
- package/src/motion/runtime.ts +122 -0
- package/src/motion/transitions.ts +206 -0
- package/src/styles.css +1 -0
- package/src/themes/baseline.css +131 -0
- package/src/themes/defineTheme.ts +15 -3
- package/src/themes/index.ts +2 -0
- package/src/themes/themeDocument.ts +47 -9
- package/src/themes/themeDocumentTypes.ts +24 -5
- package/src/themes/tokens.ts +137 -0
- package/src/typography/index.ts +199 -0
- package/src/typography/types.ts +92 -0
- package/src/typography.css +336 -0
package/src/themes/baseline.css
CHANGED
|
@@ -32,6 +32,137 @@
|
|
|
32
32
|
--rad-color-danger: var(--_rad-light, oklch(0.56 0.19 25)) var(--_rad-dark, oklch(0.72 0.17 25));
|
|
33
33
|
--rad-color-danger-foreground: var(--_rad-light, oklch(0.99 0 0))
|
|
34
34
|
var(--_rad-dark, oklch(0.2 0.04 25));
|
|
35
|
+
--rad-typography-roles-prose-title-family: var(--rad-typography-family);
|
|
36
|
+
--rad-typography-roles-prose-title-size: 2.44140625rem;
|
|
37
|
+
--rad-typography-roles-prose-title-fluid-size: clamp(
|
|
38
|
+
2.44140625rem,
|
|
39
|
+
calc(1.41143799rem + 4.29153442cqi),
|
|
40
|
+
3.81469727rem
|
|
41
|
+
);
|
|
42
|
+
--rad-typography-roles-prose-title-weight: 600;
|
|
43
|
+
--rad-typography-roles-prose-title-line-height: 1.12;
|
|
44
|
+
--rad-typography-roles-prose-title-letter-spacing: -0.025em;
|
|
45
|
+
--rad-typography-roles-prose-title-measure: 22ch;
|
|
46
|
+
--rad-typography-roles-prose-heading-family: var(--rad-typography-family);
|
|
47
|
+
--rad-typography-roles-prose-heading-size: 1.5625rem;
|
|
48
|
+
--rad-typography-roles-prose-heading-fluid-size: clamp(
|
|
49
|
+
1.5625rem,
|
|
50
|
+
calc(1.26953125rem + 1.22070313cqi),
|
|
51
|
+
1.953125rem
|
|
52
|
+
);
|
|
53
|
+
--rad-typography-roles-prose-heading-weight: 600;
|
|
54
|
+
--rad-typography-roles-prose-heading-line-height: 1.25;
|
|
55
|
+
--rad-typography-roles-prose-heading-letter-spacing: -0.015em;
|
|
56
|
+
--rad-typography-roles-prose-heading-measure: 30ch;
|
|
57
|
+
--rad-typography-roles-prose-subheading-family: var(--rad-typography-family);
|
|
58
|
+
--rad-typography-roles-prose-subheading-size: 1.375rem;
|
|
59
|
+
--rad-typography-roles-prose-subheading-fluid-size: clamp(
|
|
60
|
+
1.375rem,
|
|
61
|
+
calc(1.234375rem + 0.5859375cqi),
|
|
62
|
+
1.5625rem
|
|
63
|
+
);
|
|
64
|
+
--rad-typography-roles-prose-subheading-weight: 600;
|
|
65
|
+
--rad-typography-roles-prose-subheading-line-height: 1.3;
|
|
66
|
+
--rad-typography-roles-prose-subheading-letter-spacing: -0.01em;
|
|
67
|
+
--rad-typography-roles-prose-subheading-measure: 36ch;
|
|
68
|
+
--rad-typography-roles-prose-body-family: var(--rad-typography-family);
|
|
69
|
+
--rad-typography-roles-prose-body-size: 1.25rem;
|
|
70
|
+
--rad-typography-roles-prose-body-fluid-size: 1.25rem;
|
|
71
|
+
--rad-typography-roles-prose-body-weight: 400;
|
|
72
|
+
--rad-typography-roles-prose-body-line-height: 1.6;
|
|
73
|
+
--rad-typography-roles-prose-body-letter-spacing: 0em;
|
|
74
|
+
--rad-typography-roles-prose-body-measure: 64ch;
|
|
75
|
+
--rad-typography-roles-prose-lead-family: var(--rad-typography-family);
|
|
76
|
+
--rad-typography-roles-prose-lead-size: 1.40625rem;
|
|
77
|
+
--rad-typography-roles-prose-lead-fluid-size: 1.40625rem;
|
|
78
|
+
--rad-typography-roles-prose-lead-weight: 400;
|
|
79
|
+
--rad-typography-roles-prose-lead-line-height: 1.5;
|
|
80
|
+
--rad-typography-roles-prose-lead-letter-spacing: 0em;
|
|
81
|
+
--rad-typography-roles-prose-lead-measure: 55ch;
|
|
82
|
+
--rad-typography-roles-prose-small-family: var(--rad-typography-family);
|
|
83
|
+
--rad-typography-roles-prose-small-size: 1rem;
|
|
84
|
+
--rad-typography-roles-prose-small-fluid-size: 1rem;
|
|
85
|
+
--rad-typography-roles-prose-small-weight: 400;
|
|
86
|
+
--rad-typography-roles-prose-small-line-height: 1.5;
|
|
87
|
+
--rad-typography-roles-prose-small-letter-spacing: 0em;
|
|
88
|
+
--rad-typography-roles-prose-small-measure: 64ch;
|
|
89
|
+
--rad-typography-roles-prose-quote-family: var(--rad-typography-family);
|
|
90
|
+
--rad-typography-roles-prose-quote-size: 1.5625rem;
|
|
91
|
+
--rad-typography-roles-prose-quote-fluid-size: 1.5625rem;
|
|
92
|
+
--rad-typography-roles-prose-quote-weight: 400;
|
|
93
|
+
--rad-typography-roles-prose-quote-line-height: 1.4;
|
|
94
|
+
--rad-typography-roles-prose-quote-letter-spacing: -0.01em;
|
|
95
|
+
--rad-typography-roles-prose-quote-measure: 64ch;
|
|
96
|
+
--rad-typography-roles-ui-title-family: var(--rad-typography-family);
|
|
97
|
+
--rad-typography-roles-ui-title-size: var(--rad-typography-heading-size);
|
|
98
|
+
--rad-typography-roles-ui-title-fluid-size: var(--rad-typography-heading-size);
|
|
99
|
+
--rad-typography-roles-ui-title-weight: var(--rad-typography-heading-weight);
|
|
100
|
+
--rad-typography-roles-ui-title-line-height: 1.3;
|
|
101
|
+
--rad-typography-roles-ui-title-letter-spacing: var(--rad-typography-letter-spacing);
|
|
102
|
+
--rad-typography-roles-ui-title-measure: none;
|
|
103
|
+
--rad-typography-roles-ui-body-family: var(--rad-typography-family);
|
|
104
|
+
--rad-typography-roles-ui-body-size: var(--rad-typography-body-size);
|
|
105
|
+
--rad-typography-roles-ui-body-fluid-size: var(--rad-typography-body-size);
|
|
106
|
+
--rad-typography-roles-ui-body-weight: var(--rad-typography-body-weight);
|
|
107
|
+
--rad-typography-roles-ui-body-line-height: 1.5;
|
|
108
|
+
--rad-typography-roles-ui-body-letter-spacing: var(--rad-typography-letter-spacing);
|
|
109
|
+
--rad-typography-roles-ui-body-measure: none;
|
|
110
|
+
--rad-typography-roles-ui-label-family: var(--rad-typography-family);
|
|
111
|
+
--rad-typography-roles-ui-label-size: var(--rad-typography-body-size);
|
|
112
|
+
--rad-typography-roles-ui-label-fluid-size: var(--rad-typography-body-size);
|
|
113
|
+
--rad-typography-roles-ui-label-weight: var(--rad-typography-label-weight);
|
|
114
|
+
--rad-typography-roles-ui-label-line-height: 1.4;
|
|
115
|
+
--rad-typography-roles-ui-label-letter-spacing: var(--rad-typography-letter-spacing);
|
|
116
|
+
--rad-typography-roles-ui-label-measure: none;
|
|
117
|
+
--rad-typography-roles-ui-supporting-family: var(--rad-typography-family);
|
|
118
|
+
--rad-typography-roles-ui-supporting-size: var(--rad-typography-small-size);
|
|
119
|
+
--rad-typography-roles-ui-supporting-fluid-size: var(--rad-typography-small-size);
|
|
120
|
+
--rad-typography-roles-ui-supporting-weight: var(--rad-typography-body-weight);
|
|
121
|
+
--rad-typography-roles-ui-supporting-line-height: 1.5;
|
|
122
|
+
--rad-typography-roles-ui-supporting-letter-spacing: var(--rad-typography-letter-spacing);
|
|
123
|
+
--rad-typography-roles-ui-supporting-measure: none;
|
|
124
|
+
--rad-typography-roles-ui-caption-family: var(--rad-typography-family);
|
|
125
|
+
--rad-typography-roles-ui-caption-size: 0.875rem;
|
|
126
|
+
--rad-typography-roles-ui-caption-fluid-size: 0.875rem;
|
|
127
|
+
--rad-typography-roles-ui-caption-weight: 400;
|
|
128
|
+
--rad-typography-roles-ui-caption-line-height: 1.5;
|
|
129
|
+
--rad-typography-roles-ui-caption-letter-spacing: 0em;
|
|
130
|
+
--rad-typography-roles-ui-caption-measure: none;
|
|
131
|
+
--rad-typography-roles-ui-metric-family: var(--rad-typography-family);
|
|
132
|
+
--rad-typography-roles-ui-metric-size: 2rem;
|
|
133
|
+
--rad-typography-roles-ui-metric-fluid-size: 2rem;
|
|
134
|
+
--rad-typography-roles-ui-metric-weight: 600;
|
|
135
|
+
--rad-typography-roles-ui-metric-line-height: 1.15;
|
|
136
|
+
--rad-typography-roles-ui-metric-letter-spacing: -0.03em;
|
|
137
|
+
--rad-typography-roles-ui-metric-measure: none;
|
|
138
|
+
--rad-typography-roles-ui-eyebrow-family: var(--rad-typography-family);
|
|
139
|
+
--rad-typography-roles-ui-eyebrow-size: 0.75rem;
|
|
140
|
+
--rad-typography-roles-ui-eyebrow-fluid-size: 0.75rem;
|
|
141
|
+
--rad-typography-roles-ui-eyebrow-weight: 600;
|
|
142
|
+
--rad-typography-roles-ui-eyebrow-line-height: 1.4;
|
|
143
|
+
--rad-typography-roles-ui-eyebrow-letter-spacing: 0.1em;
|
|
144
|
+
--rad-typography-roles-ui-eyebrow-measure: none;
|
|
145
|
+
--rad-typography-roles-display-family: var(--rad-typography-family);
|
|
146
|
+
--rad-typography-roles-display-size: 2.44140625rem;
|
|
147
|
+
--rad-typography-roles-display-fluid-size: clamp(
|
|
148
|
+
2.44140625rem,
|
|
149
|
+
calc(0.69618225rem + 7.27176666cqi),
|
|
150
|
+
4.76837158rem
|
|
151
|
+
);
|
|
152
|
+
--rad-typography-roles-display-weight: 600;
|
|
153
|
+
--rad-typography-roles-display-line-height: 1.06;
|
|
154
|
+
--rad-typography-roles-display-letter-spacing: -0.035em;
|
|
155
|
+
--rad-typography-roles-display-measure: 18ch;
|
|
156
|
+
--rad-typography-roles-code-family: ui-monospace, monospace;
|
|
157
|
+
--rad-typography-roles-code-size: 0.875rem;
|
|
158
|
+
--rad-typography-roles-code-fluid-size: 0.875rem;
|
|
159
|
+
--rad-typography-roles-code-weight: 400;
|
|
160
|
+
--rad-typography-roles-code-line-height: 1.65;
|
|
161
|
+
--rad-typography-roles-code-letter-spacing: 0em;
|
|
162
|
+
--rad-typography-roles-code-measure: 80ch;
|
|
163
|
+
--rad-typography-flow-paragraph: 1.25em;
|
|
164
|
+
--rad-typography-flow-heading-before: 2em;
|
|
165
|
+
--rad-typography-flow-heading-after: 0.625em;
|
|
35
166
|
--rad-typography-family: system-ui, sans-serif;
|
|
36
167
|
--rad-typography-body-size: 0.875rem;
|
|
37
168
|
--rad-typography-small-size: 0.8125rem;
|
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import {
|
|
2
|
+
defineMotionProfile,
|
|
3
|
+
type MotionProfile,
|
|
4
|
+
type MotionProfileInput
|
|
5
|
+
} from '../motion/config.js'
|
|
1
6
|
import type { CSSProperties } from 'react'
|
|
2
7
|
import {
|
|
3
8
|
flattenTokens,
|
|
@@ -24,6 +29,7 @@ export interface ThemeLayer {
|
|
|
24
29
|
readonly components?: ThemeComponentOverrides
|
|
25
30
|
}
|
|
26
31
|
export interface ThemeDefinition extends ThemeLayer {
|
|
32
|
+
readonly motion?: MotionProfileInput
|
|
27
33
|
readonly id: string
|
|
28
34
|
readonly name: string
|
|
29
35
|
readonly modes?: { readonly light?: ThemeLayer; readonly dark?: ThemeLayer }
|
|
@@ -31,6 +37,7 @@ export interface ThemeDefinition extends ThemeLayer {
|
|
|
31
37
|
|
|
32
38
|
/** Resolved, immutable data. Safe to pass through server/client serialization. */
|
|
33
39
|
export interface Theme {
|
|
40
|
+
readonly motion: MotionProfile
|
|
34
41
|
readonly id: string
|
|
35
42
|
readonly name: string
|
|
36
43
|
readonly modes: {
|
|
@@ -75,7 +82,11 @@ function validateTokens(value: unknown, baseline: object, path: string) {
|
|
|
75
82
|
} else {
|
|
76
83
|
validateScalar(
|
|
77
84
|
item,
|
|
78
|
-
key === 'disabledOpacity'
|
|
85
|
+
key === 'disabledOpacity'
|
|
86
|
+
? 'opacity'
|
|
87
|
+
: key.endsWith('Weight') || key === 'weight'
|
|
88
|
+
? 'weight'
|
|
89
|
+
: 'css',
|
|
79
90
|
`${path}.${key}`
|
|
80
91
|
)
|
|
81
92
|
}
|
|
@@ -107,7 +118,7 @@ export function defineTheme(definition: ThemeDefinition): Theme {
|
|
|
107
118
|
assertRecord(definition, 'theme')
|
|
108
119
|
assertKeys(
|
|
109
120
|
definition,
|
|
110
|
-
{ id: true, name: true, tokens: true, components: true, modes: true },
|
|
121
|
+
{ id: true, name: true, tokens: true, components: true, modes: true, motion: true },
|
|
111
122
|
'theme'
|
|
112
123
|
)
|
|
113
124
|
if (typeof definition.id !== 'string' || !/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/.test(definition.id)) {
|
|
@@ -140,6 +151,7 @@ export function defineTheme(definition: ThemeDefinition): Theme {
|
|
|
140
151
|
return freezeTree({
|
|
141
152
|
id: definition.id,
|
|
142
153
|
name: definition.name,
|
|
143
|
-
modes
|
|
154
|
+
modes,
|
|
155
|
+
motion: defineMotionProfile(definition.motion)
|
|
144
156
|
})
|
|
145
157
|
}
|
package/src/themes/index.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { defineTheme, type Theme, type ThemeDefinition, type ThemeLayer } from './defineTheme.js'
|
|
2
2
|
import { freezeTree, tokenDefaults } from './tokens.js'
|
|
3
|
+
import { generateTypography } from '../typography/index.js'
|
|
3
4
|
import type {
|
|
4
5
|
ThemeColorSection,
|
|
5
6
|
ThemeDocument,
|
|
@@ -157,11 +158,37 @@ function validateFonts(value: unknown, path: string) {
|
|
|
157
158
|
for (const [i, font] of value.entries()) {
|
|
158
159
|
const p = `${path}.${i}`
|
|
159
160
|
record(font, p)
|
|
160
|
-
keys(font, ['id', 'family', 'source', 'weights', 'styles'], p)
|
|
161
|
+
keys(font, ['id', 'family', 'source', 'weights', 'styles', 'axes'], p)
|
|
161
162
|
textValue(font.id, `${p}.id`)
|
|
162
163
|
textValue(font.family, `${p}.family`)
|
|
163
164
|
unique(font.id, ids, `${p}.id`)
|
|
164
165
|
choice(font.source, ['system', 'catalog', 'local'], `${p}.source`)
|
|
166
|
+
if (font.axes !== undefined) {
|
|
167
|
+
list(font.axes, `${p}.axes`)
|
|
168
|
+
if (font.axes.length > 32) throw new TypeError(`${p}.axes supports at most 32 axes.`)
|
|
169
|
+
const tags = new Set<unknown>()
|
|
170
|
+
for (const [j, axis] of font.axes.entries()) {
|
|
171
|
+
const at = `${p}.axes.${j}`
|
|
172
|
+
record(axis, at)
|
|
173
|
+
keys(axis, ['tag', 'min', 'default', 'max'], at)
|
|
174
|
+
if (typeof axis.tag !== 'string' || !/^[A-Za-z][A-Za-z0-9]{3}$/.test(axis.tag))
|
|
175
|
+
throw new TypeError(
|
|
176
|
+
`${at}.tag must contain four ASCII letters/digits, starting with a letter.`
|
|
177
|
+
)
|
|
178
|
+
unique(axis.tag, tags, `${at}.tag`)
|
|
179
|
+
for (const key of ['min', 'default', 'max'])
|
|
180
|
+
if (
|
|
181
|
+
typeof axis[key] !== 'number' ||
|
|
182
|
+
!Number.isFinite(axis[key]) ||
|
|
183
|
+
Math.abs(axis[key]) > 1000000
|
|
184
|
+
)
|
|
185
|
+
throw new TypeError(
|
|
186
|
+
`${at}.${key} must be a finite number between -1000000 and 1000000.`
|
|
187
|
+
)
|
|
188
|
+
if (Number(axis.min) > Number(axis.default) || Number(axis.default) > Number(axis.max))
|
|
189
|
+
throw new TypeError(`${at} must satisfy min <= default <= max.`)
|
|
190
|
+
}
|
|
191
|
+
}
|
|
165
192
|
for (const key of ['weights', 'styles']) {
|
|
166
193
|
if (font[key] === undefined) continue
|
|
167
194
|
list(font[key], `${p}.${key}`)
|
|
@@ -169,7 +196,7 @@ function validateFonts(value: unknown, path: string) {
|
|
|
169
196
|
for (const [j, item] of font[key].entries()) {
|
|
170
197
|
const at = `${p}.${key}.${j}`
|
|
171
198
|
if (key === 'styles') choice(item, ['normal', 'italic'], at)
|
|
172
|
-
else if (typeof item !== 'number' || item < 1 || item > 1000)
|
|
199
|
+
else if (typeof item !== 'number' || !Number.isFinite(item) || item < 1 || item > 1000)
|
|
173
200
|
throw new TypeError(`${at} must be a weight from 1 to 1000.`)
|
|
174
201
|
unique(item, seen, at)
|
|
175
202
|
}
|
|
@@ -178,17 +205,25 @@ function validateFonts(value: unknown, path: string) {
|
|
|
178
205
|
}
|
|
179
206
|
|
|
180
207
|
function toDefinition(sections: ThemeSections, id: string, name: string): ThemeDefinition {
|
|
181
|
-
const common: {
|
|
208
|
+
const common: {
|
|
209
|
+
tokens: RecordValue
|
|
210
|
+
components?: ThemeLayer['components']
|
|
211
|
+
motion?: ThemeDefinition['motion']
|
|
212
|
+
} = { tokens: {} }
|
|
182
213
|
const modes = { light: { tokens: {} } as typeof common, dark: { tokens: {} } as typeof common }
|
|
183
214
|
for (const sectionName of sectionNames) {
|
|
184
215
|
const section = sections[sectionName]
|
|
185
216
|
if (!section) continue
|
|
217
|
+
if (sectionName === 'motion') common.motion = sections.motion?.profile
|
|
218
|
+
if (sectionName === 'typography' && sections.typography?.typesetting !== undefined) {
|
|
219
|
+
common.tokens.typography = generateTypography(sections.typography.typesetting).tokens
|
|
220
|
+
}
|
|
186
221
|
for (const mode of ['common', 'light', 'dark'] as const) {
|
|
187
222
|
const values = mode === 'common' ? section.values : section.modes?.[mode]
|
|
188
223
|
if (values === undefined) continue
|
|
189
224
|
const layer = mode === 'common' ? common : modes[mode]
|
|
190
225
|
if (sectionName === 'components') layer.components = values as ThemeLayer['components']
|
|
191
|
-
else layer.tokens[sectionName] = values
|
|
226
|
+
else layer.tokens[sectionName] = merge(layer.tokens[sectionName], values)
|
|
192
227
|
}
|
|
193
228
|
}
|
|
194
229
|
return { id, name, ...common, modes }
|
|
@@ -219,11 +254,13 @@ export function parseThemeDocument(input: unknown): ThemeDocument | ThemeSection
|
|
|
219
254
|
[
|
|
220
255
|
'values',
|
|
221
256
|
'modes',
|
|
222
|
-
...(name === '
|
|
223
|
-
? ['
|
|
224
|
-
: name === '
|
|
225
|
-
? ['
|
|
226
|
-
:
|
|
257
|
+
...(name === 'motion'
|
|
258
|
+
? ['profile']
|
|
259
|
+
: name === 'color'
|
|
260
|
+
? ['brand', 'fidelity', 'palettes', 'anchor']
|
|
261
|
+
: name === 'typography'
|
|
262
|
+
? ['fonts', 'typesetting']
|
|
263
|
+
: [])
|
|
227
264
|
],
|
|
228
265
|
path
|
|
229
266
|
)
|
|
@@ -321,6 +358,7 @@ export function themeDocumentFromDefinition(definition: ThemeDefinition): ThemeD
|
|
|
321
358
|
const section: RecordValue = {}
|
|
322
359
|
const values = name === 'components' ? copy.components : copy.tokens?.[name]
|
|
323
360
|
if (values !== undefined) section.values = values
|
|
361
|
+
if (name === 'motion' && copy.motion !== undefined) section.profile = copy.motion
|
|
324
362
|
const modes: RecordValue = {}
|
|
325
363
|
for (const mode of ['light', 'dark'] as const) {
|
|
326
364
|
const values =
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import type { MotionProfileInput } from '../motion/config.js'
|
|
1
2
|
import type { ThemeComponentOverrides } from './components.js'
|
|
2
3
|
import type { ThemeTokens } from './tokens.js'
|
|
4
|
+
import type { TypographyInput } from '../typography/types.js'
|
|
3
5
|
|
|
4
6
|
/** One existing token group, with independently authored mode layers. */
|
|
5
7
|
export interface ThemeSection<T> {
|
|
@@ -35,6 +37,14 @@ export interface ThemeColorSection extends ThemeSection<ThemeTokens['color']> {
|
|
|
35
37
|
readonly anchor?: { readonly paletteId: string; readonly stop: ThemeColorStop }
|
|
36
38
|
}
|
|
37
39
|
|
|
40
|
+
/** Available OpenType axis range, never a font file or a trial-only setting. */
|
|
41
|
+
export interface ThemeFontAxis {
|
|
42
|
+
readonly tag: string
|
|
43
|
+
readonly min: number
|
|
44
|
+
readonly default: number
|
|
45
|
+
readonly max: number
|
|
46
|
+
}
|
|
47
|
+
|
|
38
48
|
/** Portable descriptors only. The consuming application owns loading and local availability. */
|
|
39
49
|
export interface ThemeFontMetadata {
|
|
40
50
|
readonly id: string
|
|
@@ -42,19 +52,28 @@ export interface ThemeFontMetadata {
|
|
|
42
52
|
readonly source: 'system' | 'catalog' | 'local'
|
|
43
53
|
readonly weights?: readonly number[]
|
|
44
54
|
readonly styles?: readonly ('normal' | 'italic')[]
|
|
55
|
+
readonly axes?: readonly ThemeFontAxis[]
|
|
45
56
|
}
|
|
46
57
|
|
|
47
58
|
export interface ThemeTypographySection extends ThemeSection<ThemeTokens['typography']> {
|
|
48
59
|
readonly fonts?: readonly ThemeFontMetadata[]
|
|
60
|
+
/** Generated defaults; explicit values and mode values override these leaves. */
|
|
61
|
+
readonly typesetting?: TypographyInput
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export interface ThemeMotionSection extends ThemeSection<ThemeTokens['motion']> {
|
|
65
|
+
readonly profile?: MotionProfileInput
|
|
49
66
|
}
|
|
50
67
|
|
|
51
68
|
/** Token groups are the extension seams for richer typesetting and spring authoring. */
|
|
52
69
|
export type ThemeSections = {
|
|
53
|
-
readonly [K in keyof ThemeTokens]?: K extends '
|
|
54
|
-
?
|
|
55
|
-
: K extends '
|
|
56
|
-
?
|
|
57
|
-
:
|
|
70
|
+
readonly [K in keyof ThemeTokens]?: K extends 'motion'
|
|
71
|
+
? ThemeMotionSection
|
|
72
|
+
: K extends 'color'
|
|
73
|
+
? ThemeColorSection
|
|
74
|
+
: K extends 'typography'
|
|
75
|
+
? ThemeTypographySection
|
|
76
|
+
: ThemeSection<ThemeTokens[K]>
|
|
58
77
|
} & {
|
|
59
78
|
readonly components?: ThemeSection<ThemeComponentOverrides>
|
|
60
79
|
}
|
package/src/themes/tokens.ts
CHANGED
|
@@ -1,3 +1,105 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
TypographyProseRhythm,
|
|
3
|
+
TypographyUIRhythm,
|
|
4
|
+
TypographyStyle,
|
|
5
|
+
TypographyRole,
|
|
6
|
+
TypographyTokens,
|
|
7
|
+
TypographyAssignment
|
|
8
|
+
} from '../typography/types.js'
|
|
9
|
+
|
|
10
|
+
/** Canonical calculations live beside the defaults so source CSS generation stays self-contained. */
|
|
11
|
+
export function typographyStyles(
|
|
12
|
+
prose: TypographyProseRhythm,
|
|
13
|
+
ui: TypographyUIRhythm
|
|
14
|
+
): Record<TypographyRole, TypographyStyle> {
|
|
15
|
+
const { size: r, lineHeight, measure, headingScale: q } = prose
|
|
16
|
+
const u = ui.size
|
|
17
|
+
const style = (
|
|
18
|
+
assignment: TypographyAssignment,
|
|
19
|
+
narrow: number,
|
|
20
|
+
wide: number,
|
|
21
|
+
weight: number,
|
|
22
|
+
leading: number,
|
|
23
|
+
tracking = 0,
|
|
24
|
+
width = 0
|
|
25
|
+
): TypographyStyle => ({
|
|
26
|
+
assignment,
|
|
27
|
+
narrow,
|
|
28
|
+
wide,
|
|
29
|
+
weight,
|
|
30
|
+
lineHeight: leading,
|
|
31
|
+
tracking,
|
|
32
|
+
measure: width
|
|
33
|
+
})
|
|
34
|
+
return {
|
|
35
|
+
'prose-title': style('headings', r * q ** 3, r * q ** 5, 600, 1.12, -0.025, 22),
|
|
36
|
+
'prose-heading': style('headings', r * q, r * q ** 2, 600, 1.25, -0.015, 30),
|
|
37
|
+
'prose-subheading': style('headings', r * 1.1, r * q, 600, 1.3, -0.01, 36),
|
|
38
|
+
'prose-body': style('body', r, r, 400, lineHeight, 0, measure),
|
|
39
|
+
'prose-lead': style('body', r * 1.125, r * 1.125, 400, 1.5, 0, 55),
|
|
40
|
+
'prose-small': style('body', r * 0.8, r * 0.8, 400, 1.5, 0, measure),
|
|
41
|
+
'prose-quote': style('body', r * 1.25, r * 1.25, 400, 1.4, -0.01, measure),
|
|
42
|
+
'ui-title': style('ui', u * 1.25, u * 1.25, 600, 1.3, -0.015),
|
|
43
|
+
'ui-body': style('ui', u, u, 400, ui.lineHeight),
|
|
44
|
+
'ui-label': style('ui', u, u, 500, 1.4),
|
|
45
|
+
'ui-supporting': style('ui', u * 0.9375, u * 0.9375, 400, 1.5),
|
|
46
|
+
'ui-caption': style('ui', u * 0.875, u * 0.875, 400, 1.5),
|
|
47
|
+
'ui-metric': style('ui', u * 2, u * 2, 600, 1.15, -0.03),
|
|
48
|
+
'ui-eyebrow': style('ui', u * 0.75, u * 0.75, 600, 1.4, 0.1),
|
|
49
|
+
display: style('headings', r * q ** 3, r * q ** 6, 600, 1.06, -0.035, 18),
|
|
50
|
+
code: style('code', 14, 14, 400, 1.65, 0, 80)
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
const baselineProse: TypographyProseRhythm = {
|
|
55
|
+
size: 20,
|
|
56
|
+
lineHeight: 1.6,
|
|
57
|
+
paragraphSpacing: 1.25,
|
|
58
|
+
measure: 64,
|
|
59
|
+
headingScale: 1.25
|
|
60
|
+
}
|
|
61
|
+
export const typographyRoles = Object.freeze(
|
|
62
|
+
Object.keys(typographyStyles(baselineProse, { size: 16, lineHeight: 1.5 })) as TypographyRole[]
|
|
63
|
+
)
|
|
64
|
+
|
|
65
|
+
function decimal(value: number): string {
|
|
66
|
+
return String(Number(value.toFixed(8)))
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
export function typographyTokens(
|
|
70
|
+
styles: Readonly<Record<TypographyRole, TypographyStyle>>,
|
|
71
|
+
families: Readonly<Record<TypographyAssignment, string>>,
|
|
72
|
+
flow: number
|
|
73
|
+
): TypographyTokens {
|
|
74
|
+
const roles = {} as Record<TypographyRole, TypographyTokens['roles'][TypographyRole]>
|
|
75
|
+
for (const role of typographyRoles) {
|
|
76
|
+
const s = styles[role]
|
|
77
|
+
const slope = (s.wide - s.narrow) / 512
|
|
78
|
+
const intercept = s.narrow / 16 - slope * 24
|
|
79
|
+
const size = `${decimal(s.narrow / 16)}rem`
|
|
80
|
+
roles[role] = {
|
|
81
|
+
family: families[s.assignment],
|
|
82
|
+
size,
|
|
83
|
+
fluidSize:
|
|
84
|
+
s.narrow === s.wide
|
|
85
|
+
? size
|
|
86
|
+
: `clamp(${size}, calc(${decimal(intercept)}rem + ${decimal(slope * 100)}cqi), ${decimal(s.wide / 16)}rem)`,
|
|
87
|
+
weight: s.weight,
|
|
88
|
+
lineHeight: decimal(s.lineHeight),
|
|
89
|
+
letterSpacing: `${decimal(s.tracking)}em`,
|
|
90
|
+
measure: s.measure ? `${decimal(s.measure)}ch` : 'none'
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return {
|
|
94
|
+
roles,
|
|
95
|
+
flow: {
|
|
96
|
+
paragraph: `${decimal(flow)}em`,
|
|
97
|
+
headingBefore: `${decimal(flow * 1.6)}em`,
|
|
98
|
+
headingAfter: `${decimal(flow * 0.5)}em`
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
1
103
|
/** The complete shared-token registry. CSS names are derived from these paths. */
|
|
2
104
|
export interface SharedTokens {
|
|
3
105
|
color: {
|
|
@@ -28,6 +130,8 @@ export interface SharedTokens {
|
|
|
28
130
|
labelWeight: string | number
|
|
29
131
|
headingWeight: string | number
|
|
30
132
|
letterSpacing: string
|
|
133
|
+
roles: TypographyTokens['roles']
|
|
134
|
+
flow: TypographyTokens['flow']
|
|
31
135
|
}
|
|
32
136
|
control: {
|
|
33
137
|
small: ControlMetrics
|
|
@@ -103,6 +207,7 @@ const light: SharedTokens = {
|
|
|
103
207
|
dangerForeground: 'oklch(0.99 0 0)'
|
|
104
208
|
},
|
|
105
209
|
typography: {
|
|
210
|
+
...baselineTypographyTokens(),
|
|
106
211
|
family: 'system-ui, sans-serif',
|
|
107
212
|
bodySize: '0.875rem',
|
|
108
213
|
smallSize: '0.8125rem',
|
|
@@ -205,6 +310,38 @@ export function freezeTree<T extends object>(value: T): Readonly<T> {
|
|
|
205
310
|
return Object.freeze(value)
|
|
206
311
|
}
|
|
207
312
|
|
|
313
|
+
// Legacy/preset leaves remain a bridge until a recipe or explicit role owns them.
|
|
314
|
+
// UI measures stay layout-owned; controls retain their independent size metrics.
|
|
315
|
+
function baselineTypographyTokens(): TypographyTokens {
|
|
316
|
+
const tokens = typographyTokens(
|
|
317
|
+
typographyStyles(baselineProse, { size: 16, lineHeight: 1.5 }),
|
|
318
|
+
{
|
|
319
|
+
body: 'var(--rad-typography-family)',
|
|
320
|
+
headings: 'var(--rad-typography-family)',
|
|
321
|
+
ui: 'var(--rad-typography-family)',
|
|
322
|
+
code: 'ui-monospace, monospace'
|
|
323
|
+
},
|
|
324
|
+
baselineProse.paragraphSpacing
|
|
325
|
+
)
|
|
326
|
+
const roles = { ...tokens.roles }
|
|
327
|
+
for (const [role, size, weight] of [
|
|
328
|
+
['ui-body', 'bodySize', 'bodyWeight'],
|
|
329
|
+
['ui-label', 'bodySize', 'labelWeight'],
|
|
330
|
+
['ui-title', 'headingSize', 'headingWeight'],
|
|
331
|
+
['ui-supporting', 'smallSize', 'bodyWeight']
|
|
332
|
+
] as const) {
|
|
333
|
+
const leaf = (name: string) => `var(--rad-typography-${kebabCase(name)})`
|
|
334
|
+
roles[role] = {
|
|
335
|
+
...tokens.roles[role],
|
|
336
|
+
size: leaf(size),
|
|
337
|
+
fluidSize: leaf(size),
|
|
338
|
+
weight: leaf(weight),
|
|
339
|
+
letterSpacing: leaf('letterSpacing')
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
return { ...tokens, roles }
|
|
343
|
+
}
|
|
344
|
+
|
|
208
345
|
export const tokenDefaults = freezeTree({ light, dark })
|
|
209
346
|
|
|
210
347
|
export function kebabCase(value: string): string {
|