@nordcraft/core 1.0.76 → 1.0.77
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/styling/customProperty.d.ts +4 -0
- package/dist/styling/customProperty.js +13 -5
- package/dist/styling/customProperty.js.map +1 -1
- package/dist/styling/theme.d.ts +1 -1
- package/dist/styling/theme.js +1 -1
- package/dist/styling/theme.js.map +1 -1
- package/package.json +1 -1
- package/src/styling/customProperty.ts +31 -7
- package/src/styling/theme.ts +2 -2
|
@@ -2,9 +2,13 @@ import type { CustomPropertyName } from '../component/component.types';
|
|
|
2
2
|
import type { Nullable } from '../types';
|
|
3
3
|
import type { CustomPropertyDefinition, Theme } from './theme';
|
|
4
4
|
export type CssSyntax = 'angle' | 'color' | 'custom-ident' | 'image' | 'integer' | 'length' | 'length-percentage' | 'number' | 'percentage' | 'resolution' | 'string' | 'time' | 'transform-function' | 'transform-list' | 'url' | '*';
|
|
5
|
+
export type CssCustomSyntax = 'font-family';
|
|
5
6
|
export type CssSyntaxNode = {
|
|
6
7
|
type: 'primitive';
|
|
7
8
|
name: CssSyntax;
|
|
9
|
+
} | {
|
|
10
|
+
type: 'custom';
|
|
11
|
+
name: CssCustomSyntax;
|
|
8
12
|
} | {
|
|
9
13
|
type: 'keyword';
|
|
10
14
|
keywords: string[];
|
|
@@ -2,10 +2,16 @@ import { isDefined } from '../utils/util';
|
|
|
2
2
|
export function stringifySyntaxNode(node) {
|
|
3
3
|
switch (node.type) {
|
|
4
4
|
case 'primitive':
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
switch (node.name) {
|
|
6
|
+
case '*':
|
|
7
|
+
return node.name;
|
|
8
|
+
default:
|
|
9
|
+
return `<${node.name}>`;
|
|
7
10
|
}
|
|
8
|
-
|
|
11
|
+
case 'custom':
|
|
12
|
+
return {
|
|
13
|
+
'font-family': '<custom-ident> | <string>',
|
|
14
|
+
}[node.name];
|
|
9
15
|
case 'keyword':
|
|
10
16
|
return node.keywords.join(' | ');
|
|
11
17
|
default:
|
|
@@ -18,7 +24,8 @@ export function renderSyntaxDefinition(key, { syntax, inherits, initialValue },
|
|
|
18
24
|
value = solveVarRecursively(initialValue, theme);
|
|
19
25
|
}
|
|
20
26
|
// Fallback in-case of no reference
|
|
21
|
-
if (!isDefined(value) &&
|
|
27
|
+
if (!isDefined(value) &&
|
|
28
|
+
(syntax.type === 'primitive' || syntax.type === 'custom')) {
|
|
22
29
|
value = FALLBACK_VALUES[syntax.name];
|
|
23
30
|
}
|
|
24
31
|
return `@property ${key} {
|
|
@@ -64,8 +71,9 @@ const FALLBACK_VALUES = {
|
|
|
64
71
|
url: 'none',
|
|
65
72
|
'transform-function': 'none',
|
|
66
73
|
'transform-list': 'none',
|
|
67
|
-
'*': 'initial',
|
|
68
74
|
integer: '0',
|
|
75
|
+
'font-family': 'initial',
|
|
76
|
+
'*': 'initial',
|
|
69
77
|
};
|
|
70
78
|
export const appendUnit = (value, unit) => isDefined(value) && isDefined(unit) && !String(value).endsWith(unit)
|
|
71
79
|
? `${value}${unit}`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customProperty.js","sourceRoot":"","sources":["../../src/styling/customProperty.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"customProperty.js","sourceRoot":"","sources":["../../src/styling/customProperty.ts"],"names":[],"mappings":"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"}
|
package/dist/styling/theme.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export type FontFamily = {
|
|
|
20
20
|
family: string;
|
|
21
21
|
provider: 'google' | 'upload';
|
|
22
22
|
type: 'serif' | 'sans-serif' | 'monospace' | 'cursive';
|
|
23
|
-
variants
|
|
23
|
+
variants?: Array<{
|
|
24
24
|
name: string;
|
|
25
25
|
weight: '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
|
|
26
26
|
italic: boolean;
|
package/dist/styling/theme.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/styling/theme.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACzC,OAAO,EAAE,sBAAsB,EAAsB,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAyG5C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,MAAwC,EACxC,OAAqB,EACrB,EAAE,CAAC;IACH,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACxD,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAClC,IAAI,aAAa,IAAI,KAAK,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QACrB,CAAC;QACD,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAAA,CACxB,EACD,CAAC,EAAE,EAAE,EAAE,CAAsD,CAC9D,CAAA;IAED,OAAO;IACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;SAC7B,IAAI,CAAC,IAAI,CAAC;;IAEX,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;SACtB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAChB,OAAO;IACT,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,IAAI,EAAE,CAAC;aAChD,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,EAAE,CAChC,sBAAsB,CACpB,YAAkC,EAClC,QAAQ,EACR,OAAO,CACR,CACF;aACA,IAAI,CAAC,IAAI,CAAC;;IAEX,iBAAiB,CAAC,cAAc,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E,iBAAiB,CAAC,cAAc,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,qCAAqC,CAAC;IACvH,iBAAiB,CAAC,cAAc,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,sCAAsC,CAAC;IACzH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CACjB,iBAAiB,CACf,iBAAiB,GAAG,IAAI,EACxB,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAC9B,CACF;aACA,IAAI,CAAC,IAAI,CAAC;KACV,CAAA;IAAA,CACA,CAAC;SACD,IAAI,CAAC,IAAI,CAAC;;EAEb,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE;;IAG3C,OAAO,CAAC,eAAe;QACrB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;aACpB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;aACzB,IAAI,EAAE;aACN,GAAG,CACF,CAAC,IAAI,EAAE,EAAE,CAAC;MAChB,IAAI,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/styling/theme.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,6 +4,7 @@ import { isDefined } from '../utils/util'
|
|
|
4
4
|
import type { CustomPropertyDefinition, Theme } from './theme'
|
|
5
5
|
|
|
6
6
|
// See https://developer.mozilla.org/en-US/docs/Web/CSS/@property/syntax
|
|
7
|
+
// Note: Not all CSS syntaxes are necessarily supported logically
|
|
7
8
|
export type CssSyntax =
|
|
8
9
|
| 'angle'
|
|
9
10
|
| 'color'
|
|
@@ -22,11 +23,23 @@ export type CssSyntax =
|
|
|
22
23
|
| 'url'
|
|
23
24
|
| '*'
|
|
24
25
|
|
|
26
|
+
// Custom syntaxes that cannot be represented by a single primitive or keyword list
|
|
27
|
+
export type CssCustomSyntax = 'font-family' // <custom-ident> | <string>
|
|
28
|
+
// | 'timing-function'
|
|
29
|
+
// | 'box-shadow'
|
|
30
|
+
// | 'box-shadow-list'
|
|
31
|
+
// | 'filter'
|
|
32
|
+
// | etc.
|
|
33
|
+
|
|
25
34
|
export type CssSyntaxNode =
|
|
26
35
|
| {
|
|
27
36
|
type: 'primitive'
|
|
28
37
|
name: CssSyntax
|
|
29
38
|
}
|
|
39
|
+
| {
|
|
40
|
+
type: 'custom'
|
|
41
|
+
name: CssCustomSyntax
|
|
42
|
+
}
|
|
30
43
|
| {
|
|
31
44
|
type: 'keyword'
|
|
32
45
|
keywords: string[]
|
|
@@ -35,11 +48,18 @@ export type CssSyntaxNode =
|
|
|
35
48
|
export function stringifySyntaxNode(node: CssSyntaxNode): string {
|
|
36
49
|
switch (node.type) {
|
|
37
50
|
case 'primitive':
|
|
38
|
-
|
|
39
|
-
|
|
51
|
+
switch (node.name) {
|
|
52
|
+
case '*':
|
|
53
|
+
return node.name
|
|
54
|
+
default:
|
|
55
|
+
return `<${node.name}>`
|
|
40
56
|
}
|
|
41
|
-
|
|
42
|
-
return
|
|
57
|
+
case 'custom':
|
|
58
|
+
return (
|
|
59
|
+
{
|
|
60
|
+
'font-family': '<custom-ident> | <string>',
|
|
61
|
+
} as { [key in CssCustomSyntax]: string }
|
|
62
|
+
)[node.name]
|
|
43
63
|
case 'keyword':
|
|
44
64
|
return node.keywords.join(' | ')
|
|
45
65
|
default:
|
|
@@ -58,7 +78,10 @@ export function renderSyntaxDefinition(
|
|
|
58
78
|
}
|
|
59
79
|
|
|
60
80
|
// Fallback in-case of no reference
|
|
61
|
-
if (
|
|
81
|
+
if (
|
|
82
|
+
!isDefined(value) &&
|
|
83
|
+
(syntax.type === 'primitive' || syntax.type === 'custom')
|
|
84
|
+
) {
|
|
62
85
|
value = FALLBACK_VALUES[syntax.name]
|
|
63
86
|
}
|
|
64
87
|
|
|
@@ -97,7 +120,7 @@ function solveVarRecursively(initialValue: string, theme: Theme, depth = 0) {
|
|
|
97
120
|
return null
|
|
98
121
|
}
|
|
99
122
|
|
|
100
|
-
const FALLBACK_VALUES: Record<CssSyntax, string> = {
|
|
123
|
+
const FALLBACK_VALUES: Record<CssSyntax | CssCustomSyntax, string> = {
|
|
101
124
|
color: 'transparent',
|
|
102
125
|
length: '0px',
|
|
103
126
|
'length-percentage': '0px',
|
|
@@ -112,8 +135,9 @@ const FALLBACK_VALUES: Record<CssSyntax, string> = {
|
|
|
112
135
|
url: 'none',
|
|
113
136
|
'transform-function': 'none',
|
|
114
137
|
'transform-list': 'none',
|
|
115
|
-
'*': 'initial',
|
|
116
138
|
integer: '0',
|
|
139
|
+
'font-family': 'initial',
|
|
140
|
+
'*': 'initial',
|
|
117
141
|
}
|
|
118
142
|
|
|
119
143
|
export const appendUnit = (value: any, unit: Nullable<string>) =>
|
package/src/styling/theme.ts
CHANGED
|
@@ -34,7 +34,7 @@ export type FontFamily = {
|
|
|
34
34
|
family: string
|
|
35
35
|
provider: 'google' | 'upload'
|
|
36
36
|
type: 'serif' | 'sans-serif' | 'monospace' | 'cursive'
|
|
37
|
-
variants
|
|
37
|
+
variants?: Array<{
|
|
38
38
|
name: string
|
|
39
39
|
weight:
|
|
40
40
|
| '100'
|
|
@@ -165,7 +165,7 @@ ${options.includeResetStyle ? RESET_STYLES : ''}
|
|
|
165
165
|
.flat()
|
|
166
166
|
.map(
|
|
167
167
|
(font) => `
|
|
168
|
-
${font.variants
|
|
168
|
+
${(font.variants ?? [])
|
|
169
169
|
.map(
|
|
170
170
|
(variant) => `
|
|
171
171
|
@font-face {
|