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.

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

Mobile: Fixes #11028: Accessibility: Fix sidebar broken in right-to-left mode, improve screen reader accessibility #11056

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Avoid animations when reduceMotion is enabled
  • Loading branch information
personalizedrefrigerator committed Sep 15, 2024
commit 24e4ed2e2e7399835e707260d255e1833760d390
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@ packages/app-mobile/utils/fs-driver/testUtil/createFilesFromPathRecord.js
packages/app-mobile/utils/fs-driver/testUtil/verifyDirectoryMatches.js
packages/app-mobile/utils/getPackageInfo.js
packages/app-mobile/utils/getVersionInfoText.js
packages/app-mobile/utils/hooks/useReduceMotionEnabled.js
packages/app-mobile/utils/image/fileToImage.web.js
packages/app-mobile/utils/image/getImageDimensions.js
packages/app-mobile/utils/image/resizeImage.js
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@ packages/app-mobile/utils/fs-driver/testUtil/createFilesFromPathRecord.js
packages/app-mobile/utils/fs-driver/testUtil/verifyDirectoryMatches.js
packages/app-mobile/utils/getPackageInfo.js
packages/app-mobile/utils/getVersionInfoText.js
packages/app-mobile/utils/hooks/useReduceMotionEnabled.js
packages/app-mobile/utils/image/fileToImage.web.js
packages/app-mobile/utils/image/getImageDimensions.js
packages/app-mobile/utils/image/resizeImage.js
Expand Down
7 changes: 6 additions & 1 deletion packages/app-mobile/components/SideMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { State } from '@joplin/lib/reducer';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import AccessibleView from './accessibility/AccessibleView';
import { _ } from '@joplin/lib/locale';
import useReduceMotionEnabled from '../utils/hooks/useReduceMotionEnabled';

export enum SideMenuPosition {
Left = 'left',
Expand Down Expand Up @@ -128,11 +129,15 @@ const useAnimations = ({ onSliding, openMenuOffset, isLeftMenu, open }: UseAnima
return result;
}, [menuDragOffset, basePositioningFraction, openMenuOffset, isLeftMenu]);

const reduceMotionEnabled = useReduceMotionEnabled();
const reduceMotionEnabledRef = useRef(false);
reduceMotionEnabledRef.current = reduceMotionEnabled;

const menuUpdateAnimationRef = useRef<Animated.CompositeAnimation>(null);
const updateMenuPosition = useCallback(() => {
const baseAnimationProps = {
easing: Easing.ease,
duration: 200,
duration: reduceMotionEnabledRef.current ? 0 : 300,
useNativeDriver: true,
};
setIsAnimating(true);
Expand Down
19 changes: 19 additions & 0 deletions packages/app-mobile/utils/hooks/useReduceMotionEnabled.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import useAsyncEffect from '@joplin/lib/hooks/useAsyncEffect';
import { useEffect, useState } from 'react';
import { AccessibilityInfo } from 'react-native';

const useReduceMotionEnabled = () => {
const [reduceMotionEnabled, setReduceMotionEnabled] = useState(false);
useEffect(() => {
AccessibilityInfo.addEventListener('reduceMotionChanged', (enabled) => {
setReduceMotionEnabled(enabled);
});
}, []);
useAsyncEffect(async () => {
setReduceMotionEnabled(await AccessibilityInfo.isReduceMotionEnabled());
}, []);

return reduceMotionEnabled;
};

export default useReduceMotionEnabled;