Skip to content

Commit 41c32b3

Browse files
wegisweswegiswes
authored
Merge pull request #61 from mendix/develop
Merge develop into release
2 parents e6d2b9b + c3806aa commit 41c32b3

File tree

26 files changed

+381
-158
lines changed

26 files changed

+381
-158
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.5.6",
3+
"version": "2.5.7",
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": {

‎scripts/bump-major.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const { writeVersionFiles } = require("./lib/writeFile.js");
77
const versionNumbers = files.pkg.version.split(".");
88
const majorNumber = Number(versionNumbers[1]) + 1;
99
const majorVersion = majorNumber + "." + 0 + "." + 0;
10-
files.pkg.version = files.manifest.js.version = files.manifest.sass.version = majorVersion;
10+
files.pkg.version = files.manifest.ts.version = files.manifest.js.version = files.manifest.sass.version = majorVersion;
1111
writeVersionFiles(files, paths);
1212
})();

‎scripts/bump-minor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const { writeVersionFiles } = require("./lib/writeFile.js");
77
const versionNumbers = files.pkg.version.split(".");
88
const minorNumber = Number(versionNumbers[1]) + 1;
99
const minorVersion = versionNumbers[0] + "." + minorNumber + "." + 0;
10-
files.pkg.version = files.manifest.js.version = files.manifest.sass.version = minorVersion;
10+
files.pkg.version = files.manifest.ts.version = files.manifest.js.version = files.manifest.sass.version = minorVersion;
1111
writeVersionFiles(files, paths);
1212
})();

