@rc-component/select 1.3.3 → 1.3.5

package/es/BaseSelect/index.js

@@ -9,7 +9,7 @@ import useSelectTriggerControl, { isInside } from "../hooks/useSelectTriggerCont
 import SelectTrigger from "../SelectTrigger";
 import { getSeparatedContent, isValidCount } from "../utils/valueUtil";
 import Polite from "./Polite";
-import useOpen from "../hooks/useOpen";
+import useOpen, { macroTask } from "../hooks/useOpen";
 import { useEvent } from '@rc-component/util';
 import SelectInput from "../SelectInput";
 import useComponents from "../hooks/useComponents";
@@ -295,9 +295,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   useSelectTriggerControl(getSelectElements, mergedOpen, triggerOpen, !!mergedComponents.root);
 
   // ========================== Focus / Blur ==========================
-  /** Record real focus status */
-  // const focusRef = React.useRef<boolean>(false);
-
+  const internalMouseDownRef = React.useRef(false);
   const onInternalFocus = event => {
     setFocused(true);
     if (!disabled) {
@@ -310,7 +308,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   };
   const onRootBlur = () => {
     // Delay close should check the activeElement
-    if (mergedOpen) {
+    if (mergedOpen && !internalMouseDownRef.current) {
       triggerOpen(false, {
         cancelFun: () => isInside(getSelectElements(), document.activeElement)
       });
@@ -348,6 +346,10 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
       triggerOpen(true);
     }
     onMouseDown?.(event, ...restArgs);
+    internalMouseDownRef.current = true;
+    macroTask(() => {
+      internalMouseDownRef.current = false;
+    });
   };
 
   // ============================ Dropdown ============================

package/es/SelectInput/Input.js

@@ -174,9 +174,9 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
     role: role || 'combobox',
     'aria-expanded': open || false,
     'aria-haspopup': 'listbox',
-    'aria-owns': `${id}_list`,
+    'aria-owns': open ? `${id}_list` : undefined,
     'aria-autocomplete': 'list',
-    'aria-controls': `${id}_list`,
+    'aria-controls': open ? `${id}_list` : undefined,
     'aria-activedescendant': open ? activeDescendantId : undefined
   };
 

package/lib/BaseSelect/index.js

@@ -14,7 +14,7 @@ var _useSelectTriggerControl = _interopRequireWildcard(require("../hooks/useSele
 var _SelectTrigger = _interopRequireDefault(require("../SelectTrigger"));
 var _valueUtil = require("../utils/valueUtil");
 var _Polite = _interopRequireDefault(require("./Polite"));
-var _useOpen = _interopRequireDefault(require("../hooks/useOpen"));
+var _useOpen = _interopRequireWildcard(require("../hooks/useOpen"));
 var _util = require("@rc-component/util");
 var _SelectInput = _interopRequireDefault(require("../SelectInput"));
 var _useComponents = _interopRequireDefault(require("../hooks/useComponents"));
@@ -304,9 +304,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   (0, _useSelectTriggerControl.default)(getSelectElements, mergedOpen, triggerOpen, !!mergedComponents.root);
 
   // ========================== Focus / Blur ==========================
-  /** Record real focus status */
-  // const focusRef = React.useRef<boolean>(false);
-
+  const internalMouseDownRef = React.useRef(false);
   const onInternalFocus = event => {
     setFocused(true);
     if (!disabled) {
@@ -319,7 +317,7 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
   };
   const onRootBlur = () => {
     // Delay close should check the activeElement
-    if (mergedOpen) {
+    if (mergedOpen && !internalMouseDownRef.current) {
       triggerOpen(false, {
         cancelFun: () => (0, _useSelectTriggerControl.isInside)(getSelectElements(), document.activeElement)
       });
@@ -357,6 +355,10 @@ const BaseSelect = /*#__PURE__*/React.forwardRef((props, ref) => {
       triggerOpen(true);
     }
     onMouseDown?.(event, ...restArgs);
+    internalMouseDownRef.current = true;
+    (0, _useOpen.macroTask)(() => {
+      internalMouseDownRef.current = false;
+    });
   };
 
   // ============================ Dropdown ============================

package/lib/SelectInput/Input.js

@@ -183,9 +183,9 @@ const Input = /*#__PURE__*/React.forwardRef((props, ref) => {
     role: role || 'combobox',
     'aria-expanded': open || false,
     'aria-haspopup': 'listbox',
-    'aria-owns': `${id}_list`,
+    'aria-owns': open ? `${id}_list` : undefined,
     'aria-autocomplete': 'list',
-    'aria-controls': `${id}_list`,
+    'aria-controls': open ? `${id}_list` : undefined,
     'aria-activedescendant': open ? activeDescendantId : undefined
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/select",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "React Select",
   "engines": {
     "node": ">=8.x"