carbon-react 104.10.1 → 104.12.1

package/lib/components/select/simple-select/simple-select.component.js

@@ -76,6 +76,7 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
   const filterText = (0, _react.useRef)();
   const [textboxRef, setTextboxRef] = (0, _react.useState)();
   const [isOpen, setOpenState] = (0, _react.useState)(false);
+  const [activeDescendantId, setActiveDescendantId] = (0, _react.useState)();
   const [textValue, setTextValue] = (0, _react.useState)("");
   const [selectedValue, setSelectedValue] = (0, _react.useState)(value || defaultValue || "");
   const childOptions = (0, _react.useMemo)(() => _react.default.Children.toArray(children), [children]);
@@ -113,15 +114,7 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
       return match.props.value;
     });
   }, [childOptions, createCustomEvent, onChange]);
-  const handleTextboxChange = (0, _react.useCallback)(event => {
-    const newValue = event.target.value;
-    const newCharacter = newValue.slice(-1);
-    const isDeleteEvent = event.nativeEvent.inputType === "deleteContentBackward" || event.nativeEvent.inputType === "deleteContentForward" || event.nativeEvent.inputType === "delete";
-
-    if (isDeleteEvent) {
-      return;
-    }
-
+  const triggerFilterChange = (0, _react.useCallback)(newCharacter => {
     if (isTimerCounting.current) {
       const newVal = filterText.current + newCharacter;
       filterText.current = newVal;
@@ -161,8 +154,10 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
 
         return true;
       });
+    } else if (key.length === 1) {
+      triggerFilterChange(key);
     }
-  }, [onKeyDown, onOpen, readOnly]);
+  }, [triggerFilterChange, onKeyDown, onOpen, readOnly]);
   const handleGlobalClick = (0, _react.useCallback)(event => {
     const notInContainer = containerRef.current && !containerRef.current.contains(event.target);
     const notInList = listboxRef.current && !listboxRef.current.contains(event.target);
@@ -170,7 +165,6 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
 
     if (notInContainer && notInList && !isClickTriggeredBySelect.current) {
       setOpenState(false);
-      filterText.current = "";
     }
 
     isClickTriggeredBySelect.current = false;
@@ -283,14 +277,15 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
     const {
       text,
       value: newValue,
-      selectionType
+      selectionType,
+      id: selectedOptionId
     } = optionData;
     const isClickTriggered = selectionType === "click";
     updateValue(newValue, text);
+    setActiveDescendantId(selectedOptionId);
 
     if (selectionType !== "navigationKey") {
       setOpenState(false);
-      filterText.current = text;
     }
 
     if (isClickTriggered) {
@@ -312,7 +307,6 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
 
   function onSelectListClose() {
     setOpenState(false);
-    filterText.current = "";
   }
 
   function isNavigationKey(key) {
@@ -341,9 +335,9 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
       onMouseDown: handleTextboxMouseDown,
       onFocus: handleTextboxFocus,
       onKeyDown: handleTextboxKeydown,
-      onChange: handleTextboxChange,
       onBlur: handleTextboxBlur,
       tooltipPosition,
+      transparent,
       ...(0, _utils.filterOutStyledSystemSpacingProps)(props)
     };
   }
@@ -371,16 +365,15 @@ const SimpleSelect = /*#__PURE__*/_react.default.forwardRef(({
     transparent: transparent,
     disabled: disabled,
     readOnly: readOnly,
-    "aria-expanded": isOpen,
-    "aria-haspopup": "listbox",
     ref: containerRef,
     "data-component": dataComponent,
     "data-role": dataRole,
     "data-element": dataElement
   }, (0, _utils.filterStyledSystemMarginProps)(props)), /*#__PURE__*/_react.default.createElement(_selectTextbox.default, _extends({
-    "aria-controls": isOpen ? selectListId.current : "",
-    type: "select",
-    labelId: labelId.current
+    isOpen: isOpen,
+    labelId: labelId.current,
+    activeDescendantId: activeDescendantId,
+    "aria-controls": isOpen ? selectListId.current : undefined
   }, getTextboxProps(), {
     positionedChildren: disablePortal && isOpen && selectList
   })), !disablePortal && isOpen && selectList);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "104.10.1",
+  "version": "104.12.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {