Merge branch 'fix-sui-react-dependencies' into new/navigation-design

wpmudev · Oct 17, 2024 · 8c0ace7 · 8c0ace7
2 parents 86ad2d0 + 29065b6
commit 8c0ace7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/packages/assets/css/src/scss/_components/_setting-block/_modifiers/_state-hidden.scss b/packages/assets/css/src/scss/_components/_setting-block/_modifiers/_state-hidden.scss
@@ -16,6 +16,7 @@
 			@include modifier(hidden) {
 				.sui-#{$block}__body {
 					overflow: hidden;
+					padding: 1px; // To avoid children to appear cut
 				}
 			}
 		}

diff --git a/packages/ui/dropdown/src/dropdown.tsx b/packages/ui/dropdown/src/dropdown.tsx
@@ -53,7 +53,6 @@ const Dropdown = forwardRef<DropdownRefProps | null, DropdownProps>(
 			arrow = true,
 			dropdownArrow = false,
 			buttonIcon,
-			buttonProps,
 			onMenuClick,
 			trigger,
 			renderContentOnTop = false,
@@ -63,7 +62,6 @@ const Dropdown = forwardRef<DropdownRefProps | null, DropdownProps>(
 			size = "md",
 			isDisabled = false,
 			closeOnOuterClick = true,
-			closeOnMenuItemClick = true,
 			colorScheme = "black",
 			onToggle = () => {},
 			// search
@@ -349,10 +347,6 @@ const Dropdown = forwardRef<DropdownRefProps | null, DropdownProps>(
 								if ("select-checkbox" !== type) {
 									setIsOpen(false)
 								}
-
-								if (closeOnMenuItemClick) {
-									setIsOpen(false)
-								}
 							}
 						}
 

diff --git a/packages/ui/dropdown/src/dropdown.types.ts b/packages/ui/dropdown/src/dropdown.types.ts
@@ -198,10 +198,6 @@ interface DropdownProps
 	 * Filter button icon
 	 */
 	buttonIcon?: IconsNamesType
-	/**
-	 * Filter button icon
-	 */
-	buttonProps?: ButtonProps
 	/**
 	 * Filter button icon
 	 */
@@ -255,10 +251,6 @@ interface DropdownProps
 	 * Close dropdown on outer click
 	 */
 	closeOnOuterClick?: boolean
-	/**
-	 * Close dropdown on menu item click
-	 */
-	closeOnMenuItemClick?: boolean
 	/**
 	 * Allow search
 	 */

diff --git a/packages/ui/select/src/select-base.tsx b/packages/ui/select/src/select-base.tsx
@@ -3,7 +3,6 @@ import React, {
 	useState,
 	useEffect,
 	useRef,
-	HTMLProps,
 	ChangeEvent,
 	useId,
 } from "react"
@@ -23,7 +22,6 @@ import { Selected, SelectedSearch } from "./elements/select-selected"
 import {
 	SearchDropdown,
 	RemoveAll,
-	SelectAll,
 	RemoveSelection,
 	MultiSelectSearch,
 } from "./utils/functions"
@@ -71,12 +69,17 @@ const Select: React.FC<SelectBaseProps> = ({
 	)
 	const [selectedItem, setSelectedItems] = useState<
 		Record<string, any> | string | undefined | SelectOptionType
-	>(selected)
+	>([])
 
 	const [customVar, setCustomVar] = useState<Array<string | SelectOptionType>>(
 		[],
 	)
 
+	// Update the selected items when the props change
+	useEffect(() => {
+		setSelectedItems(selected)
+	}, [selected])
+
 	const updateOptions = (itemsOpt: SelectOptionType[]) => {
 		setOptions(itemsOpt)
 	}
@@ -86,7 +89,7 @@ const Select: React.FC<SelectBaseProps> = ({
 		setFilteredItems(options ?? [])
 
 		// update selected item
-		setSelectedItems(options?.filter((option) => option.isSelected === true))
+		//setSelectedItems(options?.filter((option) => option.isSelected === true))
 	}, [options])
 
 	// Hide dropdown when click outside of it

diff --git a/packages/ui/table/src/table-context.tsx b/packages/ui/table/src/table-context.tsx
@@ -89,6 +89,8 @@ const TableContextProvider: FC<TableContextProviderProps> = ({
 					break
 			}
 
+			console.log("tempSelected", tempSelected)
+
 			setSelected(tempSelected)
 		},
 		[rows, selected],