Merge branch 'main' into moo/moo-2235/fix-slack-messaging

stelselim · web-flow · commit 74dd3a9c6b5a · 2026-03-13T11:53:16.000+01:00
diff --git a/.github/workflows/BuildMpk.yml b/.github/workflows/BuildMpk.yml
@@ -54,7 +54,7 @@ jobs:
       - name: "Upload MPK artifact"
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4
         with:
-          name: ${{ env.ARTIFACT_NAME }}
+          name: ${{ env.ARTIFACT_NAME }}-${{ steps.bump_version.outputs.VERSION }}
           path: ${{ env.ARTIFACT_PATH }}
           if-no-files-found: error
 
diff --git a/packages/jsActions/mobile-resources-native/CHANGELOG.md b/packages/jsActions/mobile-resources-native/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [11.4.0] Native Mobile Resources - 2026-3-5
+
 -   We fixed native file system module reference.
 
 ## [11.3.5] Native Mobile Resources - 2026-2-4
diff --git a/packages/jsActions/mobile-resources-native/SiemensMendixNativeMobileResources__11.4.0__READMEOSS_2026-03-05__03-42-15.html b/packages/jsActions/mobile-resources-native/SiemensMendixNativeMobileResources__11.4.0__READMEOSS_2026-03-05__03-42-15.html
diff --git a/packages/jsActions/mobile-resources-native/package.json b/packages/jsActions/mobile-resources-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mobile-resources-native",
   "moduleName": "Native Mobile Resources",
