carbon-react 104.58.0 → 104.58.1

package/esm/components/select/__internal__/select-text/select-text.component.d.ts

@@ -1,7 +1,7 @@
 export default SelectText;
 declare function SelectText({ disabled, formattedValue, onClick, onKeyDown, onFocus, onBlur, onMouseDown, placeholder, readOnly, textId, transparent, }: {
     disabled: any;
-    formattedValue: any;
+    formattedValue?: string | undefined;
     onClick: any;
     onKeyDown: any;
     onFocus: any;

package/esm/components/select/__internal__/select-text/select-text.component.js

@@ -1,12 +1,11 @@
 import React, { useContext } from "react";
 import PropTypes from "prop-types";
 import StyledSelectText from "./select-text.style";
-import useLocale from "../../../../hooks/__internal__/useLocale";
 import { InputContext } from "../../../../__internal__/input-behaviour";
 
 const SelectText = ({
   disabled,
-  formattedValue,
+  formattedValue = "",
   onClick,
   onKeyDown,
   onFocus,
@@ -17,10 +16,8 @@ const SelectText = ({
   textId,
   transparent
 }) => {
-  const l = useLocale();
   const inputContext = useContext(InputContext);
   const hasPlaceholder = !disabled && !readOnly && !formattedValue;
-  const placeholderText = hasPlaceholder ? placeholder || l.select.placeholder() : "";
 
   function handleFocus(event) {
     inputContext.onFocus(event);
@@ -53,7 +50,7 @@ const SelectText = ({
     role: "button",
     tabIndex: "-1",
     transparent: transparent
-  }, formattedValue || placeholderText);
+  }, hasPlaceholder ? placeholder : formattedValue);
 };
 
 SelectText.propTypes = {

package/esm/components/select/select-textbox/select-textbox.component.js

@@ -119,7 +119,6 @@ const SelectTextbox = ({
 
   function getTextboxProps() {
     return {
-      placeholder: hasTextCursor ? placeholder || l.select.placeholder() : undefined,
       disabled,
       readOnly,
       required,
@@ -147,14 +146,11 @@ const SelectTextbox = ({
   }
 
   function renderSelectText() {
-    if (hasTextCursor) {
-      return null;
-    }
-
     return /*#__PURE__*/React.createElement(SelectText, _extends({
       textId: textId.current,
       transparent: transparent,
-      onKeyDown: handleSelectTextKeydown
+      onKeyDown: handleSelectTextKeydown,
+      placeholder: placeholder || l.select.placeholder()
     }, getTextboxProps()));
   }
 
@@ -174,8 +170,9 @@ const SelectTextbox = ({
     autoComplete: "off",
     size: size,
     onChange: onChange,
-    value: selectedValue
-  }, getInputAriaAttributes(), getTextboxProps()), renderSelectText());
+    value: selectedValue,
+    placeholder: hasTextCursor ? placeholder || l.select.placeholder() : undefined
+  }, getInputAriaAttributes(), getTextboxProps()), !hasTextCursor && renderSelectText());
 };
 
 const formInputPropTypes = {

package/lib/components/select/__internal__/select-text/select-text.component.d.ts

@@ -1,7 +1,7 @@
 export default SelectText;
 declare function SelectText({ disabled, formattedValue, onClick, onKeyDown, onFocus, onBlur, onMouseDown, placeholder, readOnly, textId, transparent, }: {
     disabled: any;
-    formattedValue: any;
+    formattedValue?: string | undefined;
     onClick: any;
     onKeyDown: any;
     onFocus: any;

package/lib/components/select/__internal__/select-text/select-text.component.js

@@ -11,8 +11,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _selectText = _interopRequireDefault(require("./select-text.style"));
 
-var _useLocale = _interopRequireDefault(require("../../../../hooks/__internal__/useLocale"));
-
 var _inputBehaviour = require("../../../../__internal__/input-behaviour");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -23,7 +21,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 const SelectText = ({
   disabled,
-  formattedValue,
+  formattedValue = "",
   onClick,
   onKeyDown,
   onFocus,
@@ -34,10 +32,8 @@ const SelectText = ({
   textId,
   transparent
 }) => {
-  const l = (0, _useLocale.default)();
   const inputContext = (0, _react.useContext)(_inputBehaviour.InputContext);
   const hasPlaceholder = !disabled && !readOnly && !formattedValue;
-  const placeholderText = hasPlaceholder ? placeholder || l.select.placeholder() : "";
 
   function handleFocus(event) {
     inputContext.onFocus(event);
@@ -70,7 +66,7 @@ const SelectText = ({
     role: "button",
     tabIndex: "-1",
     transparent: transparent
-  }, formattedValue || placeholderText);
+  }, hasPlaceholder ? placeholder : formattedValue);
 };
 
 SelectText.propTypes = {

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

@@ -140,7 +140,6 @@ const SelectTextbox = ({
 
   function getTextboxProps() {
     return {
-      placeholder: hasTextCursor ? placeholder || l.select.placeholder() : undefined,
       disabled,
       readOnly,
       required,
@@ -168,14 +167,11 @@ const SelectTextbox = ({
   }
 
   function renderSelectText() {
-    if (hasTextCursor) {
-      return null;
-    }
-
     return /*#__PURE__*/_react.default.createElement(_selectText.default, _extends({
       textId: textId.current,
       transparent: transparent,
-      onKeyDown: handleSelectTextKeydown
+      onKeyDown: handleSelectTextKeydown,
+      placeholder: placeholder || l.select.placeholder()
     }, getTextboxProps()));
   }
 
@@ -195,8 +191,9 @@ const SelectTextbox = ({
     autoComplete: "off",
     size: size,
     onChange: onChange,
-    value: selectedValue
-  }, getInputAriaAttributes(), getTextboxProps()), renderSelectText());
+    value: selectedValue,
+    placeholder: hasTextCursor ? placeholder || l.select.placeholder() : undefined
+  }, getInputAriaAttributes(), getTextboxProps()), !hasTextCursor && renderSelectText());
 };
 
 const formInputPropTypes = {

package/package.json

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