@charcoal-ui/react 4.0.0-beta.4 → 4.0.0-beta.5

package/src/components/Checkbox/index.story.tsx

@@ -1,29 +1,34 @@
 import Checkbox from '.'
 import { Meta, StoryObj } from '@storybook/react'
 import { useCallback, useState } from 'react'
-import { action } from '@storybook/addon-actions'
 
 export default {
   title: 'Checkbox',
   component: Checkbox,
+  parameters: {
+    layout: 'centered',
+  },
 } as Meta<typeof Checkbox>
 
 export const Default: StoryObj<typeof Checkbox> = {
+  argTypes: {
+    checked: { type: 'boolean' },
+    children: { type: 'string' },
+    disabled: { type: 'boolean' },
+    invalid: { type: 'boolean' },
+    readOnly: { type: 'boolean' },
+  },
   render: function Render(props) {
     const [checked, setChecked] = useState(props.checked)
     const handleChange = useCallback((isSelected: boolean) => {
       setChecked(isSelected)
-      action('change')(isSelected)
     }, [])
 
     return (
       <Checkbox
         {...props}
         checked={checked ?? props.checked}
-        onBlur={action('blur')}
-        onClick={action('click')}
         onChange={handleChange}
-        onFocus={action('focus')}
       />
     )
   },
@@ -31,27 +36,27 @@ export const Default: StoryObj<typeof Checkbox> = {
 
 export const Label: StoryObj<typeof Checkbox> = {
   render: () => {
-    return <Checkbox>Accelerate creativity.</Checkbox>
+    return <Checkbox>Checkbox</Checkbox>
   },
 }
 
 export const Checked: StoryObj<typeof Checkbox> = {
   render: () => {
-    return <Checkbox checked>Accelerate creativity.</Checkbox>
+    return <Checkbox checked>Checked</Checkbox>
   },
 }
 
 export const Disabled: StoryObj<typeof Checkbox> = {
   render: () => {
-    return <Checkbox disabled>Accelerate creativity.</Checkbox>
+    return <Checkbox disabled>Disabled</Checkbox>
   },
 }
 
 export const ReadOnly: StoryObj<typeof Checkbox> = {
   render: () => {
     return (
-      <Checkbox name="labelled" readOnly>
-        Accelerate creativity.
+      <Checkbox checked name="labelled" readOnly>
+        ReadOnly
       </Checkbox>
     )
   },
@@ -61,7 +66,7 @@ export const Invalid: StoryObj<typeof Checkbox> = {
   render: () => {
     return (
       <Checkbox name="labelled" invalid>
-        Accelerate creativity.
+        Invalid
       </Checkbox>
     )
   },

package/src/components/Checkbox/index.tsx

@@ -1,29 +1,37 @@
 import './index.css'
 
-import React, { forwardRef, memo } from 'react'
+import { forwardRef, memo } from 'react'
 import { useId } from '@react-aria/utils'
-import CheckboxInput, { CheckboxInputProps } from '../CheckboxInput'
-import { useClassNames } from '../../_lib/useClassNames'
+import CheckboxInput, { CheckboxInputProps } from './CheckboxInput'
+import { CheckboxWithLabel } from './CheckboxWithLabel'
 
-export type CheckboxProps = CheckboxInputProps & {
-  children?: React.ReactNode
-}
+export type CheckboxProps = CheckboxInputProps
 
-const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
-  function CheckboxInner({ disabled, className, id, children, ...props }, ref) {
-    const classNames = useClassNames('charcoal-checkbox__label', className)
+const Checkbox = forwardRef<HTMLInputElement, CheckboxInputProps>(
+  function Checkbox({ disabled, className, id, children, ...props }, ref) {
     const htmlId = useId(id)
+    const noChildren = children === undefined
     const input = (
-      <CheckboxInput {...props} id={htmlId} disabled={disabled} ref={ref} />
+      <CheckboxInput
+        {...props}
+        className={noChildren ? className : undefined}
+        disabled={disabled}
+        id={htmlId}
+        ref={ref}
+      />
     )
-    if (children === undefined) {
+    if (noChildren) {
       return input
     }
     return (
-      <label htmlFor={htmlId} aria-disabled={disabled} className={classNames}>
-        {input}
-        <div className="charcoal-checkbox__text">{children}</div>
-      </label>
+      <CheckboxWithLabel
+        className={className}
+        disabled={disabled}
+        id={htmlId}
+        input={input}
+      >
+        {children}
+      </CheckboxWithLabel>
     )
   }
 )

package/src/components/Clickable/__snapshots__/index.story.storyshot

@@ -1,49 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Storybook Tests Clickable Button 1`] = `
-.c0 {
-  cursor: pointer;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  background: transparent;
-  padding: 0;
-  border-style: none;
-  outline: none;
-  color: inherit;
-  text-rendering: inherit;
-  -webkit-letter-spacing: inherit;
-  -moz-letter-spacing: inherit;
-  -ms-letter-spacing: inherit;
-  letter-spacing: inherit;
-  word-spacing: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font: inherit;
-  margin: 0;
-  overflow: visible;
-  text-transform: none;
-}
-
-.c0:disabled,
-.c0[aria-disabled]:not([aria-disabled=false]) {
-  cursor: default;
-}
-
-.c0:focus {
-  outline: none;
-}
-
-.c0::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
 <div
   data-dark={false}
 >
   <button
-    className="c0"
+    className="charcoal-clickable"
     onClick={[Function]}
   >
     button
@@ -52,49 +14,11 @@ exports[`Storybook Tests Clickable Button 1`] = `
 `;
 
 exports[`Storybook Tests Clickable Link 1`] = `
-.c0 {
-  cursor: pointer;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  background: transparent;
-  padding: 0;
-  border-style: none;
-  outline: none;
-  color: inherit;
-  text-rendering: inherit;
-  -webkit-letter-spacing: inherit;
-  -moz-letter-spacing: inherit;
-  -ms-letter-spacing: inherit;
-  letter-spacing: inherit;
-  word-spacing: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font: inherit;
-  margin: 0;
-  overflow: visible;
-  text-transform: none;
-}
-
-.c0:disabled,
-.c0[aria-disabled]:not([aria-disabled=false]) {
-  cursor: default;
-}
-
-.c0:focus {
-  outline: none;
-}
-
-.c0::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
 <div
   data-dark={false}
 >
   <a
-    className="c0"
+    className="charcoal-clickable"
     href="#"
     onClick={[Function]}
   >

package/src/components/Clickable/index.css

@@ -0,0 +1,41 @@
+.charcoal-clickable {
+  cursor: pointer;
+
+  /* Reset button appearance */
+  appearance: none;
+  background: transparent;
+  padding: 0;
+  border-style: none;
+  outline: none;
+  color: inherit;
+  text-rendering: inherit;
+  letter-spacing: inherit;
+  word-spacing: inherit;
+  text-decoration: none;
+
+  /* Change the font styles in all browsers. */
+  font: inherit;
+
+  /* Remove the margin in Firefox and Safari. */
+  margin: 0;
+
+  /* Show the overflow in Edge. */
+  overflow: visible;
+
+  /* Remove the inheritance of text transform in Firefox. */
+  text-transform: none;
+}
+
+.charcoal-clickable:disabled,
+.charcoal-clickable[aria-disabled]:not([aria-disabled='false']) {
+  cursor: default;
+}
+
+.charcoal-clickable:focus {
+  outline: none;
+}
+
+.charcoal-clickable::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}

package/src/components/Clickable/index.story.tsx

@@ -13,7 +13,7 @@ export const Button: StoryObj = {
 
 export const Link: StoryObj = {
   render: () => (
-    <Clickable to="#" onClick={action('click')}>
+    <Clickable as="a" href="#" onClick={action('click')}>
       link
     </Clickable>
   ),

package/src/components/Clickable/index.tsx

@@ -1,91 +1,31 @@
-import * as React from 'react'
-import styled from 'styled-components'
-import {
-  LinkProps,
-  useComponentAbstraction,
-} from '../../core/ComponentAbstraction'
-import { disabledSelector } from '@charcoal-ui/utils'
+import React, { useMemo, forwardRef } from 'react'
+import { useClassNames } from '../../_lib/useClassNames'
+import './index.css'
 
-interface BaseProps {
+export type ClickableProps<T extends React.ElementType = 'button'> = {
   /**
-   * クリックの無効化
+   * The component used for root element.
+   * @type T extends React.ElementType = 'button'
    */
-  disabled?: boolean
-}
-
-interface LinkBaseProps {
+  as?: T
   /**
-   * リンクのURL。指定するとbuttonタグではなくaタグとして描画される
+   * The as property of the component specified by the Button component's as attribute.
    */
-  to: string
-}
-
-export type ClickableProps =
-  | (BaseProps & Omit<React.ComponentPropsWithoutRef<'button'>, 'disabled'>)
-  | (BaseProps & LinkBaseProps & Omit<LinkProps, 'to'>)
-export type ClickableElement = HTMLButtonElement & HTMLAnchorElement
-
-const Clickable = React.forwardRef<ClickableElement, ClickableProps>(
-  function Clickable(props, ref) {
-    const { Link } = useComponentAbstraction()
-    const isLink = 'to' in props
-    const as = isLink ? Link : 'button'
-    const ariaDisabled = isLink && props.disabled === true ? true : undefined
-    let rest = props
-    if (isLink) {
-      const { disabled, ..._rest } = props
-      rest = _rest
-    }
-    return (
-      <StyledClickableDiv
-        {...rest}
-        ref={ref}
-        as={as}
-        aria-disabled={ariaDisabled}
-      />
-    )
-  }
-)
+  componentAs?: React.ComponentPropsWithRef<T>['as']
+} & Omit<React.ComponentPropsWithRef<T>, 'as'>
+
+const Clickable = forwardRef(function Clickable<T extends React.ElementType>(
+  { componentAs, as, ...props }: ClickableProps<T>,
+  ref: React.ForwardedRef<HTMLButtonElement>
+) {
+  const className = useClassNames('charcoal-clickable', props.className)
+
+  const Component = useMemo(() => as ?? 'button', [as])
+
+  return (
+    <Component {...props} ref={ref} className={className} as={componentAs} />
+  )
+}) as <T extends React.ElementType = 'button'>(
+  p: ClickableProps<T>
+) => JSX.Element
 export default Clickable
-
-const StyledClickableDiv = styled.div`
-  cursor: pointer;
-
-  ${disabledSelector} {
-    cursor: default;
-  }
-
-  /* Reset button appearance */
-  appearance: none;
-  background: transparent;
-  padding: 0;
-  border-style: none;
-  outline: none;
-  color: inherit;
-  text-rendering: inherit;
-  letter-spacing: inherit;
-  word-spacing: inherit;
-  text-decoration: none;
-
-  &:focus {
-    outline: none;
-  }
-
-  /* Change the font styles in all browsers. */
-  font: inherit;
-
-  /* Remove the margin in Firefox and Safari. */
-  margin: 0;
-
-  /* Show the overflow in Edge. */
-  overflow: visible;
-
-  /* Remove the inheritance of text transform in Firefox. */
-  text-transform: none;
-
-  /* Remove the inner border and padding in Firefox. */
-  &::-moz-focus-inner {
-    border-style: none;
-    padding: 0;
-  }
-`

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

@@ -35,115 +35,6 @@ exports[`Storybook Tests DropdownSelector/ListItem Basic 1`] = `
   background-color: var(--charcoal-surface3);
 }
 
-.c3 {
-  display: inline-grid;
-  grid-template-columns: auto 1fr;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  outline: 0;
-}
-
-.c3:disabled,
-.c3[aria-disabled]:not([aria-disabled='false']) {
-  opacity: 0.32;
-  cursor: default;
-}
-
-.c4 {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  position: relative;
-  box-sizing: border-box;
-  width: 28px;
-  border: 2px solid transparent;
-  -webkit-transition-property: background-color,box-shadow;
-  transition-property: background-color,box-shadow;
-  -webkit-transition-duration: 0.2s;
-  transition-duration: 0.2s;
-  cursor: inherit;
-  outline: none;
-  border-radius: 16px;
-  height: 16px;
-  margin: 0;
-  background-color: var(--charcoal-text4);
-}
-
-.c4:hover {
-  background-color: var(--charcoal-text4-hover);
-}
-
-.c4:active {
-  background-color: var(--charcoal-text4-press);
-}
-
-.c4:focus {
-  outline: none;
-  box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
-}
-
-.c4:focus:not(:focus-visible) {
-  box-shadow: none;
-}
-
-.c4:focus-visible {
-  box-shadow: 0 0 0 4px rgba(0,150,250,0.32);
-}
-
-.c4::after {
-  content: '';
-  position: absolute;
-  display: block;
-  top: 0;
-  left: 0;
-  width: 12px;
-  height: 12px;
-  -webkit-transform: translateX(0);
-  -ms-transform: translateX(0);
-  transform: translateX(0);
-  -webkit-transition: -webkit-transform 0.2s;
-  -webkit-transition: transform 0.2s;
-  transition: transform 0.2s;
-  border-radius: 1024px;
-  background-color: var(--charcoal-text5);
-}
-
-.c4::after:hover {
-  background-color: var(--charcoal-text5-hover);
-}
-
-.c4::after:active {
-  background-color: var(--charcoal-text5-press);
-}
-
-.c4:checked {
-  background-color: var(--charcoal-brand);
-}
-
-.c4:checked:hover {
-  background-color: var(--charcoal-brand-hover);
-}
-
-.c4:checked:active {
-  background-color: var(--charcoal-brand-press);
-}
-
-.c4:checked::after {
-  -webkit-transform: translateX(12px);
-  -ms-transform: translateX(12px);
-  transform: translateX(12px);
-  -webkit-transition: -webkit-transform 0.2s;
-  -webkit-transition: transform 0.2s;
-  transition: transform 0.2s;
-}
-
 .c2 {
   color: red;
 }
@@ -212,32 +103,16 @@ exports[`Storybook Tests DropdownSelector/ListItem Basic 1`] = `
           }
         }
       >
-        <label
-          className="c3"
-        >
-          <input
-            aria-label="hello"
-            checked={false}
-            className="c4"
-            disabled={false}
-            name="hello"
-            onChange={[Function]}
-            onClick={[Function]}
-            onDragStart={[Function]}
-            onKeyDown={[Function]}
-            onKeyUp={[Function]}
-            onMouseDown={[Function]}
-            onMouseEnter={[Function]}
-            onMouseLeave={[Function]}
-            onMouseUp={[Function]}
-            onTouchCancel={[Function]}
-            onTouchEnd={[Function]}
-            onTouchMove={[Function]}
-            onTouchStart={[Function]}
-            role="switch"
-            type="checkbox"
-          />
-        </label>
+        <input
+          checked={false}
+          className="charcoal-switch-input"
+          id="test-id"
+          label="hello"
+          name="hello"
+          onChange={[Function]}
+          role="switch"
+          type="checkbox"
+        />
       </div>
     </div>
   </li>