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

Jump to bottom

fix(action-sheet): iOS dismiss animation respects safe area #28915

Merged
merged 10 commits into from
Feb 6, 2024
Merged

fix(action-sheet): iOS dismiss animation respects safe area #28915

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
28d6cc1
fix(action-sheet): iOS dismiss animation respects safe area
sean-perkins Jan 30, 2024
2b987f0
revert: reset action sheet top padding for iOS to 0
sean-perkins Jan 30, 2024
a0da1ef
test: set height with safe area to avoid visual diff
sean-perkins Jan 30, 2024
4ffbccb
chore(): add updated snapshots
Ionitron Jan 30, 2024
d8c7919
fix: set top safe area as margin
sean-perkins Jan 30, 2024
b62cc27
Merge branch 'sp/FW-5608' of https://github.com/ionic-team/ionic-fram…
sean-perkins Jan 30, 2024
fe0aafd
revert: reset to main
sean-perkins Feb 1, 2024
4ba98cc
fix: apply padding to action sheet wrapper
sean-perkins Feb 1, 2024
91c38d7
chore: reset screenshots
sean-perkins Feb 1, 2024
baa80ff
chore: add comment block for padding change
sean-perkins Feb 6, 2024
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
2 changes: 1 addition & 1 deletion core/src/components/action-sheet/action-sheet.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// ---------------------------------------------------

.action-sheet-wrapper {
@include margin(var(--ion-safe-area-top, 0), auto, var(--ion-safe-area-bottom, 0), auto);
@include margin(null, auto);
}

// iOS Action Sheet Container
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/action-sheet/action-sheet.ios.vars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $action-sheet-ios-padding-top: 0 !default;
$action-sheet-ios-padding-end: 8px !default;

/// @prop - Padding bottom of the action sheet
$action-sheet-ios-padding-bottom: $action-sheet-ios-padding-top !default;
$action-sheet-ios-padding-bottom: var(--ion-safe-area-bottom, 0) !default;

/// @prop - Padding start of the action sheet
$action-sheet-ios-padding-start: $action-sheet-ios-padding-end !default;
Expand Down
Binary file modified ...dering.e2e.ts-snapshots/action-sheet-custom-diff-md-ltr-Mobile-Chrome-linux.png
View file
Open in desktop
sean-perkins marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ering.e2e.ts-snapshots/action-sheet-custom-diff-md-ltr-Mobile-Firefox-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...dering.e2e.ts-snapshots/action-sheet-custom-diff-md-ltr-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...dering.e2e.ts-snapshots/action-sheet-custom-diff-md-rtl-Mobile-Chrome-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ering.e2e.ts-snapshots/action-sheet-custom-diff-md-rtl-Mobile-Firefox-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...dering.e2e.ts-snapshots/action-sheet-custom-diff-md-rtl-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...n-sheet.e2e.ts-snapshots/action-sheet-safe-area-ios-ltr-Mobile-Chrome-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...-sheet.e2e.ts-snapshots/action-sheet-safe-area-ios-ltr-Mobile-Firefox-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...n-sheet.e2e.ts-snapshots/action-sheet-safe-area-ios-ltr-Mobile-Safari-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion core/src/components/action-sheet/test/basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
--ion-safe-area-bottom: 40px;

--max-width: 300px;
--height: 325px;
--height: calc(325px + var(--ion-safe-area-bottom));
sean-perkins marked this conversation as resolved.
Show resolved Hide resolved
}

.custom-backdrop {
Expand Down
Loading