Skip to content

Fixed iOS related display issues #570

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.

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

Merged
merged 1 commit into from
Apr 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 11 additions & 2 deletions src/Environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { LeftHandTapEffectInfo } from './rendering/effects/LeftHandTapEffectInfo
import { CapellaImporter } from './importer/CapellaImporter';
import { ResizeObserverPolyfill } from './platform/javascript/ResizeObserverPolyfill';
import { WebPlatform } from './platform/javascript/WebPlatform';
import { IntersectionObserverPolyfill } from './platform/javascript/IntersectionObserverPolyfill';

export class LayoutEngineFactory {
public readonly vertical: boolean;
Expand Down Expand Up @@ -125,6 +126,9 @@ export class Environment {
vertical-align: top;
overflow: visible;
}
.at-surface-svg text {
dominant-baseline: central;
}
.at {
font-family: 'alphaTab';
speak: none;
Expand Down Expand Up @@ -466,8 +470,13 @@ export class Environment {
Environment.HighDpiFactor = window.devicePixelRatio;
// ResizeObserver API does not yet exist so long on Safari (only start 2020 with iOS Safari 13.7 and Desktop 13.1)
// so we better add a polyfill for it
if (!('ResizeObserver' in globalThis)) {
(globalThis as any).ResizeObserver = ResizeObserverPolyfill;
if (!('ResizeObserver' in Environment.globalThis)) {
(Environment.globalThis as any).ResizeObserver = ResizeObserverPolyfill;
}
// IntersectionObserver API does not on older iOS versions
// so we better add a polyfill for it
if (!('IntersectionObserver' in Environment.globalThis)) {
(Environment.globalThis as any).IntersectionObserver = IntersectionObserverPolyfill;
}
}
}
Expand Down
64 changes: 64 additions & 0 deletions src/platform/javascript/IntersectionObserverPolyfill.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/**
* A polyfill of the InsersectionObserver
* @target web
*/
export class IntersectionObserverPolyfill {
private _callback: IntersectionObserverCallback;
private _elements: HTMLElement[] = [];

public constructor(callback: IntersectionObserverCallback) {
let timer: any = null;
const oldCheck = this._check.bind(this);
this._check = () => {
if (!timer) {
timer = setTimeout(() => {
oldCheck();
timer = null;
}, 100);
}
};

this._callback = callback;

window.addEventListener('resize', this._check, true);
document.addEventListener('scroll', this._check, true);
}

public observe(target: HTMLElement) {
if (this._elements.indexOf(target) >= 0) {
return;
}
this._elements.push(target);
this._check();
}

public unobserve(target: HTMLElement) {
this._elements = this._elements.filter(item => {
return item != target;
});
};

private _check() {
const entries: IntersectionObserverEntry[] = [];
this._elements.forEach(element => {
const rect = element.getBoundingClientRect();
const isVisible = (
rect.top + rect.height >= 0 &&
rect.top <= window.innerHeight &&
rect.left + rect.width >= 0 &&
rect.left <= window.innerWidth
);

if (isVisible) {
entries.push({
target: element,
isIntersecting: true
} as any);
}
});

if (entries.length) {
this._callback(entries, this as any);
}
}
}
2 changes: 1 addition & 1 deletion src/platform/svg/SvgCanvas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export abstract class SvgCanvas implements ICanvas {

public beginRender(width: number, height: number): void {
this.buffer = `<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="${width | 0}px" height="${height | 0
}px" class="at-surface-svg" style="dominant-baseline: central;">\n`;
}px" class="at-surface-svg">\n`;
this._currentPath = '';
this._currentPathIsEmpty = true;
this.textBaseline = TextBaseline.Top;
Expand Down