feat: implement :focus-visible for Tree component with targeted foc…

…us style for non-pointer devices
trendmicro-frontend · Aug 28, 2023 · 36d624f · 36d624f
1 parent a54ce75
commit 36d624f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/packages/react/src/tree/TreeItemContent.js b/packages/react/src/tree/TreeItemContent.js
@@ -1,9 +1,7 @@
 import { useMergeRefs } from '@tonic-ui/react-hooks';
 import { callEventHandlers } from '@tonic-ui/utils';
-import { ensureArray } from 'ensure-type';
-import React, { forwardRef, useCallback, useMemo } from 'react';
+import React, { forwardRef, useCallback } from 'react';
 import { Box } from '../box';
-import { useTheme } from '../theme';
 import { useTreeItemContentStyle } from './styles';
 import useTree from './useTree';
 import useTreeItem from './useTreeItem';
@@ -12,12 +10,10 @@ const TreeItemContent = forwardRef((
   {
     onClick: onClickProp,
     onMouseDown: onMouseDownProp,
-    sx: sxProp,
     ...rest
   },
   ref,
 ) => {
-  const { sizes } = useTheme();
   const {
     multiSelect,
   } = useTree();
@@ -63,29 +59,14 @@ const TreeItemContent = forwardRef((
   }, [isDisabled]);
 
   const tabIndex = -1;
-  const styleProps = useTreeItemContentStyle({ isDisabled, isSelected, tabIndex });
-  const sxProps = useMemo(() => ([
-    {
-      pl: `calc(${nodeDepth} * ${sizes['6x']} + ${sizes['3x']})`,
-      pr: `calc(${sizes['3x']})`,
-      ':focus-visible': {
-        borderStyle: 'solid',
-        borderWidth: '1h',
-        pl: `calc(${nodeDepth} * ${sizes['6x']} + ${sizes['3x']} - ${sizes['1h']})`,
-        pr: `calc(${sizes['3x']} - ${sizes['1h']})`,
-        py: `calc(${sizes['2x']} - ${sizes['1h']})`,
-      },
-    },
-    ...ensureArray(sxProp),
-  ]), [nodeDepth, sizes, sxProp]);
+  const styleProps = useTreeItemContentStyle({ isDisabled, isSelected, nodeDepth, tabIndex });
 
   return (
     <Box
       ref={combinedRef}
       onClick={callEventHandlers(onClickProp, onClick)}
       onMouseDown={callEventHandlers(onMouseDownProp, onMouseDown)}
       tabIndex={tabIndex}
-      sx={sxProps}
       {...styleProps}
       {...rest}
     />

diff --git a/packages/react/src/tree/styles.js b/packages/react/src/tree/styles.js
@@ -1,4 +1,5 @@
 import { useColorMode } from '../color-mode';
+import { useTheme } from '../theme';
 
 const useTreeItemStyle = () => {
   return {
@@ -8,8 +9,10 @@ const useTreeItemStyle = () => {
 const useTreeItemContentStyle = ({
   isDisabled,
   isSelected,
+  nodeDepth,
   tabIndex,
 }) => {
+  const { colors, sizes } = useTheme();
   const [colorMode] = useColorMode();
   const color = {
     dark: 'white:primary',
@@ -42,16 +45,15 @@ const useTreeItemContentStyle = ({
     alignItems: 'center',
     outline: (tabIndex < 0) ? 0 : undefined, // Remove the default outline for tabindex="-1"
     px: '3x',
+    pl: `calc(${nodeDepth} * ${sizes['6x']} + ${sizes['3x']})`,
     py: '2x',
     userSelect: 'none',
     width: '100%',
     _hover: {
       backgroundColor: !isDisabled ? hoverBackgroundColor : undefined,
     },
-    _focus: {
-      borderColor: focusBorderColor,
-
-      // Note: The border will be added in TreeItemContent
+    _focusVisible: {
+      boxShadow: `inset 0 0 0 ${sizes['1h']} ${colors[focusBorderColor]}`,
     },
   };
 };