Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Return focus to feedback button #1941

Merged
merged 6 commits into from
Jul 19, 2022
Merged

Fix: Return focus to feedback button #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9b2c49
return focus to feedback button
Onokaev Jul 14, 2022
240c49c
add space
Onokaev Jul 14, 2022
d0c9079
Merge branch 'dev' into fix/return-focus-to-button
Onokaev Jul 18, 2022
a6a717b
add focus to feedback button
Onokaev Jul 18, 2022
8ccc330
remove extra spaces
Onokaev Jul 18, 2022
0270e57
fix code smells
Onokaev Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/app/views/main-header/FeedbackButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getTheme, IconButton, IIconProps, TooltipHost } from '@fluentui/react';
import React, { useState } from 'react';
import { getTheme, IButton, IconButton, IIconProps, TooltipHost } from '@fluentui/react';
import React, { useState, useEffect } from 'react';
import { translateMessage } from '../../utils/translate-messages';
import { useSelector } from 'react-redux';
import FeedbackForm from '../query-runner/request/feedback/FeedbackForm';
Expand All @@ -17,6 +17,18 @@ export const FeedbackButton = () => {
const feedbackTitle = translateMessage('Feedback');
const content = <div style={{padding:'3px'}}>{translateMessage('Feedback')}</div>

const feedbackButtonRef = React.useRef<IButton>(null)
const isFirstRender = React.useRef(true);
useEffect( () => {
if (isFirstRender.current) {
isFirstRender.current = false;
return;
}
if(!enableSurvey){
feedbackButtonRef.current?.focus();
}
},[enableSurvey])

const feedbackIconStyles = {
root:{
height: '50px',
Expand Down Expand Up @@ -66,6 +78,7 @@ export const FeedbackButton = () => {
styles={feedbackIconStyles}
role={'button'}
disabled={enableSurvey}
componentRef={feedbackButtonRef}
/>
</TooltipHost>

Expand Down
1 change: 1 addition & 0 deletions src/app/views/main-header/MainHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const MainHeader: React.FunctionComponent <MainHeaderProps> = (props: Mai
feedbackIconAdjustmentStyles, tenantIconStyles, moreInformationStyles,
tenantLabelStyle, tenantContainerStyle } = mainHeaderStyles(currentTheme, mobileScreen);


return (
<Stack tokens={sectionStackTokens}>
<Stack
Expand Down