react-native-divkit 0.1.0-alpha.4 → 1.0.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.
- package/dist/DivKit.d.ts +4 -1
- package/dist/DivKit.d.ts.map +1 -1
- package/dist/DivKit.js +37 -6
- package/dist/DivKit.js.map +1 -1
- package/dist/components/container/DivContainer.d.ts +0 -14
- package/dist/components/container/DivContainer.d.ts.map +1 -1
- package/dist/components/container/DivContainer.js +24 -34
- package/dist/components/container/DivContainer.js.map +1 -1
- package/dist/components/state/DivState.d.ts.map +1 -1
- package/dist/components/state/DivState.js +1 -0
- package/dist/components/state/DivState.js.map +1 -1
- package/dist/components/text/DivText.d.ts.map +1 -1
- package/dist/components/text/DivText.js +17 -7
- package/dist/components/text/DivText.js.map +1 -1
- package/dist/components/utilities/Background.js.map +1 -1
- package/dist/components/utilities/Outer.d.ts.map +1 -1
- package/dist/components/utilities/Outer.js +28 -15
- package/dist/components/utilities/Outer.js.map +1 -1
- package/dist/context/LayoutParamsContext.d.ts +4 -0
- package/dist/context/LayoutParamsContext.d.ts.map +1 -0
- package/dist/context/LayoutParamsContext.js +6 -0
- package/dist/context/LayoutParamsContext.js.map +1 -0
- package/dist/expressions/eval.d.ts.map +1 -1
- package/dist/expressions/eval.js +3 -1
- package/dist/expressions/eval.js.map +1 -1
- package/dist/expressions/globalVariablesController.d.ts +13 -0
- package/dist/expressions/globalVariablesController.d.ts.map +1 -0
- package/dist/expressions/globalVariablesController.js +33 -0
- package/dist/expressions/globalVariablesController.js.map +1 -0
- package/dist/hooks/useDerivedFromVars.js +2 -2
- package/dist/hooks/useDerivedFromVars.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/utils/escapeRegExp.js +1 -1
- package/dist/utils/escapeRegExp.js.map +1 -1
- package/package.json +12 -5
- package/src/DivKit.tsx +52 -7
- package/src/components/container/DivContainer.tsx +28 -34
- package/src/components/state/DivState.tsx +1 -0
- package/src/components/text/DivText.tsx +21 -7
- package/src/components/utilities/Background.tsx +1 -1
- package/src/components/utilities/Outer.tsx +28 -15
- package/src/context/LayoutParamsContext.tsx +8 -0
- package/src/expressions/eval.ts +3 -1
- package/src/expressions/globalVariablesController.ts +39 -0
- package/src/hooks/useDerivedFromVars.ts +2 -2
- package/src/index.ts +3 -0
- package/src/types/env.d.ts +11 -0
- package/src/types/text.d.ts +4 -2
- package/src/utils/escapeRegExp.ts +1 -1
package/dist/DivKit.d.ts
CHANGED
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
import React from 'react';
|
|
21
21
|
import { type ViewStyle } from 'react-native';
|
|
22
22
|
import type { Action, DivJson, Direction } from '../typings/common';
|
|
23
|
+
import { GlobalVariablesController } from './expressions/globalVariablesController';
|
|
23
24
|
import { type WrappedError } from './utils/wrapError';
|
|
24
25
|
/**
|
|
25
26
|
* Callback for logging statistics
|
|
@@ -58,11 +59,13 @@ export interface DivKitProps {
|
|
|
58
59
|
style?: ViewStyle;
|
|
59
60
|
/** Component ID (for debugging) */
|
|
60
61
|
id?: string;
|
|
62
|
+
/** Global variables controller for sharing variables across DivKit instances */
|
|
63
|
+
globalVariablesController?: GlobalVariablesController;
|
|
61
64
|
}
|
|
62
65
|
/**
|
|
63
66
|
* DivKit - Main component
|
|
64
67
|
*
|
|
65
68
|
* Renders DivKit JSON as React Native components
|
|
66
69
|
*/
|
|
67
|
-
export declare function DivKit({ data, onStat, onCustomAction, onError, direction, platform, style, id }: DivKitProps): React.JSX.Element;
|
|
70
|
+
export declare function DivKit({ data, onStat, onCustomAction, onError, direction, platform, style, id, globalVariablesController }: DivKitProps): React.JSX.Element;
|
|
68
71
|
//# sourceMappingURL=DivKit.d.ts.map
|
package/dist/DivKit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivKit.d.ts","sourceRoot":"","sources":["../src/DivKit.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"DivKit.d.ts","sourceRoot":"","sources":["../src/DivKit.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAe,SAAS,EAAE,MAAM,mBAAmB,CAAC;AASjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAEpF,OAAO,EAAa,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQjE;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,CAAC;AAE5E;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,CAAC;AAE9E;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,WAAW;IACxB,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvB,sCAAsC;IACtC,MAAM,CAAC,EAAE,YAAY,CAAC;IAEtB,kCAAkC;IAClC,cAAc,CAAC,EAAE,oBAAoB,CAAC;IAEtC,0BAA0B;IAC1B,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,sCAAsC;IACtC,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;IAE/B,0CAA0C;IAC1C,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB,mCAAmC;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,gFAAgF;IAChF,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;CACzD;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,EACnB,IAAI,EACJ,MAAM,EACN,cAAc,EACd,OAAO,EACP,SAAiB,EACjB,QAAkB,EAClB,KAAK,EACL,EAAW,EACX,yBAAyB,EAC5B,EAAE,WAAW,qBAmgBb"}
|
package/dist/DivKit.js
CHANGED
|
@@ -17,13 +17,14 @@
|
|
|
17
17
|
* - Custom components
|
|
18
18
|
* - Extensions
|
|
19
19
|
*/
|
|
20
|
-
import React, { useMemo, useCallback, useRef } from 'react';
|
|
20
|
+
import React, { useMemo, useCallback, useRef, useEffect } from 'react';
|
|
21
21
|
import { View, StyleSheet } from 'react-native';
|
|
22
22
|
import { DivKitContext } from './context/DivKitContext';
|
|
23
23
|
import { ActionContext } from './context/ActionContext';
|
|
24
24
|
import { StateContext } from './context/StateContext';
|
|
25
25
|
import { DivComponent } from './components/DivComponent';
|
|
26
26
|
import { createVariable } from './expressions/variable';
|
|
27
|
+
import { GlobalVariablesController } from './expressions/globalVariablesController';
|
|
27
28
|
import { applyTemplatesRecursively } from './utils/applyTemplate';
|
|
28
29
|
import { wrapError } from './utils/wrapError';
|
|
29
30
|
import { arrayInsert, arrayRemove, arraySet } from './actions/array';
|
|
@@ -37,7 +38,7 @@ import { parse } from './expressions/expressions';
|
|
|
37
38
|
*
|
|
38
39
|
* Renders DivKit JSON as React Native components
|
|
39
40
|
*/
|
|
40
|
-
export function DivKit({ data, onStat, onCustomAction, onError, direction = 'ltr', platform = 'touch', style, id = 'root' }) {
|
|
41
|
+
export function DivKit({ data, onStat, onCustomAction, onError, direction = 'ltr', platform = 'touch', style, id = 'root', globalVariablesController }) {
|
|
41
42
|
const componentIdCounter = useRef(0);
|
|
42
43
|
const componentsMap = useRef(new Map());
|
|
43
44
|
const statesMap = useRef(new Map());
|
|
@@ -81,16 +82,33 @@ export function DivKit({ data, onStat, onCustomAction, onError, direction = 'ltr
|
|
|
81
82
|
initialVariables: card.variables || []
|
|
82
83
|
};
|
|
83
84
|
}, [data, logError]);
|
|
84
|
-
//
|
|
85
|
+
// Create or reuse variables controller
|
|
86
|
+
const variablesController = useMemo(() => globalVariablesController || new GlobalVariablesController(), [globalVariablesController]);
|
|
87
|
+
const globalVariables = variablesController.getVariables();
|
|
88
|
+
// Initialize variables: local (from JSON) + global, local has precedence
|
|
85
89
|
const variables = useMemo(() => {
|
|
90
|
+
const localVariables = new Map();
|
|
91
|
+
// Combined map: local and global variables, with local in precedence
|
|
86
92
|
const map = new Map();
|
|
93
|
+
// First, add global variables
|
|
94
|
+
for (const [varName, variable] of globalVariables) {
|
|
95
|
+
map.set(varName, variable);
|
|
96
|
+
}
|
|
97
|
+
// Then, add local variables (from card JSON) — they override globals
|
|
87
98
|
initialVariables.forEach((varData) => {
|
|
88
99
|
try {
|
|
89
100
|
// Skip property variables for MVP (complex feature)
|
|
90
101
|
if (varData.type === 'property') {
|
|
91
102
|
return;
|
|
92
103
|
}
|
|
104
|
+
if (localVariables.has(varData.name)) {
|
|
105
|
+
logError(wrapError(new Error('Duplicate variable'), {
|
|
106
|
+
additional: { name: varData.name }
|
|
107
|
+
}));
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
93
110
|
const variable = createVariable(varData.name, varData.type, varData.value);
|
|
111
|
+
localVariables.set(varData.name, variable);
|
|
94
112
|
map.set(varData.name, variable);
|
|
95
113
|
}
|
|
96
114
|
catch (err) {
|
|
@@ -103,7 +121,20 @@ export function DivKit({ data, onStat, onCustomAction, onError, direction = 'ltr
|
|
|
103
121
|
}
|
|
104
122
|
});
|
|
105
123
|
return map;
|
|
106
|
-
}, [initialVariables, logError]);
|
|
124
|
+
}, [initialVariables, globalVariables, logError]);
|
|
125
|
+
// Subscribe to new global variables added after initialization
|
|
126
|
+
useEffect(() => {
|
|
127
|
+
const store = variablesController.getLastAddedVariableStore();
|
|
128
|
+
const unsubscribe = store.subscribe((newVarName) => {
|
|
129
|
+
if (newVarName && !variables.has(newVarName)) {
|
|
130
|
+
const varInstance = globalVariables.get(newVarName);
|
|
131
|
+
if (varInstance) {
|
|
132
|
+
variables.set(newVarName, varInstance);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
});
|
|
136
|
+
return unsubscribe;
|
|
137
|
+
}, [variablesController, variables, globalVariables]);
|
|
107
138
|
// Generate unique component IDs
|
|
108
139
|
const genId = useCallback((key) => {
|
|
109
140
|
return `${key}_${componentIdCounter.current++}`;
|
|
@@ -381,8 +412,8 @@ export function DivKit({ data, onStat, onCustomAction, onError, direction = 'ltr
|
|
|
381
412
|
registerPager: () => {
|
|
382
413
|
// MVP: Pagers deferred
|
|
383
414
|
return {
|
|
384
|
-
update
|
|
385
|
-
destroy
|
|
415
|
+
update() { },
|
|
416
|
+
destroy() { }
|
|
386
417
|
};
|
|
387
418
|
},
|
|
388
419
|
listenPager: () => {
|
package/dist/DivKit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivKit.js","sourceRoot":"","sources":["../src/DivKit.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DivKit.js","sourceRoot":"","sources":["../src/DivKit.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,20 +6,6 @@ export interface DivContainerProps {
|
|
|
6
6
|
}
|
|
7
7
|
/**
|
|
8
8
|
* DivContainer component - renders a flex container with child items
|
|
9
|
-
* MVP implementation with basic features:
|
|
10
|
-
* - Vertical/horizontal/overlap orientation
|
|
11
|
-
* - Content alignment (horizontal & vertical)
|
|
12
|
-
* - Item spacing (gap)
|
|
13
|
-
* - Flex layout with proper alignment
|
|
14
|
-
*
|
|
15
|
-
* Deferred for post-MVP:
|
|
16
|
-
* - Wrap layout mode
|
|
17
|
-
* - Separators (show_at_start, show_between, show_at_end)
|
|
18
|
-
* - Line separators (for wrap mode)
|
|
19
|
-
* - Aspect ratio constraints
|
|
20
|
-
* - Item builder (dynamic items from data)
|
|
21
|
-
* - Clip to bounds
|
|
22
|
-
*
|
|
23
9
|
* Based on Web Container.svelte
|
|
24
10
|
*/
|
|
25
11
|
export declare function DivContainer({ componentContext }: DivContainerProps): React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivContainer.d.ts","sourceRoot":"","sources":["../../../src/components/container/DivContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAwB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"DivContainer.d.ts","sourceRoot":"","sources":["../../../src/components/container/DivContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAwB,MAAM,uBAAuB,CAAC;AASpF,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;CACxD;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,EAAE,gBAAgB,EAAE,EAAE,iBAAiB,qBAwHnE"}
|
|
@@ -4,22 +4,9 @@ import { Outer } from '../utilities/Outer';
|
|
|
4
4
|
import { DivComponent } from '../DivComponent';
|
|
5
5
|
import { useDerivedFromVarsSimple } from '../../hooks/useDerivedFromVars';
|
|
6
6
|
import { useDivKitContext } from '../../context/DivKitContext';
|
|
7
|
+
import { LayoutParamsContext } from '../../context/LayoutParamsContext';
|
|
7
8
|
/**
|
|
8
9
|
* DivContainer component - renders a flex container with child items
|
|
9
|
-
* MVP implementation with basic features:
|
|
10
|
-
* - Vertical/horizontal/overlap orientation
|
|
11
|
-
* - Content alignment (horizontal & vertical)
|
|
12
|
-
* - Item spacing (gap)
|
|
13
|
-
* - Flex layout with proper alignment
|
|
14
|
-
*
|
|
15
|
-
* Deferred for post-MVP:
|
|
16
|
-
* - Wrap layout mode
|
|
17
|
-
* - Separators (show_at_start, show_between, show_at_end)
|
|
18
|
-
* - Line separators (for wrap mode)
|
|
19
|
-
* - Aspect ratio constraints
|
|
20
|
-
* - Item builder (dynamic items from data)
|
|
21
|
-
* - Clip to bounds
|
|
22
|
-
*
|
|
23
10
|
* Based on Web Container.svelte
|
|
24
11
|
*/
|
|
25
12
|
export function DivContainer({ componentContext }) {
|
|
@@ -30,11 +17,10 @@ export function DivContainer({ componentContext }) {
|
|
|
30
17
|
const contentAlignmentHorizontal = useDerivedFromVarsSimple(json.content_alignment_horizontal || 'start', variables || new Map());
|
|
31
18
|
const contentAlignmentVertical = useDerivedFromVarsSimple(json.content_alignment_vertical || 'top', variables || new Map());
|
|
32
19
|
const itemSpacing = useDerivedFromVarsSimple(json.item_spacing || 0, variables || new Map());
|
|
33
|
-
// Build container style
|
|
20
|
+
// Build container style — passed to Outer via style prop
|
|
21
|
+
// Outer's View becomes the flex container directly (Background is absolute-positioned)
|
|
34
22
|
const containerStyle = useMemo(() => {
|
|
35
|
-
const style = {
|
|
36
|
-
display: 'flex'
|
|
37
|
-
};
|
|
23
|
+
const style = {};
|
|
38
24
|
// Orientation -> flexDirection
|
|
39
25
|
if (orientation === 'horizontal') {
|
|
40
26
|
style.flexDirection = 'row';
|
|
@@ -43,32 +29,37 @@ export function DivContainer({ componentContext }) {
|
|
|
43
29
|
style.flexDirection = 'column';
|
|
44
30
|
}
|
|
45
31
|
else if (orientation === 'overlap') {
|
|
46
|
-
// Overlap is like CSS position: relative with absolute children
|
|
47
|
-
// In React Native, this is achieved differently
|
|
48
|
-
// For MVP, we'll use a simple approach with View
|
|
49
32
|
style.position = 'relative';
|
|
50
33
|
}
|
|
51
|
-
// Content alignment
|
|
52
|
-
// Maps to justifyContent for row, alignItems for column
|
|
34
|
+
// Content alignment
|
|
53
35
|
if (orientation === 'horizontal') {
|
|
54
|
-
// Horizontal orientation: content_alignment_horizontal -> justifyContent
|
|
55
36
|
style.justifyContent = mapContentAlignmentToJustify(contentAlignmentHorizontal, direction);
|
|
56
|
-
// content_alignment_vertical -> alignItems (cross axis)
|
|
57
37
|
style.alignItems = mapContentAlignmentToAlign(contentAlignmentVertical);
|
|
58
38
|
}
|
|
59
39
|
else if (orientation === 'vertical') {
|
|
60
|
-
// Vertical orientation: content_alignment_vertical -> justifyContent
|
|
61
40
|
style.justifyContent = mapContentAlignmentToJustify(contentAlignmentVertical, direction);
|
|
62
|
-
// content_alignment_horizontal -> alignItems (cross axis)
|
|
63
41
|
style.alignItems = mapContentAlignmentToAlign(contentAlignmentHorizontal, direction);
|
|
64
42
|
}
|
|
65
|
-
// Item spacing
|
|
66
|
-
// React Native 0.71+ supports gap property
|
|
43
|
+
// Item spacing
|
|
67
44
|
if (itemSpacing && itemSpacing > 0 && orientation !== 'overlap') {
|
|
68
45
|
style.gap = itemSpacing;
|
|
69
46
|
}
|
|
70
47
|
return style;
|
|
71
48
|
}, [orientation, contentAlignmentHorizontal, contentAlignmentVertical, itemSpacing, direction]);
|
|
49
|
+
// LayoutParams for children — tells Outer how to handle flex sizing
|
|
50
|
+
const childLayoutParams = useMemo(() => {
|
|
51
|
+
const params = {};
|
|
52
|
+
if (orientation === 'overlap') {
|
|
53
|
+
params.overlapParent = true;
|
|
54
|
+
}
|
|
55
|
+
if (orientation === 'horizontal') {
|
|
56
|
+
params.parentContainerOrientation = 'horizontal';
|
|
57
|
+
}
|
|
58
|
+
else if (orientation === 'vertical') {
|
|
59
|
+
params.parentContainerOrientation = 'vertical';
|
|
60
|
+
}
|
|
61
|
+
return params;
|
|
62
|
+
}, [orientation]);
|
|
72
63
|
// For overlap mode, we need to position children absolutely
|
|
73
64
|
const childWrapperStyle = useMemo(() => {
|
|
74
65
|
if (orientation === 'overlap') {
|
|
@@ -82,9 +73,6 @@ export function DivContainer({ componentContext }) {
|
|
|
82
73
|
}
|
|
83
74
|
return undefined;
|
|
84
75
|
}, [orientation]);
|
|
85
|
-
// Render children
|
|
86
|
-
// We'll import DivComponent dynamically or assume it's available
|
|
87
|
-
// For now, we'll use a placeholder and fix this in the integration phase
|
|
88
76
|
const renderChildren = () => {
|
|
89
77
|
if (!json.items || json.items.length === 0) {
|
|
90
78
|
return null;
|
|
@@ -106,8 +94,10 @@ export function DivContainer({ componentContext }) {
|
|
|
106
94
|
return child;
|
|
107
95
|
});
|
|
108
96
|
};
|
|
109
|
-
return (<Outer componentContext={componentContext}>
|
|
110
|
-
<
|
|
97
|
+
return (<Outer componentContext={componentContext} style={containerStyle}>
|
|
98
|
+
<LayoutParamsContext.Provider value={childLayoutParams}>
|
|
99
|
+
{renderChildren()}
|
|
100
|
+
</LayoutParamsContext.Provider>
|
|
111
101
|
</Outer>);
|
|
112
102
|
}
|
|
113
103
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivContainer.js","sourceRoot":"","sources":["../../../src/components/container/DivContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,IAAI,EAAa,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"DivContainer.js","sourceRoot":"","sources":["../../../src/components/container/DivContainer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivState.d.ts","sourceRoot":"","sources":["../../../src/components/state/DivState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAE5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAS,MAAM,mBAAmB,CAAC;AAM7D,MAAM,WAAW,aAAa;IAC1B,gBAAgB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CACpD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,QAAQ,CAAC,EAAE,gBAAgB,EAAE,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"DivState.d.ts","sourceRoot":"","sources":["../../../src/components/state/DivState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAE5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAS,MAAM,mBAAmB,CAAC;AAM7D,MAAM,WAAW,aAAa;IAC1B,gBAAgB,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CACpD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,QAAQ,CAAC,EAAE,gBAAgB,EAAE,EAAE,aAAa,qBA6G3D"}
|
|
@@ -109,6 +109,7 @@ export function DivState({ componentContext }) {
|
|
|
109
109
|
return null;
|
|
110
110
|
}
|
|
111
111
|
// Import DivComponent dynamically to avoid circular dependency
|
|
112
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
112
113
|
const DivComponent = require('../DivComponent').DivComponent;
|
|
113
114
|
return <DivComponent componentContext={childContext}/>;
|
|
114
115
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivState.js","sourceRoot":"","sources":["../../../src/components/state/DivState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAMlD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,QAAQ,CAAC,EAAE,gBAAgB,EAAiB;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC;IAClC,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC3C,MAAM,EAAE,aAAa,EAAE,GAAG,eAAe,EAAE,CAAC;IAE5C,gCAAgC;IAChC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE,CAAC;IAEvC,qBAAqB;IACrB,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC;QACjC,CAAC;QACD,iCAAiC;QACjC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QACnC,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEzC,mBAAmB;IACnB,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAqB,cAAc,CAAC,CAAC;IAEzF,6CAA6C;IAC7C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;IACjD,MAAM,aAAa,GAAG,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAErF,2BAA2B;IAC3B,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,aAAa,EAAE,CAAC;YAChB,gCAAgC;YAChC,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,KAAc,EAAE,EAAE;gBAC3D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,cAAc,EAAE,CAAC;oBACxD,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,WAAW,CAAC;QACvB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAEpC,qCAAqC;IACrC,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,aAAa,IAAI,cAAc,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC9C,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;gBAClC,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC;IACL,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAEpC,iDAAiD;IACjD,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,UAAkB,EAAE,EAAE;gBACnE,iBAAiB,CAAC,UAAU,CAAC,CAAC;gBAC9B,OAAO,SAAS,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,OAAO,UAAU,CAAC;QACtB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IAE7B,kBAAkB;IAClB,SAAS,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC,CAAC;QACzF,CAAC;IACL,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE7C,qBAAqB;IACrB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAsB,EAAE;QACjD,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,cAAc,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAChD,OAAO,KAAc,CAAC;IAC1B,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAElC,yCAAyC;IACzC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,IAAI,CAAC,YAAY,EAAE,GAAG;YAAE,OAAO,SAAS,CAAC;QAEzC,OAAO,gBAAgB,CAAC,mBAAmB,CAAC,YAAY,CAAC,GAAG,EAAE;YAC1D,IAAI,EAAE,cAAc;SACvB,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAErD,uBAAuB;IACvB,MAAM,aAAa,GAAG,GAAG,EAAE;QACvB,IAAI,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,+DAA+D;QAC/D,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC;QAE7D,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,YAAY,CAAC,EAAG,CAAC;IAC5D,CAAC,CAAC;IAEF,OAAO,CACH,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACtC;YAAA,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC,EAAE,IAAI,CACjC;QAAA,EAAE,KAAK,CAAC,CACX,CAAC;AACN,CAAC"}
|
|
1
|
+
{"version":3,"file":"DivState.js","sourceRoot":"","sources":["../../../src/components/state/DivState.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivText.d.ts","sourceRoot":"","sources":["../../../src/components/text/DivText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"DivText.d.ts","sourceRoot":"","sources":["../../../src/components/text/DivText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAsC,MAAM,kBAAkB,CAAC;AAKxF,MAAM,WAAW,YAAY;IACzB,gBAAgB,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CACnD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,OAAO,CAAC,EAAE,gBAAgB,EAAE,EAAE,YAAY,qBA2JzD"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
|
-
import { Text } from 'react-native';
|
|
2
|
+
import { PixelRatio, Text } from 'react-native';
|
|
3
3
|
import { Outer } from '../utilities/Outer';
|
|
4
4
|
import { useDerivedFromVarsSimple } from '../../hooks/useDerivedFromVars';
|
|
5
5
|
import { useDivKitContext } from '../../context/DivKitContext';
|
|
@@ -31,13 +31,25 @@ export function DivText({ componentContext }) {
|
|
|
31
31
|
const fontSize = useDerivedFromVarsSimple(json.font_size || 12, variables || new Map());
|
|
32
32
|
const textColor = useDerivedFromVarsSimple(json.text_color || '#000000', variables || new Map());
|
|
33
33
|
const textAlignmentHorizontal = useDerivedFromVarsSimple(json.text_alignment_horizontal || 'start', variables || new Map());
|
|
34
|
+
const fontSizeUnit = useDerivedFromVarsSimple(json.font_size_unit || 'sp', variables || new Map());
|
|
34
35
|
const maxLines = useDerivedFromVarsSimple(json.max_lines, variables || new Map());
|
|
36
|
+
// Convert size value based on font_size_unit
|
|
37
|
+
// sp = scalable pixels (allowFontScaling handles this in RN)
|
|
38
|
+
// dp = density-independent pixels (RN default unit)
|
|
39
|
+
// px = physical pixels (need to divide by PixelRatio)
|
|
40
|
+
const convertSize = (value) => {
|
|
41
|
+
if (fontSizeUnit === 'px') {
|
|
42
|
+
return value / PixelRatio.get();
|
|
43
|
+
}
|
|
44
|
+
return value;
|
|
45
|
+
};
|
|
46
|
+
const allowFontScaling = fontSizeUnit === 'sp';
|
|
35
47
|
// Build text style
|
|
36
48
|
const textStyle = useMemo(() => {
|
|
37
49
|
const style = {};
|
|
38
50
|
// Font size
|
|
39
51
|
if (fontSize) {
|
|
40
|
-
style.fontSize = fontSize;
|
|
52
|
+
style.fontSize = convertSize(fontSize);
|
|
41
53
|
}
|
|
42
54
|
// Text color
|
|
43
55
|
if (textColor) {
|
|
@@ -64,9 +76,7 @@ export function DivText({ componentContext }) {
|
|
|
64
76
|
}
|
|
65
77
|
// Line height
|
|
66
78
|
if (json.line_height && fontSize) {
|
|
67
|
-
|
|
68
|
-
// Convert to ratio: line_height / font_size
|
|
69
|
-
style.lineHeight = json.line_height;
|
|
79
|
+
style.lineHeight = convertSize(json.line_height);
|
|
70
80
|
}
|
|
71
81
|
// Letter spacing
|
|
72
82
|
if (json.letter_spacing !== undefined) {
|
|
@@ -109,6 +119,7 @@ export function DivText({ componentContext }) {
|
|
|
109
119
|
return style;
|
|
110
120
|
}, [
|
|
111
121
|
fontSize,
|
|
122
|
+
fontSizeUnit,
|
|
112
123
|
textColor,
|
|
113
124
|
textAlignmentHorizontal,
|
|
114
125
|
json.font_weight,
|
|
@@ -134,8 +145,7 @@ export function DivText({ componentContext }) {
|
|
|
134
145
|
// Vertical alignment is handled by Outer component via alignment props
|
|
135
146
|
// For text, we primarily care about horizontal alignment which is in textStyle
|
|
136
147
|
return (<Outer componentContext={componentContext}>
|
|
137
|
-
<Text style={textStyle} numberOfLines={numberOfLines} ellipsizeMode={ellipsizeMode} allowFontScaling={
|
|
138
|
-
>
|
|
148
|
+
<Text style={textStyle} numberOfLines={numberOfLines} ellipsizeMode={ellipsizeMode} allowFontScaling={allowFontScaling}>
|
|
139
149
|
{text}
|
|
140
150
|
</Text>
|
|
141
151
|
</Outer>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DivText.js","sourceRoot":"","sources":["../../../src/components/text/DivText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,IAAI,EAAa,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"DivText.js","sourceRoot":"","sources":["../../../src/components/text/DivText.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAa,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAM/D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,OAAO,CAAC,EAAE,gBAAgB,EAAgB;IACtD,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC;IAE7C,4EAA4E;IAC5E,MAAM,IAAI,GAAG,wBAAwB,CAAS,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;IAEvF,MAAM,QAAQ,GAAG,wBAAwB,CAAS,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;IAEhG,MAAM,SAAS,GAAG,wBAAwB,CAAS,IAAI,CAAC,UAAU,IAAI,SAAS,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;IAEzG,MAAM,uBAAuB,GAAG,wBAAwB,CACpD,IAAI,CAAC,yBAAyB,IAAI,OAAO,EACzC,SAAS,IAAI,IAAI,GAAG,EAAE,CACzB,CAAC;IAEF,MAAM,YAAY,GAAG,wBAAwB,CAAe,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;IAEjH,MAAM,QAAQ,GAAG,wBAAwB,CAAqB,IAAI,CAAC,SAAS,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;IAEtG,6CAA6C;IAC7C,6DAA6D;IAC7D,oDAAoD;IACpD,sDAAsD;IACtD,MAAM,WAAW,GAAG,CAAC,KAAa,EAAU,EAAE;QAC1C,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YACxB,OAAO,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,YAAY,KAAK,IAAI,CAAC;IAE/C,mBAAmB;IACnB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAc,EAAE;QACtC,MAAM,KAAK,GAAc,EAAE,CAAC;QAE5B,YAAY;QACZ,IAAI,QAAQ,EAAE,CAAC;YACX,KAAK,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC;QAED,aAAa;QACb,IAAI,SAAS,EAAE,CAAC;YACZ,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC;QAC5B,CAAC;QAED,cAAc;QACd,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,MAAM,SAAS,GAAgD;gBAC3D,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,KAAK;aACd,CAAC;YACF,KAAK,CAAC,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC;QAC5D,CAAC;aAAM,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChC,gCAAgC;YAChC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACpE,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAA4B,CAAC;QACjE,CAAC;QAED,cAAc;QACd,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,CAAC;QAED,cAAc;QACd,IAAI,IAAI,CAAC,WAAW,IAAI,QAAQ,EAAE,CAAC;YAC/B,KAAK,CAAC,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;QAED,iBAAiB;QACjB,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACpC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC;QAC9C,CAAC;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAG,uBAAuB,CAAC;QAC3C,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YACzB,KAAK,CAAC,SAAS,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7D,CAAC;aAAM,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;YAC9B,KAAK,CAAC,SAAS,GAAG,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAC7D,CAAC;aAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YACjC,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC/B,CAAC;aAAM,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YACzD,KAAK,CAAC,SAAS,GAAG,UAAU,CAAC;QACjC,CAAC;QAED,8BAA8B;QAC9B,IAAI,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YAC9B,KAAK,CAAC,kBAAkB,GAAG,WAAW,CAAC;QAC3C,CAAC;QAED,2CAA2C;QAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,kBAAkB,KAAK,WAAW,EAAE,CAAC;gBAC3C,KAAK,CAAC,kBAAkB,GAAG,wBAAwB,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACJ,KAAK,CAAC,kBAAkB,GAAG,cAAc,CAAC;YAC9C,CAAC;QACL,CAAC;QAED,8CAA8C;QAC9C,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,sDAAsD;YACtD,oDAAoD;YACpD,qBAAqB;YACrB,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAQ,CAAC;QACxF,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC,EAAE;QACC,QAAQ;QACR,YAAY;QACZ,SAAS;QACT,uBAAuB;QACvB,IAAI,CAAC,WAAW;QAChB,IAAI,CAAC,iBAAiB;QACtB,IAAI,CAAC,WAAW;QAChB,IAAI,CAAC,WAAW;QAChB,IAAI,CAAC,cAAc;QACnB,IAAI,CAAC,SAAS;QACd,IAAI,CAAC,MAAM;QACX,IAAI,CAAC,qBAAqB;QAC1B,SAAS;KACZ,CAAC,CAAC;IAEH,+BAA+B;IAC/B,MAAM,aAAa,GAAG,QAAQ,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAEtE,iBAAiB;IACjB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAgC,CAAC;QACvD,IAAI,QAAQ,KAAK,KAAK,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAEnC,uEAAuE;IACvE,+EAA+E;IAE/E,OAAO,CACH,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CACtC;YAAA,CAAC,IAAI,CACD,KAAK,CAAC,CAAC,SAAS,CAAC,CACjB,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,CAEnC;gBAAA,CAAC,IAAI,CACT;YAAA,EAAE,IAAI,CACV;QAAA,EAAE,KAAK,CAAC,CACX,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Background.js","sourceRoot":"","sources":["../../../src/components/utilities/Background.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAa,MAAM,cAAc,CAAC;AAC3D,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAUzE,MAAM,mBAAmB,GAAG,CAAC,EAAE,KAAK,EAA+B,EAAE,EAAE;IACnE,sCAAsC;IACtC,IAAI,EAAE,GAAG,KAAK,CAAC;IACf,IAAI,EAAE,GAAG,KAAK,CAAC;IAEf,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClC,EAAE,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,EAAE,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,GAAG,GAAG,CAAC;QAC1C,CAAC;IACL,CAAC;IAED,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAClC,EAAE,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,EAAE,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,GAAG,GAAG,CAAC;QAC1C,CAAC;IACL,CAAC;IAED,SAAS;IACT,8CAA8C;IAC9C,gCAAgC;IAChC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"Background.js","sourceRoot":"","sources":["../../../src/components/utilities/Background.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Outer.d.ts","sourceRoot":"","sources":["../../../src/components/utilities/Outer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAW,MAAM,OAAO,CAAC;AAClD,OAAO,EAAmB,SAAS,EAAc,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"Outer.d.ts","sourceRoot":"","sources":["../../../src/components/utilities/Outer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAW,MAAM,OAAO,CAAC;AAClD,OAAO,EAAmB,SAAS,EAAc,MAAM,cAAc,CAAC;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAUpD,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IAC3D,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtC,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,EAAE,EACvD,gBAAgB,EAChB,QAAQ,EACR,KAAK,EAAE,WAAW,EACrB,EAAE,UAAU,CAAC,CAAC,CAAC,4BA+Nf"}
|
|
@@ -3,6 +3,7 @@ import { View, Pressable, StyleSheet } from 'react-native';
|
|
|
3
3
|
import { useDerivedFromVarsSimple } from '../../hooks/useDerivedFromVars';
|
|
4
4
|
import { useActionHandler, useHasActions } from '../../hooks/useAction';
|
|
5
5
|
import { useDivKitContext } from '../../context/DivKitContext';
|
|
6
|
+
import { useLayoutParams } from '../../context/LayoutParamsContext';
|
|
6
7
|
import { Background } from './Background';
|
|
7
8
|
/**
|
|
8
9
|
* Outer component - base wrapper for all DivKit components
|
|
@@ -12,18 +13,19 @@ import { Background } from './Background';
|
|
|
12
13
|
*/
|
|
13
14
|
export function Outer({ componentContext, children, style: customStyle }) {
|
|
14
15
|
const { direction } = useDivKitContext();
|
|
16
|
+
const layoutParams = useLayoutParams();
|
|
15
17
|
const { json, variables } = componentContext;
|
|
16
18
|
// Only use reactive hooks for truly dynamic properties (visibility, alpha)
|
|
17
19
|
// For MVP, other properties are read directly from JSON (can be enhanced later)
|
|
18
20
|
const visibility = useDerivedFromVarsSimple(json.visibility || 'visible', variables || new Map());
|
|
19
21
|
const alpha = useDerivedFromVarsSimple(json.alpha !== undefined ? json.alpha : 1, variables || new Map());
|
|
20
|
-
//
|
|
21
|
-
const paddings = json.paddings;
|
|
22
|
-
const margins = json.margins;
|
|
22
|
+
// Paddings and margins need expression evaluation (e.g. @{safeAreaTop})
|
|
23
|
+
const paddings = useDerivedFromVarsSimple(json.paddings, variables || new Map());
|
|
24
|
+
const margins = useDerivedFromVarsSimple(json.margins, variables || new Map());
|
|
23
25
|
const background = json.background;
|
|
24
|
-
const border = json.border;
|
|
25
|
-
const width = json.width;
|
|
26
|
-
const height = json.height;
|
|
26
|
+
const border = useDerivedFromVarsSimple(json.border, variables || new Map());
|
|
27
|
+
const width = useDerivedFromVarsSimple(json.width, variables || new Map());
|
|
28
|
+
const height = useDerivedFromVarsSimple(json.height, variables || new Map());
|
|
27
29
|
// Actions - use type assertion for now (will be refined in component implementations)
|
|
28
30
|
const jsonAny = json;
|
|
29
31
|
const actions = jsonAny.actions || (jsonAny.action ? [jsonAny.action] : []);
|
|
@@ -44,27 +46,32 @@ export function Outer({ componentContext, children, style: customStyle }) {
|
|
|
44
46
|
styles.opacity = Math.max(0, Math.min(1, alpha));
|
|
45
47
|
}
|
|
46
48
|
// Width
|
|
49
|
+
const parentOrientation = layoutParams.parentContainerOrientation;
|
|
47
50
|
if (width) {
|
|
48
51
|
const widthVal = width;
|
|
49
52
|
if (widthVal.type === 'fixed') {
|
|
50
53
|
styles.width = widthVal.value;
|
|
51
54
|
}
|
|
52
55
|
else if (widthVal.type === 'match_parent') {
|
|
53
|
-
// Use alignSelf: 'stretch' instead of width: '100%' so that
|
|
54
|
-
// margins are subtracted from the available space rather than
|
|
55
|
-
// added on top of 100%, which would cause overflow.
|
|
56
56
|
styles.alignSelf = 'stretch';
|
|
57
|
-
|
|
57
|
+
// flexGrow only on the main axis (horizontal parent)
|
|
58
|
+
if (parentOrientation === 'horizontal') {
|
|
59
|
+
styles.flexGrow = widthVal.weight || 1;
|
|
60
|
+
styles.flexShrink = 1;
|
|
61
|
+
}
|
|
58
62
|
}
|
|
59
63
|
else if (widthVal.type === 'wrap_content') {
|
|
60
64
|
styles.alignSelf = 'flex-start';
|
|
61
|
-
// React Native default is wrap_content-like for View
|
|
62
65
|
}
|
|
63
66
|
}
|
|
64
67
|
else {
|
|
65
68
|
// Default: match_parent
|
|
66
69
|
styles.alignSelf = 'stretch';
|
|
67
|
-
|
|
70
|
+
// flexGrow only on the main axis (horizontal parent) or outside a container
|
|
71
|
+
if (!parentOrientation || parentOrientation === 'horizontal') {
|
|
72
|
+
styles.flexGrow = 1;
|
|
73
|
+
styles.flexShrink = 1;
|
|
74
|
+
}
|
|
68
75
|
}
|
|
69
76
|
// Height
|
|
70
77
|
if (height) {
|
|
@@ -73,8 +80,14 @@ export function Outer({ componentContext, children, style: customStyle }) {
|
|
|
73
80
|
styles.height = heightVal.value;
|
|
74
81
|
}
|
|
75
82
|
else if (heightVal.type === 'match_parent') {
|
|
76
|
-
|
|
77
|
-
|
|
83
|
+
// flexGrow only on the main axis (vertical parent)
|
|
84
|
+
if (parentOrientation === 'vertical') {
|
|
85
|
+
styles.flexGrow = heightVal.weight || 1;
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
// Cross axis — stretch via alignSelf or explicit height
|
|
89
|
+
styles.alignSelf = 'stretch';
|
|
90
|
+
}
|
|
78
91
|
}
|
|
79
92
|
// wrap_content is default in React Native
|
|
80
93
|
}
|
|
@@ -190,7 +203,7 @@ export function Outer({ componentContext, children, style: customStyle }) {
|
|
|
190
203
|
}
|
|
191
204
|
}
|
|
192
205
|
return styles;
|
|
193
|
-
}, [visibility, alpha, width, height, paddings, margins, background, border, direction]);
|
|
206
|
+
}, [visibility, alpha, width, height, paddings, margins, background, border, direction, layoutParams]);
|
|
194
207
|
const finalStyle = useMemo(() => {
|
|
195
208
|
return StyleSheet.flatten([containerStyle, customStyle]);
|
|
196
209
|
}, [containerStyle, customStyle]);
|