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(app): fix Touchscreen Sleep scrolling issue #12992

Merged
merged 2 commits into from
Jun 28, 2023
Merged

fix(app): fix Touchscreen Sleep scrolling issue #12992

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20c1dfa
fix(app): fix Touchscreen Sleep scrolling issue
koji Jun 27, 2023
e5cad65
to avoid test error for scrollIntoView
koji Jun 28, 2023
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
8 changes: 6 additions & 2 deletions app/src/organisms/RobotSettingsDashboard/TouchScreenSleep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ export function TouchScreenSleep({
setCurrentOption,
}: TouchScreenSleepProps): JSX.Element {
const { t } = useTranslation(['device_settings'])
// ToDo (kj:02/06/2023) This will be replaced config value via redux
const { sleepMs } = useSelector(getOnDeviceDisplaySettings) ?? SLEEP_NEVER_MS
const dispatch = useDispatch<Dispatch>()
const screenRef = React.useRef<HTMLDivElement | null>(null)

// Note (kj:02/10/2023) value's unit is ms
const settingsButtons = [
Expand All @@ -49,8 +49,12 @@ export function TouchScreenSleep({
)
}

React.useEffect(() => {
if (screenRef.current != null) screenRef.current.scrollIntoView()
}, [])

return (
<Flex flexDirection={DIRECTION_COLUMN}>
<Flex flexDirection={DIRECTION_COLUMN} ref={screenRef}>
<ChildNavigation
header={t('touchscreen_sleep')}
onClickBack={() => setCurrentOption(null)}
Expand Down