Merge pull request #4054 from dpalou/MOBILE-4470

Mobile 4470
main
Pau Ferrer Ocaña 2024-05-21 16:07:36 +02:00 committed by GitHub
commit e8457e89d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 52 additions and 3 deletions

View File

@ -48,8 +48,8 @@ export class CoreIframeComponent implements OnChanges, OnDestroy {
@Input() src?: string;
@Input() id: string | null = null;
@Input() iframeWidth?: string;
@Input() iframeHeight?: string;
@Input() iframeWidth = '100%';
@Input() iframeHeight = '100%';
@Input() allowFullscreen?: boolean | string;
@Input() showFullscreenOnToolbar?: boolean | string;
@Input() autoFullscreenOnRotate?: boolean | string;

View File

@ -30,6 +30,7 @@ import { StackDidChangeEvent } from '@ionic/angular/common/directives/navigation
import { CoreNavigator } from '@services/navigator';
import { CoreTabBase, CoreTabsBaseComponent } from '@classes/tabs';
import { CoreDirectivesRegistry } from '@singletons/directives-registry';
import { CorePath } from '@singletons/path';
/**
* This component displays some top scrollable tabs that will autohide on vertical scroll.
@ -143,6 +144,14 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
// After the view has entered for the first time, we can assume that it'll always be in the navigation stack
// until it's destroyed.
this.existsInNavigationStack = true;
const selectedTab = this.getSelected();
const currentPath = CoreNavigator.getCurrentPath();
if (selectedTab && CorePath.pathIsAncestor(currentPath, selectedTab.page)) {
// Current path is an ancestor of the selected path, this happens when the user changes main menu tab and comes back.
// Load the tab again so the right route is loaded. This only changes the current route, it doesn't reload the page.
this.loadTab(selectedTab);
}
}
/**

View File

@ -2,7 +2,11 @@
<swiper-container #swiperRef>
<swiper-slide>
<div class="swiper-zoom-container">
@if (dataUrl) {
<img [src]="dataUrl" [alt]="title">
} @else {
<img [url]="image" [alt]="title" core-external-content [component]="component" [componentId]="componentId">
}
</div>
</swiper-slide>
</swiper-container>

View File

@ -13,11 +13,12 @@
// limitations under the License.
import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
import { ModalController, Translate } from '@singletons';
import { DomSanitizer, ModalController, Translate } from '@singletons';
import { CoreMath } from '@singletons/math';
import { Swiper } from 'swiper';
import { SwiperOptions } from 'swiper/types';
import { CoreSwiper } from '@singletons/swiper';
import { SafeResourceUrl } from '@angular/platform-browser';
/**
* Modal component to view an image.
@ -52,6 +53,8 @@ export class CoreViewerImageComponent implements OnInit {
@Input() component?: string; // Component to use in external-content.
@Input() componentId?: string | number; // Component ID to use in external-content.
dataUrl?: SafeResourceUrl;
private static readonly MAX_RATIO = 8;
private static readonly MIN_RATIO = 0.5;
@ -72,6 +75,12 @@ export class CoreViewerImageComponent implements OnInit {
*/
ngOnInit(): void {
this.title = this.title || Translate.instant('core.imageviewer');
if (this.image.startsWith('data:')) {
// It's a data image, sanitize it so it can be rendered.
// Don't sanitize other images because they load fine and they need to be treated by core-external-content.
this.dataUrl = DomSanitizer.bypassSecurityTrustResourceUrl(this.image);
}
}
/**

View File

@ -99,4 +99,22 @@ export class CorePath {
}
}
/**
* Check if a certain path is the ancestor of another path.
*
* @param ancestorPath Ancestor path.
* @param path Path to check.
* @returns Whether the path is an ancestor of the other path.
*/
static pathIsAncestor(ancestorPath: string, path: string): boolean {
const ancestorSplit = CoreText.removeEndingSlash(ancestorPath).split('/');
const pathSplit = CoreText.removeEndingSlash(path).split('/');
if (ancestorSplit.length >= pathSplit.length) {
return false;
}
return !ancestorSplit.some((value, index) => value !== pathSplit[index]);
}
}

View File

@ -52,4 +52,13 @@ describe('CorePath', () => {
expect(CorePath.concatenatePaths('foo/bar', 'baz')).toEqual('foo/bar/baz');
});
it('checks ancestor paths', () => {
expect(CorePath.pathIsAncestor('/foo', '/foo/bar')).toEqual(true);
expect(CorePath.pathIsAncestor('/foo/', '/foo/bar')).toEqual(true);
expect(CorePath.pathIsAncestor('/foo', '/foo/bar/baz')).toEqual(true);
expect(CorePath.pathIsAncestor('/foo/baz', '/foo/bar')).toEqual(false);
expect(CorePath.pathIsAncestor('/foo/bar', '/foo/bar')).toEqual(false);
expect(CorePath.pathIsAncestor('/foo/b', '/foo/bar')).toEqual(false);
});
});