Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui5-split-button): fix split button when in wrapper #8037

Merged
merged 8 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions packages/main/src/SplitButton.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@
<slot></slot>
{{/if}}
</ui5-button>

<div
class="ui5-split-arrow-button-wrapper"
dir={{effectiveDir}}
>
<ui5-button
dir={{effectiveDir}}
class="ui5-split-arrow-button"
design="{{design}}"
icon="slim-arrow-down"
Expand All @@ -49,8 +45,6 @@
@ui5-_active-state-change={{_onArrowButtonActiveStateChange}}
>
</ui5-button>
</div>

<span id="{{_id}}-invisibleText" class="ui5-hidden-text">{{accessibilityInfo.description}} {{accessibilityInfo.keyboardHint}} {{accessibleName}}</span>
<span id="{{_id}}-invisibleTextDefault" class="ui5-hidden-text">{{textButtonAccText}}</span>

Expand Down
224 changes: 62 additions & 162 deletions packages/main/src/themes/SplitButton.css

Large diffs are not rendered by default.

27 changes: 3 additions & 24 deletions packages/main/src/themes/base/SplitButton-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
--_ui5_split_button_hover_border_radius: 0;
--_ui5_split_button_hover_border_radius: 0;
--_ui5_split_button_middle_separator_width: 0;
--_ui5_split_button_middle_separator_left: 0;
--_ui5_split_button_middle_separator_left: -0.0625rem;
--_ui5_split_button_middle_separator_hover_display: block;
--_ui5_split_button_text_button_width: 2.25rem;
--_ui5_split_button_text_button_right_border_width: 0;
Expand Down Expand Up @@ -39,7 +39,7 @@
--_ui5_split_text_button_emphasized_border: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);


--_ui5_split_text_button_emphasized_border_width: 0.0625rem 0 0.0625rem 0.0625rem;
--_ui5_split_text_button_emphasized_border_width: 0.0625rem;


--_ui5_split_text_button_hover_border: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
Expand All @@ -50,11 +50,6 @@
--_ui5_split_text_button_transparent_hover_border: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);


--_--_ui5_split_button_text_button_border_width_rtl: 0.0625rem 0.0625rem 0.0625rem 0;

--_ui5_split_text_button_emphasized_border_width_rtl: 0.0625rem;


--_ui5_split_arrow_button_hover_border: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border_left: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
Expand All @@ -77,21 +72,5 @@
--_ui5_split_text_button_attention_hover_border_left: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_left: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

/* RTL */

--_ui5_split_text_button_hover_border_left_rtl: var(--sapButton_BorderWidth) solid transparent;
--_ui5_split_text_button_emphasized_hover_border_left_rtl: var(--sapButton_BorderWidth) solid transparent;
--_ui5_split_text_button_positive_hover_border_left_rtl: var(--sapButton_BorderWidth) solid transparent;
--_ui5_split_text_button_negative_hover_border_left_rtl: var(--sapButton_BorderWidth) solid transparent;
--_ui5_split_text_button_attention_hover_border_left_rtl: var(--sapButton_BorderWidth) solid transparent;
--_ui5_split_text_button_transparent_hover_border_left_rtl: var(--sapButton_BorderWidth) solid transparent;

--_ui5_split_text_button_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

--_ui5_split_arrow_button_wrapper_emphasized_hover_border_left_width_rtl: var(--sapButton_BorderWidth);
--_ui5_split_button_middle_separator_hover_display_emphasized: block;
}
14 changes: 0 additions & 14 deletions packages/main/src/themes/base/rtl-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,4 @@
--_ui5_segmented_btn_item_border_left: 0.0625rem;
--_ui5_segmented_btn_item_border_right: 0px;
--_ui5-shellbar-notification-btn-count-offset: auto;

--_ui5_split_text_button_hover_border_left: none;
--_ui5_split_text_button_emphasized_hover_border_left: none;
--_ui5_split_text_button_positive_hover_border_left: none;
--_ui5_split_text_button_negative_hover_border_left: none;
--_ui5_split_text_button_attention_hover_border_left: none;
--_ui5_split_text_button_transparent_hover_border_left: none;

--_ui5_split_text_button_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
}
3 changes: 1 addition & 2 deletions packages/main/src/themes/base/sizes-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
--_ui5_timeline_tli_indicator_before_without_icon_right: -1.9375rem;

/* SplitButton */
--_ui5_split_button_middle_separator_top: 0;
--_ui5_split_button_middle_separator_top: -0.0625rem;
--_ui5_split_button_middle_separator_height: 2.25rem;

/* Toolbar */
Expand Down Expand Up @@ -304,7 +304,6 @@
--_ui5_slider_outer_height: 1.3125rem;