‎settings-native.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,14 @@
179179
]
180180
}
181181
],
182+
"Page": [
183+
{
184+
"name": "Hide header bottom border",
185+
"type": "Toggle",
186+
"description": "Hide the bottom border (iOS) and elevation (Android) of the header.",
187+
"class": "pageHeaderBorderNone"
188+
}
189+
],
182190
"Widget": [
183191
{
184192
"name": "Spacing top",

‎settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
{
293293
"name": "Align icon",
294294
"type": "Dropdown",
295-
"description": "Place the icon to the left or on top of the button.",
295+
"description": "Place the icon to the right or on top of the button.",
296296
"options": [
297297
{
298298
"name": "Right",

‎styles/native/js/core/base/flex.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ export const alignChildrenBaseline = {
124124
},
125125
};
126126
export const childrenCenter = {
127-
container: Object.assign(Object.assign({}, justifyContentCenter.container), alignChildrenCenter.container),
127+
container: {
128+
...justifyContentCenter.container,
129+
...alignChildrenCenter.container,
130+
},
128131
};
129132
export const alignContentStart = {
130133
container: {

‎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.5.6"
3+
"version": "2.5.7"
44
}

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

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,16 @@ To customize any core styling, copy the part you want to customize to styles/nat
1414
Default Class For Mendix CheckBox Widget
1515
========================================================================== */
1616
export const CheckBox = {
17-
container: Object.assign(Object.assign({}, TextBox.container), { paddingVertical: spacing.smallest, justifyContent: "center" }),
18-
label: Object.assign({}, TextBox.label),
17+
container: {
18+
// All ViewStyle properties are allowed
19+
...TextBox.container,
20+
paddingVertical: spacing.smallest,
21+
justifyContent: "center",
22+
},
23+
label: {
24+
// numberOfLines and all TextStyle properties are allowed
25+
...TextBox.label,
26+
},
1927
input: {
2028
// thumbColorOn, thumbColorOff, trackColorOn, trackColorOff and all TextStyle properties are allowed
2129
backgroundColor: "transparent",
@@ -29,14 +37,39 @@ export const CheckBox = {
2937
// thumbColorOn, thumbColorOff, trackColorOn, trackColorOff and all TextStyle properties are allowed
3038
opacity: Platform.select({ android: 0.5 }),
3139
},
32-
inputError: Object.assign(Object.assign({}, TextBox.inputError), { thumbColorOn: background.primary, trackColorOn: brand.danger, thumbColorOff: contrast.regular, trackColorOff: brand.danger }),
33-
validationMessage: Object.assign(Object.assign({}, TextBox.validationMessage), { alignSelf: "stretch" }),
40+
inputError: {
41+
// thumbColorOn, thumbColorOff, trackColorOn, trackColorOff and all TextStyle properties are allowed
42+
...TextBox.inputError,
43+
thumbColorOn: background.primary,
44+
trackColorOn: brand.danger,
45+
thumbColorOff: contrast.regular,
46+
trackColorOff: brand.danger,
47+
},
48+
validationMessage: {
49+
// All TextStyle properties are allowed
50+
...TextBox.validationMessage,
51+
alignSelf: "stretch",
52+
},
3453
};
3554
export const CheckBoxVertical = {
3655
container: TextBoxVertical.container,
37-
label: Object.assign({}, TextBoxVertical.label),
38-
input: Object.assign(Object.assign({}, CheckBox.input), { alignSelf: "flex-start" }),
56+
label: {
57+
...TextBoxVertical.label,
58+
},
59+
input: {
60+
...CheckBox.input,
61+
alignSelf: "flex-start",
62+
},
3963
inputDisabled: CheckBox.inputDisabled,
40-
inputError: Object.assign(Object.assign({}, TextBoxVertical.inputError), { thumbColorOn: background.primary, trackColorOn: brand.danger, thumbColorOff: contrast.regular, trackColorOff: brand.danger }),
41-
validationMessage: Object.assign(Object.assign({}, TextBoxVertical.validationMessage), { alignSelf: "stretch" }),
64+
inputError: {
65+
...TextBoxVertical.inputError,
66+
thumbColorOn: background.primary,
67+
trackColorOn: brand.danger,
68+
thumbColorOff: contrast.regular,
69+
trackColorOff: brand.danger,
70+
},
71+
validationMessage: {
72+
...TextBoxVertical.validationMessage,
73+
alignSelf: "stretch",
74+
},
4275
};

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@ const pickerBackgroundColor = !darkMode && isOSDarkMode ?
2222
darkMode && !isOSDarkMode ? "rgba(255, 255, 255, 1)" : input.backgroundColor;
2323
//
2424
export const DatePicker = {
25-
container: Object.assign({}, TextBox.container),
26-
label: Object.assign({}, TextBox.label),
25+
container: {
26+
// All ViewStyle properties are allowed
27+
...TextBox.container,
28+
},
29+
label: {
30+
// numberOfLines and all TextStyle properties are allowed
31+
...TextBox.label,
32+
},
2733
pickerIOS: {
2834
// All ViewStyle properties are allowed
2935
backgroundColor: pickerBackgroundColor,
@@ -58,7 +64,10 @@ export const DatePicker = {
5864
placeholderDisabled: {
5965
// All TextStyle properties are allowed
6066
},
61-
validationMessage: Object.assign({}, TextBox.validationMessage),
67+
validationMessage: {
68+
// All TextStyle properties are allowed
69+
...TextBox.validationMessage,
70+
},
6271
};
6372
export const DatePickerVertical = {
6473
container: TextBoxVertical.container,

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@ To customize any core styling, copy the part you want to customize to styles/nat
1313
Default Class For Mendix Drop Down Widget
1414
========================================================================== */
1515
export const DropDown = {
16-
container: Object.assign({}, TextBox.container),
17-
label: Object.assign({}, TextBox.label),
16+
container: {
17+
// All ViewStyle properties are allowed
18+
...TextBox.container,
19+
},
20+
label: {
21+
// numberOfLines and all TextStyle properties are allowed
22+
...TextBox.label,
23+
},
1824
value: {
1925
// All TextStyle properties & placeholderTextColor are allowed
2026
color: input.color,
@@ -32,7 +38,10 @@ export const DropDown = {
3238
// All TextStyle properties are allowed
3339
backgroundColor: input.disabledBackgroundColor,
3440
},
35-
validationMessage: Object.assign({}, TextBox.validationMessage),
41+
validationMessage: {
42+
// All TextStyle properties are allowed
43+
...TextBox.validationMessage,
44+
},
3645
/* New dropdown styles start */
3746
valueContainer: {
3847
// All ViewStyle properties & rippleColor are allowed

0 commit comments

Comments
 (0)