Merge branch 'main' into list-accRole

SAP · Apr 23, 2024 · 9611e52 · 9611e52
2 parents b4e6354 + 735bb32
commit 9611e52
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/packages/main/src/ListItem.ts b/packages/main/src/ListItem.ts
@@ -187,16 +187,6 @@ abstract class ListItem extends ListItemBase {
 	@property({ type: Boolean })
 	actionable!: boolean;
 
-	/**
-	 * Used to define the role of the list item.
-	 * @private
-	 * @default "listitem"
-	 * @since 1.0.0-rc.9
-	 *
-	 */
-	@property({ defaultValue: "listitem" })
-	role!: string;
-
 	/**
 	 * Defines the description for the accessible role of the component.
 	 * @protected
@@ -518,7 +508,7 @@ abstract class ListItem extends ListItemBase {
 
 	get _accInfo(): AccInfo {
 		return {
-			role: this.listItemAccessibleRole || this.role,
+			role: this.listItemAccessibleRole,
 			ariaExpanded: undefined,
 			ariaLevel: undefined,
 			ariaLabel: ListItem.i18nBundle.getText(ARIA_LABEL_LIST_ITEM_CHECKBOX),

diff --git a/packages/main/src/themes/SplitButton.css b/packages/main/src/themes/SplitButton.css
@@ -3,7 +3,7 @@
 
 :host(:not([hidden])) {
 	display: inline-flex;
-	height: 100%;
+	height: var(--_ui5_button_base_height);
 	border-radius: var(--_ui5_button_border_radius);
 	background-color: var(--sapButton_Background);
 	box-shadow: var(--_ui5_split_button_host_default_box_shadow);
@@ -115,6 +115,7 @@
 	display: inline-flex;
 	position: relative;
 	width: inherit;
+	height: 100%;
 }
 
 .ui5-split-button-root:focus,

diff --git a/packages/main/test/pages/SplitButton.html b/packages/main/test/pages/SplitButton.html
@@ -19,6 +19,10 @@
 		<h3 class="header-title">Wrapped Split Buttons</h3>
 	</header>
 
+	<div style="border: 1px solid red; display: inline-block; width: 80px; height: 70px">
+		<ui5-split-button style="width: 100%;" icon="picture">Random Text</ui5-split-button>
+	</div>
+
 	<div style="border: 1px solid red; display: inline-block; width: 80px">
 		<ui5-split-button style="width: 100%" icon="picture">Random Text</ui5-split-button>
 	</div>