Merge pull request #494 from pixiv/mimo/fix-multiselect

Replace multiselect icon with icon component
pixiv · Mar 25, 2024 · 062ae3b · 062ae3b
2 parents c6a4d6a + 23e4802
commit 062ae3b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.storybook/test-runner.ts b/.storybook/test-runner.ts
@@ -13,8 +13,6 @@ const config: TestRunnerConfig = {
       customSnapshotIdentifier: context.id,
       customDiffDir: `${process.cwd()}/__diff_output__`,
       customSnapshotsDir: `${process.cwd()}/__image_snapshots__`,
-      failureThresholdType: 'percent',
-      failureThreshold: 0.0001,
     })
   },
   tags: {

diff --git a/jest.setup.ts b/jest.setup.ts
@@ -8,6 +8,15 @@ globalThis.ResizeObserver = jest.fn().mockImplementation(() => ({
   disconnect: jest.fn(),
 }))
 
+global.IntersectionObserver = jest.fn().mockImplementation(() => ({
+  observe() {
+    return null
+  },
+  disconnect() {
+    return null
+  },
+}))
+
 window.matchMedia = jest.fn().mockImplementation((query: string) => ({
   matches: false,
   media: query,

diff --git a/packages/react/src/components/MultiSelect/index.tsx b/packages/react/src/components/MultiSelect/index.tsx
@@ -6,6 +6,7 @@ import { px } from '@charcoal-ui/utils'
 
 import { MultiSelectGroupContext } from './context'
 import { focusVisibleFocusRingCss } from '@charcoal-ui/styled'
+import Icon from '../Icon'
 
 export type MultiSelectProps = React.PropsWithChildren<{
   value: string
@@ -76,7 +77,7 @@ const MultiSelect = forwardRef<HTMLInputElement, MultiSelectProps>(
           invalid={invalid}
           aria-hidden={true}
         >
-          <pixiv-icon name="24/Check" unsafe-non-guideline-scale={16 / 24} />
+          <Icon name="24/Check" unsafe-non-guideline-scale={16 / 24} />
         </MultiSelectInputOverlay>
         {Boolean(children) && <MultiSelectLabel>{children}</MultiSelectLabel>}
       </MultiSelectRoot>