Merge pull request #84 from mendix/develop

wegiswes · web-flow · commit 428e26d09743 · 2020-08-25T11:23:48.000+02:00
Merge develop into release
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,7 @@
 .github/
 
 # Zips
-**/*.zip
+**/*.zip
+
+# Modules
+node_modules
diff --git a/index.html b/index.html
@@ -15,6 +15,7 @@
 
     </head>
     <body dir="ltr">
+        <noscript>To use this application, please enable JavaScript.</noscript>
         <div id="content"></div>
         <script>
             dojoConfig = {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "atlas-ui-framework",
-    "version": "2.6.0",
+    "version": "2.6.1",
     "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.",
     "main": "",
     "scripts": {
@@ -18,6 +18,9 @@
         "url": "https://github.com/mendix/Atlas-UI-Framework/issues"
     },
     "homepage": "https://github.com/mendix/Atlas-UI-Framework#readme",
-    "devDependencies": {},
+    "devDependencies": {
+        "@types/react-native": "^0.61.19",
+        "react-native-device-info": "^5.5.3"
+    },
     "dependencies": {}
 }
diff --git a/styles/native/js/core/manifest.json b/styles/native/js/core/manifest.json
@@ -1,4 +1,4 @@
 {
     "name": "Atlas-UI-Framework",
-    "version": "2.6.0"
+    "version": "2.6.1"
 }
