+
{button}
{list}
diff --git a/components/lib/speeddial/SpeedDialBase.js b/components/lib/speeddial/SpeedDialBase.js
index aa808164e6..31a2ff3b5c 100644
--- a/components/lib/speeddial/SpeedDialBase.js
+++ b/components/lib/speeddial/SpeedDialBase.js
@@ -75,43 +75,6 @@ const styles = `
.p-speeddial-opened .p-speeddial-rotate {
transform: rotate(45deg);
}
-
-/* Direction */
-.p-speeddial-direction-up {
- align-items: center;
- flex-direction: column-reverse;
-}
-
-.p-speeddial-direction-up .p-speeddial-list {
- flex-direction: column-reverse;
-}
-
-.p-speeddial-direction-down {
- align-items: center;
- flex-direction: column;
-}
-
-.p-speeddial-direction-down .p-speeddial-list {
- flex-direction: column;
-}
-
-.p-speeddial-direction-left {
- justify-content: center;
- flex-direction: row-reverse;
-}
-
-.p-speeddial-direction-left .p-speeddial-list {
- flex-direction: row-reverse;
-}
-
-.p-speeddial-direction-right {
- justify-content: center;
- flex-direction: row;
-}
-
-.p-speeddial-direction-right .p-speeddial-list {
- flex-direction: row;
-}
`;
const classes = {
@@ -131,12 +94,19 @@ const classes = {
}),
action: ({ disabled }) => classNames('p-speeddial-action', { 'p-disabled': disabled }),
actionIcon: ({ _icon }) => classNames('p-speeddial-action-icon', _icon),
- list: 'p-speeddial-list',
+ menu: 'p-speeddial-list',
menuitem: 'p-speeddial-item'
};
const inlineStyles = {
- menuitem: ({ index, getItemStyle }) => getItemStyle(index)
+ root: ({ props }) => ({
+ alignItems: props.direction === 'up' || props.direction === 'down' ? 'center' : '',
+ justifyContent: props.direction === 'left' || props.direction === 'right' ? 'center' : '',
+ flexDirection: props.direction === 'up' ? 'column-reverse' : props.direction === 'down' ? 'column' : props.direction === 'left' ? 'row-reverse' : props.direction === 'right' ? 'row' : null
+ }),
+ menu: ({ props }) => ({
+ flexDirection: props.direction === 'up' ? 'column-reverse' : props.direction === 'down' ? 'column' : props.direction === 'left' ? 'row-reverse' : props.direction === 'right' ? 'row' : null
+ })
};
export const SpeedDialBase = ComponentBase.extend({
diff --git a/components/lib/splitbutton/SplitButton.js b/components/lib/splitbutton/SplitButton.js
index 542ba04d9d..99017899a2 100644
--- a/components/lib/splitbutton/SplitButton.js
+++ b/components/lib/splitbutton/SplitButton.js
@@ -173,6 +173,7 @@ export const SplitButton = React.memo(
onClick={props.onClick}
disabled={props.disabled}
tabIndex={props.tabIndex}
+ size={props.size}
{...props.buttonProps}
pt={ptm('button')}
__parentMetadata={{
@@ -192,6 +193,7 @@ export const SplitButton = React.memo(
aria-haspopup="true"
aria-controls={overlayVisibleState ? menuId : null}
{...props.menuButtonProps}
+ size={props.size}
pt={ptm('menuButton')}
__parentMetadata={{
parent: metadata