Refactor #3889 - button updates

primefaces · May 2, 2023 · 21ab0ad · 21ab0ad
1 parent 4fe92f0
commit 21ab0ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/components/lib/speeddial/SpeedDial.d.ts b/components/lib/speeddial/SpeedDial.d.ts
@@ -8,6 +8,7 @@
  *
  */
 import { VNode } from 'vue';
+import { ButtonPassThroughOptions } from '../button';
 import { MenuItem } from '../menuitem';
 import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
 
@@ -33,12 +34,9 @@ export interface SpeedDialPassThroughOptions {
     root?: SpeedDialPassThroughOptionType;
     /**
      * Uses to pass attributes to the button's DOM element.
+     *  @see {@link ButtonPassThroughOptions}
      */
-    button?: SpeedDialPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the icon's DOM element.
-     */
-    icon?: SpeedDialPassThroughOptionType;
+    button?: ButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the menu's DOM element.
      */

diff --git a/components/lib/speeddial/SpeedDial.vue b/components/lib/speeddial/SpeedDial.vue
@@ -12,12 +12,12 @@
                 :aria-controls="id + '_list'"
                 :aria-label="ariaLabel"
                 :aria-labelledby="ariaLabelledby"
-                v-bind="ptm('button')"
+                :pt="ptm('button')"
             >
                 <template #icon>
                     <slot name="icon" :visible="d_visible">
-                        <component v-if="d_visible && !!hideIcon" :is="hideIcon ? 'span' : 'PlusIcon'" :class="hideIcon" v-bind="ptm('icon')" />
-                        <component v-else :is="showIcon ? 'span' : 'PlusIcon'" :class="showIcon" v-bind="ptm('icon')" />
+                        <component v-if="d_visible && !!hideIcon" :is="hideIcon ? 'span' : 'PlusIcon'" :class="hideIcon" v-bind="ptm('button')['icon']" />
+                        <component v-else :is="showIcon ? 'span' : 'PlusIcon'" :class="showIcon" v-bind="ptm('button')['icon']" />
                     </slot>
                 </template>
             </SDButton>

diff --git a/components/lib/splitbutton/SplitButton.d.ts b/components/lib/splitbutton/SplitButton.d.ts
@@ -8,6 +8,7 @@
  *
  */
 import { ButtonHTMLAttributes, VNode } from 'vue';
+import { ButtonPassThroughOptions } from '../button';
 import { MenuItem } from '../menuitem';
 import { TieredMenuPassThroughOptions } from '../tieredmenu';
 import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
@@ -41,12 +42,9 @@ export interface SplitButtonPassThroughOptions {
     icon?: SplitButtonPassThroughOptionType;
     /**
      * Uses to pass attributes to the menu button's DOM element.
+     * @see {@link ButtonPassThroughOptions}
      */
-    menuButton?: SplitButtonPassThroughOptionType;
-    /**
-     * Uses to pass attributes to the menu button icon's DOM element.
-     */
-    menuButtonIcon?: SplitButtonPassThroughOptionType;
+    menuButton?: ButtonPassThroughOptions;
     /**
      * Uses to pass attributes to the menu's DOM element.
      * @see {@link TieredMenuPassThroughOptions}

diff --git a/components/lib/splitbutton/SplitButton.vue b/components/lib/splitbutton/SplitButton.vue
@@ -19,11 +19,12 @@
             :aria-controls="ariaId + '_overlay'"
             @click="onDropdownButtonClick"
             @keydown="onDropdownKeydown"
-            v-bind="{ ...menuButtonProps, ...ptm('menuButton') }"
+            :pt="ptm('menuButton')"
+            v-bind="menuButtonProps"
         >
             <template #icon="slotProps">
                 <slot name="menubuttonicon">
-                    <component :is="menuButtonIcon ? 'span' : 'ChevronDownIcon'" :class="[menuButtonIcon, slotProps.class]" v-bind="ptm('menuButtonIcon')" />
+                    <component :is="menuButtonIcon ? 'span' : 'ChevronDownIcon'" :class="[menuButtonIcon, slotProps.class]" v-bind="ptm('menuButton')['icon']" />
                 </slot>
             </template>
         </PVSButton>