@telus-uds/components-base 0.0.2-prerelease.6 → 1.0.0

package/__tests__/ActivityIndicator/ActivityIndicator.test.jsx

@@ -4,7 +4,7 @@ import Theme from '../../__fixtures__/Theme'
 import ActivityIndicator from '../../src/ActivityIndicator'
 
 // Used to remove the "Animated: `useNativeDriver` is not supported because the native animated module is missing." warnings
-jest.mock('react-native/Libraries/Animated/src/NativeAnimatedHelper')
+jest.mock('react-native/Libraries/Animated/NativeAnimatedHelper')
 
 const render = (jsx) => baseRender(jsx, { wrapper: Theme })
 

package/__tests__/Button/ButtonBase.test.jsx

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import React from 'react'
 import { render } from '@testing-library/react-native'
 import { Platform, Text } from 'react-native'
@@ -9,41 +8,13 @@ import ButtonBase from '../../src/Button/ButtonBase'
 
 beforeEach(() => jest.clearAllMocks())
 
-describe('ButtonBase', () => {
-  it('throws if both href and onPress are provided', async () => {
-    jest.spyOn(console, 'error').mockImplementation()
-    expect(() =>
-      render(
-        <Theme>
-          <ButtonBase href="example.com" onPress={jest.fn()}>
-            click me
-          </ButtonBase>
-        </Theme>
-      )
-    ).toThrow()
-    expect(console.error).toHaveBeenCalledTimes(1)
-  })
-
-  it('throws if neither href nor onPress are provided', async () => {
-    jest.spyOn(console, 'error').mockImplementation()
-    expect(() =>
-      render(
-        <Theme>
-          <ButtonBase>click me</ButtonBase>
-        </Theme>
-      )
-    ).toThrow()
-    expect(console.error).toHaveBeenCalledTimes(1)
-  })
-})
-
 describe('ButtonBase with render function child', () => {
-  it('receives text styles in render function from button theme', () => {
+  it('receives tokens in render function child', () => {
     const { tokens } = testTheme.components.Button
     const arbitraryWeight = '300'
     const { getByText } = render(
       <Theme>
-        <ButtonBase onPress={() => {}} tokens={{ fontWeight: arbitraryWeight }}>
+        <ButtonBase onPress={() => {}} tokens={{ ...tokens, fontWeight: arbitraryWeight }}>
           {({ textStyles }) => <Text style={textStyles}>Function child</Text>}
         </ButtonBase>
       </Theme>

package/__tests__/Button/ButtonGroup.test.jsx

@@ -106,7 +106,7 @@ describe('ButtonGroup (uncontrolled)', () => {
       </Theme>
     )
     expect(queryAllByA11yRole('checkbox')).toHaveLength(0)
-    expect(queryAllByA11yRole('radioGroup')).toHaveLength(1)
+    expect(queryAllByA11yRole('radiogroup')).toHaveLength(1)
     const radios = queryAllByA11yRole('radio')
     expect(radios).toHaveLength(4)
 
@@ -158,7 +158,7 @@ describe('ButtonGroup (uncontrolled)', () => {
       </Theme>
     )
 
-    expect(queryAllByA11yRole('radioGroup')).toHaveLength(0)
+    expect(queryAllByA11yRole('radiogroup')).toHaveLength(0)
     expect(queryAllByA11yRole('radio')).toHaveLength(0)
 
     const checks = queryAllByA11yRole('checkbox')
@@ -253,15 +253,14 @@ describe('ButtonGroup (controlled)', () => {
     expect(handleChange).toHaveBeenCalledTimes(0)
 
     const one = getByText('One')
-    await fireEvent.press(one)
+    await fireEvent(one, 'press', { nativeEvent: 'example' })
     expect(handleChange).toHaveBeenCalledTimes(1)
-
-    expect(handleChange.mock.calls[0][0]).toEqual(['one'])
+    expect(handleChange).toHaveBeenLastCalledWith(['one'], { nativeEvent: 'example' })
 
     const two = getByText('Two')
-    await fireEvent.press(two)
+    await fireEvent(two, 'press', { nativeEvent: 'example2' })
     expect(handleChange).toHaveBeenCalledTimes(2)
-    expect(handleChange.mock.calls[1][0]).toEqual(['two'])
+    expect(handleChange).toHaveBeenLastCalledWith(['two'], { nativeEvent: 'example2' })
   })
 
   it("Doesn't change its own selection if `values` is passed", async () => {

package/__tests__/Checkbox/Checkbox.test.jsx

@@ -0,0 +1,94 @@
+import React from 'react'
+import { fireEvent, render } from '@testing-library/react-native'
+
+import { Checkbox } from '../../src'
+import Theme from '../../__fixtures__/Theme'
+
+const checkedId = 'Checkbox-Icon'
+const inputId = 'Checkbox-Input'
+const setup = (props) =>
+  render(
+    <Theme>
+      <Checkbox {...props} />
+    </Theme>
+  )
+
+describe('Checkbox', () => {
+  it('renders with defaults', () => {
+    const { getByRole } = setup()
+
+    expect(getByRole('checkbox')).toBeTruthy()
+  })
+
+  it('renders the label', () => {
+    const label = 'Test label message'
+    const { queryByText } = setup({ label })
+
+    expect(queryByText(label)).toBeTruthy()
+  })
+
+  it('renders the feedback', () => {
+    const feedback = 'Test feedback message'
+    const { queryByText } = setup({ feedback })
+
+    expect(queryByText(feedback)).toBeTruthy()
+  })
+
+  it('renders error styling on validation failure', () => {
+    const errorBorderColor = '#e12339' // from __fixtures__/testTheme.js
+    const { getByTestId } = setup({ error: true })
+
+    const checkboxInput = getByTestId(inputId)
+    expect(checkboxInput).toHaveStyle({ borderColor: errorBorderColor })
+  })
+
+  it('triggers the callback', () => {
+    const onChange = jest.fn()
+
+    const { getByRole } = setup({ onChange })
+
+    const checkbox = getByRole('checkbox')
+    expect(onChange).not.toHaveBeenCalled()
+    fireEvent(checkbox, 'press')
+    expect(onChange).toHaveBeenCalledTimes(1)
+  })
+
+  it('cannot be changed if inactive', () => {
+    const { getByRole, queryByTestId } = setup({ inactive: true })
+
+    const checkbox = getByRole('checkbox')
+    expect(queryByTestId(checkedId)).toBeFalsy()
+    fireEvent(checkbox, 'press')
+    expect(queryByTestId(checkedId)).toBeFalsy()
+  })
+
+  describe('when uncontrolled', () => {
+    it('uses `defaultChecked` as the initial value', () => {
+      const { queryByTestId } = setup({ defaultChecked: true })
+
+      expect(queryByTestId(checkedId)).toBeTruthy()
+    })
+
+    it('changes value', () => {
+      const { getByRole, queryByTestId } = setup({ defaultChecked: false })
+
+      const checkbox = getByRole('checkbox')
+      expect(queryByTestId(checkedId)).toBeFalsy()
+      fireEvent(checkbox, 'press')
+      expect(queryByTestId(checkedId)).toBeTruthy()
+    })
+  })
+
+  describe('when controlled', () => {
+    it('calls `onChange` with the new value', () => {
+      const onChange = jest.fn()
+      const { getByRole, queryByTestId } = setup({ onChange, checked: false })
+
+      const checkbox = getByRole('checkbox')
+      expect(queryByTestId(checkedId)).toBeFalsy()
+      fireEvent(checkbox, 'press', { nativeEvent: 'example' })
+      expect(onChange).toHaveBeenCalledTimes(1)
+      expect(onChange).toHaveBeenCalledWith(true, { nativeEvent: 'example' })
+    })
+  })
+})

package/__tests__/Checkbox/CheckboxGroup.test.jsx

@@ -0,0 +1,246 @@
+import React from 'react'
+import { render, fireEvent } from '@testing-library/react-native'
+import { toHaveTextContent } from '@testing-library/jest-native'
+
+import Theme from '../../__fixtures__/Theme'
+import CheckboxGroup from '../../src/Checkbox/CheckboxGroup'
+
+const items = [
+  { label: 'One', id: 'one' },
+  { label: 'Two', id: 'two' },
+  { label: 'Three', id: 'three' },
+  { label: 'Four', id: 'four' }
+]
+const checked = { checked: true }
+
+// expect().toHaveTextContent doesn't work on arrays, expect().toContain etc doesn't match elements
+const containsText = (queryResult, text) =>
+  queryResult.some((testInstance) => toHaveTextContent(testInstance, text).pass)
+
+describe('CheckboxGroup', () => {
+  // eslint-disable-next-line no-console
+  const consoleError = console.error
+  beforeEach(() => {
+    // eslint-disable-next-line no-console
+    console.error = () => {}
+  })
+  afterEach(() => {
+    // eslint-disable-next-line no-console
+    console.error = consoleError
+  })
+
+  it('Throws if has `checkedIds` without `onChange`', () => {
+    expect(() =>
+      render(
+        <Theme>
+          <CheckboxGroup items={items} checkedIds={['one']} />
+        </Theme>
+      )
+    ).toThrow(/values.+without.+onChange/)
+  })
+  it("Doesn't throw if has `checkedIds` without `onChange` and is read only", () => {
+    expect(() =>
+      render(
+        <Theme>
+          <CheckboxGroup items={items} checkedIds={['one']} readOnly />
+        </Theme>
+      )
+    ).not.toThrow()
+  })
+  it('Throws if has both `checkedIds` and `initialCheckedIds`', () => {
+    expect(() =>
+      render(
+        <Theme>
+          <CheckboxGroup
+            items={items}
+            checkedIds={['one']}
+            initialCheckedIds={['one']}
+            onChange={() => {}}
+          />
+        </Theme>
+      )
+    ).toThrow(/both(?=.*initialValues)(?=.*values){2}/)
+  })
+})
+
+describe('CheckboxGroup (uncontrolled)', () => {
+  it('Selects unlimited items', async () => {
+    const { getByText, queryAllByA11yState } = render(
+      <Theme>
+        <CheckboxGroup items={items} />
+      </Theme>
+    )
+
+    expect(queryAllByA11yState(checked)).toHaveLength(0)
+
+    const one = getByText('One')
+    await fireEvent.press(one)
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const two = getByText('Two')
+    await fireEvent.press(two)
+    expect(queryAllByA11yState(checked)).toHaveLength(2)
+    expect(containsText(queryAllByA11yState(checked), 'Two')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const three = getByText('Three')
+    await fireEvent.press(three)
+    expect(queryAllByA11yState(checked)).toHaveLength(3)
+    expect(containsText(queryAllByA11yState(checked), 'Three')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'Two')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const four = getByText('Four')
+    await fireEvent.press(four)
+    expect(queryAllByA11yState(checked)).toHaveLength(4)
+    expect(containsText(queryAllByA11yState(checked), 'Four')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'Three')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'Two')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+  })
+
+  it('Deselects if the selected item is pressed', async () => {
+    const { getByText, queryAllByA11yState } = render(
+      <Theme>
+        <CheckboxGroup items={items} />
+      </Theme>
+    )
+
+    expect(queryAllByA11yState(checked)).toHaveLength(0)
+
+    const three = getByText('Three')
+    await fireEvent.press(three)
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'Three')).toBeTruthy()
+
+    await fireEvent.press(three)
+    expect(queryAllByA11yState(checked)).toHaveLength(0)
+    expect(containsText(queryAllByA11yState(checked), 'Three')).not.toBeTruthy()
+  })
+
+  it('Is accessible as checkboxes button', async () => {
+    const { queryAllByA11yRole, queryAllByA11yState } = render(
+      <Theme>
+        <CheckboxGroup items={items} />
+      </Theme>
+    )
+
+    expect(queryAllByA11yRole('radiogroup')).toHaveLength(0)
+    expect(queryAllByA11yRole('radio')).toHaveLength(0)
+
+    const checks = queryAllByA11yRole('checkbox')
+    expect(checks).toHaveLength(4)
+
+    expect(queryAllByA11yState(checked)).toHaveLength(0)
+    await fireEvent.press(checks[0])
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+  })
+
+  it('Auto-selects any provided initialCheckedIds', async () => {
+    const { getByText, queryAllByA11yState } = render(
+      <Theme>
+        <CheckboxGroup items={items} initialCheckedIds={['one', 'two']} />
+      </Theme>
+    )
+    expect(queryAllByA11yState(checked)).toHaveLength(2)
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'Two')).toBeTruthy()
+
+    const three = getByText('Three')
+    await fireEvent.press(three)
+
+    expect(queryAllByA11yState(checked)).toHaveLength(3)
+    expect(containsText(queryAllByA11yState(checked), 'Three')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'Two')).toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+  })
+})
+
+describe('CheckboxGroup (controlled)', () => {
+  it('Calls onChange handler on press in controlled mode, providing pressed id', async () => {
+    const handleChange = jest.fn((arg) => arg)
+    const { getByText } = render(
+      <Theme>
+        <CheckboxGroup items={items} checkedIds={[]} onChange={handleChange} />
+      </Theme>
+    )
+
+    expect(handleChange).toHaveBeenCalledTimes(0)
+
+    const one = getByText('One')
+    await fireEvent(one, 'press', { nativeEvent: 'example' })
+    expect(handleChange).toHaveBeenCalledTimes(1)
+    expect(handleChange).toHaveBeenLastCalledWith(['one'], { nativeEvent: 'example' })
+
+    const two = getByText('Two')
+    await fireEvent(two, 'press', { nativeEvent: 'example2' })
+    expect(handleChange).toHaveBeenCalledTimes(2)
+    expect(handleChange).toHaveBeenLastCalledWith(['two'], { nativeEvent: 'example2' })
+  })
+
+  it("Doesn't change its own selection if `checkedIds` is passed", async () => {
+    const { getByText, queryAllByA11yState } = render(
+      <Theme>
+        <CheckboxGroup items={items} checkedIds={['one']} onChange={() => {}} />
+      </Theme>
+    )
+
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const one = getByText('One')
+    await fireEvent.press(one)
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const two = getByText('Two')
+    await fireEvent.press(two)
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'Two')).not.toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+  })
+})
+
+describe('CheckboxGroup (read-only)', () => {
+  it("Doesn't call onChange handler when read-only", async () => {
+    const handleChange = jest.fn((arg) => arg)
+    const { getByText } = render(
+      <Theme>
+        <CheckboxGroup items={items} checkedIds={[]} onChange={handleChange} readOnly />
+      </Theme>
+    )
+
+    expect(handleChange).toHaveBeenCalledTimes(0)
+
+    const one = getByText('One')
+    await fireEvent.press(one)
+    expect(handleChange).toHaveBeenCalledTimes(0)
+
+    const two = getByText('Two')
+    await fireEvent.press(two)
+    expect(handleChange).toHaveBeenCalledTimes(0)
+  })
+
+  it("Doesn't change its selection on press", async () => {
+    const { getByText, queryAllByA11yState } = render(
+      <Theme>
+        <CheckboxGroup items={items} checkedIds={['one']} readOnly />
+      </Theme>
+    )
+
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const one = getByText('One')
+    await fireEvent.press(one)
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+
+    const two = getByText('Two')
+    await fireEvent.press(two)
+    expect(queryAllByA11yState(checked)).toHaveLength(1)
+    expect(containsText(queryAllByA11yState(checked), 'Two')).not.toBeTruthy()
+    expect(containsText(queryAllByA11yState(checked), 'One')).toBeTruthy()
+  })
+})

package/__tests__/ExpandCollapse/ExpandCollapse.test.jsx

@@ -64,10 +64,10 @@ describe('ExpandCollapse', () => {
     expect(onPress).toHaveBeenCalledTimes(0)
     expect(queryAllByA11yState({ expanded: true }).length).toBe(0)
 
-    await fireEvent.press(getByText('First control'))
+    await fireEvent(getByText('First control'), 'press', { nativeEvent: 'example' })
     expect(queryAllByA11yState({ expanded: true }).length).toBe(1)
     expect(onPress).toHaveBeenCalledTimes(1)
-    expect(onPress).toHaveBeenLastCalledWith(panelId)
+    expect(onPress).toHaveBeenLastCalledWith(panelId, { nativeEvent: 'example' })
   })
 })
 

package/__tests__/HorizontalScroll/HorizontalScroll.test.jsx

@@ -0,0 +1,164 @@
+import React, { useState } from 'react'
+import { Pressable, Text, View } from 'react-native'
+import { fireEvent, render } from '@testing-library/react-native'
+import {
+  getItemPositionLayoutHandler,
+  getItemPositionScrollTarget,
+  useItemPositions
+} from '../../src/HorizontalScroll/itemPositions'
+
+// ScrollViewRef.scrollTo doesn't work in Jest - unit-test the utilities instead
+describe('HorizontalScroll', () => {
+  describe('getItemPositionScrollTarget', () => {
+    const positionsWithoutSpacing = {
+      0: { start: 0, end: 100 },
+      1: { start: 100, end: 200 },
+      2: { start: 200, end: 300 }
+    }
+    const positions = {
+      0: { start: 0, end: 50 },
+      1: { start: 100, end: 150 },
+      2: { start: 200, end: 250 }
+    }
+    it('scrolls to the start of an item rather than chopping it', () => {
+      const x = getItemPositionScrollTarget(150, 300, positionsWithoutSpacing)
+      expect(x).toBe(100)
+    })
+    it('offsets the position by a button clearance', () => {
+      const x = getItemPositionScrollTarget(150, 300, positionsWithoutSpacing, 20)
+      expect(x).toBe(80)
+    })
+    it('scrolls exactly if landing on a gap', () => {
+      const x = getItemPositionScrollTarget(170, 300, positions)
+      expect(x).toBe(170)
+    })
+    it('applies button clearance if landing on a gap', () => {
+      const x = getItemPositionScrollTarget(170, 300, positions, 40)
+      expect(x).toBe(130)
+    })
+    it('does not apply button clearance on reaching the end', () => {
+      const x = getItemPositionScrollTarget(300, 300, positions, 40)
+      expect(x).toBe(300)
+    })
+    it('does not exceed the maximum', () => {
+      const x = getItemPositionScrollTarget(320, 300, positions, 40)
+      expect(x).toBe(300)
+    })
+    it('does not go below 0', () => {
+      const x = getItemPositionScrollTarget(-420, 300, positions, 40)
+      expect(x).toBe(0)
+    })
+  })
+
+  // onLayout also doesn't work naturally in jest
+  describe('getItemPositionLayoutHandler', () => {
+    // Test component using useItemPositions with getItemPositionLayoutHandler
+    // that can be rerendered manually and that outputs itemPositions value
+    const MockComponent = () => {
+      const [num, setNum] = useState()
+      const [{ positions }] = useItemPositions()
+      return (
+        <View>
+          <View testID="onlayout[0]" onLayout={getItemPositionLayoutHandler(positions, 0)} />
+          <View testID="onlayout[1]" onLayout={getItemPositionLayoutHandler(positions, 1)} />
+          <Text testID="output">{JSON.stringify(positions)}</Text>
+          <Pressable testID="rerender" onPress={() => setNum(num + 1)}>
+            <Text>{num}</Text>
+          </Pressable>
+        </View>
+      )
+    }
+    it('gets width and x positions from onLayout events', async () => {
+      const { getByTestId } = render(<MockComponent />)
+
+      // onLayout doesn't work in jest but can be called directly as an event, but we
+      // have to pass the event object. Can't test that it gets them correctly from style
+      await fireEvent(getByTestId('onlayout[0]'), 'layout', {
+        nativeEvent: {
+          layout: {
+            width: 200,
+            x: 0
+          }
+        }
+      })
+      await fireEvent(getByTestId('onlayout[1]'), 'layout', {
+        nativeEvent: {
+          layout: {
+            width: 100,
+            x: 250
+          }
+        }
+      })
+      await fireEvent.press(getByTestId('rerender'))
+      expect(getByTestId('output')).toHaveTextContent(
+        '{"0":{"start":0,"end":200},"1":{"start":250,"end":350}}'
+      )
+    })
+    it('does not cause a rerender from onLayout events alone', async () => {
+      const { getByTestId } = render(<MockComponent />)
+
+      expect(getByTestId('output')).toHaveTextContent('{}')
+      await fireEvent(getByTestId('onlayout[0]'), 'layout', {
+        nativeEvent: {
+          layout: {
+            width: 200,
+            x: 0
+          }
+        }
+      })
+      await fireEvent(getByTestId('onlayout[1]'), 'layout', {
+        nativeEvent: {
+          layout: {
+            width: 100,
+            x: 250
+          }
+        }
+      })
+      expect(getByTestId('output')).toHaveTextContent('{}')
+    })
+  })
+
+  describe('useItemPositions', () => {
+    // Again we're limited in what we can test; we can't test natural onLayout
+    // or page load timing, but we can affirm that calling `setIsReady` after layout
+    // events causes a re-render that can access positions data
+    const IsReadyMockComponent = () => {
+      const [{ positions, setIsReady }] = useItemPositions()
+      return (
+        <View testID="container" onLayout={setIsReady}>
+          <View testID="onlayout[0]" onLayout={getItemPositionLayoutHandler(positions, 0)} />
+          <View testID="onlayout[1]" onLayout={getItemPositionLayoutHandler(positions, 1)} />
+          <Text testID="output">{JSON.stringify(positions)}</Text>
+        </View>
+      )
+    }
+    it('causes a rerender when setIsReady is called', async () => {
+      const { getByTestId } = render(<IsReadyMockComponent />)
+
+      expect(getByTestId('output')).toHaveTextContent('{}')
+      await fireEvent(getByTestId('onlayout[0]'), 'layout', {
+        nativeEvent: {
+          layout: {
+            width: 200,
+            x: 0
+          }
+        }
+      })
+      await fireEvent(getByTestId('onlayout[1]'), 'layout', {
+        nativeEvent: {
+          layout: {
+            width: 100,
+            x: 250
+          }
+        }
+      })
+      await fireEvent(getByTestId('container'), 'layout', {
+        nativeEvent: { layout: {} }
+      })
+
+      expect(getByTestId('output')).toHaveTextContent(
+        '{"0":{"start":0,"end":200},"1":{"start":250,"end":350}}'
+      )
+    })
+  })
+})

package/__tests__/Icon/Icon.test.jsx

@@ -16,7 +16,7 @@ describe('Icon', () => {
   it('gets default styles from theme', () => {
     const { getByTestId } = render(
       <Theme>
-        <Icon IconSvg={InnerComponent} />
+        <Icon icon={InnerComponent} />
       </Theme>
     )
 
@@ -29,7 +29,7 @@ describe('Icon', () => {
   it('gets styles from variant', () => {
     const { getByTestId } = render(
       <Theme>
-        <Icon IconSvg={InnerComponent} variant={{ size: 'small' }} />
+        <Icon icon={InnerComponent} variant={{ size: 'small' }} />
       </Theme>
     )
 
@@ -46,7 +46,7 @@ describe('Icon', () => {
     const props = { tokens: { size: 30 } }
     const { getByTestId } = render(
       <Theme>
-        <Icon IconSvg={InnerComponent} {...props} />
+        <Icon icon={InnerComponent} {...props} />
       </Theme>
     )