diff --git a/styles/native/js/core/widgets/badge.js b/styles/native/js/core/widgets/badge.js
@@ -14,6 +14,7 @@ To customize any core styling, copy the part you want to customize to styles/nat
 export const com_mendix_widget_native_badge_Badge = {
     container: {
         // All ViewStyle properties are allowed
+        borderRadius: badge.borderRadius,
         backgroundColor: badge.default.backgroundColor,
         paddingVertical: badge.paddingVertical,
         paddingHorizontal: badge.paddingHorizontal,
diff --git a/styles/native/js/core/widgets/dropdown.js b/styles/native/js/core/widgets/dropdown.js
@@ -44,7 +44,7 @@ export const DropDown = {
     },
     /*  New dropdown styles start */
     valueContainer: {
-    // All ViewStyle properties & rippleColor are allowed
+        // All ViewStyle properties & rippleColor are allowed
     },
     menuWrapper: {
         // All ViewStyle properties are allowed
@@ -59,9 +59,11 @@ export const DropDown = {
         maxWidth: 500,
         paddingVertical: 6,
         paddingHorizontal: 16,
+        backgroundColor: input.backgroundColor,
     },
     item: {
-    // All TextStlye properties are allowed
+        // All TextStlye properties are allowed
+        color: input.color,
     },
     selectedItem: {
         // All TextStlye properties are allowed
@@ -79,10 +81,10 @@ export const DropDown = {
         backgroundColor: input.backgroundColor,
     },
     pickerItemIOS: {
-    // All TextStyle properties are allowed
+        // All TextStyle properties are allowed
     },
     pickerBackdropIOS: {
-    // All ViewStyle properties are allowed
+        // All ViewStyle properties are allowed
     },
     pickerTopIOS: {
         // All ViewStyle properties are allowed
diff --git a/styles/native/js/core/widgets/tabcontainer.js b/styles/native/js/core/widgets/tabcontainer.js
@@ -1,4 +1,4 @@
-import { font, spacing, tabContainer } from "../variables";
+import { badge, font, spacing, tabContainer } from "../variables";
 /*
 
 DISCLAIMER:
@@ -48,4 +48,20 @@ export const TabContainer = {
         fontWeight: tabContainer.activeLabel.fontWeight,
         textTransform: tabContainer.activeLabel.textTransform,
     },
+    badgeContainer: {
+        // All ViewStyle properties are allowed
+        borderRadius: badge.borderRadius,
+        backgroundColor: badge.default.backgroundColor,
+        paddingVertical: badge.paddingVertical,
+        paddingHorizontal: badge.paddingHorizontal,
+        marginLeft: 8
+    },
+    badgeCaption: {
+        // All TextStyle properties are allowed
+        fontSize: font.size,
+        color: badge.default.color,
+        fontFamily: font.family,
+        fontWeight: badge.fontWeight,
+        marginTop: -1,
+    }
 };
diff --git a/styles/native/ts/core/manifest.json b/styles/native/ts/core/manifest.json
@@ -1,4 +1,4 @@
 {
     "name": "Atlas-UI-Framework",
-    "version": "2.6.0"
-}
+    "version": "2.6.1"
+}
diff --git a/styles/native/ts/core/widgets/badge.ts b/styles/native/ts/core/widgets/badge.ts
@@ -15,6 +15,7 @@ To customize any core styling, copy the part you want to customize to styles/nat
 export const com_mendix_widget_native_badge_Badge: BadgeType = {
     container: {
         // All ViewStyle properties are allowed
+        borderRadius: badge.borderRadius,
         backgroundColor: badge.default.backgroundColor,
         paddingVertical: badge.paddingVertical,
         paddingHorizontal: badge.paddingHorizontal,
diff --git a/styles/native/ts/core/widgets/dropdown.ts b/styles/native/ts/core/widgets/dropdown.ts
@@ -63,9 +63,11 @@ export const DropDown: DropDownType = {
         maxWidth: 500,
         paddingVertical: 6,
         paddingHorizontal: 16,
+        backgroundColor: input.backgroundColor,
     },
     item: {
         // All TextStlye properties are allowed
+        color: input.color,
     },
     selectedItem: {
         // All TextStlye properties are allowed
diff --git a/styles/native/ts/core/widgets/tabcontainer.ts b/styles/native/ts/core/widgets/tabcontainer.ts
@@ -1,5 +1,5 @@
-import { font, spacing, tabContainer } from "../variables";
-import { TabContainerType }            from "../../types/widgets";
+import { badge, font, spacing, tabContainer } from "../variables";
+import { TabContainerType }                   from "../../types/widgets";
 /*
 
 DISCLAIMER:
@@ -49,4 +49,20 @@ export const TabContainer: TabContainerType = {
         fontWeight: tabContainer.activeLabel.fontWeight,
         textTransform: tabContainer.activeLabel.textTransform,
     },
+    badgeContainer: {
+        // All ViewStyle properties are allowed
+        borderRadius: badge.borderRadius,
+        backgroundColor: badge.default.backgroundColor,
+        paddingVertical: badge.paddingVertical,
+        paddingHorizontal: badge.paddingHorizontal,
+        marginLeft: 8
+    },
+    badgeCaption: {
+        // All TextStyle properties are allowed
+        fontSize: font.size,
+        color: badge.default.color,
+        fontFamily: font.family,
+        fontWeight: badge.fontWeight,
+        marginTop: -1,
+    }
 };
diff --git a/styles/native/ts/types/widgets.d.ts b/styles/native/ts/types/widgets.d.ts
@@ -411,7 +411,9 @@ export interface TabContainerType {
     indicator?: ViewStyle,
     tab?: ViewStyle,
     label?: TextStyle,
-    activeLabel?: TextStyle
+    activeLabel?: TextStyle,
+    badgeContainer?: ViewStyle,
+    badgeCaption?: TextStyle
 }
 
 // Text Box
diff --git a/styles/web/css/main.css b/styles/web/css/main.css
diff --git a/styles/web/css/main.css.map b/styles/web/css/main.css.map
diff --git a/styles/web/sass/core/manifest.json b/styles/web/sass/core/manifest.json
@@ -1,4 +1,4 @@
 {
     "name": "Atlas-UI-Framework",
-    "version": "2.6.0"
+    "version": "2.6.1"
 }
diff --git a/styles/web/sass/core/widgets/_tabcontainer.scss b/styles/web/sass/core/widgets/_tabcontainer.scss
@@ -84,3 +84,14 @@
         }
     }
 }
+
+.mx-tabcontainer-badge {
+    margin-left: 8px;
+    border-radius: $font-size-small;
+    background-color: $label-primary-bg;
+    color: $label-primary-color;
+    font-size: $font-size-small;
+    font-weight: $font-weight-bold;
+    line-height: 1;
+    padding: 3px 7px;
+}
diff --git a/styles/web/sass/core/widgetscustom/_range-slider-theme.scss b/styles/web/sass/core/widgetscustom/_range-slider-theme.scss
@@ -53,3 +53,7 @@ div.widget-range-slider-danger .rc-slider-track {
 div.widget-range-slider-inverse .rc-slider-track {
     background-color: $brand-inverse;
 }
+
+.rc-slider-tooltip {
+    z-index: 999;
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,48 @@
+{
+    "compilerOptions": {
+        "baseUrl": "./",
+        "module": "es2015",
+        "target": "esnext",
+        "typeRoots": [
+            "./node_modules/@types"
+        ],
+        "types": [
+            "react-native",
+            "react-native-device-info"
+        ],
+        "paths": {
+            "react-native": [
+                "./node_modules/@types/react-native"
+            ],
+            "react-native-device-info": [
+                "./node_modules/react-native-device-info/lib/typescript"
+            ]
+        },
+        "lib": [
+            "es2017"
+        ],
+        "noEmitOnError": true,
+        "sourceMap": false,
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
+        "removeComments": false,
+        "allowJs": true,
+        "checkJs": true,
+        "declaration": false,
+        "noLib": false,
+        "watch": false,
+        "forceConsistentCasingInFileNames": true,
+        "noFallthroughCasesInSwitch": true,
+        "strict": true,
+        "strictFunctionTypes": false,
+        "skipLibCheck": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "moduleResolution": "node",
+        "outDir": "./styles/native/js",
+        "newLine": "CRLF"
+    },
+    "include": [
+        "./styles/native/**/*.ts"
+    ]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Atlas-UI-Framework",`
`3`		`- "version": "2.6.0"`
	`3`	`+ "version": "2.6.1"`
`4`	`4`	`}`