@nordcraft/runtime 1.0.87 → 1.0.88
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/custom-element.main.esm.js +29 -29
- package/dist/custom-element.main.esm.js.map +4 -4
- package/dist/page.main.esm.js +3 -3
- package/dist/page.main.esm.js.map +4 -4
- package/dist/src/components/createComponent.js +33 -42
- package/dist/src/components/createComponent.js.map +1 -1
- package/dist/src/components/createElement.js +34 -49
- package/dist/src/components/createElement.js.map +1 -1
- package/dist/src/utils/formulaHasValue.d.ts +2 -0
- package/dist/src/utils/formulaHasValue.js +3 -0
- package/dist/src/utils/formulaHasValue.js.map +1 -0
- package/package.json +3 -3
- package/src/components/createComponent.ts +38 -47
- package/src/components/createElement.ts +25 -44
- package/src/utils/formulaHasValue.ts +7 -0
|
@@ -13,6 +13,7 @@ import { registerComponentToLogState } from '../debug/logState';
|
|
|
13
13
|
import { handleAction } from '../events/handleAction';
|
|
14
14
|
import { signal } from '../signal/signal';
|
|
15
15
|
import { createFormulaCache } from '../utils/createFormulaCache';
|
|
16
|
+
import { formulaHasValue } from '../utils/formulaHasValue';
|
|
16
17
|
import { subscribeCustomProperty } from '../utils/subscribeCustomProperty';
|
|
17
18
|
import { renderComponent } from './renderComponent';
|
|
18
19
|
export function createComponent({ node, path, dataSignal, ctx, parentElement, instance, namespace, }) {
|
|
@@ -25,55 +26,52 @@ export function createComponent({ node, path, dataSignal, ctx, parentElement, in
|
|
|
25
26
|
.join('", "')}"]`);
|
|
26
27
|
return [];
|
|
27
28
|
}
|
|
29
|
+
const formulaCtx = {
|
|
30
|
+
component: ctx.component,
|
|
31
|
+
formulaCache: ctx.formulaCache,
|
|
32
|
+
root: ctx.root,
|
|
33
|
+
package: ctx.package,
|
|
34
|
+
toddle: ctx.toddle,
|
|
35
|
+
env: ctx.env,
|
|
36
|
+
};
|
|
28
37
|
const attributesSignal = dataSignal.map((data) => {
|
|
29
38
|
return mapObject(node.attrs, ([attr, value]) => [
|
|
30
39
|
attr,
|
|
31
40
|
value?.type !== 'value'
|
|
32
41
|
? applyFormula(value, {
|
|
42
|
+
...formulaCtx,
|
|
33
43
|
data,
|
|
34
|
-
component: ctx.component,
|
|
35
|
-
formulaCache: ctx.formulaCache,
|
|
36
|
-
root: ctx.root,
|
|
37
|
-
package: ctx.package,
|
|
38
|
-
toddle: ctx.toddle,
|
|
39
|
-
env: ctx.env,
|
|
40
44
|
})
|
|
41
45
|
: value?.value,
|
|
42
46
|
]);
|
|
43
47
|
});
|
|
44
|
-
Object.entries(node.customProperties ?? {})
|
|
48
|
+
Object.entries(node.customProperties ?? {})
|
|
49
|
+
.filter(([_, { formula }]) => formulaHasValue(formula))
|
|
50
|
+
.forEach(([customPropertyName, customProperty]) => subscribeCustomProperty({
|
|
45
51
|
selector: getNodeSelector(path, {
|
|
46
52
|
componentName: ctx.component.name,
|
|
47
53
|
nodeId: node.id,
|
|
48
54
|
}),
|
|
49
55
|
signal: dataSignal.map((data) => appendUnit(applyFormula(customProperty.formula, {
|
|
56
|
+
...formulaCtx,
|
|
50
57
|
data,
|
|
51
|
-
component: ctx.component,
|
|
52
|
-
formulaCache: ctx.formulaCache,
|
|
53
|
-
root: ctx.root,
|
|
54
|
-
package: ctx.package,
|
|
55
|
-
toddle: ctx.toddle,
|
|
56
|
-
env: ctx.env,
|
|
57
58
|
}), customProperty.unit)),
|
|
58
59
|
customPropertyName,
|
|
59
60
|
root: ctx.root,
|
|
60
61
|
runtime: ctx.env.runtime,
|
|
61
62
|
}));
|
|
62
63
|
node.variants?.forEach((variant) => {
|
|
63
|
-
Object.entries(variant.customProperties ?? {})
|
|
64
|
+
Object.entries(variant.customProperties ?? {})
|
|
65
|
+
.filter(([_, { formula }]) => formulaHasValue(formula))
|
|
66
|
+
.forEach(([customPropertyName, customProperty]) => subscribeCustomProperty({
|
|
64
67
|
selector: getNodeSelector(path, {
|
|
65
68
|
componentName: ctx.component.name,
|
|
66
69
|
nodeId: node.id,
|
|
67
70
|
variant,
|
|
68
71
|
}),
|
|
69
72
|
signal: dataSignal.map((data) => appendUnit(applyFormula(customProperty.formula, {
|
|
73
|
+
...formulaCtx,
|
|
70
74
|
data,
|
|
71
|
-
component: ctx.component,
|
|
72
|
-
formulaCache: ctx.formulaCache,
|
|
73
|
-
root: ctx.root,
|
|
74
|
-
package: ctx.package,
|
|
75
|
-
toddle: ctx.toddle,
|
|
76
|
-
env: ctx.env,
|
|
77
75
|
}), customProperty.unit)),
|
|
78
76
|
customPropertyName,
|
|
79
77
|
variant,
|
|
@@ -90,13 +88,9 @@ export function createComponent({ node, path, dataSignal, ctx, parentElement, in
|
|
|
90
88
|
data: null,
|
|
91
89
|
isLoading: api.autoFetch &&
|
|
92
90
|
applyFormula(api.autoFetch, {
|
|
93
|
-
|
|
91
|
+
...formulaCtx,
|
|
94
92
|
component,
|
|
95
|
-
|
|
96
|
-
root: ctx.root,
|
|
97
|
-
package: ctx.package,
|
|
98
|
-
toddle: ctx.toddle,
|
|
99
|
-
env: ctx.env,
|
|
93
|
+
data: dataSignal.get(),
|
|
100
94
|
})
|
|
101
95
|
? true
|
|
102
96
|
: false,
|
|
@@ -104,6 +98,17 @@ export function createComponent({ node, path, dataSignal, ctx, parentElement, in
|
|
|
104
98
|
},
|
|
105
99
|
]),
|
|
106
100
|
});
|
|
101
|
+
// Subscribe to global stores (currently only theme)
|
|
102
|
+
// We subscribe before calculating variable initial values to ensure they can reference global store values
|
|
103
|
+
ctx.stores.theme.subscribe((newTheme) => {
|
|
104
|
+
componentDataSignal.update((data) => ({
|
|
105
|
+
...data,
|
|
106
|
+
Page: {
|
|
107
|
+
...data.Page,
|
|
108
|
+
Theme: newTheme,
|
|
109
|
+
},
|
|
110
|
+
}));
|
|
111
|
+
});
|
|
107
112
|
// Subscribe context before calculating variable initial values to ensure they can reference context values
|
|
108
113
|
subscribeToContext(componentDataSignal, component, ctx);
|
|
109
114
|
componentDataSignal.update((data) => ({
|
|
@@ -112,13 +117,9 @@ export function createComponent({ node, path, dataSignal, ctx, parentElement, in
|
|
|
112
117
|
name,
|
|
113
118
|
applyFormula(variable.initialValue, {
|
|
114
119
|
// Initial value
|
|
115
|
-
|
|
120
|
+
...formulaCtx,
|
|
116
121
|
component,
|
|
117
|
-
|
|
118
|
-
root: ctx.root,
|
|
119
|
-
package: ctx.package,
|
|
120
|
-
toddle: ctx.toddle,
|
|
121
|
-
env: ctx.env,
|
|
122
|
+
data: componentDataSignal.get(),
|
|
122
123
|
}),
|
|
123
124
|
]),
|
|
124
125
|
}));
|
|
@@ -233,16 +234,6 @@ export function createComponent({ node, path, dataSignal, ctx, parentElement, in
|
|
|
233
234
|
},
|
|
234
235
|
});
|
|
235
236
|
}
|
|
236
|
-
// Subscribe to global stores (currently only theme)
|
|
237
|
-
ctx.stores.theme.subscribe((newTheme) => {
|
|
238
|
-
componentDataSignal.update((data) => ({
|
|
239
|
-
...data,
|
|
240
|
-
Page: {
|
|
241
|
-
...data.Page,
|
|
242
|
-
Theme: newTheme,
|
|
243
|
-
},
|
|
244
|
-
}));
|
|
245
|
-
});
|
|
246
237
|
attributesSignal.subscribe((Attributes) => componentDataSignal.update((data) => ({
|
|
247
238
|
...data,
|
|
248
239
|
Attributes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponent.js","sourceRoot":"","sources":["../../../src/components/createComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAM1E,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAA;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAA;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAYnD,MAAM,UAAU,eAAe,CAAC,EAC9B,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,GAAG,EACH,aAAa,EACb,QAAQ,EACR,SAAS,GACgB,EAAiC;IAC1D,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC1E,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;IAC7E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,sCAAsC;QACtC,OAAO,CAAC,IAAI,CACV,6BAA6B,aAAa,oBACxC,GAAG,CAAC,SAAS,CAAC,IAChB,kCAAkC,GAAG,CAAC,UAAU;aAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CACpB,CAAA;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,
|
|
1
|
+
{"version":3,"file":"createComponent.js","sourceRoot":"","sources":["../../../src/components/createComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { appendUnit } from '@nordcraft/core/dist/styling/customProperty';
|
|
|
4
4
|
import { getNodeSelector } from '@nordcraft/core/dist/utils/getNodeSelector';
|
|
5
5
|
import { isDefined, toBoolean } from '@nordcraft/core/dist/utils/util';
|
|
6
6
|
import { handleAction } from '../events/handleAction';
|
|
7
|
+
import { formulaHasValue } from '../utils/formulaHasValue';
|
|
7
8
|
import { getDragData } from '../utils/getDragData';
|
|
8
9
|
import { getElementTagName } from '../utils/getElementTagName';
|
|
9
10
|
import { setAttribute } from '../utils/setAttribute';
|
|
@@ -28,6 +29,14 @@ export function createElement({ node, dataSignal, id, path, ctx, namespace, inst
|
|
|
28
29
|
const elem = namespace
|
|
29
30
|
? document.createElementNS(namespace, tag)
|
|
30
31
|
: document.createElement(tag);
|
|
32
|
+
const formulaCtx = {
|
|
33
|
+
component: ctx.component,
|
|
34
|
+
formulaCache: ctx.formulaCache,
|
|
35
|
+
root: ctx.root,
|
|
36
|
+
package: ctx.package,
|
|
37
|
+
toddle: ctx.toddle,
|
|
38
|
+
env: ctx.env,
|
|
39
|
+
};
|
|
31
40
|
elem.setAttribute('data-node-id', id);
|
|
32
41
|
if (path) {
|
|
33
42
|
elem.setAttribute('data-id', path);
|
|
@@ -46,13 +55,8 @@ export function createElement({ node, dataSignal, id, path, ctx, namespace, inst
|
|
|
46
55
|
Object.entries(node.classes)?.forEach(([className, { formula }]) => {
|
|
47
56
|
if (formula) {
|
|
48
57
|
const classSignal = dataSignal.map((data) => toBoolean(applyFormula(formula, {
|
|
58
|
+
...formulaCtx,
|
|
49
59
|
data,
|
|
50
|
-
component: ctx.component,
|
|
51
|
-
formulaCache: ctx.formulaCache,
|
|
52
|
-
root: ctx.root,
|
|
53
|
-
package: ctx.package,
|
|
54
|
-
toddle: ctx.toddle,
|
|
55
|
-
env: ctx.env,
|
|
56
60
|
})));
|
|
57
61
|
classSignal.subscribe((show) => show
|
|
58
62
|
? elem.classList.add(className)
|
|
@@ -74,13 +78,8 @@ export function createElement({ node, dataSignal, id, path, ctx, namespace, inst
|
|
|
74
78
|
}
|
|
75
79
|
else {
|
|
76
80
|
o = dataSignal.map((data) => applyFormula(value, {
|
|
81
|
+
...formulaCtx,
|
|
77
82
|
data,
|
|
78
|
-
component: ctx.component,
|
|
79
|
-
formulaCache: ctx.formulaCache,
|
|
80
|
-
root: ctx.root,
|
|
81
|
-
package: ctx.package,
|
|
82
|
-
toddle: ctx.toddle,
|
|
83
|
-
env: ctx.env,
|
|
84
83
|
}));
|
|
85
84
|
o.subscribe((val) => {
|
|
86
85
|
setAttribute(elem, attr, val);
|
|
@@ -108,39 +107,35 @@ export function createElement({ node, dataSignal, id, path, ctx, namespace, inst
|
|
|
108
107
|
const { name, formula, unit } = styleVariable;
|
|
109
108
|
const signal = dataSignal.map((data) => {
|
|
110
109
|
const value = applyFormula(formula, {
|
|
110
|
+
...formulaCtx,
|
|
111
111
|
data,
|
|
112
|
-
component: ctx.component,
|
|
113
|
-
formulaCache: ctx.formulaCache,
|
|
114
|
-
root: ctx.root,
|
|
115
|
-
package: ctx.package,
|
|
116
|
-
toddle: ctx.toddle,
|
|
117
|
-
env: ctx.env,
|
|
118
112
|
});
|
|
119
113
|
return unit ? value + unit : value;
|
|
120
114
|
});
|
|
121
115
|
signal.subscribe((value) => elem.style.setProperty(`--${name}`, value));
|
|
122
116
|
});
|
|
123
|
-
Object.entries(node.customProperties ?? {})
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
117
|
+
Object.entries(node.customProperties ?? {})
|
|
118
|
+
.filter(([_, { formula }]) => formulaHasValue(formula))
|
|
119
|
+
.forEach(([customPropertyName, { formula, unit }]) => {
|
|
120
|
+
subscribeCustomProperty({
|
|
121
|
+
customPropertyName,
|
|
122
|
+
selector: ctx.env.runtime === 'custom-element' &&
|
|
123
|
+
ctx.isRootComponent &&
|
|
124
|
+
path === '0'
|
|
125
|
+
? `${getNodeSelector(path)}, :host`
|
|
126
|
+
: getNodeSelector(path),
|
|
127
|
+
signal: dataSignal.map((data) => appendUnit(applyFormula(formula, {
|
|
128
|
+
...formulaCtx,
|
|
129
|
+
data,
|
|
130
|
+
}), unit)),
|
|
134
131
|
root: ctx.root,
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
}), unit)),
|
|
139
|
-
root: ctx.root,
|
|
140
|
-
runtime: ctx.env.runtime,
|
|
141
|
-
}));
|
|
132
|
+
runtime: ctx.env.runtime,
|
|
133
|
+
});
|
|
134
|
+
});
|
|
142
135
|
node.variants?.forEach((variant) => {
|
|
143
|
-
Object.entries(variant.customProperties ?? {})
|
|
136
|
+
Object.entries(variant.customProperties ?? {})
|
|
137
|
+
.filter(([_, { formula }]) => formulaHasValue(formula))
|
|
138
|
+
.forEach(([customPropertyName, { formula, unit }]) => {
|
|
144
139
|
subscribeCustomProperty({
|
|
145
140
|
customPropertyName,
|
|
146
141
|
selector: getNodeSelector(path, {
|
|
@@ -148,13 +143,8 @@ export function createElement({ node, dataSignal, id, path, ctx, namespace, inst
|
|
|
148
143
|
}),
|
|
149
144
|
variant,
|
|
150
145
|
signal: dataSignal.map((data) => appendUnit(applyFormula(formula, {
|
|
146
|
+
...formulaCtx,
|
|
151
147
|
data,
|
|
152
|
-
component: ctx.component,
|
|
153
|
-
formulaCache: ctx.formulaCache,
|
|
154
|
-
root: ctx.root,
|
|
155
|
-
package: ctx.package,
|
|
156
|
-
toddle: ctx.toddle,
|
|
157
|
-
env: ctx.env,
|
|
158
148
|
}), unit)),
|
|
159
149
|
root: ctx.root,
|
|
160
150
|
runtime: ctx.env.runtime,
|
|
@@ -189,13 +179,8 @@ export function createElement({ node, dataSignal, id, path, ctx, namespace, inst
|
|
|
189
179
|
else {
|
|
190
180
|
const textSignal = dataSignal.map((data) => {
|
|
191
181
|
return String(applyFormula(node.value, {
|
|
182
|
+
...formulaCtx,
|
|
192
183
|
data,
|
|
193
|
-
component: ctx.component,
|
|
194
|
-
formulaCache: ctx.formulaCache,
|
|
195
|
-
root: ctx.root,
|
|
196
|
-
package: ctx.package,
|
|
197
|
-
toddle: ctx.toddle,
|
|
198
|
-
env: ctx.env,
|
|
199
184
|
}));
|
|
200
185
|
});
|
|
201
186
|
textValues.push(textSignal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createElement.js","sourceRoot":"","sources":["../../../src/components/createElement.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createElement.js","sourceRoot":"","sources":["../../../src/components/createElement.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formulaHasValue.js","sourceRoot":"","sources":["../../../src/utils/formulaHasValue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAE3D,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,OAA4B,EACR,EAAE,CACtB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
"directory": "packages/runtime"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@nordcraft/core": "1.0.
|
|
13
|
-
"@nordcraft/std-lib": "1.0.
|
|
12
|
+
"@nordcraft/core": "1.0.88",
|
|
13
|
+
"@nordcraft/std-lib": "1.0.88",
|
|
14
14
|
"fast-deep-equal": "3.1.3",
|
|
15
15
|
"path-to-regexp": "6.3.0"
|
|
16
16
|
},
|
|
@@ -23,5 +23,5 @@
|
|
|
23
23
|
"files": ["dist", "src"],
|
|
24
24
|
"main": "dist/page.main.js",
|
|
25
25
|
"types": "dist/page.main.d.ts",
|
|
26
|
-
"version": "1.0.
|
|
26
|
+
"version": "1.0.88"
|
|
27
27
|
}
|
|
@@ -20,6 +20,7 @@ import type { Signal } from '../signal/signal'
|
|
|
20
20
|
import { signal } from '../signal/signal'
|
|
21
21
|
import type { ComponentChild, ComponentContext, ContextApi } from '../types'
|
|
22
22
|
import { createFormulaCache } from '../utils/createFormulaCache'
|
|
23
|
+
import { formulaHasValue } from '../utils/formulaHasValue'
|
|
23
24
|
import { subscribeCustomProperty } from '../utils/subscribeCustomProperty'
|
|
24
25
|
import { renderComponent } from './renderComponent'
|
|
25
26
|
|
|
@@ -55,24 +56,29 @@ export function createComponent({
|
|
|
55
56
|
)
|
|
56
57
|
return []
|
|
57
58
|
}
|
|
59
|
+
const formulaCtx = {
|
|
60
|
+
component: ctx.component,
|
|
61
|
+
formulaCache: ctx.formulaCache,
|
|
62
|
+
root: ctx.root,
|
|
63
|
+
package: ctx.package,
|
|
64
|
+
toddle: ctx.toddle,
|
|
65
|
+
env: ctx.env,
|
|
66
|
+
}
|
|
58
67
|
const attributesSignal = dataSignal.map((data) => {
|
|
59
68
|
return mapObject(node.attrs, ([attr, value]) => [
|
|
60
69
|
attr,
|
|
61
70
|
value?.type !== 'value'
|
|
62
71
|
? applyFormula(value, {
|
|
72
|
+
...formulaCtx,
|
|
63
73
|
data,
|
|
64
|
-
component: ctx.component,
|
|
65
|
-
formulaCache: ctx.formulaCache,
|
|
66
|
-
root: ctx.root,
|
|
67
|
-
package: ctx.package,
|
|
68
|
-
toddle: ctx.toddle,
|
|
69
|
-
env: ctx.env,
|
|
70
74
|
})
|
|
71
75
|
: value?.value,
|
|
72
76
|
])
|
|
73
77
|
})
|
|
74
|
-
|
|
75
|
-
|
|
78
|
+
|
|
79
|
+
Object.entries(node.customProperties ?? {})
|
|
80
|
+
.filter(([_, { formula }]) => formulaHasValue(formula))
|
|
81
|
+
.forEach(([customPropertyName, customProperty]) =>
|
|
76
82
|
subscribeCustomProperty({
|
|
77
83
|
selector: getNodeSelector(path, {
|
|
78
84
|
componentName: ctx.component.name,
|
|
@@ -81,13 +87,8 @@ export function createComponent({
|
|
|
81
87
|
signal: dataSignal.map((data) =>
|
|
82
88
|
appendUnit(
|
|
83
89
|
applyFormula(customProperty.formula, {
|
|
90
|
+
...formulaCtx,
|
|
84
91
|
data,
|
|
85
|
-
component: ctx.component,
|
|
86
|
-
formulaCache: ctx.formulaCache,
|
|
87
|
-
root: ctx.root,
|
|
88
|
-
package: ctx.package,
|
|
89
|
-
toddle: ctx.toddle,
|
|
90
|
-
env: ctx.env,
|
|
91
92
|
}),
|
|
92
93
|
customProperty.unit,
|
|
93
94
|
),
|
|
@@ -96,10 +97,11 @@ export function createComponent({
|
|
|
96
97
|
root: ctx.root,
|
|
97
98
|
runtime: ctx.env.runtime,
|
|
98
99
|
}),
|
|
99
|
-
|
|
100
|
+
)
|
|
100
101
|
node.variants?.forEach((variant) => {
|
|
101
|
-
Object.entries(variant.customProperties ?? {})
|
|
102
|
-
([
|
|
102
|
+
Object.entries(variant.customProperties ?? {})
|
|
103
|
+
.filter(([_, { formula }]) => formulaHasValue(formula))
|
|
104
|
+
.forEach(([customPropertyName, customProperty]) =>
|
|
103
105
|
subscribeCustomProperty({
|
|
104
106
|
selector: getNodeSelector(path, {
|
|
105
107
|
componentName: ctx.component.name,
|
|
@@ -109,13 +111,8 @@ export function createComponent({
|
|
|
109
111
|
signal: dataSignal.map((data) =>
|
|
110
112
|
appendUnit(
|
|
111
113
|
applyFormula(customProperty.formula, {
|
|
114
|
+
...formulaCtx,
|
|
112
115
|
data,
|
|
113
|
-
component: ctx.component,
|
|
114
|
-
formulaCache: ctx.formulaCache,
|
|
115
|
-
root: ctx.root,
|
|
116
|
-
package: ctx.package,
|
|
117
|
-
toddle: ctx.toddle,
|
|
118
|
-
env: ctx.env,
|
|
119
116
|
}),
|
|
120
117
|
customProperty.unit,
|
|
121
118
|
),
|
|
@@ -125,7 +122,7 @@ export function createComponent({
|
|
|
125
122
|
root: ctx.root,
|
|
126
123
|
runtime: ctx.env.runtime,
|
|
127
124
|
}),
|
|
128
|
-
|
|
125
|
+
)
|
|
129
126
|
})
|
|
130
127
|
|
|
131
128
|
const componentDataSignal = signal<ComponentData>({
|
|
@@ -138,13 +135,9 @@ export function createComponent({
|
|
|
138
135
|
isLoading:
|
|
139
136
|
api.autoFetch &&
|
|
140
137
|
applyFormula(api.autoFetch, {
|
|
141
|
-
|
|
138
|
+
...formulaCtx,
|
|
142
139
|
component,
|
|
143
|
-
|
|
144
|
-
root: ctx.root,
|
|
145
|
-
package: ctx.package,
|
|
146
|
-
toddle: ctx.toddle,
|
|
147
|
-
env: ctx.env,
|
|
140
|
+
data: dataSignal.get(),
|
|
148
141
|
})
|
|
149
142
|
? true
|
|
150
143
|
: false,
|
|
@@ -152,6 +145,19 @@ export function createComponent({
|
|
|
152
145
|
},
|
|
153
146
|
]),
|
|
154
147
|
})
|
|
148
|
+
|
|
149
|
+
// Subscribe to global stores (currently only theme)
|
|
150
|
+
// We subscribe before calculating variable initial values to ensure they can reference global store values
|
|
151
|
+
ctx.stores.theme.subscribe((newTheme) => {
|
|
152
|
+
componentDataSignal.update((data) => ({
|
|
153
|
+
...data,
|
|
154
|
+
Page: {
|
|
155
|
+
...data.Page,
|
|
156
|
+
Theme: newTheme,
|
|
157
|
+
},
|
|
158
|
+
}))
|
|
159
|
+
})
|
|
160
|
+
|
|
155
161
|
// Subscribe context before calculating variable initial values to ensure they can reference context values
|
|
156
162
|
subscribeToContext(componentDataSignal, component, ctx)
|
|
157
163
|
componentDataSignal.update((data) => ({
|
|
@@ -160,13 +166,9 @@ export function createComponent({
|
|
|
160
166
|
name,
|
|
161
167
|
applyFormula(variable.initialValue, {
|
|
162
168
|
// Initial value
|
|
163
|
-
|
|
169
|
+
...formulaCtx,
|
|
164
170
|
component,
|
|
165
|
-
|
|
166
|
-
root: ctx.root,
|
|
167
|
-
package: ctx.package,
|
|
168
|
-
toddle: ctx.toddle,
|
|
169
|
-
env: ctx.env,
|
|
171
|
+
data: componentDataSignal.get(),
|
|
170
172
|
}),
|
|
171
173
|
]),
|
|
172
174
|
}))
|
|
@@ -310,17 +312,6 @@ export function createComponent({
|
|
|
310
312
|
})
|
|
311
313
|
}
|
|
312
314
|
|
|
313
|
-
// Subscribe to global stores (currently only theme)
|
|
314
|
-
ctx.stores.theme.subscribe((newTheme) => {
|
|
315
|
-
componentDataSignal.update((data) => ({
|
|
316
|
-
...data,
|
|
317
|
-
Page: {
|
|
318
|
-
...data.Page,
|
|
319
|
-
Theme: newTheme,
|
|
320
|
-
},
|
|
321
|
-
}))
|
|
322
|
-
})
|
|
323
|
-
|
|
324
315
|
attributesSignal.subscribe(
|
|
325
316
|
(Attributes) =>
|
|
326
317
|
componentDataSignal.update((data) => ({
|