Skip to content

Commit f0065d1

Browse files
wegisweswegiswes
authored
Merge pull request #109 from mendix/develop
Merge dev to release for 8.17
2 parents 80e5695 + e02245c commit f0065d1

File tree

14 files changed

+459
-6
lines changed

14 files changed

+459
-6
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "atlas-ui-framework",
3-
"version": "2.6.4",
3+
"version": "2.6.5",
44
"description": "Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go to https://atlas.mendix.com.",
55
"main": "",
66
"scripts": {

‎settings-native.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,23 @@
14121412
]
14131413
}
14141414
],
1415+
"com.mendix.widget.native.linechart.LineChart": [
1416+
{
1417+
"name": "Chart size",
1418+
"type": "Dropdown",
1419+
"description": "Size of the chart.",
1420+
"options": [
1421+
{
1422+
"name": "Square",
1423+
"class": "lineChartSquare"
1424+
},
1425+
{
1426+
"name": "Maximum space",
1427+
"class": "lineChartMaxSpace"
1428+
}
1429+
]
1430+
}
1431+
],
14151432
"com.mendix.widget.native.listviewswipe.ListViewSwipe": [
14161433
{
14171434
"name": "Panel size",

‎styles/native/js/core/helpers/linechart.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export const lineChartSquare = {
2+
chart: {
3+
aspectRatio: 1
4+
}
5+
};
6+
export const lineChartMaxSpace = {
7+
chart: {
8+
flex: 1,
9+
aspectRatio: undefined
10+
}
11+
};

‎styles/native/js/core/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "Atlas-UI-Framework",
3-
"version": "2.6.4"
3+
"version": "2.6.5"
44
}

‎styles/native/js/core/widgets/linechart.js‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
import { border, brand, font, spacing } from "../variables";
2+
/*
3+
4+
DISCLAIMER:
5+
Do not change this file because it is core styling.
6+
Customizing core files will make updating Atlas much more difficult in the future.
7+
To customize any core styling, copy the part you want to customize to styles/native/app/ so the core styling is overwritten.
8+
9+
==========================================================================
10+
Line Chart
11+
12+
Default Class For Mendix Line Chart Widget
13+
========================================================================== */
14+
// eslint-disable-next-line @typescript-eslint/camelcase
15+
export const com_mendix_widget_native_linechart_LineChart = {
16+
container: {
17+
// All ViewStyle properties are allowed
18+
},
19+
errorMessage: {
20+
// All TextStyle properties are allowed
21+
fontFamily: font.family,
22+
fontSize: font.sizeSmall,
23+
fontWeight: font.weightNormal,
24+
},
25+
chart: {
26+
// All ViewStyle properties are allowed
27+
},
28+
grid: {
29+
/*
30+
Allowed properties:
31+
- backgroundColor (string)
32+
- dashArray (string)
33+
- lineColor (string)
34+
- lineWidth (number)
35+
- padding (number)
36+
- paddingBottom (number)
37+
- paddingHorizontal (number)
38+
- paddingLeft (number)
39+
- paddingRight (number)
40+
- paddingTop (number)
41+
- paddingVertical (number)
42+
*/
43+
lineColor: border.color,
44+
paddingBottom: 32,
45+
paddingLeft: 32,
46+
paddingRight: 8,
47+
paddingTop: 8,
48+
},
49+
xAxis: {
50+
/*
51+
Allowed properties:
52+
- color (string)
53+
- dashArray (string)
54+
- fontFamily (string)
55+
- fontSize (number)
56+
- fontStyle ("normal" or "italic")
57+
- fontWeight ("normal" or "bold" or "100" or "200" or "300" or "400" or "500" or "600" or "700" or "800" or "900")
58+
- lineColor (string)
59+
- lineWidth (number)
60+
*/
61+
color: font.color,
62+
fontFamily: font.family,
63+
fontSize: font.sizeSmall,
64+
fontWeight: font.weightNormal,
65+
lineColor: border.color,
66+
label: {
67+
/*
68+
All TextStyle properties are allowed and:
69+
- relativePositionGrid ("bottom" or "right")
70+
*/
71+
color: font.color,
72+
alignSelf: "center",
73+
marginHorizontal: 0,
74+
marginVertical: spacing.smallest,
75+
fontFamily: font.family,
76+
fontSize: font.sizeSmall,
77+
fontWeight: font.weightNormal,
78+
relativePositionGrid: "bottom"
79+
},
80+
},
81+
yAxis: {
82+
/*
83+
Allowed properties:
84+
- color (string)
85+
- dashArray (string)
86+
- fontFamily (string)
87+
- fontSize (number)
88+
- fontStyle ("normal" or "italic")
89+
- fontWeight ("normal" or "bold" or "100" or "200" or "300" or "400" or "500" or "600" or "700" or "800" or "900")
90+
- lineColor (string)
91+
- lineWidth (number)
92+
*/
93+
color: font.color,
94+
fontFamily: font.family,
95+
fontSize: font.sizeSmall,
96+
fontWeight: font.weightNormal,
97+
lineColor: border.color,
98+
label: {
99+
/*
100+
All TextStyle properties are allowed and:
101+
- relativePositionGrid ("top" or "left")
102+
*/
103+
color: font.color,
104+
marginHorizontal: 0,
105+
marginVertical: spacing.smallest,
106+
fontFamily: font.family,
107+
fontSize: font.sizeSmall,
108+
fontWeight: font.weightNormal,
109+
relativePositionGrid: "top"
110+
},
111+
},
112+
lines: {
113+
/*
114+
Allowed properties:
115+
- lineColorPalette (string with array of colors separated by ';')
116+
*/
117+
lineColorPalette: Object.values(brand)
118+
.map((color, index, brandColors) => (index === brandColors.length - 1 ? color : `${color};`))
119+
.join(""),
120+
customLineStyles: {
121+
any_custom_line_style_name: {
122+
line: {
123+
/*
124+
Allowed properties:
125+
- dashArray (string)
126+
- ending ("flat" or "round")
127+
- lineColor (string)
128+
- lineWidth (number)
129+
*/
130+
},
131+
markers: {
132+
/*
133+
Allowed properties:
134+
- backgroundColor (string)
135+
- borderColor (string)
136+
- borderWidth (number)
137+
- display ("false" or "underneath" or "onTop")
138+
- size (number)
139+
- symbol ("circle" or "diamond" or "plus" or "minus" or "square" or "star" or "triangleDown" or "triangleUp")
140+
*/
141+
}
142+
}
143+
}
144+
},
145+
legend: {
146+
container: {
147+
// All ViewStyle properties are allowed
148+
justifyContent: "flex-start",
149+
marginHorizontal: 0,
150+
marginVertical: spacing.smallest,
151+
},
152+
item: {
153+
// All ViewStyle properties are allowed
154+
padding: 0,
155+
paddingRight: spacing.smaller,
156+
},
157+
indicator: {
158+
// All ViewStyle properties are allowed
159+
marginRight: spacing.smallest,
160+
},
161+
label: {
162+
// All TextStyle properties are allowed
163+
color: font.color,
164+
fontFamily: font.family,
165+
fontSize: font.sizeSmall,
166+
fontWeight: font.weightNormal,
167+
},
168+
}
169+
};

‎styles/native/js/main.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ export * from "./core/widgets/images";
2929
export * from "./core/helpers/images";
3030
export * from "./core/widgets/introscreen";
3131
export * from "./core/widgets/layoutgrid";
32+
export * from "./core/widgets/linechart";
33+
export * from "./core/helpers/linechart";
3234
export * from "./core/widgets/listviews";
3335
export * from "./core/helpers/listviews";
3436
export * from "./core/widgets/listviewswipe";

‎styles/native/ts/core/helpers/linechart.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
export const lineChartSquare = {
2+
chart: {
3+
aspectRatio: 1
4+
}
5+
};
6+
7+
export const lineChartMaxSpace = {
8+
chart: {
9+
flex: 1,
10+
aspectRatio: undefined
11+
}
12+
};

‎styles/native/ts/core/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "Atlas-UI-Framework",
3-
"version": "2.6.4"
3+
"version": "2.6.5"
44
}

0 commit comments

Comments
 (0)