-  "version": "11.3.5",
+  "version": "11.4.0",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "repository": {
diff --git a/packages/jsActions/nanoflow-actions-native/SiemensMendixNanoflowCommons__6.3.1__READMEOSS_2026-03-05__03-45-06.html b/packages/jsActions/nanoflow-actions-native/SiemensMendixNanoflowCommons__6.3.1__READMEOSS_2026-03-05__03-45-06.html
diff --git a/packages/jsActions/nanoflow-actions-native/package.json b/packages/jsActions/nanoflow-actions-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nanoflow-actions-native",
   "moduleName": "Nanoflow Commons",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "repository": {
diff --git a/packages/pluggableWidgets/gallery-text-filter-native/CHANGELOG.md b/packages/pluggableWidgets/gallery-text-filter-native/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+
+-   Fixed VoiceOver/TalkBack not announcing the clear text button.
+
 ## [2.0.1] - 2025-12-15
 
 -   Updated react-native-svg to v15.12.1. This addresses compatibility issues with React Native 0.78 and later versions.
diff --git a/packages/pluggableWidgets/gallery-text-filter-native/package.json b/packages/pluggableWidgets/gallery-text-filter-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gallery-text-filter-native",
   "widgetName": "GalleryTextFilter",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "license": "Apache-2.0",
   "copyright": "© Mendix Technology BV 2022. All rights reserved.",
   "repository": {
diff --git a/packages/pluggableWidgets/gallery-text-filter-native/src/components/FilterComponent.tsx b/packages/pluggableWidgets/gallery-text-filter-native/src/components/FilterComponent.tsx
@@ -95,6 +95,8 @@ export default function FilterComponent(props: FilterComponentProps): ReactEleme
             />
             {value !== "" ? (
                 <TouchableOpacity
+                    accessibilityRole="button"
+                    accessibilityLabel="Clear text"
                     testID={`${props.name}-clear-text-button`}
                     onPress={onPressClearTextIcon}
                     style={props.styles?.textInputClearIcon}
diff --git a/packages/pluggableWidgets/gallery-text-filter-native/src/package.xml b/packages/pluggableWidgets/gallery-text-filter-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="GalleryTextFilter" version="2.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="GalleryTextFilter" version="2.0.2" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="GalleryTextFilter.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/switch-native/CHANGELOG.md b/packages/pluggableWidgets/switch-native/CHANGELOG.md
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Added
+
+-   Added the ability to change the position of the label in horizontal view from the left side of the switch to the right side.
+
+### Fixed
+
+-   We fixed an issue where the validation message was rendered inside the view container of the switch, which caused incorrect styling of the switch.
+-   Fixed an issue where two overlapping tracks were seen in IOS, giving a inconsistent look to switch.
+
 ## [1.1.0] - 2024-12-3
 
 ### Changed
diff --git a/packages/pluggableWidgets/switch-native/package.json b/packages/pluggableWidgets/switch-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "switch-native",
   "widgetName": "Switch",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/packages/pluggableWidgets/switch-native/src/Switch.editorConfig.ts b/packages/pluggableWidgets/switch-native/src/Switch.editorConfig.ts
@@ -24,12 +24,11 @@ export function getPreview(values: SwitchPreviewProps, isDarkMode: boolean): Str
         document: decodeURIComponent(
             (isDarkMode ? StructurePreviewSwitchDarkSVG : StructurePreviewSwitchSVG).replace("data:image/svg+xml,", "")
         ),
-        width: 80,
+        width: 51,
         height: 30,
         grow: 8
     };
-    const children = values.showLabel ? [label, image] : [image];
-
+    const children = values.showLabel ? (values.labelPosition === "right" ? [image, label] : [label, image]) : [image];
     return values.labelOrientation === "horizontal"
         ? {
               type: "RowLayout",
@@ -48,7 +47,11 @@ export function getPreview(values: SwitchPreviewProps, isDarkMode: boolean): Str
 
 export function getProperties(values: SwitchPreviewProps, defaultProperties: Properties): Properties {
     if (!values.showLabel) {
-        hidePropertiesIn(defaultProperties, values, ["label", "labelOrientation"]);
+        hidePropertiesIn(defaultProperties, values, ["label", "labelOrientation", "labelPosition"]);
+    }
+
+    if (values.showLabel && values.labelOrientation !== "horizontal") {
+        hidePropertiesIn(defaultProperties, values, ["labelPosition"]);
     }
 
     return defaultProperties;
diff --git a/packages/pluggableWidgets/switch-native/src/Switch.tsx b/packages/pluggableWidgets/switch-native/src/Switch.tsx
@@ -1,6 +1,6 @@
 import { flattenStyles } from "@mendix/piw-native-utils-internal";
-import { ReactElement, useCallback } from "react";
-import { View, Text, Switch as SwitchComponent, Platform } from "react-native";
+import React, { ReactElement, useCallback } from "react";
+import { View, Text, Switch as SwitchComponent } from "react-native";
 import { executeAction } from "@mendix/piw-utils-internal";
 import { extractStyles } from "@mendix/pluggable-widgets-tools";
 
@@ -10,7 +10,7 @@ import { SwitchStyle, defaultSwitchStyle, CheckBoxInputType } from "./ui/Styles"
 export type Props = SwitchProps<SwitchStyle>;
 
 export function Switch(props: Props): ReactElement {
-    const { label, labelOrientation, showLabel, name, onChange, booleanAttribute } = props;
+    const { label, labelOrientation, showLabel, name, onChange, booleanAttribute, labelPosition } = props;
     const combinedStyles = flattenStyles(defaultSwitchStyle, props.style);
     const styles = processStyles(combinedStyles);
     const horizontalOrientation = showLabel && labelOrientation === "horizontal";
@@ -39,36 +39,87 @@ export function Switch(props: Props): ReactElement {
 
     const labelValue = label?.status === "available" ? label.value : "";
 
+    const switchElement = (
+        <SwitchComponent
+            disabled={!editable}
+            testID={name}
+            style={inputStyle}
+            onValueChange={editable ? onChangeCallback : undefined}
+            value={booleanAttribute.value}
+            trackColor={{
+                true: inputProps.trackColorOn,
+                false: inputProps.trackColorOff
+            }}
+            thumbColor={booleanAttribute.value ? inputProps.thumbColorOn : inputProps.thumbColorOff}
+        />
+    );
+
+    const labelElement = showLabel ? (
+        <Text testID={`${name}$label`} style={[labelStyles]}>
+            {labelValue}
+        </Text>
+    ) : null;
+
+    const validationMessage = hasValidationMessage ? (
+        <Text testID={`${name}$alert`} style={styles.validationMessage}>
+            {booleanAttribute.validation}
+        </Text>
+    ) : null;
+
     return (
         <View
             testID={`${name}$wrapper`}
-            style={[containerStyles, horizontalOrientation ? { flexDirection: "row", alignItems: "center" } : null]}
+            style={[containerStyles, { flexDirection: "column", alignItems: "flex-start" }]}
         >
-            {showLabel ? (
-                <Text testID={`${name}$label`} style={[labelStyles, horizontalOrientation ? { flex: 1 } : null]}>
-                    {labelValue}
-                </Text>
-            ) : null}
-            <View style={[horizontalOrientation ? { flex: 1, alignItems: "flex-end" } : { alignItems: "flex-start" }]}>
-                <SwitchComponent
-                    disabled={!editable}
-                    testID={name}
-                    style={inputStyle}
-                    onValueChange={editable ? onChangeCallback : undefined}
-                    value={booleanAttribute.value}
-                    trackColor={{
-                        true: inputProps.trackColorOn,
-                        false: inputProps.trackColorOff
-                    }}
-                    thumbColor={booleanAttribute.value ? inputProps.thumbColorOn : inputProps.thumbColorOff}
-                    {...(Platform.OS === "ios" ? { ios_backgroundColor: inputProps.trackColorOff } : {})}
-                />
-                {hasValidationMessage ? (
-                    <Text testID={`${name}$alert`} style={styles.validationMessage}>
-                        {booleanAttribute.validation}
-                    </Text>
-                ) : null}
-            </View>
+            {horizontalOrientation ? (
+                // Horizontal layout: label and switch in a row, validation message below
+                <>
+                    <View
+                        testID={`${name}$horizontalContainer`}
+                        style={{
+                            flexDirection: "row",
+                            alignItems: "center",
+                            width: "100%",
+                            justifyContent: "space-between"
+                        }}
+                    >
+                        {labelPosition === "right" ? (
+                            <>
+                                {React.cloneElement(switchElement, { key: "switch" })}
+                                <View
+                                    style={{
+                                        flexDirection: "column",
+                                        alignItems: "flex-end"
+                                    }}
+                                >
+                                    {labelElement && React.cloneElement(labelElement, { key: "label" })}
+                                    {validationMessage}
+                                </View>
+                            </>
+                        ) : (
+                            <>
+                                <View
+                                    style={{
+                                        flexDirection: "column",
+                                        alignItems: "flex-start"
+                                    }}
+                                >
+                                    {labelElement && React.cloneElement(labelElement, { key: "label" })}
+                                    {validationMessage}
+                                </View>
+                                {React.cloneElement(switchElement, { key: "switch" })}
+                            </>
+                        )}
+                    </View>
+                </>
+            ) : (
+                // Vertical layout: label, switch, and validation message all in a column
+                <>
+                    {labelElement && React.cloneElement(labelElement, { key: "label" })}
+                    {React.cloneElement(switchElement, { key: "switch" })}
+                    {validationMessage}
+                </>
+            )}
         </View>
     );
 }
diff --git a/packages/pluggableWidgets/switch-native/src/Switch.xml b/packages/pluggableWidgets/switch-native/src/Switch.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<widget id="com.mendix.widget.native.switch.Switch" supportedPlatform="Native" needsEntityContext="true" offlineCapable="true"
-        pluginWidget="true" xmlns="http://www.mendix.com/widget/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.mendix.com/widget/1.0/ ../../../node_modules/mendix/custom_widget.xsd">
+<?xml version="1.0" encoding="utf-8" ?>
+<widget id="com.mendix.widget.native.switch.Switch" supportedPlatform="Native" needsEntityContext="true" offlineCapable="true" pluginWidget="true" xmlns="http://www.mendix.com/widget/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mendix.com/widget/1.0/ ../../../node_modules/mendix/custom_widget.xsd">
     <name>Switch</name>
     <description>Toggle a boolean attribute.</description>
     <studioProCategory>Display</studioProCategory>
@@ -11,44 +9,52 @@
             <propertyGroup caption="Data source">
                 <property key="booleanAttribute" type="attribute">
                     <caption>Attribute</caption>
-                    <description/>
+                    <description />
                     <attributeTypes>
-                        <attributeType name="Boolean"/>
+                        <attributeType name="Boolean" />
                     </attributeTypes>
                 </property>
             </propertyGroup>
             <propertyGroup caption="Events">
                 <property key="onChange" type="action" required="false">
                     <caption>On change</caption>
-                    <description/>
+                    <description />
                 </property>
             </propertyGroup>
             <propertyGroup caption="Label">
                 <property key="showLabel" type="boolean" defaultValue="false">
                     <caption>Show label</caption>
-                    <description/>
+                    <description />
                 </property>
                 <property key="label" type="textTemplate" required="false">
                     <caption>Label</caption>
-                    <description/>
+                    <description />
                 </property>
                 <property key="labelOrientation" type="enumeration" defaultValue="horizontal">
                     <caption>Label orientation</caption>
-                    <description/>
+                    <description />
                     <enumerationValues>
                         <enumerationValue key="horizontal">Horizontal</enumerationValue>
                         <enumerationValue key="vertical">Vertical</enumerationValue>
                     </enumerationValues>
                 </property>
+                <property key="labelPosition" type="enumeration" defaultValue="left">
+                    <caption>Label position</caption>
+                    <description>The position of the label relative to the switch</description>
+                    <enumerationValues>
+                        <enumerationValue key="left">Left</enumerationValue>
+                        <enumerationValue key="right">Right</enumerationValue>
+                    </enumerationValues>
+                </property>
             </propertyGroup>
             <propertyGroup caption="Editability">
-                <systemProperty key="Editability"/>
+                <systemProperty key="Editability" />
             </propertyGroup>
             <propertyGroup caption="Visibility">
-                <systemProperty key="Visibility"/>
+                <systemProperty key="Visibility" />
             </propertyGroup>
             <propertyGroup caption="Common">
-                <systemProperty key="Name"/>
+                <systemProperty key="Name" />
             </propertyGroup>
         </propertyGroup>
     </properties>
diff --git a/packages/pluggableWidgets/switch-native/src/__tests__/Switch.spec.tsx b/packages/pluggableWidgets/switch-native/src/__tests__/Switch.spec.tsx
@@ -13,7 +13,8 @@ const createProps = (props?: Partial<Props>): Props => {
         showLabel: false,
         booleanAttribute: new EditableValueBuilder<boolean>().withValue(false).build(),
         onChange: undefined,
-        style: [{ ...defaultSwitchStyle, ...style }]
+        style: [{ ...defaultSwitchStyle, ...style }],
+        labelPosition: "left"
     };
 
     return { ...defaultProps, ...props };
@@ -55,14 +56,23 @@ describe("Switch", () => {
         expect(screen.getByTestId(`${name}$label`)).toBeTruthy();
     });
 
-    it("with showLabel true renders label horizontally", () => {
+    it("with showLabel true and horizontal orientation, renders label and switch in a row", () => {
         const props = createProps({
-            showLabel: true
+            showLabel: true,
+            labelOrientation: "horizontal",
+            label: dynamicValue<string>("Test Label", false)
         });
 
         render(<Switch {...props} />);
-        const wrapper = screen.getByTestId(`${name}$wrapper`);
-        expect(wrapper.props.style).toEqual(expect.arrayContaining([{ flexDirection: "row", alignItems: "center" }]));
+
+        const horizontalContainer = screen.getByTestId(`${name}$horizontalContainer`);
+
+        expect(horizontalContainer.props.style).toEqual(
+            expect.objectContaining({ flexDirection: "row", alignItems: "center" })
+        );
+
+        expect(horizontalContainer).toContainElement(screen.getByTestId(`${name}$label`));
+        expect(horizontalContainer).toContainElement(screen.getByTestId(name));
     });
 
     it("with showLabel true and labelOrientation vertical, renders vertical", () => {
@@ -74,8 +84,9 @@ describe("Switch", () => {
         render(<Switch {...props} />);
         const wrapper = screen.getByTestId(`${name}$wrapper`);
         expect(wrapper.props.style).toEqual(
-            expect.not.arrayContaining([{ flexDirection: "row", alignItems: "center" }])
+            expect.arrayContaining([{ flexDirection: "column", alignItems: "flex-start" }])
         );
+        expect(screen.queryByTestId(`${name}$horizontalContainer`)).toBeNull();
     });
 
     it("with error renders validation message", () => {
diff --git a/packages/pluggableWidgets/switch-native/src/assets/checked-dark.svg b/packages/pluggableWidgets/switch-native/src/assets/checked-dark.svg
@@ -1,4 +1,4 @@
-<svg width="80" height="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="51" height="30" viewBox="0 0 51 30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <defs>
         <path d="M15 0h21c8.284 0 15 6.716 15 15 0 8.284-6.716 15-15 15H15C6.716 30 0 23.284 0 15 0 6.716 6.716 0 15 0z"
               id="a"/>
diff --git a/packages/pluggableWidgets/switch-native/src/assets/checked.svg b/packages/pluggableWidgets/switch-native/src/assets/checked.svg
@@ -1,4 +1,4 @@
-<svg width="80" height="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="51" height="30" viewBox="0 0 51 30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <defs>
         <path d="M15 0h21c8.284 0 15 6.716 15 15 0 8.284-6.716 15-15 15H15C6.716 30 0 23.284 0 15 0 6.716 6.716 0 15 0z"
               id="a"/>
diff --git a/packages/pluggableWidgets/switch-native/src/package.xml b/packages/pluggableWidgets/switch-native/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="Switch" version="1.1.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Switch" version="1.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Switch.xml" />
         </widgetFiles>
diff --git a/packages/pluggableWidgets/switch-native/src/ui/Styles.ts b/packages/pluggableWidgets/switch-native/src/ui/Styles.ts
diff --git a/packages/pluggableWidgets/switch-native/typings/SwitchProps.d.ts b/packages/pluggableWidgets/switch-native/typings/SwitchProps.d.ts
diff --git a/scripts/release/build-mpk.ts b/scripts/release/build-mpk.ts
diff --git a/scripts/release/module-automation/utils.ts b/scripts/release/module-automation/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mobile-resources-native",`
`3`	`3`	`"moduleName": "Native Mobile Resources",`
`4`		`- "version": "11.3.5",`
	`4`	`+ "version": "11.4.0",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"copyright": "© Mendix Technology BV 2022. All rights reserved.",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nanoflow-actions-native",`
`3`	`3`	`"moduleName": "Nanoflow Commons",`
`4`		`- "version": "6.3.0",`
	`4`	`+ "version": "6.3.1",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"copyright": "© Mendix Technology BV 2022. All rights reserved.",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gallery-text-filter-native",`
`3`	`3`	`"widgetName": "GalleryTextFilter",`
`4`		`- "version": "2.0.1",`
	`4`	`+ "version": "2.0.2",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"copyright": "© Mendix Technology BV 2022. All rights reserved.",`
`7`	`7`	`"repository": {`