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(modal): backdrop animation when backdropBreakpoint is 1 #25430

Merged
merged 11 commits into from
Jun 13, 2022
Merged

fix(modal): backdrop animation when backdropBreakpoint is 1 #25430

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b4d9725
fix(modal): backdrop animation when backdropBreakpoint is 1
sean-perkins Jun 7, 2022
3938613
test(modal): getBackdropValueForSheet returns valid integer
sean-perkins Jun 8, 2022
83a639a
chore(): prettier
sean-perkins Jun 8, 2022
cbc6a7a
chore(): update documentation
sean-perkins Jun 8, 2022
d8c4efe
Merge branch 'main' into FW-1650
sean-perkins Jun 8, 2022
6ca16aa
Merge branch 'main' into FW-1650
sean-perkins Jun 8, 2022
a864fc1
fix(modal): backdrop flickering
sean-perkins Jun 10, 2022
1e4eab6
Merge branch 'main' into FW-1650
sean-perkins Jun 10, 2022
cc4e3dc
test(): update test to check for backdropBreakpoint of 1
sean-perkins Jun 10, 2022
0cd2f3e
Merge remote-tracking branch 'origin/FW-1650' into FW-1650
sean-perkins Jun 10, 2022
598e052
Merge branch 'main' into FW-1650
sean-perkins Jun 13, 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
13 changes: 13 additions & 0 deletions core/src/components/modal/utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { getBackdropValueForSheet } from './utils';

describe('getBackdropValueForSheet()', () => {
it('should return a valid integer when backdropBreakpoint is 1', () => {
/**
* Issue: https://github.com/ionic-team/ionic-framework/issues/25402
*/
const backdropBreakpoint = 1;
expect(getBackdropValueForSheet(1, backdropBreakpoint)).toBe(0);
expect(getBackdropValueForSheet(5, backdropBreakpoint)).toBe(4);
expect(getBackdropValueForSheet(10, backdropBreakpoint)).toBe(9);
});
});
5 changes: 4 additions & 1 deletion core/src/components/modal/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ export const getBackdropValueForSheet = (x: number, backdropBreakpoint: number)
*
* This is simplified from:
* m = (1 - 0) / (maxBreakpoint - backdropBreakpoint)
*
* We prevent the slope from being greater than 1, since with a backdropBreakpoint
* value of 1, the slope would evaluate to Infinity.
*/
const slope = 1 / (1 - backdropBreakpoint);
const slope = Math.min(1 / (1 - backdropBreakpoint), 1);

/**
* From here, compute b which is
Expand Down