Merge branch 'v4.2.0-form' of https://github.com/primefaces/primevue into v4.2.0-form

apps/showcase/doc/slider/FormsDoc.vue

@@ -22,7 +22,7 @@ export default {
     data() {
         return {
             initialValues: {
-                slider: null
+                slider: 0
             },
             resolver: zodResolver(
                 z.object({
@@ -60,7 +60,7 @@ export default {
     data() {
         return {
             initialValues: {
-                slider: null
+                slider: 0
             },
             resolver: zodResolver(
                 z.object({
@@ -101,7 +101,7 @@ import { z } from 'zod';
 
 const toast = useToast();
 const initialValues = ref({
-    slider: null
+    slider: 0
 });
 const resolver = ref(zodResolver(
     z.object({

packages/primevue/src/select/Select.vue

@@ -355,7 +355,7 @@ export default {
             this.focusedOptionIndex = -1;
             this.searchValue = '';
             this.$emit('blur', event);
-            this.formField.onBlur?.();
+            this.formField.onBlur?.(event);
         },
         onKeyDown(event) {
             if (this.disabled || isAndroid()) {

packages/primevue/src/slider/BaseSlider.vue

@@ -1,12 +1,11 @@
 <script>
-import BaseComponent from '@primevue/core/basecomponent';
+import BaseEditableHolder from '@primevue/core/baseeditableholder';
 import SliderStyle from 'primevue/slider/style';
 
 export default {
     name: 'BaseSlider',
-    extends: BaseComponent,
+    extends: BaseEditableHolder,
     props: {
-        modelValue: [Number, Array],
         min: {
             type: Number,
             default: 0
@@ -27,10 +26,6 @@ export default {
             type: Boolean,
             default: false
         },
-        disabled: {
-            type: Boolean,
-            default: false
-        },
         tabindex: {
             type: Number,
             default: 0

packages/primevue/src/slider/Slider.vue

@@ -10,10 +10,11 @@
             @touchend="onDragEnd($event)"
             @mousedown="onMouseDown($event)"
             @keydown="onKeyDown($event)"
+            @blur="onBlur($event)"
             :tabindex="tabindex"
             role="slider"
             :aria-valuemin="min"
-            :aria-valuenow="modelValue"
+            :aria-valuenow="d_value"
             :aria-valuemax="max"
             :aria-labelledby="ariaLabelledby"
             :aria-label="ariaLabel"
@@ -29,10 +30,11 @@
             @touchend="onDragEnd($event)"
             @mousedown="onMouseDown($event, 0)"
             @keydown="onKeyDown($event, 0)"
+            @blur="onBlur($event, 0)"
             :tabindex="tabindex"
             role="slider"
             :aria-valuemin="min"
-            :aria-valuenow="modelValue ? modelValue[0] : null"
+            :aria-valuenow="d_value ? d_value[0] : null"
             :aria-valuemax="max"
             :aria-labelledby="ariaLabelledby"
             :aria-label="ariaLabel"
@@ -48,10 +50,11 @@
             @touchend="onDragEnd($event)"
             @mousedown="onMouseDown($event, 1)"
             @keydown="onKeyDown($event, 1)"
+            @blur="onBlur($event, 1)"
             :tabindex="tabindex"
             role="slider"
             :aria-valuemin="min"
-            :aria-valuenow="modelValue ? modelValue[1] : null"
+            :aria-valuenow="d_value ? d_value[1] : null"
             :aria-valuemax="max"
             :aria-labelledby="ariaLabelledby"
             :aria-label="ariaLabel"
@@ -62,14 +65,14 @@
 </template>
 
 <script>
-import { getWindowScrollLeft, getWindowScrollTop, getAttribute } from '@primeuix/utils/dom';
+import { getAttribute, getWindowScrollLeft, getWindowScrollTop } from '@primeuix/utils/dom';
 import BaseSlider from './BaseSlider.vue';
 
 export default {
     name: 'Slider',
     extends: BaseSlider,
     inheritAttrs: false,
-    emits: ['update:modelValue', 'change', 'slideend'],
+    emits: ['change', 'slideend'],
     dragging: false,
     handleIndex: null,
     initX: null,
@@ -136,7 +139,7 @@ export default {
                 modelValue = newValue;
             }
 
-            this.$emit('update:modelValue', modelValue);
+            this.updateValue(modelValue, event);
             this.$emit('change', modelValue);
         },
         onDragStart(event, index) {
@@ -224,6 +227,9 @@ export default {
                     break;
             }
         },
+        onBlur(event, index) {
+            this.formField.onBlur?.(event);
+        },
         decrementValue(event, index, pageKey = false) {
             let newValue;
 
@@ -280,10 +286,10 @@ export default {
     computed: {
         value() {
             if (this.range) {
-                return [this.modelValue?.[0] ?? this.min, this.modelValue?.[1] ?? this.max];
+                return [this.d_value?.[0] ?? this.min, this.d_value?.[1] ?? this.max];
             }
 
-            return this.modelValue ?? this.min;
+            return this.d_value ?? this.min;
         },
         horizontal() {
             return this.orientation === 'horizontal';

packages/primevue/src/slider/style/SliderStyle.js

@@ -95,10 +95,11 @@ const inlineStyles = {
 };
 
 const classes = {
-    root: ({ props }) => [
+    root: ({ instance, props }) => [
         'p-slider p-component',
         {
             'p-disabled': props.disabled,
+            'p-invalid': instance.$invalid,
             'p-slider-horizontal': props.orientation === 'horizontal',
             'p-slider-vertical': props.orientation === 'vertical'
         }