@charcoal-ui/react 4.0.0-beta.6 → 4.0.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@charcoal-ui/react",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-beta.8",
   "license": "Apache-2.0",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -28,7 +28,7 @@
     "clean": "rimraf dist .tsbuildinfo"
   },
   "devDependencies": {
-    "@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-beta.6",
+    "@charcoal-ui/esbuild-plugin-styled-components": "^4.0.0-beta.8",
     "@react-types/switch": "^3.1.2",
     "@storybook/addon-actions": "^8.0.5",
     "@storybook/react": "^8.0.5",
@@ -57,11 +57,11 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@charcoal-ui/foundation": "^4.0.0-beta.6",
-    "@charcoal-ui/icons": "^4.0.0-beta.6",
-    "@charcoal-ui/styled": "^4.0.0-beta.6",
-    "@charcoal-ui/theme": "^4.0.0-beta.6",
-    "@charcoal-ui/utils": "^4.0.0-beta.6",
+    "@charcoal-ui/foundation": "^4.0.0-beta.8",
+    "@charcoal-ui/icons": "^4.0.0-beta.8",
+    "@charcoal-ui/styled": "^4.0.0-beta.8",
+    "@charcoal-ui/theme": "^4.0.0-beta.8",
+    "@charcoal-ui/utils": "^4.0.0-beta.8",
     "@react-aria/button": "^3.9.1",
     "@react-aria/checkbox": "^3.13.0",
     "@react-aria/dialog": "^3.5.10",
@@ -94,5 +94,5 @@
     "url": "https://github.com/pixiv/charcoal.git",
     "directory": "packages/react"
   },
-  "gitHead": "0257ebd0246caa24f928a58887cb439b79c4f246"
+  "gitHead": "4b5d1ba9e43b6703957c7c53e6e59c8f0d7b8589"
 }

package/src/_lib/createDivComponent.tsx

@@ -0,0 +1,11 @@
+import { forwardRef } from 'react'
+import { useClassNames } from './useClassNames'
+
+export function createDivComponent(mainClassName: string) {
+  return forwardRef<HTMLDivElement, React.ComponentPropsWithRef<'div'>>(
+    function DivComponent({ className, ...props }, ref) {
+      const classNames = useClassNames(mainClassName, className)
+      return <div className={classNames} ref={ref} {...props} />
+    }
+  )
+}

package/src/components/DropdownSelector/Divider/index.css

@@ -0,0 +1,11 @@
+.charcoal-menu-group-divider {
+  display: flex;
+}
+
+.charcoal-menu-group-divider::before {
+  content: '';
+  display: block;
+  width: 100%;
+  height: 1px;
+  background: #00000014;
+}

package/src/components/DropdownSelector/Divider/index.tsx

@@ -0,0 +1,5 @@
+import './index.css'
+
+export function Divider() {
+  return <div role="separator" className="charcoal-menu-group-divider" />
+}

package/src/components/DropdownSelector/DropdownMenuItem/index.css

@@ -0,0 +1,20 @@
+.charcoal-dropdown-selector-menu-item {
+  font-size: 14px;
+  line-height: 22px;
+  color: var(--charcoal-text2);
+  padding: 9px 0;
+
+  display: flex;
+  align-items: center;
+  width: 100%;
+  margin-left: 20px;
+}
+
+.charcoal-dropdown-selector-menu-item[data-selected='true'] {
+  margin-left: 0px;
+}
+
+.charcoal-dropdown-selector-menu-item-icon {
+  color: var(--charcoal-text2);
+  padding-right: 4px;
+}

package/src/components/DropdownSelector/DropdownMenuItem/index.tsx

@@ -0,0 +1,34 @@
+import './index.css'
+
+import MenuItem, { MenuItemProps } from '../MenuItem'
+import { MenuListContext } from '../MenuList/MenuListContext'
+import { useContext } from 'react'
+import Icon from '../../Icon'
+
+export type DropdownMenuItemProps = Omit<MenuItemProps, 'as'>
+
+/**
+ * DropdownSelectorの選択肢として使うMenuItem
+ */
+export default function DropdownMenuItem(props: DropdownMenuItemProps) {
+  const { value: ctxValue } = useContext(MenuListContext)
+  const isSelected = props.value === ctxValue
+  const { children, ...rest } = props
+
+  return (
+    <MenuItem {...rest} aria-selected={isSelected}>
+      {isSelected && (
+        <Icon
+          className="charcoal-dropdown-selector-menu-item-icon"
+          name="16/Check"
+        />
+      )}
+      <span
+        className="charcoal-dropdown-selector-menu-item"
+        data-selected={isSelected}
+      >
+        {props.children}
+      </span>
+    </MenuItem>
+  )
+}

