From 751d9e153f23208086918c33cfb28bfeab38af73 Mon Sep 17 00:00:00 2001
From: Diljohn Singh <diljohn.chauhan@gmail.com>
Date: Fri, 14 Nov 2025 12:21:47 +0100
Subject: [PATCH 1/2] fix: accessibility issue with slider ariaLabelledBy

---
 packages/pluggableWidgets/slider-web/package.json              | 2 +-
 .../pluggableWidgets/slider-web/src/components/Container.tsx   | 3 +++
 .../slider-web/src/components/__tests__/Slider.spec.tsx        | 3 ++-
 .../components/__tests__/__snapshots__/Slider.spec.tsx.snap    | 3 +++
 packages/pluggableWidgets/slider-web/src/package.xml           | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/pluggableWidgets/slider-web/package.json b/packages/pluggableWidgets/slider-web/package.json
index 1e2f6bae85..b5ab7ceed4 100644
--- a/packages/pluggableWidgets/slider-web/package.json
+++ b/packages/pluggableWidgets/slider-web/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@mendix/slider-web",
     "widgetName": "Slider",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "description": "Change a number value using a slider",
     "copyright": "© Mendix Technology BV 2025. All rights reserved.",
     "license": "Apache-2.0",
diff --git a/packages/pluggableWidgets/slider-web/src/components/Container.tsx b/packages/pluggableWidgets/slider-web/src/components/Container.tsx
index 28eb9859e0..c64cbe7461 100644
--- a/packages/pluggableWidgets/slider-web/src/components/Container.tsx
+++ b/packages/pluggableWidgets/slider-web/src/components/Container.tsx
@@ -43,6 +43,8 @@ function InnerContainer(props: InnerContainerProps): ReactElement {
         min: props.min,
         max: props.max
     });
