@charcoal-ui/react 6.0.0-rc.4 → 6.0.0-rc.6

package/src/components/Carousel/index.test.tsx

@@ -2,12 +2,13 @@ import { createRef } from 'react'
 import { render, screen, fireEvent, act } from '@testing-library/react'
 import { renderToString } from 'react-dom/server'
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest'
-import Carousel, { type CarouselItem, type CarouselHandlerRef } from '.'
+import Carousel, { type CarouselHandlerRef } from '.'
 
-const items: CarouselItem[] = Array.from({ length: 6 }, (_, i) => ({
-  id: `item-${i}`,
-  children: <div data-testid={`slide-${i}`}>Slide {i}</div>,
-}))
+const slides = Array.from({ length: 6 }, (_, i) => (
+  <div key={`item-${i}`} data-testid={`slide-${i}`}>
+    Slide {i}
+  </div>
+))
 
 function mockScrollerGeometry(
   el: HTMLElement,
@@ -77,14 +78,14 @@ function fireIntersect(el: Element) {
 describe('Carousel', () => {
   describe('rendering', () => {
     it('renders all items', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       for (let i = 0; i < 6; i++) {
         expect(screen.getByTestId(`slide-${i}`)).toBeInTheDocument()
       }
     })
 
     it('has carousel ARIA attributes', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const region = screen.getByRole('region')
       expect(region).toHaveAttribute('aria-roledescription', 'carousel')
       expect(region).toHaveAttribute('aria-label', 'Carousel')
@@ -93,7 +94,7 @@ describe('Carousel', () => {
 
   describe('Size M (default)', () => {
     it('shows navigation buttons', () => {
-      render(<Carousel items={items} size="M" />)
+      render(<Carousel size="M">{slides}</Carousel>)
       expect(
         screen.getByRole('button', { name: 'Previous' }),
       ).toBeInTheDocument()
@@ -101,7 +102,7 @@ describe('Carousel', () => {
     })
 
     it('hides indicator by default', () => {
-      const { container } = render(<Carousel items={items} size="M" />)
+      const { container } = render(<Carousel size="M">{slides}</Carousel>)
       const indicator = container.querySelector('.charcoal-carousel__indicator')
       expect(indicator).toHaveAttribute('data-visible', 'false')
     })
@@ -109,7 +110,7 @@ describe('Carousel', () => {
 
   describe('Size S', () => {
     it('hides navigation buttons by default', () => {
-      const { container } = render(<Carousel items={items} size="S" />)
+      const { container } = render(<Carousel size="S">{slides}</Carousel>)
       const nav = container.querySelector('.charcoal-carousel__navigation')
       expect(nav).toHaveAttribute('data-visible', 'false')
     })
@@ -117,13 +118,13 @@ describe('Carousel', () => {
 
   describe('navigation button state', () => {
     it('disables prev button at scroll start', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const prev = screen.getByRole('button', { name: 'Previous' })
       expect(prev).toBeDisabled()
     })
 
     it('enables next button when scrollable content exists', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 0 })
       act(() => {
@@ -136,7 +137,7 @@ describe('Carousel', () => {
 
   describe('scrollByStep (0.75x viewport)', () => {
     it('calls scrollBy with 0.75x viewport width on next button click', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
       act(() => {
@@ -156,7 +157,7 @@ describe('Carousel', () => {
     })
 
     it('calls scrollBy with negative 0.75x on prev button click', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 400 })
       act(() => {
@@ -176,7 +177,7 @@ describe('Carousel', () => {
     })
 
     it('respects custom scrollStep ratio (number)', () => {
-      render(<Carousel items={items} scrollStep={0.5} />)
+      render(<Carousel scrollStep={0.5}>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
       act(() => {
@@ -199,7 +200,7 @@ describe('Carousel', () => {
       const scrollStep = vi.fn(
         ({ clientWidth }: { clientWidth: number }) => clientWidth - 48,
       )
-      render(<Carousel items={items} scrollStep={scrollStep} />)
+      render(<Carousel scrollStep={scrollStep}>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
       act(() => {
@@ -228,7 +229,7 @@ describe('Carousel', () => {
 
   describe('keyboard navigation', () => {
     it('scrolls next by 0.75x viewport on ArrowRight', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
       act(() => {
@@ -247,7 +248,7 @@ describe('Carousel', () => {
     })
 
     it('scrolls prev by negative 0.75x viewport on ArrowLeft', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 400 })
       act(() => {
@@ -266,7 +267,7 @@ describe('Carousel', () => {
     })
 
     it('ignores unrelated keys', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
 
@@ -284,7 +285,7 @@ describe('Carousel', () => {
       // jsdom には scrollIntoView が無いのでモックを定義する。
       const scrollIntoView = vi.fn()
       Element.prototype.scrollIntoView = scrollIntoView
-      const { container } = render(<Carousel items={items} size="S" />)
+      const { container } = render(<Carousel size="S">{slides}</Carousel>)
 
       const dots = container.querySelectorAll(
         '.charcoal-carousel__indicator__item',
@@ -311,7 +312,9 @@ describe('Carousel', () => {
     it('item が中央に入ると activeIndex が更新され indicator に反映される', () => {
       const restore = installIOMock()
       const { container } = render(
-        <Carousel items={items} size="M" indicator />,
+        <Carousel size="M" indicator>
+          {slides}
+        </Carousel>,
       )
       const itemEls = container.querySelectorAll('.charcoal-carousel__item')
       act(() => {
@@ -327,7 +330,7 @@ describe('Carousel', () => {
 
   describe('scroll-state data attributes (mask)', () => {
     it('reflects canPrev/canNext on the root element', () => {
-      const { container } = render(<Carousel items={items} hasGradient />)
+      const { container } = render(<Carousel hasGradient>{slides}</Carousel>)
       const root = container.querySelector('.charcoal-carousel')
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
@@ -339,7 +342,7 @@ describe('Carousel', () => {
     })
 
     it('marks data-can-prev false at the start edge', () => {
-      const { container } = render(<Carousel items={items} hasGradient />)
+      const { container } = render(<Carousel hasGradient>{slides}</Carousel>)
       const root = container.querySelector('.charcoal-carousel')
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 0 })
@@ -378,26 +381,25 @@ describe('Carousel', () => {
     })
 
     it('defaults to the left edge (0)', () => {
-      render(<Carousel items={items} />)
+      render(<Carousel>{slides}</Carousel>)
       expect(lastSetLeft).toBe(0)
     })
 
     it('centers the content when align=center (maxScroll / 2)', () => {
-      render(<Carousel items={items} defaultScroll={{ align: 'center' }} />)
+      render(<Carousel defaultScroll={{ align: 'center' }}>{slides}</Carousel>)
       expect(lastSetLeft).toBe(800)
     })
 
     it('aligns to the right edge when align=right (maxScroll)', () => {
-      render(<Carousel items={items} defaultScroll={{ align: 'right' }} />)
+      render(<Carousel defaultScroll={{ align: 'right' }}>{slides}</Carousel>)
       expect(lastSetLeft).toBe(1600)
     })
 
     it('applies offset from the base position', () => {
       render(
-        <Carousel
-          items={items}
-          defaultScroll={{ align: 'left', offset: 100 }}
-        />,
+        <Carousel defaultScroll={{ align: 'left', offset: 100 }}>
+          {slides}
+        </Carousel>,
       )
       expect(lastSetLeft).toBe(100)
     })
@@ -444,7 +446,7 @@ describe('Carousel', () => {
     })
 
     it('re-applies the initial position when content width settles later', () => {
-      render(<Carousel items={items} defaultScroll={{ align: 'right' }} />)
+      render(<Carousel defaultScroll={{ align: 'right' }}>{slides}</Carousel>)
       // at mount the content is not laid out yet (maxScroll 0) -> right -> 0
       expect(lastSetLeft).toBe(0)
 
@@ -460,7 +462,7 @@ describe('Carousel', () => {
     })
 
     it('stops re-applying once the user interacts', () => {
-      render(<Carousel items={items} defaultScroll={{ align: 'right' }} />)
+      render(<Carousel defaultScroll={{ align: 'right' }}>{slides}</Carousel>)
 
       // user interacts (pointerdown on the scroller) before the content settles
       fireEvent.pointerDown(getScroller())
@@ -476,16 +478,31 @@ describe('Carousel', () => {
     })
   })
 
+  describe('children (sandbox-compatible API)', () => {
+    it('renders each direct child as one slide', () => {
+      const { container } = render(<Carousel>{slides}</Carousel>)
+      expect(
+        container.querySelectorAll('.charcoal-carousel__item'),
+      ).toHaveLength(6)
+    })
+  })
+
   describe('props override defaults', () => {
     it('shows indicator on Size M when prop is true', () => {
       const { container } = render(
-        <Carousel items={items} size="M" indicator />,
+        <Carousel size="M" indicator>
+          {slides}
+        </Carousel>,
       )
       expect(container.querySelector("[data-indicator='true']")).toBeTruthy()
     })
 
     it('shows navigation on Size S when prop is true', () => {
-      render(<Carousel items={items} size="S" navigationButtons />)
+      render(
+        <Carousel size="S" navigationButtons>
+          {slides}
+        </Carousel>,
+      )
       const nav = document.querySelector('.charcoal-carousel__navigation')
       expect(nav).toHaveAttribute('data-visible', 'true')
     })
@@ -493,12 +510,12 @@ describe('Carousel', () => {
 
   describe('variant data attributes', () => {
     it('sets gradient data attribute', () => {
-      const { container } = render(<Carousel items={items} hasGradient />)
+      const { container } = render(<Carousel hasGradient>{slides}</Carousel>)
       expect(container.querySelector("[data-has-gradient='true']")).toBeTruthy()
     })
 
     it('sets full-width data attribute', () => {
-      const { container } = render(<Carousel items={items} fullWidth />)
+      const { container } = render(<Carousel fullWidth>{slides}</Carousel>)
       expect(container.querySelector("[data-full-width='true']")).toBeTruthy()
     })
   })
@@ -507,30 +524,32 @@ describe('Carousel', () => {
     const getRegion = () => screen.getByRole('region')
 
     it('defaults to none / center on Size M (sandbox 同等の 0.75)', () => {
-      render(<Carousel items={items} size="M" />)
+      render(<Carousel size="M">{slides}</Carousel>)
       expect(getRegion()).toHaveAttribute('data-scroll-snap-type', 'none')
       expect(getRegion()).toHaveAttribute('data-scroll-snap-align', 'center')
     })
 
     it('defaults to mandatory on Size S', () => {
-      render(<Carousel items={items} size="S" />)
+      render(<Carousel size="S">{slides}</Carousel>)
       expect(getRegion()).toHaveAttribute('data-scroll-snap-type', 'mandatory')
     })
 
     it('overrides type per prop (item-ごと mandatory)', () => {
       render(
-        <Carousel items={items} size="M" scrollSnap={{ type: 'mandatory' }} />,
+        <Carousel size="M" scrollSnap={{ type: 'mandatory' }}>
+          {slides}
+        </Carousel>,
       )
       expect(getRegion()).toHaveAttribute('data-scroll-snap-type', 'mandatory')
     })
 
     it('overrides align per prop', () => {
-      render(<Carousel items={items} scrollSnap={{ align: 'start' }} />)
+      render(<Carousel scrollSnap={{ align: 'start' }}>{slides}</Carousel>)
       expect(getRegion()).toHaveAttribute('data-scroll-snap-align', 'start')
     })
 
     it('supports disabling snap (none)', () => {
-      render(<Carousel items={items} scrollSnap={{ type: 'none' }} />)
+      render(<Carousel scrollSnap={{ type: 'none' }}>{slides}</Carousel>)
       expect(getRegion()).toHaveAttribute('data-scroll-snap-type', 'none')
     })
   })
@@ -538,7 +557,7 @@ describe('Carousel', () => {
   describe('react-sandbox compat (callbacks / ref)', () => {
     it('calls onScroll with scrollLeft on scroll', () => {
       const onScroll = vi.fn()
-      render(<Carousel items={items} onScroll={onScroll} />)
+      render(<Carousel onScroll={onScroll}>{slides}</Carousel>)
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 240 })
       act(() => {
@@ -550,7 +569,7 @@ describe('Carousel', () => {
     it('calls onScrollStateChange when scrollability changes', () => {
       const onScrollStateChange = vi.fn()
       render(
-        <Carousel items={items} onScrollStateChange={onScrollStateChange} />,
+        <Carousel onScrollStateChange={onScrollStateChange}>{slides}</Carousel>,
       )
       const scroller = getScroller()
       mockScrollerGeometry(scroller, { scrollLeft: 100 })
@@ -577,7 +596,9 @@ describe('Carousel', () => {
       ]
       const ref = createRef<CarouselHandlerRef>()
       render(
-        <Carousel ref={ref} items={items} defaultScroll={{ align: 'right' }} />,
+        <Carousel ref={ref} defaultScroll={{ align: 'right' }}>
+          {slides}
+        </Carousel>,
       )
       lastSetLeft = undefined
       act(() => {
@@ -603,7 +624,7 @@ describe('Carousel', () => {
         .spyOn(HTMLElement.prototype, 'clientWidth', 'get')
         .mockReturnValue(640)
       const onResize = vi.fn()
-      render(<Carousel items={items} onResize={onResize} />)
+      render(<Carousel onResize={onResize}>{slides}</Carousel>)
       act(() => {
         roCallbacks.forEach((cb) => cb([]))
       })
@@ -613,6 +634,58 @@ describe('Carousel', () => {
     })
   })
 
+  describe('navigation button visibility (focus modality)', () => {
+    // jsdom はジオメトリが全て 0 で Next ボタンが disabled（=フォーカス不可）の
+    // ままになるため、スクロール余地をモックして有効化してからフォーカスする。
+    function renderWithFocusableNext() {
+      render(<Carousel size="M">{slides}</Carousel>)
+      const scroller = getScroller()
+      mockScrollerGeometry(scroller, { scrollLeft: 0 })
+      scroller.scrollBy = vi.fn()
+      act(() => {
+        fireEvent.scroll(scroller)
+      })
+      const next = screen.getByRole('button', { name: 'Next' })
+      expect(next).not.toBeDisabled()
+      return next
+    }
+
+    // react-aria は document 上の keydown / pointerdown でフォーカスの由来
+    // （keyboard / pointer）を判定するため、focus() の前にイベントを発火して
+    // モダリティを切り替える。
+    it('does not mark focus-visible when a button is focused by pointer', () => {
+      const next = renderWithFocusableNext()
+      fireEvent.pointerDown(next)
+      fireEvent.mouseDown(next)
+      act(() => next.focus())
+      fireEvent.click(next)
+      expect(document.activeElement).toBe(next)
+      expect(screen.getByRole('region')).not.toHaveAttribute(
+        'data-focus-visible-within',
+      )
+    })
+
+    it('marks focus-visible when a button is focused by keyboard', () => {
+      const next = renderWithFocusableNext()
+      fireEvent.keyDown(document.body, { key: 'Tab' })
+      act(() => next.focus())
+      expect(screen.getByRole('region')).toHaveAttribute(
+        'data-focus-visible-within',
+        'true',
+      )
+    })
+
+    it('clears focus-visible when focus leaves the carousel', () => {
+      const next = renderWithFocusableNext()
+      fireEvent.keyDown(document.body, { key: 'Tab' })
+      act(() => next.focus())
+      act(() => next.blur())
+      expect(screen.getByRole('region')).not.toHaveAttribute(
+        'data-focus-visible-within',
+      )
+    })
+  })
+
   describe('SSR (server rendering)', () => {
     // jsdom では window が定義されているため renderToString 時に
     // 「useLayoutEffect does nothing on the server」警告が出る（実 SSR=window 無しでは
@@ -641,13 +714,13 @@ describe('Carousel', () => {
       // getServerSnapshot を使うため、サーバー描画でブラウザ API に触れない。
       expect(() =>
         renderToString(
-          <Carousel items={items} defaultScroll={{ align: 'center' }} />,
+          <Carousel defaultScroll={{ align: 'center' }}>{slides}</Carousel>,
         ),
       ).not.toThrow()
     })
 
     it('uses the server snapshot (canPrev/canNext = false) and renders items + indicator', () => {
-      const html = renderToString(<Carousel items={items} size="M" />)
+      const html = renderToString(<Carousel size="M">{slides}</Carousel>)
 
       // サーバースナップショットでは canPrev/canNext は false。
       expect(html).toContain('data-can-prev="false"')

package/src/components/Carousel/index.tsx

@@ -1,7 +1,9 @@
 import './index.css'
 
 import {
+  Children,
   forwardRef,
+  isValidElement,
   memo,
   useCallback,
   useImperativeHandle,
@@ -23,11 +25,6 @@ import { useCarouselScroller } from './useCarouselScroller'
 
 const getServerSnapshot = (): CarouselState => INITIAL_CAROUSEL_STATE
 
-export type CarouselItem = {
-  id: string
-  children: ReactNode
-}
-
 export type ScrollAlign = 'left' | 'center' | 'right'
 
 export type ScrollSnapType = 'none' | 'proximity' | 'mandatory'
@@ -70,7 +67,8 @@ export type CarouselProps = Readonly<{
   onResize?: (width: number) => void
   onScrollStateChange?: (canScroll: boolean) => void
   defaultScroll?: { align?: ScrollAlign; offset?: number }
-  items: CarouselItem[]
+  // 1 直接子要素 = 1 スライド（react-sandbox 互換）。
+  children: ReactNode
 }>
 
 type Direction = 'prev' | 'next'
@@ -149,6 +147,7 @@ const Carousel = forwardRef<CarouselHandlerRef, CarouselProps>(function Render(
     onResize,
     onScrollStateChange,
     defaultScroll: { align = 'left', offset = 0 } = {},
+    children,
     ...props
   }: CarouselProps,
   ref,
@@ -159,13 +158,20 @@ const Carousel = forwardRef<CarouselHandlerRef, CarouselProps>(function Render(
   const snapType = scrollSnap?.type ?? (size === 'S' ? 'mandatory' : 'none')
   const snapAlign = scrollSnap?.align ?? 'center'
 
+  // 直接子要素 1 つを 1 スライドとして数える。key は子要素の key を引き継ぐ
+  // （toArray が付与する接頭辞付き key。無ければ index）。
+  const slides = Children.toArray(children)
+  const slideKeys = slides.map((slide, i) =>
+    isValidElement(slide) && slide.key != null ? slide.key : i,
+  )
+
   const scrollerRef = useRef<HTMLDivElement>(null)
   const [store] = useState(createCarouselStore)
 
   const { scrollByStep, onItemResize, resetScroll } = useCarouselScroller(
     scrollerRef,
     store,
-    props.items.length,
+    slides.length,
     { align, offset, scrollStep, onScroll, onResize, onScrollStateChange },
   )
 
@@ -202,8 +208,14 @@ const Carousel = forwardRef<CarouselHandlerRef, CarouselProps>(function Render(
     isFocusVisible: scrollerFocusVisible,
   } = useFocusRing()
 
+  // ナビゲーションボタン表示用。クリックで残留したフォーカス（pointer 由来）では
+  // 表示し続けないよう、キーボード由来のフォーカスのみを検知する。
+  const { focusProps: rootFocusProps, isFocusVisible: rootFocusVisible } =
+    useFocusRing({ within: true })
+
   return (
     <div
+      {...rootFocusProps}
       className={className}
       data-size={size}
       data-has-gradient={hasGradient}
@@ -213,26 +225,30 @@ const Carousel = forwardRef<CarouselHandlerRef, CarouselProps>(function Render(
       data-scroll-snap-align={snapAlign}
       data-can-prev={canPrev}
       data-can-next={canNext}
+      data-focus-visible-within={rootFocusVisible || undefined}
       role="region"
       aria-roledescription="carousel"
       aria-label="Carousel"
     >
-      <div className="charcoal-carousel__viewport">
+      {/* フォーカスリングは viewport に描く（理由は index.css の同セレクタ参照） */}
+      <div
+        className="charcoal-carousel__viewport"
+        data-focus-visible={scrollerFocusVisible || undefined}
+      >
         <div
           {...mergeProps(scrollerFocusProps, keyboardProps)}
           ref={scrollerRef}
           className="charcoal-carousel__scroller"
           tabIndex={0}
-          data-focus-visible={scrollerFocusVisible || undefined}
         >
-          {props.items.map((item, i) => (
+          {slides.map((slide, i) => (
             <CarouselSlide
-              key={item.id}
+              key={slideKeys[i]}
               index={i}
               store={store}
               onResize={onItemResize}
             >
-              {item.children}
+              {slide}
             </CarouselSlide>
           ))}
         </div>
@@ -260,9 +276,9 @@ const Carousel = forwardRef<CarouselHandlerRef, CarouselProps>(function Render(
         data-visible={showIndicator}
         aria-hidden={!showIndicator}
       >
-        {props.items.map((item, i) => (
+        {slides.map((_, i) => (
           <CarouselIndicatorItem
-            key={item.id}
+            key={slideKeys[i]}
             index={i}
             isActive={i === activeIndex}
             onSelect={scrollToItem}

package/src/components/Carousel/useCarouselScroller.ts

@@ -1,16 +1,8 @@
-import {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useRef,
-  type RefObject,
-} from 'react'
+import { useCallback, useEffect, useRef, type RefObject } from 'react'
+import { useIsomorphicLayoutEffect } from '../../_lib/useIsomorphicLayoutEffect'
 import type { CarouselStore } from './carouselStore'
 import type { ScrollAlign, ScrollStep } from './index'
 
-const useIsomorphicLayoutEffect =
-  typeof window !== 'undefined' ? useLayoutEffect : useEffect
-
 const INTERACTION_EVENTS = ['pointerdown', 'wheel', 'touchstart'] as const
 
 export type CarouselScrollerOptions = Readonly<{
@@ -74,8 +66,12 @@ export function useCarouselScroller(
         left = maxScroll + offset
         break
     }
-    // eslint-disable-next-line react-compiler/react-compiler
-    el.scrollLeft = Math.max(0, Math.min(left, maxScroll))
+    // scrollLeft 代入は CSS の scroll-behavior: smooth の対象になり
+    // 初期位置決めがアニメーションしてしまうため、instant で確定させる。
+    el.scrollTo({
+      left: Math.max(0, Math.min(left, maxScroll)),
+      behavior: 'instant',
+    })
   }, [scrollerRef, align, offset])
 
   // canPrev/canNext: scroll で更新。onScroll もここから発火。itemCount 変化で貼り直し。

package/src/components/FieldLabel/__snapshots__/index.css.snap

@@ -3,7 +3,7 @@
   line-height: 22px;
   font-weight: bold;
   display: flow-root;
-  color: var(--charcoal-color-text-default);
+  color: var(--charcoal-color-text-default-text1);
 }
 
 .charcoal-field-label-required-text {

package/src/components/FieldLabel/index.css

@@ -3,7 +3,7 @@
   line-height: 22px;
   font-weight: bold;
   display: flow-root;
-  color: var(--charcoal-color-text-default);
+  color: var(--charcoal-color-text-default-text1);
 }
 
 .charcoal-field-label-required-text {

package/src/components/IconButton/__snapshots__/index.css.snap

@@ -54,7 +54,7 @@
 
 .charcoal-icon-button[data-variant='Default'] {
   color: var(--charcoal-color-icon-tertiary-default);
-  background-color: var(--charcoal-color-container-default-a);
+  background-color: transparent;
 }
 
 .charcoal-icon-button[data-variant='Default'][data-active='true']:not(:disabled):not([aria-disabled]), .charcoal-icon-button[data-variant='Default'][data-active='true'][aria-disabled='false'] {

package/src/components/IconButton/index.css

@@ -56,7 +56,7 @@
 
   &[data-variant='Default'] {
     color: var(--charcoal-color-icon-tertiary-default);
-    background-color: var(--charcoal-color-container-default-a);
+    background-color: transparent;
 
     &[data-active='true']:not(:disabled):not([aria-disabled]),
     &[data-active='true'][aria-disabled='false'] {

package/src/components/Modal/__snapshots__/index.css.snap

@@ -19,6 +19,38 @@
 }
 }
 
+/* easeOutQuart。duration は useTransitionPresence の MODAL_TRANSITION_DURATION_MS と一致させること。
+   transition は entering / exiting に限定し、開いたままテーマ切り替え等で
+   色や transform が変わってもアニメーションしないようにする */
+
+.charcoal-modal-background[data-animation] {
+  overflow: hidden;
+}
+
+.charcoal-modal-background[data-animation='entering'], .charcoal-modal-background[data-animation='exiting'] {
+  transition: background-color 400ms cubic-bezier(0.25, 1, 0.5, 1);
+}
+
+/* 閉じアニメーション中はクリックを下のページへ通す（transitionend が来ない環境で
+   透明なオーバーレイがタップを奪い続けるのも防ぐ） */
+
+.charcoal-modal-background[data-animation='exited'], .charcoal-modal-background[data-animation='exiting'] {
+  background-color: transparent;
+  pointer-events: none;
+}
+
+.charcoal-modal-background[data-animation='entered'] {
+  overflow: auto;
+}
+
+.charcoal-modal-background[data-animation='entering'] > .charcoal-modal-dialog, .charcoal-modal-background[data-animation='exiting'] > .charcoal-modal-dialog {
+  transition: transform 400ms cubic-bezier(0.25, 1, 0.5, 1);
+}
+
+.charcoal-modal-background[data-animation='exited'] > .charcoal-modal-dialog, .charcoal-modal-background[data-animation='exiting'] > .charcoal-modal-dialog {
+  transform: translateY(100%);
+}
+
 .charcoal-modal-close-button {
   position: absolute;
   top: 8px;
@@ -32,4 +64,3 @@
   font-weight: inherit;
   font-size: inherit;
 }
-