Merge pull request #153 from brainstormforce/uat_final_fixes

SUR-310 - alert button type change, and select text size change
brainstormforce · Oct 17, 2024 · 4d556b1 · 4d556b1
2 parents da90bcd + 17fb0c0
commit 4d556b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/components/alert/alert.stories.js b/src/components/alert/alert.stories.js
@@ -170,7 +170,7 @@ export const WithAction = {
 		action: {
 			label: 'My Action',
 			onClick: () => {},
-			type: 'button',
+			type: 'link',
 		},
 	},
 };

diff --git a/src/components/select/component-style.js b/src/components/select/component-style.js
@@ -3,15 +3,15 @@ export const sizeClassNames = {
 		icon: '[&>svg]:size-4',
 		searchIcon: '[&>svg]:size-4',
 		selectButton:
-			'px-2.5 py-2 rounded text-xs font-medium leading-4 min-h-[2rem]',
+			'px-2.5 py-2 rounded text-sm font-medium leading-4 min-h-[2rem]',
 		multiSelect: 'pl-2 pr-2 py-1.5',
-		displaySelected: 'text-xs font-normal',
+		displaySelected: 'text-sm font-normal',
 		dropdown: 'rounded-md',
 		dropdownItemsWrapper: 'p-1.5',
 		searchbarWrapper: 'p-3 flex items-center gap-0.5',
-		searchbar: 'font-medium text-xs',
+		searchbar: 'font-medium text-sm',
 		searchbarIcon: '[&>svg]:size-4',
-		label: 'text-xs font-medium',
+		label: 'text-sm font-medium',
 	},
 	md: {
 		icon: '[&>svg]:size-5',
@@ -33,7 +33,7 @@ export const sizeClassNames = {
 		selectButton:
 			'px-4 py-3 rounded-lg text-sm font-medium leading-5 min-h-[3rem]',
 		multiSelect: 'pl-2.5 pr-3 py-2.5',
-		displaySelected: 'text-sm font-normal',
+		displaySelected: 'text-base font-normal',
 		dropdown: 'rounded-lg',
 		dropdownItemsWrapper: 'p-2',
 		searchbarWrapper: 'p-2.5 flex items-center gap-1',

diff --git a/src/components/select/select.jsx b/src/components/select/select.jsx
@@ -355,11 +355,14 @@ function SelectOptions( {
 						<div
 							ref={ refs.setFloating }
 							className={ cn(
-								'box-border [&_*]:box-border w-full bg-white outline-none shadow-lg outline outline-1 outline-border-subtle overflow-hidden',
+								'box-border [&_*]:box-border w-full bg-white outline-none shadow-lg outline outline-1 outline-border-subtle',
 								combobox &&
 									'grid grid-cols-1 grid-rows-[auto_1fr] divide-y divide-x-0 divide-solid divide-border-subtle',
 								sizeClassNames[ sizeValue ].dropdown,
-								! combobox && 'h-full',
+								! combobox && 'h-auto',
+								! combobox
+									? 'overflow-y-auto'
+									: 'overflow-hidden',
 								className
 							) }
 							style={ {
@@ -441,12 +444,12 @@ function SelectItem( { value, selected, children, className, ...props } ) {
 
 	const selectItemClassNames = {
 		sm: 'py-1.5 px-2 text-sm font-normal',
-		md: 'p-2 text-base font-normal',
+		md: 'p-2 text-sm font-normal',
 		lg: 'p-2 text-base font-normal',
 	};
 	const selectedIconClassName = {
 		sm: 'size-4',
-		md: 'size-5',
+		md: 'size-4',
 		lg: 'size-5',
 	};