+    // Label generated by systemProperty has the format: {widgetId}-label
+    const ariaLabelledByForHandle = `${props.id}-label`;
 
     return (
         <SliderComponent
@@ -59,6 +61,7 @@ function InnerContainer(props: InnerContainerProps): ReactElement {
             step={props.step}
             onChange={onChange}
             marks={marks}
+            ariaLabelledByForHandle={ariaLabelledByForHandle}
             handleRender={handleRender}
             ref={sliderRef}
         />
diff --git a/packages/pluggableWidgets/slider-web/src/components/__tests__/Slider.spec.tsx b/packages/pluggableWidgets/slider-web/src/components/__tests__/Slider.spec.tsx
index 138ece3641..16ceedeb80 100644
--- a/packages/pluggableWidgets/slider-web/src/components/__tests__/Slider.spec.tsx
+++ b/packages/pluggableWidgets/slider-web/src/components/__tests__/Slider.spec.tsx
@@ -8,7 +8,8 @@ describe("Slider", () => {
     const defaultSliderProps: SliderProps = {
         min: -100,
         max: 100,
-        step: 10
+        step: 10,
+        ariaLabelledByForHandle: "test-slider"
     };
 
     function renderSlider(props?: Partial<SliderProps>): ReturnType<typeof render> {
diff --git a/packages/pluggableWidgets/slider-web/src/components/__tests__/__snapshots__/Slider.spec.tsx.snap b/packages/pluggableWidgets/slider-web/src/components/__tests__/__snapshots__/Slider.spec.tsx.snap
index 2470d1be2c..02f3286b92 100644
--- a/packages/pluggableWidgets/slider-web/src/components/__tests__/__snapshots__/Slider.spec.tsx.snap
+++ b/packages/pluggableWidgets/slider-web/src/components/__tests__/__snapshots__/Slider.spec.tsx.snap
@@ -20,6 +20,7 @@ exports[`Slider renders horizontal Slider correctly 1`] = `
       />
       <div
         aria-disabled="false"
+        aria-labelledby="test-slider"
         aria-orientation="horizontal"
         aria-valuemax="100"
         aria-valuemin="-100"
@@ -75,6 +76,7 @@ exports[`Slider renders markers correctly 1`] = `
       </div>
       <div
         aria-disabled="false"
+        aria-labelledby="test-slider"
         aria-orientation="horizontal"
         aria-valuemax="100"
         aria-valuemin="-100"
@@ -143,6 +145,7 @@ exports[`Slider renders vertical Slider correctly 1`] = `
       />
       <div
         aria-disabled="false"
+        aria-labelledby="test-slider"
         aria-orientation="vertical"
         aria-valuemax="100"
         aria-valuemin="-100"
diff --git a/packages/pluggableWidgets/slider-web/src/package.xml b/packages/pluggableWidgets/slider-web/src/package.xml
index 4b58071280..03f67a46f7 100644
--- a/packages/pluggableWidgets/slider-web/src/package.xml
+++ b/packages/pluggableWidgets/slider-web/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="Slider" version="2.1.4" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="Slider" version="2.1.5" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="Slider.xml" />
         </widgetFiles>

From 91da86be934f40e9609e82d55b5634987a9f1d52 Mon Sep 17 00:00:00 2001
From: Diljohn Singh <diljohn.chauhan@gmail.com>
Date: Wed, 7 Jan 2026 17:24:13 +0100
Subject: [PATCH 2/2] fix: adding aria-labelled by only when label is present

---
 .../slider-web/src/components/Container.tsx              | 9 +++++++--
 .../pluggableWidgets/slider-web/src/utils/helpers.ts     | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 packages/pluggableWidgets/slider-web/src/utils/helpers.ts

diff --git a/packages/pluggableWidgets/slider-web/src/components/Container.tsx b/packages/pluggableWidgets/slider-web/src/components/Container.tsx
index c64cbe7461..b26135235b 100644
--- a/packages/pluggableWidgets/slider-web/src/components/Container.tsx
+++ b/packages/pluggableWidgets/slider-web/src/components/Container.tsx
@@ -1,10 +1,13 @@
-import { ReactElement, useRef } from "react";
+import { ReactElement, useMemo, useRef } from "react";
 import { SliderContainerProps } from "../../typings/SliderProps";
+
 import { createHandleRender } from "../utils/createHandleRender";
 import { getStyleProp, isVertical, maxProp, minProp, stepProp } from "../utils/prop-utils";
 import { useMarks } from "../utils/useMarks";
 import { useNumber } from "../utils/useNumber";
+import { getSliderLabel } from "../utils/helpers";
 import { useOnChangeDebounced } from "../utils/useOnChangeDebounced";
+
 import { Slider as SliderComponent } from "./Slider";
 
 export function Container(props: SliderContainerProps): ReactElement {
@@ -45,6 +48,8 @@ function InnerContainer(props: InnerContainerProps): ReactElement {
     });
     // Label generated by systemProperty has the format: {widgetId}-label
     const ariaLabelledByForHandle = `${props.id}-label`;
+    const sliderLabel = getSliderLabel(props.id);
+    const hasLabel = useMemo(() => Boolean(sliderLabel), [sliderLabel]);
 
     return (
         <SliderComponent
@@ -61,7 +66,7 @@ function InnerContainer(props: InnerContainerProps): ReactElement {
             step={props.step}
             onChange={onChange}
             marks={marks}
-            ariaLabelledByForHandle={ariaLabelledByForHandle}
+            ariaLabelledByForHandle={hasLabel ? ariaLabelledByForHandle : undefined}
             handleRender={handleRender}
             ref={sliderRef}
         />
diff --git a/packages/pluggableWidgets/slider-web/src/utils/helpers.ts b/packages/pluggableWidgets/slider-web/src/utils/helpers.ts
new file mode 100644
index 0000000000..df4a690418
--- /dev/null
+++ b/packages/pluggableWidgets/slider-web/src/utils/helpers.ts
@@ -0,0 +1 @@
+export const getSliderLabel = (sliderId: string): Element | null => document.querySelector(`label[for="${sliderId}"]`);