Skip to content

fix(mobile): hide non-positive DotCount values #793

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

Open
tallyhuhu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(mobile): hide non-positive DotCount values #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions packages/mobile/src/dots/DotCount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export const DotCount = memo((_props: DotCountProps) => {

const opacityAnimatedValue = useSharedValue(opacityEnter.fromValue);
const scaleAnimatedValue = useSharedValue(scaleEnter.fromValue);
const [shouldUnmount, setShouldUnmount] = useState(count === 0);
const [shouldUnmount, setShouldUnmount] = useState(count <= 0);
const [countInternal, setCountInternal] = useState(count);
const prevCount = usePreviousValue<number>(count);

Expand All @@ -163,9 +163,9 @@ export const DotCount = memo((_props: DotCountProps) => {
return {};
}, [pin, transforms]);

// avoid displaying 0 during animations and preserve exit animation
// avoid displaying non-positive counts during animations and preserve exit animation
useEffect(() => {
if (count !== 0) {
if (count > 0) {
setCountInternal(count);
}
}, [count]);
Expand All @@ -174,14 +174,14 @@ export const DotCount = memo((_props: DotCountProps) => {
() => count,
(result) => {
// play enter animation
if ((prevCount === 0 || prevCount === undefined) && result > 0) {
if ((prevCount === undefined || prevCount <= 0) && result > 0) {
runOnJS(setShouldUnmount)(false);
opacityAnimatedValue.value = withMotionTiming(opacityEnter);
scaleAnimatedValue.value = withMotionTiming(scaleEnter);
}

// play exit animation
if (prevCount && prevCount > 0 && result === 0) {
if (prevCount !== undefined && prevCount > 0 && result <= 0) {
opacityAnimatedValue.value = withMotionTiming(opacityExit, () => {
runOnJS(setShouldUnmount)(true);
});
Expand Down
6 changes: 3 additions & 3 deletions packages/mobile/src/dots/__tests__/DotCount.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ describe('DotCount', () => {
expect(screen.getByText('1')).toBeTruthy();
});

it('renders correct count when count 0', () => {
renderDotCount({ count: 0, testID: DOTCOUNT_TESTID, variant: 'negative' });
it.each([0, -1])('does not render when count is %s', (count) => {
renderDotCount({ count, testID: DOTCOUNT_TESTID, variant: 'negative' });
triggerChildrenLayout();

expect(screen.queryByText('0')).toBeNull();
expect(screen.queryByText(String(count))).toBeNull();
});

it('passes a11y for 0 counter', () => {
Expand Down
Loading