MOBILE-3099 fab: Adapt fab to add correct paddings

main
Pau Ferrer Ocaña 2021-11-30 13:12:50 +01:00
parent 4ee4862492
commit 2e31220942
3 changed files with 37 additions and 30 deletions

View File

@ -22,6 +22,7 @@
.menu, .menu,
.content-outlet { .content-outlet {
top: var(--offset-top); top: var(--offset-top);
height: calc(100% - var(--offset-top));
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;

View File

@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import { Directive, ElementRef, OnDestroy } from '@angular/core'; import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core';
import { IonContent } from '@ionic/angular'; import { CoreUtils } from '@services/utils/utils';
/** /**
* Directive to move ion-fab components as direct children of the nearest ion-content. * Directive to move ion-fab components as direct children of the nearest ion-content.
@ -25,47 +25,50 @@ import { IonContent } from '@ionic/angular';
@Directive({ @Directive({
selector: 'ion-fab[core-fab]', selector: 'ion-fab[core-fab]',
}) })
export class CoreFabDirective implements OnDestroy { export class CoreFabDirective implements OnInit, OnDestroy {
protected static readonly PADDINGBOTTOM = 56;
protected scrollElement?: HTMLElement;
protected done = false;
protected element: HTMLElement; protected element: HTMLElement;
protected content?: HTMLIonContentElement | null;
protected initialPaddingBottom = 0;
constructor(el: ElementRef, protected content: IonContent) { constructor(el: ElementRef) {
this.element = el.nativeElement; this.element = el.nativeElement;
this.asyncInit(); this.element.setAttribute('slot', 'fixed');
} }
/** /**
* Initialize Component. * @inheritdoc
*/ */
async asyncInit(): Promise<void> { async ngOnInit(retries = 3): Promise<void> {
if (this.content) { this.content = this.element.closest('ion-content');
this.scrollElement = await this.content.getScrollElement(); if (!this.content) {
if (!this.done) { if(retries > 0) {
// Move element to the nearest ion-content if it's not the parent await CoreUtils.nextTicks(50);
if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
const ionContent = this.element.closest('ion-content');
ionContent?.appendChild(this.element);
}
// Add space at the bottom to let the user see the whole content. this.ngOnInit(retries - 1);
const bottom = parseInt(this.scrollElement.style.paddingBottom, 10) || 0;
this.scrollElement.style.paddingBottom = (bottom + CoreFabDirective.PADDINGBOTTOM) + 'px';
this.done = true;
} }
return;
} }
const initialHeight = this.element.getBoundingClientRect().height || 56;
// Move element to the nearest ion-content if it's not the parent
if (this.element.parentElement?.nodeName != 'ION-CONTENT') {
this.content.appendChild(this.element);
}
// Add space at the bottom to let the user see the whole content.
this.initialPaddingBottom = parseFloat(this.content.style.getPropertyValue('--padding-bottom') || '0');
this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + initialHeight + 'px');
} }
/** /**
* Destroy component. * @inheritdoc
*/ */
ngOnDestroy(): void { ngOnDestroy(): void {
if (this.done && this.scrollElement) { if (this.content) {
const bottom = parseInt(this.scrollElement.style.paddingBottom, 10) || 0; this.content.style.setProperty('--padding-bottom', this.initialPaddingBottom + 'px');
this.scrollElement.style.paddingBottom = (bottom - CoreFabDirective.PADDINGBOTTOM) + 'px';
} }
} }

View File

@ -906,15 +906,18 @@ ion-back-button.md::part(text) {
display: none; display: none;
} }
// Hide close button because when present is read on voice over.
ion-fab[core-fab] { ion-fab[core-fab] {
position: fixed;
// Hide close button because when present is read on voice over.
ion-fab-button::part(close-icon) { ion-fab-button::part(close-icon) {
display: none; display: none;
} }
} }
core-course-module-navigation + ion-fab {
bottom: calc(var(--core-course-module-navigation-height, 0px) + 10px);
@include core-transition(all, 200ms);
}
.core-media-adapt-width { .core-media-adapt-width {
max-width: 100%; max-width: 100%;
} }