From f2b98911970564a784e0334cdc64f4f84b18ab41 Mon Sep 17 00:00:00 2001
From: Nia Peeva <nia.peeva@sap.com>
Date: Tue, 22 Aug 2023 16:48:29 +0300
Subject: [PATCH 1/2] fix(ui5-combobox): enhance storybook samples

---
 packages/main/src/ComboBox.ts                 | 12 +---------
 .../main/ComboBox/ComboBox.stories.ts         | 24 ++++++++-----------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/packages/main/src/ComboBox.ts b/packages/main/src/ComboBox.ts
index 40482f02802a..b4cd080eeac1 100644
--- a/packages/main/src/ComboBox.ts
+++ b/packages/main/src/ComboBox.ts
@@ -267,15 +267,6 @@ class ComboBox extends UI5Element {
 
 	/**
 	 * Defines the value state of the component.
-	 * <br><br>
-	 * Available options are:
-	 * <ul>
-	 * <li><code>None</code></li>
-	 * <li><code>Error</code></li>
-	 * <li><code>Warning</code></li>
-	 * <li><code>Success</code></li>
-	 * <li><code>Information</code></li>
-	 * </ul>
 	 *
 	 * @type {sap.ui.webc.base.types.ValueState}
 	 * @name sap.ui.webc.main.ComboBox.prototype.valueState
@@ -323,7 +314,6 @@ class ComboBox extends UI5Element {
 
 	/**
 	 * Defines the filter type of the component.
-	 * Available options are: <code>StartsWithPerTerm</code>, <code>StartsWith</code>, <code>Contains</code> and <code>None</code>.
 	 *
 	 * @type {sap.ui.webc.main.types.ComboBoxFilter}
 	 * @name sap.ui.webc.main.ComboBox.prototype.filter
@@ -352,7 +342,7 @@ class ComboBox extends UI5Element {
 	 *
 	 * @type {string}
 	 * @name sap.ui.webc.main.ComboBox.prototype.accessibleName
-	 * @defaultvalue: ""
+	 * @defaultvalue ""
 	 * @public
 	 * @since 1.0.0-rc.15
 	 */
diff --git a/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts b/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts
index fec828cfaa60..c1e94ba29e9a 100644
--- a/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts
+++ b/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts
@@ -17,7 +17,7 @@ import ComboBoxFilter from "@ui5/webcomponents/dist/types/ComboBoxFilter.js";
 const component = "ui5-combobox";
 
 export default {
-	title: "Main/ComboBox",
+	title: "Main/Combo Box",
 	component: "ComboBox",
 	subcomponents: {
 		ComboBoxItem: "ComboBoxItem",
@@ -60,12 +60,6 @@ Basic.args = {
 	`,
 };
 
-export const Disabled = Template.bind({});
-Disabled.args = {
-	disabled: true,
-	value: "Disabled",
-};
-
 export const Filters = Template.bind({});
 Filters.args = {
 	placeholder: "Contains Filtering",
@@ -74,13 +68,14 @@ Filters.args = {
 		<ui5-cb-item text="Austria"></ui5-cb-item>
 		<ui5-cb-item text="Bulgaria"></ui5-cb-item>
 		<ui5-cb-item text="Germany"></ui5-cb-item>
-		<ui5-cb-item text="United Kingdom"></ui5-cb-item>
 		<ui5-cb-item text="Kazakhstan"></ui5-cb-item>
+		<ui5-cb-item text="The United Kingdom of Great Britain and Northern Ireland"></ui5-cb-item>
+		<ui5-cb-item text="United Kingdom"></ui5-cb-item>
 	`,
 };
 
-export const TwoColumns = Template.bind({});
-TwoColumns.args = {
+export const TwoColumnsLayout = Template.bind({});
+TwoColumnsLayout.args = {
 	placeholder: "Two-column layout",
 	default: `
 		<ui5-cb-item text="Austria" additional-text="AT"></ui5-cb-item>
@@ -88,16 +83,17 @@ TwoColumns.args = {
 		<ui5-cb-item text="Brazil" additional-text="BR"></ui5-cb-item>
 		<ui5-cb-item text="Bulgaria" additional-text="BG"></ui5-cb-item>
 		<ui5-cb-item text="Canada" additional-text="CA"></ui5-cb-item>
+		<ui5-cb-item text="The United Kingdom of Great Britain and Northern Ireland" additional-text="UK"></ui5-cb-item>
 	`,
 };
 
-export const GroupingItems = Template.bind({});
-GroupingItems.args = {
-	placeholder: "ComboBox with grouping of suggestions",
+export const Grouping = Template.bind({});
+Grouping.args = {
+	placeholder: "Grouping of suggestions",
 	default: `
 		<ui5-cb-group-item text="A"></ui5-cb-group-item>
 		<ui5-cb-item text="Argentina"></ui5-cb-item>
-		<ui5-cb-item text="Australia"></ui5-cb-item>
+		<ui5-cb-item text="Australia"></ui5-cb-item>	
 		<ui5-cb-item text="Austria"></ui5-cb-item>	
 		<ui5-cb-group-item text="B"></ui5-cb-group-item>
 		<ui5-cb-item text="Bahrain"></ui5-cb-item>

From d6d3e340df3b2ea27f0db1502ab6e1024b9bee19 Mon Sep 17 00:00:00 2001
From: Nia Peeva <nia.peeva@sap.com>
Date: Wed, 30 Aug 2023 18:11:31 +0300
Subject: [PATCH 2/2] fix(ui5-combobox): apply review comments

---
 .../_stories/main/ComboBox/ComboBox.stories.ts        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts b/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts
index c1e94ba29e9a..afceb1b86112 100644
--- a/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts
+++ b/packages/playground/_stories/main/ComboBox/ComboBox.stories.ts
@@ -54,9 +54,11 @@ export const Basic = Template.bind({});
 Basic.args = {
 	placeholder: "Enter value",
 	default: `
-		<ui5-cb-item text="Item 1"></ui5-cb-item>
-		<ui5-cb-item text="Item 2"></ui5-cb-item>
-		<ui5-cb-item text="Item 3"></ui5-cb-item>
+	<ui5-cb-item text="Austria"></ui5-cb-item>
+	<ui5-cb-item text="Bulgaria"></ui5-cb-item>
+	<ui5-cb-item text="Germany"></ui5-cb-item>
+	<ui5-cb-item text="Italy"></ui5-cb-item>
+	<ui5-cb-item text="Spain"></ui5-cb-item>
 	`,
 };
 
@@ -70,7 +72,6 @@ Filters.args = {
 		<ui5-cb-item text="Germany"></ui5-cb-item>
 		<ui5-cb-item text="Kazakhstan"></ui5-cb-item>
 		<ui5-cb-item text="The United Kingdom of Great Britain and Northern Ireland"></ui5-cb-item>
-		<ui5-cb-item text="United Kingdom"></ui5-cb-item>
 	`,
 };
 
@@ -89,7 +90,7 @@ TwoColumnsLayout.args = {
 
 export const Grouping = Template.bind({});
 Grouping.args = {
-	placeholder: "Grouping of suggestions",
+	placeholder: "Grouping of items",
 	default: `
 		<ui5-cb-group-item text="A"></ui5-cb-group-item>
 		<ui5-cb-item text="Argentina"></ui5-cb-item>