Refactor #5437

primefaces · Mar 22, 2024 · 7e17767 · 7e17767
1 parent 4d640c4
commit 7e17767
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/components/lib/listbox/style/ListboxStyle.js b/components/lib/listbox/style/ListboxStyle.js
@@ -4,6 +4,7 @@ const classes = {
     root: ({ props }) => [
         'p-listbox p-component',
         {
+            'p-listbox-striped': props.stripedRows,
             'p-disabled': props.disabled,
             'p-invalid': props.invalid
         }

diff --git a/components/lib/orderlist/BaseOrderList.vue b/components/lib/orderlist/BaseOrderList.vue
@@ -48,7 +48,7 @@ export default {
         },
         severity: {
             type: String,
-            default: null
+            default: 'secondary'
         },
         tabindex: {
             type: Number,

diff --git a/components/lib/orderlist/OrderList.d.ts b/components/lib/orderlist/OrderList.d.ts
@@ -232,6 +232,7 @@ export interface OrderListProps {
     tabindex?: number | string | undefined;
     /**
      * Defines the style of the button.
+     * @defaultValue secondary
      */
     severity?: HintedString<'secondary' | 'success' | 'info' | 'warning' | 'help' | 'danger' | 'contrast'> | undefined;
     /**

diff --git a/components/lib/orderlist/OrderList.vue b/components/lib/orderlist/OrderList.vue
@@ -44,6 +44,7 @@
             :dataKey="dataKey"
             :autoOptionFocus="autoOptionFocus"
             :focusOnHover="focusOnHover"
+            :stripedRows="stripedRows"
             :disabled="disabled"
             :ariaLabel="ariaLabel"
             :ariaLabelledby="ariaLabelledby"

diff --git a/components/lib/orderlist/style/OrderListStyle.js b/components/lib/orderlist/style/OrderListStyle.js
@@ -1,12 +1,7 @@
 import BaseStyle from 'primevue/base/style';
 
 const classes = {
-    root: ({ props }) => [
-        'p-orderlist p-component',
-        {
-            'p-orderlist-striped': props.stripedRows
-        }
-    ],
+    root: 'p-orderlist p-component',
     controls: 'p-orderlist-controls',
     container: 'p-orderlist-list-container',
     header: 'p-orderlist-header',

diff --git a/components/lib/picklist/BasePickList.vue b/components/lib/picklist/BasePickList.vue
@@ -56,7 +56,7 @@ export default {
         },
         severity: {
             type: String,
-            default: null
+            default: 'secondary'
         },
         tabindex: {
             type: Number,

diff --git a/components/lib/picklist/PickList.d.ts b/components/lib/picklist/PickList.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { ClassComponent, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type PickListPassThroughOptionType = PickListPassThroughAttributes | ((options: PickListPassThroughMethodOptions) => PickListPassThroughAttributes | string) | string | null | undefined;
 
@@ -364,6 +364,11 @@ export interface PickListProps {
      * @defaultValue true
      */
     showTargetControls?: boolean | undefined;
+    /**
+     * Defines the style of the button.
+     * @defaultValue secondary
+     */
+    severity?: HintedString<'secondary' | 'success' | 'info' | 'warning' | 'help' | 'danger' | 'contrast'> | undefined;
     /**
      * Index of the list element in tabbing order.
      */

diff --git a/components/lib/picklist/PickList.vue b/components/lib/picklist/PickList.vue
@@ -45,6 +45,7 @@
                 :dataKey="dataKey"
                 :autoOptionFocus="autoOptionFocus"
                 :focusOnHover="focusOnHover"
+                :stripedRows="stripedRows"
                 :disabled="disabled"
                 :pt="ptm('list')"
                 :unstyled="unstyled"
@@ -109,6 +110,7 @@
                 :dataKey="dataKey"
                 :autoOptionFocus="autoOptionFocus"
                 :focusOnHover="focusOnHover"
+                :stripedRows="stripedRows"
                 :disabled="disabled"
                 :pt="ptm('list')"
                 :unstyled="unstyled"

diff --git a/components/lib/picklist/style/PickListStyle.js b/components/lib/picklist/style/PickListStyle.js
@@ -1,12 +1,7 @@
 import BaseStyle from 'primevue/base/style';
 
 const classes = {
-    root: ({ props }) => [
-        'p-picklist p-component',
-        {
-            'p-picklist-striped': props.stripedRows
-        }
-    ],
+    root: 'p-picklist p-component',
     sourceControls: 'p-picklist-buttons p-picklist-source-controls',
     sourceWrapper: 'p-picklist-list-wrapper p-picklist-source-wrapper',
     sourceHeader: 'p-picklist-header',