@acusti/dropdown 1.0.0-rc.2 → 1.0.0-rc.3

package/dist/Dropdown.js

@@ -380,10 +380,18 @@ function Menubar(t0) {
 			},
 			registerMember(member_2) {
 				membersRef.current.add(member_2);
-				setTabbableElement((current) => current == null && canHoldTabStop(member_2) ? member_2.element : current);
+				setTabbableElement((current) => {
+					if (current == null) return canHoldTabStop(member_2) ? member_2.element : current;
+					if (current === member_2.element && !canHoldTabStop(member_2)) return null;
+					return current;
+				});
 				return () => {
 					membersRef.current.delete(member_2);
-					reconcile();
+					if (member_2.element !== tabbableElement) return;
+					queueMicrotask(() => {
+						for (const registered of membersRef.current) if (registered.element === member_2.element) return;
+						reconcile();
+					});
 				};
 			},
 			tabbableElement
@@ -539,7 +547,7 @@ function RootDropdown(t0) {
 	const keepOpenOnSubmit = t3 === void 0 ? !hasItems : t3;
 	const childrenCount = Children.count(children);
 	if (childrenCount !== 1 && childrenCount !== 2) {
-		if (childrenCount === 0) throw new Error("@acusti/dropdown requires either 1 child (the dropdown body) or 2 children: the dropdown trigger and the dropdown body. Received no children.");
+		if (childrenCount === 0) throw new Error(CHILDREN_ERROR + " Received no children.");
 		console.error(`${CHILDREN_ERROR} Received ${childrenCount} children.`);
 	}
 	let trigger;
@@ -1469,76 +1477,77 @@ function RootDropdown(t0) {
 	} else t45 = $[120];
 	const handleBodyRef = t45;
 	let bodyLabelledBy;
-	if (!isValidElement(trigger)) if (isSearchable) {
-		const t46 = valueLabel ?? "";
-		let t47;
-		if ($[121] === Symbol.for("react.memo_cache_sentinel")) {
-			t47 = () => setIsOpen(true);
-			$[121] = t47;
-		} else t47 = $[121];
-		let t48;
-		if ($[122] !== bodyId || $[123] !== disabled || $[124] !== isOpen || $[125] !== name || $[126] !== placeholder || $[127] !== popupRole || $[128] !== t46 || $[129] !== tabIndex || $[130] !== triggerId) {
-			t48 = /* @__PURE__ */ jsx("input", {
-				"aria-autocomplete": "list",
-				"aria-controls": bodyId,
-				"aria-expanded": isOpen,
-				"aria-haspopup": popupRole,
-				autoComplete: "off",
-				className: "uktdropdown-trigger",
-				defaultValue: t46,
-				disabled,
-				id: triggerId,
-				name,
-				onFocus: t47,
-				placeholder,
-				ref: inputElementRef,
-				role: "combobox",
-				tabIndex,
-				type: "text"
-			});
-			$[122] = bodyId;
-			$[123] = disabled;
-			$[124] = isOpen;
-			$[125] = name;
-			$[126] = placeholder;
-			$[127] = popupRole;
-			$[128] = t46;
-			$[129] = tabIndex;
-			$[130] = triggerId;
-			$[131] = t48;
-		} else t48 = $[131];
-		trigger = t48;
+	if (!isValidElement(trigger)) {
+		if (isSearchable) {
+			const t46 = valueLabel ?? "";
+			let t47;
+			if ($[121] === Symbol.for("react.memo_cache_sentinel")) {
+				t47 = () => setIsOpen(true);
+				$[121] = t47;
+			} else t47 = $[121];
+			let t48;
+			if ($[122] !== bodyId || $[123] !== disabled || $[124] !== isOpen || $[125] !== name || $[126] !== placeholder || $[127] !== popupRole || $[128] !== t46 || $[129] !== tabIndex || $[130] !== triggerId) {
+				t48 = /* @__PURE__ */ jsx("input", {
+					"aria-autocomplete": "list",
+					"aria-controls": bodyId,
+					"aria-expanded": isOpen,
+					"aria-haspopup": popupRole,
+					autoComplete: "off",
+					className: "uktdropdown-trigger",
+					defaultValue: t46,
+					disabled,
+					id: triggerId,
+					name,
+					onFocus: t47,
+					placeholder,
+					ref: inputElementRef,
+					role: "combobox",
+					tabIndex,
+					type: "text"
+				});
+				$[122] = bodyId;
+				$[123] = disabled;
+				$[124] = isOpen;
+				$[125] = name;
+				$[126] = placeholder;
+				$[127] = popupRole;
+				$[128] = t46;
+				$[129] = tabIndex;
+				$[130] = triggerId;
+				$[131] = t48;
+			} else t48 = $[131];
+			trigger = t48;
+		} else {
+			bodyLabelledBy = triggerId;
+			const t46 = isMenubarItem ? "menuitem" : void 0;
+			const t47 = menubarTabIndex ?? 0;
+			let t48;
+			if ($[132] !== bodyId || $[133] !== disabled || $[134] !== isOpen || $[135] !== popupRole || $[136] !== t46 || $[137] !== t47 || $[138] !== trigger || $[139] !== triggerId) {
+				t48 = /* @__PURE__ */ jsx("button", {
+					"aria-controls": bodyId,
+					"aria-expanded": isOpen,
+					"aria-haspopup": popupRole,
+					className: "uktdropdown-trigger",
+					disabled,
+					id: triggerId,
+					role: t46,
+					tabIndex: t47,
+					type: "button",
+					children: trigger
+				});
+				$[132] = bodyId;
+				$[133] = disabled;
+				$[134] = isOpen;
+				$[135] = popupRole;
+				$[136] = t46;
+				$[137] = t47;
+				$[138] = trigger;
+				$[139] = triggerId;
+				$[140] = t48;
+			} else t48 = $[140];
+			trigger = t48;
+		}
 	} else {
-		bodyLabelledBy = triggerId;
-		const t46 = isMenubarItem ? "menuitem" : void 0;
-		const t47 = menubarTabIndex ?? 0;
-		let t48;
-		if ($[132] !== bodyId || $[133] !== disabled || $[134] !== isOpen || $[135] !== popupRole || $[136] !== t46 || $[137] !== t47 || $[138] !== trigger || $[139] !== triggerId) {
-			t48 = /* @__PURE__ */ jsx("button", {
-				"aria-controls": bodyId,
-				"aria-expanded": isOpen,
-				"aria-haspopup": popupRole,
-				className: "uktdropdown-trigger",
-				disabled,
-				id: triggerId,
-				role: t46,
-				tabIndex: t47,
-				type: "button",
-				children: trigger
-			});
-			$[132] = bodyId;
-			$[133] = disabled;
-			$[134] = isOpen;
-			$[135] = popupRole;
-			$[136] = t46;
-			$[137] = t47;
-			$[138] = trigger;
-			$[139] = triggerId;
-			$[140] = t48;
-		} else t48 = $[140];
-		trigger = t48;
-	}
-	else {
 		const triggerProps = trigger.props;
 		const resolvedTriggerId = triggerProps.id ?? triggerId;
 		const isTextInputTrigger = isTextInputElement(trigger);