package/src/components/DropdownSelector/DropdownPopover.tsx

@@ -19,15 +19,22 @@ export function DropdownPopover({ children, ...props }: DropdownPopoverProps) {
   }, [props.triggerRef, props.isOpen])
 
   useEffect(() => {
-    if (props.isOpen && props.value !== undefined) {
-      // windowのスクロールを維持したまま選択肢をPopoverの中心に表示する
-      const windowScrollY = window.scrollY
-      const windowScrollX = window.scrollX
-      const selectedElement = document.querySelector(
-        `[data-key="${props.value.toString()}"]`
-      ) as HTMLElement | undefined
-      selectedElement?.focus()
-      window.scrollTo(windowScrollX, windowScrollY)
+    if (props.isOpen) {
+      if (props.value !== undefined && props.value !== '') {
+        // windowのスクロールを維持したまま選択肢をPopoverの中心に表示する
+        const windowScrollY = window.scrollY
+        const windowScrollX = window.scrollX
+        const selectedElement = document.querySelector(
+          `[data-key="${props.value.toString()}"]`
+        ) as HTMLElement | undefined
+        selectedElement?.focus()
+        window.scrollTo(windowScrollX, windowScrollY)
+      } else {
+        const el = ref.current?.querySelector("[role='option']")
+        if (el instanceof HTMLElement) {
+          el.focus()
+        }
+      }
     }
   }, [props.value, props.isOpen])
 

package/src/components/DropdownSelector/ListItem/__snapshots__/index.story.storyshot

@@ -2,40 +2,6 @@
 
 exports[`Storybook Tests react/internals/ListItem Basic 1`] = `
 .c0 {
-  list-style: none;
-}
-
-.c1 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  min-height: 40px;
-  cursor: pointer;
-  outline: none;
-  padding-right: 16px;
-  padding-left: 16px;
-  -webkit-transition: background-color 0.2s;
-  transition: background-color 0.2s;
-}
-
-.c1:disabled,
-.c1[aria-disabled]:not([aria-disabled='false']) {
-  opacity: 0.32;
-  cursor: default;
-}
-
-.c1:hover:not(disabled):not([aria-disabled='true']),
-.c1:focus:not(disabled):not([aria-disabled='true']),
-.c1:focus-within:not(disabled):not([aria-disabled='true']) {
-  background-color: var(--charcoal-surface3);
-}
-
-.c2 {
   color: red;
 }
 
@@ -43,77 +9,52 @@ exports[`Storybook Tests react/internals/ListItem Basic 1`] = `
   data-dark={false}
 >
   <li
-    className="c0"
-    role="option"
+    className="charcoal-list-item"
   >
-    <div
-      className="c1"
-    >
-      Item
-    </div>
+    Item
   </li>
   <li
-    className="c0"
-    role="option"
+    className="charcoal-list-item"
   >
-    <div
-      className="c1"
-    >
-      <pixiv-icon
-        name="16/Add"
-      />
-       Add
-    </div>
+    <pixiv-icon
+      name="16/Add"
+    />
+     Add
   </li>
-  <li
-    className="c0"
-    role="option"
+  <a
+    className="charcoal-list-item"
+    href="#"
   >
-    <a
-      className="c1"
-      href="#"
-    >
-      Normal Link
-    </a>
-  </li>
-  <li
-    className="c0"
-    role="option"
+    Normal Link
+  </a>
+  <a
+    className="c0 charcoal-list-item"
+    href="#"
   >
-    <a
-      className="c2 c1"
-      href="#"
-    >
-      Custom Link
-    </a>
-  </li>
+    Custom Link
+  </a>
   <li
-    className="c0"
-    role="option"
+    className="charcoal-list-item"
+    onClick={[Function]}
   >
+    Switch
     <div
-      className="c1"
-      onClick={[Function]}
-    >
-      Switch
-      <div
-        style={
-          Object {
-            "marginLeft": "auto",
-          }
+      style={
+        Object {
+          "marginLeft": "auto",
         }
-      >
-        <input
-          checked={false}
-          className="charcoal-switch-input"
-          id="test-id"
-          label="hello"
-          name="hello"
-          onChange={[Function]}
-          role="switch"
-          type="checkbox"
-        />
-      </div>
+      }
+    >
+      <input
+        checked={false}
+        className="charcoal-switch-input"
+        id="test-id"
+        label="hello"
+        name="hello"
+        onChange={[Function]}
+        role="switch"
+        type="checkbox"
+      />
     </div>
   </li>
 </div>

package/src/components/DropdownSelector/ListItem/index.css

@@ -0,0 +1,24 @@
+.charcoal-list-item {
+  list-style: none;
+  display: flex;
+  align-items: center;
+  min-height: 40px;
+  cursor: pointer;
+  outline: none;
+
+  padding-right: 16px;
+  padding-left: 16px;
+
+  transition: background-color 0.2s;
+}
+
+.charcoal-list-item:not([aria-disabled='true']):hover,
+.charcoal-list-item:not([aria-disabled='true']):focus,
+.charcoal-list-item:not([aria-disabled='true']):focus-within {
+  background-color: var(--charcoal-surface3);
+}
+
+.charcoal-list-item[aria-disabled='true'] {
+  opacity: 0.32;
+  cursor: default;
+}

package/src/components/DropdownSelector/ListItem/index.tsx

@@ -1,64 +1,25 @@
-import { ReactNode } from 'react'
-import styled from 'styled-components'
+import './index.css'
+
+import { ForwardedRef, forwardRef, ReactNode, useMemo } from 'react'
+import { useClassNames } from '../../../_lib/useClassNames'
 
 export type CustomJSXElement =
   | keyof JSX.IntrinsicElements
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   | React.JSXElementConstructor<any>
 
-export type ListItemProps<T extends CustomJSXElement = 'div'> = {
+export type ListItemProps<T extends React.ElementType = 'li'> = {
   children?: ReactNode
   as?: T
-} & Omit<React.ComponentProps<T>, 'children'>
+} & Omit<React.ComponentPropsWithRef<T>, 'children' | 'as'>
 
-/**
- * リストのある要素を示すコンポーネント
- *
- * asを用いて拡張することができる
- * @example
- * ```
- * <ListItem as="a" href="#">Link</ListItem>
- * <ListItem as={NextLink} href="#">NextLink</ListItem>
- * ```
- */
-export default function ListItem<T extends CustomJSXElement = 'div'>(
-  props: ListItemProps<T>
+const ListItem = forwardRef(function ListItem<T extends React.ElementType>(
+  { as, className, ...props }: ListItemProps<T>,
+  ref: ForwardedRef<HTMLLIElement>
 ) {
-  const { children, ...rest } = props
-  return (
-    <StyledLi role="option">
-      <ItemDiv {...rest}>{props.children}</ItemDiv>
-    </StyledLi>
-  )
-}
-
-const StyledLi = styled.li`
-  list-style: none;
-`
-
-const ItemDiv = styled.div`
-  display: flex;
-  align-items: center;
-  min-height: 40px;
-  cursor: pointer;
-  outline: none;
-
-  padding-right: 16px;
-  padding-left: 16px;
-
-  transition: background-color 0.2s;
-
-  &:disabled,
-  &[aria-disabled]:not([aria-disabled='false']) {
-    opacity: 0.32;
-    cursor: default;
-  }
+  const Component = useMemo(() => as ?? 'li', [as])
+  const classNames = useClassNames('charcoal-list-item', className)
+  return <Component className={classNames} ref={ref} {...props}></Component>
+}) as <T extends React.ElementType = 'li'>(p: ListItemProps<T>) => JSX.Element
 
-  :hover,
-  :focus,
-  :focus-within {
-    &:not(disabled):not([aria-disabled='true']) {
-      background-color: var(--charcoal-surface3);
-    }
-  }
-`
+export default ListItem

package/src/components/DropdownSelector/MenuItem/index.tsx

@@ -1,7 +1,8 @@
-import ListItem, { CustomJSXElement, ListItemProps } from '../ListItem'
+import { ForwardedRef, forwardRef } from 'react'
+import ListItem, { ListItemProps } from '../ListItem'
 import { useMenuItemHandleKeyDown } from './internals/useMenuItemHandleKeyDown'
 
-export type MenuItemProps<T extends CustomJSXElement = never> = {
+export type MenuItemProps<T extends React.ElementType = 'li'> = {
   value?: string
   disabled?: boolean
 } & ListItemProps<T>
@@ -10,22 +11,26 @@ export type MenuItemProps<T extends CustomJSXElement = never> = {
  * 上下キーでフォーカス移動でき、エンターキーで選択できるリストの項目
  * 基本的に`<MenuList>`, `<MenuGroup>`と合わせて使用する
  */
-export default function MenuItem<T extends CustomJSXElement>(
-  props: MenuItemProps<T>
+const MenuItem = forwardRef(function MenuItem<
+  T extends React.ElementType = 'li'
+>(
+  { className, value, disabled, ...props }: MenuItemProps<T>,
+  ref: ForwardedRef<HTMLLIElement>
 ) {
-  const { children, as, ...rest } = props
-  const [handleKeyDown, setContextValue] = useMenuItemHandleKeyDown(props.value)
+  const [handleKeyDown, setContextValue] = useMenuItemHandleKeyDown(value)
   return (
     <ListItem
-      {...rest}
-      as={as as CustomJSXElement}
-      data-key={props.value}
+      {...props}
+      ref={ref}
+      data-key={value}
       onKeyDown={handleKeyDown}
-      onClick={props.disabled === true ? undefined : setContextValue}
+      onClick={disabled === true ? undefined : setContextValue}
       tabIndex={-1}
-      aria-disabled={props.disabled}
+      aria-disabled={disabled}
+      role="option"
     >
       {props.children}
     </ListItem>
   )
-}
+})
+export default MenuItem

package/src/components/DropdownSelector/MenuItem/internals/useMenuItemHandleKeyDown.tsx

@@ -11,14 +11,14 @@ import { MenuListContext } from '../../MenuList/MenuListContext'
  */
 export function useMenuItemHandleKeyDown(
   value?: string
-): [(e: React.KeyboardEvent<HTMLDivElement>) => void, () => void] {
+): [(e: React.KeyboardEvent<HTMLElement>) => void, () => void] {
   const { setValue, root, propsArray } = useContext(MenuListContext)
   const setContextValue = useCallback(() => {
     if (value !== undefined) setValue(value)
   }, [value, setValue])
 
   const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLDivElement>) => {
+    (e: React.KeyboardEvent<HTMLElement>) => {
       if (e.key === 'Enter') {
         setContextValue()
       } else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {

package/src/components/DropdownSelector/MenuItemGroup/index.css

@@ -0,0 +1,19 @@
+.charcoal-menu-item-group {
+  display: block;
+}
+
+.charcoal-menu-item-group > span {
+  display: block;
+  color: var(--charcoal-text3);
+  font-size: 12px;
+  font-weight: bold;
+  padding: 12px 0 8px 16px;
+}
+
+.charcoal-menu-item-group > ul {
+  padding-left: 0;
+  margin: 0;
+  box-sizing: border-box;
+  list-style: none;
+  overflow: hidden;
+}

package/src/components/DropdownSelector/MenuItemGroup/index.tsx

@@ -1,4 +1,5 @@
-import styled from 'styled-components'
+import './index.css'
+
 import MenuItem from '../MenuItem'
 import { Divider } from '../Divider'
 
@@ -9,34 +10,11 @@ export type MenuItemGroupProps = {
   children: MenuItemGroupChild | MenuItemGroupChild[]
 }
 
-/**
- * 項目のリストを分類する見出しをつけるコンテナ要素
- */
 export default function MenuItemGroup(props: MenuItemGroupProps) {
   return (
-    <StyledLi role="presentation">
-      <TextSpan>{props.text}</TextSpan>
-      <StyledUl role="group">{props.children}</StyledUl>
-    </StyledLi>
+    <li className="charcoal-menu-item-group" role="presentation">
+      <span>{props.text}</span>
+      <ul role="group">{props.children}</ul>
+    </li>
   )
 }
-
-const TextSpan = styled.span`
-  display: block;
-  color: var(--charcoal-text3);
-  font-size: 12px;
-  font-weight: bold;
-  padding: 12px 0 8px 16px;
-`
-
-const StyledUl = styled.ul`
-  padding-left: 0;
-  margin: 0;
-  box-sizing: border-box;
-  list-style: none;
-  overflow: hidden;
-`
-
-const StyledLi = styled.li`
-  display: block;
-`