carbon-react 144.2.0 → 144.2.1

package/esm/components/multi-action-button/multi-action-button.component.js

@@ -36,6 +36,8 @@ export const MultiActionButton = ({
   } = useChildButtons(buttonRef);
   const handleInsideClick = useClickAwayListener(hideButtons);
   const handleClick = ev => {
+    // ensure button is focused when clicked (Safari)
+    buttonRef.current?.focus();
     showButtons();
     handleInsideClick();
     if (onClick) {

package/esm/components/split-button/split-button.component.js

@@ -37,6 +37,7 @@ export const SplitButton = ({
   const locale = useLocale();
   const theme = useContext(ThemeContext) || baseTheme;
   const buttonLabelId = useRef(guid());
+  const mainButtonRef = useRef(null);
   const toggleButton = useRef(null);
   const {
     showAdditionalButtons,
@@ -47,25 +48,36 @@ export const SplitButton = ({
     wrapperProps,
     contextValue
   } = useChildButtons(toggleButton, CONTENT_WIDTH_RATIO);
+  const handleMainClick = ev => {
+    // ensure button is focused when clicked (Safari)
+    mainButtonRef.current?.focus();
+    if (onClick) {
+      onClick(ev);
+    }
+  };
   const mainButtonProps = {
-    onMouseEnter: hideButtons,
     onFocus: hideButtons,
     onTouchStart: hideButtons,
     iconPosition,
     buttonType,
     disabled,
     iconType,
-    onClick: onClick,
+    onClick: handleMainClick,
     size,
     subtext,
     ...filterOutStyledSystemSpacingProps(rest)
   };
+  const handleToggleClick = () => {
+    // ensure button is focused when clicked (Safari)
+    toggleButton.current?.focus();
+    showButtons();
+  };
   const toggleButtonProps = {
     disabled,
     displayed: showAdditionalButtons,
     onTouchStart: showButtons,
     onKeyDown: handleToggleButtonKeyDown,
-    onClick: showButtons,
+    onClick: handleToggleClick,
     buttonType,
     size
   };
@@ -87,7 +99,8 @@ export const SplitButton = ({
     return [/*#__PURE__*/React.createElement(Button, _extends({
       "data-element": "main-button",
       key: "main-button",
-      id: buttonLabelId.current
+      id: buttonLabelId.current,
+      ref: mainButtonRef
     }, mainButtonProps), text), /*#__PURE__*/React.createElement(StyledSplitButtonToggle, _extends({
       "aria-haspopup": "true",
       "aria-expanded": showAdditionalButtons,

package/esm/components/text-editor/text-editor.component.js

@@ -258,7 +258,8 @@ const TextEditor = /*#__PURE__*/React.forwardRef(({
       editMode: true
     }
   }, /*#__PURE__*/React.createElement(StyledEditorWrapper, _extends({
-    ref: wrapper
+    ref: wrapper,
+    "data-role": "text-editor-wrapper"
   }, rest), /*#__PURE__*/React.createElement(LabelWrapper, {
     onClick: () => handleEditorFocus(true)
   }, /*#__PURE__*/React.createElement(Label, {
@@ -277,7 +278,8 @@ const TextEditor = /*#__PURE__*/React.forwardRef(({
     warning: !!(!error && warning)
   })), /*#__PURE__*/React.createElement(StyledEditorOutline, {
     isFocused: isFocused,
-    hasError: !!error
+    hasError: !!error,
+    "data-role": "editor-outline"
   }, /*#__PURE__*/React.createElement(StyledEditorContainer, {
     "data-component": "text-editor-container",
     hasError: !!error,

package/esm/hooks/__internal__/useChildButtons/useChildButtons.js

@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect, useCallback } from "react";
+import { useState, useRef, useCallback } from "react";
 import Events from "../../../__internal__/utils/helpers/events";
 import useMenuKeyboardNavigation from "../useMenuKeyboardNavigation";
 const useChildButtons = (toggleButtonRef, widthRatio = 1) => {
@@ -6,7 +6,6 @@ const useChildButtons = (toggleButtonRef, widthRatio = 1) => {
   const [minWidth, setMinWidth] = useState(0);
   const buttonNode = useRef(null);
   const childrenContainer = useRef(null);
-  const focusFirstChildButtonOnOpen = useRef(false);
   const hideButtons = useCallback(() => {
     setShowAdditionalButtons(false);
   }, []);
@@ -19,20 +18,16 @@ const useChildButtons = (toggleButtonRef, widthRatio = 1) => {
     }
   }
   const getButtonChildren = useCallback(() => childrenContainer.current?.querySelectorAll('[data-component="button"]'), []);
-  useEffect(() => {
-    const firstChild = getButtonChildren()?.[0];
-    if (focusFirstChildButtonOnOpen.current && showAdditionalButtons && firstChild) {
-      focusFirstChildButtonOnOpen.current = false;
-      firstChild.focus();
-    }
-  }, [showAdditionalButtons, getButtonChildren]);
   const handleToggleButtonKeyDown = ev => {
-    if (Events.isEnterKey(ev) || Events.isSpaceKey(ev) || Events.isDownKey(ev) || Events.isUpKey(ev)) {
+    const isToggleKey = Events.isEnterKey(ev) || Events.isSpaceKey(ev) || Events.isDownKey(ev) || Events.isUpKey(ev) || showAdditionalButtons && Events.isTabKey(ev);
+    if (isToggleKey) {
       ev.preventDefault();
       if (!showAdditionalButtons) {
         showButtons();
       }
-      focusFirstChildButtonOnOpen.current = true;
+      setTimeout(() => {
+        getButtonChildren()?.[0]?.focus();
+      });
     }
   };
   const handleKeyDown = useMenuKeyboardNavigation(toggleButtonRef, getButtonChildren, hideButtons, showAdditionalButtons);

package/lib/components/multi-action-button/multi-action-button.component.js

@@ -45,6 +45,8 @@ const MultiActionButton = ({
   } = (0, _useChildButtons.default)(buttonRef);
   const handleInsideClick = (0, _useClickAwayListener.default)(hideButtons);
   const handleClick = ev => {
+    // ensure button is focused when clicked (Safari)
+    buttonRef.current?.focus();
     showButtons();
     handleInsideClick();
     if (onClick) {

package/lib/components/split-button/split-button.component.js

@@ -46,6 +46,7 @@ const SplitButton = ({
   const locale = (0, _useLocale.default)();
   const theme = (0, _react.useContext)(_styledComponents.ThemeContext) || _themes.baseTheme;
   const buttonLabelId = (0, _react.useRef)((0, _guid.default)());
+  const mainButtonRef = (0, _react.useRef)(null);
   const toggleButton = (0, _react.useRef)(null);
   const {
     showAdditionalButtons,
@@ -56,25 +57,36 @@ const SplitButton = ({
     wrapperProps,
     contextValue
   } = (0, _useChildButtons.default)(toggleButton, CONTENT_WIDTH_RATIO);
+  const handleMainClick = ev => {
+    // ensure button is focused when clicked (Safari)
+    mainButtonRef.current?.focus();
+    if (onClick) {
+      onClick(ev);
+    }
+  };
   const mainButtonProps = {
-    onMouseEnter: hideButtons,
     onFocus: hideButtons,
     onTouchStart: hideButtons,
     iconPosition,
     buttonType,
     disabled,
     iconType,
-    onClick: onClick,
+    onClick: handleMainClick,
     size,
     subtext,
     ...(0, _utils.filterOutStyledSystemSpacingProps)(rest)
   };
+  const handleToggleClick = () => {
+    // ensure button is focused when clicked (Safari)
+    toggleButton.current?.focus();
+    showButtons();
+  };
   const toggleButtonProps = {
     disabled,
     displayed: showAdditionalButtons,
     onTouchStart: showButtons,
     onKeyDown: handleToggleButtonKeyDown,
-    onClick: showButtons,
+    onClick: handleToggleClick,
     buttonType,
     size
   };
@@ -96,7 +108,8 @@ const SplitButton = ({
     return [/*#__PURE__*/_react.default.createElement(_button.default, _extends({
       "data-element": "main-button",
       key: "main-button",
-      id: buttonLabelId.current
+      id: buttonLabelId.current,
+      ref: mainButtonRef
     }, mainButtonProps), text), /*#__PURE__*/_react.default.createElement(_splitButtonToggle.default, _extends({
       "aria-haspopup": "true",
       "aria-expanded": showAdditionalButtons,

package/lib/components/text-editor/text-editor.component.js

@@ -267,7 +267,8 @@ const TextEditor = exports.TextEditor = /*#__PURE__*/_react.default.forwardRef((
       editMode: true
     }
   }, /*#__PURE__*/_react.default.createElement(_textEditor.StyledEditorWrapper, _extends({
-    ref: wrapper
+    ref: wrapper,
+    "data-role": "text-editor-wrapper"
   }, rest), /*#__PURE__*/_react.default.createElement(_labelWrapper.default, {
     onClick: () => handleEditorFocus(true)
   }, /*#__PURE__*/_react.default.createElement(_label.default, {
@@ -286,7 +287,8 @@ const TextEditor = exports.TextEditor = /*#__PURE__*/_react.default.forwardRef((
     warning: !!(!error && warning)
   })), /*#__PURE__*/_react.default.createElement(_textEditor.StyledEditorOutline, {
     isFocused: isFocused,
-    hasError: !!error
+    hasError: !!error,
+    "data-role": "editor-outline"
   }, /*#__PURE__*/_react.default.createElement(_textEditor.StyledEditorContainer, {
     "data-component": "text-editor-container",
     hasError: !!error,

package/lib/hooks/__internal__/useChildButtons/useChildButtons.js

@@ -13,7 +13,6 @@ const useChildButtons = (toggleButtonRef, widthRatio = 1) => {
   const [minWidth, setMinWidth] = (0, _react.useState)(0);
   const buttonNode = (0, _react.useRef)(null);
   const childrenContainer = (0, _react.useRef)(null);
-  const focusFirstChildButtonOnOpen = (0, _react.useRef)(false);
   const hideButtons = (0, _react.useCallback)(() => {
     setShowAdditionalButtons(false);
   }, []);
@@ -26,20 +25,16 @@ const useChildButtons = (toggleButtonRef, widthRatio = 1) => {
     }
   }
   const getButtonChildren = (0, _react.useCallback)(() => childrenContainer.current?.querySelectorAll('[data-component="button"]'), []);
-  (0, _react.useEffect)(() => {
-    const firstChild = getButtonChildren()?.[0];
-    if (focusFirstChildButtonOnOpen.current && showAdditionalButtons && firstChild) {
-      focusFirstChildButtonOnOpen.current = false;
-      firstChild.focus();
-    }
-  }, [showAdditionalButtons, getButtonChildren]);
   const handleToggleButtonKeyDown = ev => {
-    if (_events.default.isEnterKey(ev) || _events.default.isSpaceKey(ev) || _events.default.isDownKey(ev) || _events.default.isUpKey(ev)) {
+    const isToggleKey = _events.default.isEnterKey(ev) || _events.default.isSpaceKey(ev) || _events.default.isDownKey(ev) || _events.default.isUpKey(ev) || showAdditionalButtons && _events.default.isTabKey(ev);
+    if (isToggleKey) {
       ev.preventDefault();
       if (!showAdditionalButtons) {
         showButtons();
       }
-      focusFirstChildButtonOnOpen.current = true;
+      setTimeout(() => {
+        getButtonChildren()?.[0]?.focus();
+      });
     }
   };
   const handleKeyDown = (0, _useMenuKeyboardNavigation.default)(toggleButtonRef, getButtonChildren, hideButtons, showAdditionalButtons);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "144.2.0",
+  "version": "144.2.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",