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(NcAppSidebar): make closing animation less glitchy #5608

Merged
merged 2 commits into from
May 20, 2024
Merged

fix(NcAppSidebar): make closing animation less glitchy #5608

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6291ce1
fix(NcAppSidebar): make closing animation less glitchy
ShGKme May 17, 2024
b30d1f5
chore(NcAppSidebar): update snapshots
ShGKme May 20, 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
33 changes: 20 additions & 13 deletions src/components/NcAppSidebar/NcAppSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,11 +1116,21 @@ export default {
</script>

<style lang="scss">
// Allows to use transition over a custom CSS property (CSS Variable)
// Ignored on old browsers resulting in slightly noticeable jump
@property --app-sidebar-offset {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fancy!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't work in Firefox, except nightly build. But when it doesn't work, it's just a little more jumping

syntax: '<length>';
initial-value: 0;
inherits: true;
}

.content {
// A padding between the toggle button and the page border
--app-sidebar-padding: #{$app-navigation-padding};
// A padding between the toggle button and the page border
--app-sidebar-offset: 0;
transition-duration: var(--animation-quick);
transition-property: --app-sidebar-offset;
}

.content:has(.app-sidebar__toggle) {
Expand All @@ -1129,9 +1139,6 @@ export default {
</style>

<style lang="scss" scoped>
$sidebar-min-width: 300px;
$sidebar-max-width: 500px;

$desc-vertical-padding: 18px;
$desc-vertical-padding-compact: 10px;
$desc-input-padding: 7px;
Expand All @@ -1148,6 +1155,9 @@ $top-buttons-spacing: 6px;
app-content will be shrinked properly
*/
.app-sidebar {
--app-sidebar-width: clamp(300px, 27vw, 500px);
susnux marked this conversation as resolved.
Show resolved Hide resolved
width: var(--app-sidebar-width);

z-index: 1500;
top: 0;
right: 0;
Expand All @@ -1156,12 +1166,11 @@ $top-buttons-spacing: 6px;
overflow-y: auto;
flex-direction: column;
flex-shrink: 0;
width: 27vw;
min-width: $sidebar-min-width;
max-width: $sidebar-max-width;
height: 100%;
border-left: 1px solid var(--color-border);
background: var(--color-main-background);
// Make close button positioned relative to the header
position: relative;

&__toggle {
position: absolute !important;
Expand Down Expand Up @@ -1391,27 +1400,25 @@ $top-buttons-spacing: 6px;
// Make the sidebar full-width on small screens
@media only screen and (max-width: $breakpoint-small-mobile) {
.app-sidebar {
width: 100vw;
max-width: 100vw;
position: absolute;
--app-sidebar-width: 100vw;
}
}

.slide-right-leave-active,
.slide-right-enter-active {
transition-duration: var(--animation-quick);
transition-property: max-width, min-width;
transition-property: margin-right;
}

.slide-right-enter-to,
.slide-right-leave {
min-width: $sidebar-min-width;
max-width: $sidebar-max-width;
margin-right: 0;
}

.slide-right-enter,
.slide-right-leave-to {
min-width: 0 !important;
max-width: 0 !important;
margin-right: calc(-1 * var(--app-sidebar-width));
}
</style>

Expand Down
Loading