/* SplitButton */
--_ui5_split_button_middle_separator_top: 0;
--_ui5_split_button_middle_separator_height: 1.625rem;

/* StepInput */
Expand Down
21 changes: 10 additions & 11 deletions packages/main/src/themes/sap_fiori_3_hcb/SplitButton-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
--_ui5_split_text_button_emphasized_hover_border_right: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_emphasized_hover_border: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border_left: var(--sapButton_BorderWidth);

/* RTL */

--_ui5_split_text_button_emphasized_border_width_rtl: 0.125rem;

--_ui5_split_text_button_emphasized_hover_border_left_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_right_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_wrapper_emphasized_hover_border_left_width_rtl: 0.125rem;
--_ui5_split_arrow_button_emphasized_hover_border: 0.0625rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border_left: 0.0625rem;
--_ui5_split_arrow_button_emphasized_hover_box_shadow:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset -0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_box_shadow_rtl:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset 0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
}
20 changes: 10 additions & 10 deletions packages/main/src/themes/sap_fiori_3_hcw/SplitButton-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
--_ui5_split_text_button_emphasized_hover_border_right: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_emphasized_hover_border: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border: 0.0625rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border_left: var(--sapButton_BorderWidth);

/* RTL */

--_ui5_split_text_button_emphasized_border_width_rtl: 0.125rem;

--_ui5_split_text_button_emphasized_hover_border_left_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_right_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_wrapper_emphasized_hover_border_left_width_rtl: 0.125rem;
--_ui5_split_button_middle_separator_hover_display_emphasized: none;
--_ui5_split_arrow_button_emphasized_hover_box_shadow:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset -0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_box_shadow_rtl:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset 0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
}
15 changes: 1 addition & 14 deletions packages/main/src/themes/sap_horizon/SplitButton-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,5 @@
--_ui5_split_text_button_attention_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

/* RTL */

--_ui5_split_text_button_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

--_ui5_split_text_button_emphasized_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_button_middle_separator_hover_display_emphasized: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,5 @@
--_ui5_split_text_button_negative_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

/* RTL */

--_ui5_split_text_button_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

--_ui5_split_text_button_emphasized_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_button_middle_separator_hover_display_emphasized: none;
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,4 @@
--_ui5_split_text_button_negative_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

/* RTL */

--_ui5_split_text_button_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

--_ui5_split_text_button_emphasized_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,4 @@
--_ui5_split_text_button_negative_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

/* RTL */

--_ui5_split_text_button_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_left_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);

--_ui5_split_text_button_emphasized_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_positive_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Accept_BorderColor);
--_ui5_split_text_button_negative_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Reject_BorderColor);
--_ui5_split_text_button_attention_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_Attention_BorderColor);
--_ui5_split_text_button_transparent_hover_border_right_rtl: var(--sapButton_BorderWidth) solid var(--sapButton_BorderColor);
}
20 changes: 10 additions & 10 deletions packages/main/src/themes/sap_horizon_hcb/SplitButton-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
--_ui5_split_text_button_emphasized_hover_border_right: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_emphasized_hover_border: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border: 0.0625rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border_left: var(--sapButton_BorderWidth);

/* RTL */

--_ui5_split_text_button_emphasized_border_width_rtl: 0.125rem;

--_ui5_split_text_button_emphasized_hover_border_left_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_right_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_wrapper_emphasized_hover_border_left_width_rtl: 0.125rem;
--_ui5_split_button_middle_separator_hover_display_emphasized: none;
--_ui5_split_arrow_button_emphasized_hover_box_shadow:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset -0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_box_shadow_rtl:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset 0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
--_ui5_split_text_button_emphasized_hover_border_right: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_left: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_emphasized_hover_border: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border: 0.0625rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_border_left: var(--sapButton_BorderWidth);

/* RTL */

--_ui5_split_text_button_emphasized_border_width_rtl: 0.125rem;

--_ui5_split_text_button_emphasized_hover_border_left_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);
--_ui5_split_text_button_emphasized_hover_border_right_rtl: 0.125rem solid var(--sapButton_Emphasized_BorderColor);

--_ui5_split_arrow_button_wrapper_emphasized_hover_border_left_width_rtl: 0.125rem;
--_ui5_split_button_middle_separator_hover_display_emphasized: none;
--_ui5_split_arrow_button_emphasized_hover_box_shadow:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset -0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
--_ui5_split_arrow_button_emphasized_hover_box_shadow_rtl:
inset 0 -0.0625rem 0 var(--sapButton_BorderColor),
inset 0.0625rem 0 0 var(--sapButton_BorderColor),
inset 0 0.0625rem 0 var(--sapButton_BorderColor);
}
Loading