From 723ec9c6bf116930e82e38a1e0fe6fb4c54f06a0 Mon Sep 17 00:00:00 2001 From: Caleb Guanzon Date: Thu, 8 Oct 2020 12:06:34 -0600 Subject: [PATCH] add tooltip to PronounsInput flag=none fixes VICE-771 test plan: - visit /accounts/self/settings - scroll down and enable personal pronouns - hover over info icon - verify tooltip shows 'These pronouns will be available to Canvas users in your account to choose from.' Change-Id: Ie46b06eb306930161eec8fab5cec57c1b7c7137a Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/249634 Tested-by: Service Cloud Jenkins Reviewed-by: Davis Hyer QA-Review: Davis Hyer Product-Review: Davis Hyer --- app/jsx/account_settings/PronounsInput.js | 18 +++++++++++++++--- .../__tests__/pronoun_input.test.js | 11 +++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/jsx/account_settings/PronounsInput.js b/app/jsx/account_settings/PronounsInput.js index 9131ca2c19c..d6b9a7835e7 100644 --- a/app/jsx/account_settings/PronounsInput.js +++ b/app/jsx/account_settings/PronounsInput.js @@ -22,6 +22,8 @@ import {Text} from '@instructure/ui-text' import {TextInput} from '@instructure/ui-text-input' import {nanoid} from 'nanoid' import {IconInfoLine} from '@instructure/ui-icons' +import {ScreenReaderContent} from '@instructure/ui-a11y' +import {Tooltip} from '@instructure/ui-tooltip' import I18n from 'i18n!PronounsInput' export default class PronounsInput extends React.Component { @@ -65,6 +67,9 @@ export default class PronounsInput extends React.Component { } render() { + const infoToolTip = I18n.t( + 'These pronouns will be available to Canvas users in your account to choose from.' + ) return ( {I18n.t('Available Pronouns')} - - - + + + + {infoToolTip} + + } size="medium" diff --git a/app/jsx/account_settings/__tests__/pronoun_input.test.js b/app/jsx/account_settings/__tests__/pronoun_input.test.js index b4c15a341b7..2a21fdf81aa 100644 --- a/app/jsx/account_settings/__tests__/pronoun_input.test.js +++ b/app/jsx/account_settings/__tests__/pronoun_input.test.js @@ -25,6 +25,17 @@ describe('render available pronouns input', () => { ENV.PRONOUNS_LIST = ['She/Her', 'He/Him', 'They/Them'] }) + it('renders tooltip when focused', () => { + const {getAllByText, getByTestId} = render() + const icon = getByTestId('pronoun_info') + fireEvent.focus(icon) + expect( + getAllByText( + 'These pronouns will be available to Canvas users in your account to choose from.' + )[0] + ).toBeVisible() + }) + it('with defaults in view', () => { const {getByText} = render() expect(getByText('She/Her')).toBeVisible()