diff --git a/src/lib/__tests__/turnstone.test.jsx b/src/lib/__tests__/turnstone.test.jsx index 425448c..f76db68 100644 --- a/src/lib/__tests__/turnstone.test.jsx +++ b/src/lib/__tests__/turnstone.test.jsx @@ -9,7 +9,7 @@ describe('Integration tests', () => { afterEach(cleanup) test('Minimal render includes expected elements', () => { - const placeholder = 'Test placeholder' + const placeholder = 'test' render( { placeholder={placeholder} />) + const input = screen.getByPlaceholderText(placeholder) + expect(screen.getByRole('combobox')) - expect(screen.getByPlaceholderText(placeholder)).toBeDefined() + expect(input).toBeDefined() + expect(input.hasAttribute('disabled')).toBe(false) expect(screen.queryByText('listbox')).toBeNull().toBeDefined() expect(screen.queryByRole('button', { name: /clear contents/i })).toBeNull() }) @@ -51,6 +54,22 @@ describe('Integration tests', () => { expect(screen.queryByRole('button', { name: /clear contents/i })).toBeDefined() }) + test('Supplying a disabled prop disables the input', () => { + const placeholder = 'test' + + render() + + const input = screen.getByPlaceholderText(placeholder) + + expect(input).toBeDefined() + expect(input.hasAttribute('disabled')).toBe(true) + }) + test('Changing the typed text produces the expected dropdown results', async () => { const placeholder = 'test' diff --git a/src/lib/components/container.jsx b/src/lib/components/container.jsx index b4569fc..4f2fe16 100644 --- a/src/lib/components/container.jsx +++ b/src/lib/components/container.jsx @@ -31,11 +31,11 @@ export default function Container(props) { debounceWait, defaultItemGroups, defaultItemGroupsAreImmutable, + disabled, displayField, data, dataSearchType, id, - isDisabled, itemGroupsAreImmutable, maxItems, minQueryLength, @@ -201,7 +201,7 @@ export default function Container(props) { name={name} className={customStyles.query} style={defaultStyles.query} - disabled={isDisabled} + disabled={disabled} placeholder={placeholder} type='text' autoComplete='off' @@ -221,7 +221,7 @@ export default function Container(props) { { diff --git a/src/lib/index.test.jsx b/src/lib/index.test.jsx index 4a88444..2a73d69 100644 --- a/src/lib/index.test.jsx +++ b/src/lib/index.test.jsx @@ -36,7 +36,7 @@ describe('Turnstone', () => { clearButtonText: '×', debounceWait: 250, defaultItemGroupsAreImmutable: true, - isDisabled: false, + disabled: false, itemGroupsAreImmutable: true, maxItems: 10, minQueryLength: 1,