-
-
-
- ];
+
+ );
}
}
diff --git a/core/src/global/config.ts b/core/src/global/config.ts
index c49882c3ab..7ac0f22125 100644
--- a/core/src/global/config.ts
+++ b/core/src/global/config.ts
@@ -34,25 +34,27 @@ export class Config {
}
}
-export function configFromSession(win: Window): any {
+export const config = /*@__PURE__*/new Config();
+
+export const configFromSession = (win: Window): any => {
try {
const configStr = win.sessionStorage.getItem(IONIC_SESSION_KEY);
return configStr !== null ? JSON.parse(configStr) : {};
} catch (e) {
return {};
}
-}
+};
-export function saveConfig(win: Window, config: any) {
+export const saveConfig = (win: Window, c: any) => {
try {
- win.sessionStorage.setItem(IONIC_SESSION_KEY, JSON.stringify(config));
+ win.sessionStorage.setItem(IONIC_SESSION_KEY, JSON.stringify(c));
} catch (e) {
return;
}
-}
+};
-export function configFromURL(win: Window) {
- const config: any = {};
+export const configFromURL = (win: Window) => {
+ const configObj: any = {};
win.location.search.slice(1)
.split('&')
.map(entry => entry.split('='))
@@ -60,15 +62,15 @@ export function configFromURL(win: Window) {
.filter(([key]) => startsWith(key, IONIC_PREFIX))
.map(([key, value]) => [key.slice(IONIC_PREFIX.length), value])
.forEach(([key, value]) => {
- config[key] = value;
+ configObj[key] = value;
});
- return config;
-}
+ return configObj;
+};
-function startsWith(input: string, search: string): boolean {
+const startsWith = (input: string, search: string): boolean => {
return input.substr(0, search.length) === search;
-}
+};
const IONIC_PREFIX = 'ionic:';
const IONIC_SESSION_KEY = 'ionic-persist-config';
diff --git a/core/src/global/ionic-global.ts b/core/src/global/ionic-global.ts
index 75411b77c2..5e0657424e 100644
--- a/core/src/global/ionic-global.ts
+++ b/core/src/global/ionic-global.ts
@@ -3,12 +3,10 @@ import { getMode, setMode } from '@stencil/core';
import { Mode } from '../interface';
import { isPlatform, setupPlatforms } from '../utils/platform';
-import { Config, configFromSession, configFromURL, saveConfig } from './config';
+import { config, configFromSession, configFromURL, saveConfig } from './config';
declare const Context: any;
-const config = /*@__PURE__*/new Config();
-
let mode: Mode;
export function getIonMode(ref?: any): Mode {
@@ -56,5 +54,3 @@ export default function() {
);
}
-
-export { config };
diff --git a/core/src/utils/focus-visible.ts b/core/src/utils/focus-visible.ts
index 7ac64767b6..5085ac8238 100644
--- a/core/src/utils/focus-visible.ts
+++ b/core/src/utils/focus-visible.ts
@@ -3,7 +3,8 @@ const ION_FOCUSED = 'ion-focused';
const ION_FOCUSABLE = 'ion-focusable';
const FOCUS_KEYS = ['Tab', 'ArrowDown', 'Space', 'Escape', ' ', 'Shift', 'Enter', 'ArrowLeft', 'ArrowRight', 'ArrowUp'];
-export function startFocusVisible(doc: Document) {
+export function startFocusVisible() {
+ const doc = document;
let currentFocus: Element[] = [];
let keyboardMode = true;
diff --git a/core/src/utils/hardware-back-button.ts b/core/src/utils/hardware-back-button.ts
index 24e10caad8..ddcec8771c 100644
--- a/core/src/utils/hardware-back-button.ts
+++ b/core/src/utils/hardware-back-button.ts
@@ -7,9 +7,11 @@ interface HandlerRegister {
handler: Handler;
}
-export function startHardwareBackButton(win: Window) {
+export function startHardwareBackButton() {
+ const doc = document;
+
let busy = false;
- win.document.addEventListener('backbutton', () => {
+ doc.addEventListener('backbutton', () => {
if (busy) {
return;
}
@@ -23,7 +25,7 @@ export function startHardwareBackButton(win: Window) {
}
}
});
- win.document.dispatchEvent(ev);
+ doc.dispatchEvent(ev);
if (handlers.length > 0) {
let selectedPriority = Number.MIN_SAFE_INTEGER;
diff --git a/core/src/utils/helpers.ts b/core/src/utils/helpers.ts
index 888687097a..6a7c333818 100644
--- a/core/src/utils/helpers.ts
+++ b/core/src/utils/helpers.ts
@@ -77,8 +77,8 @@ export function pointerCoord(ev: any): {x: number, y: number} {
* @param side the side
* @param isRTL whether the application dir is rtl
*/
-export function isEndSide(win: Window, side: Side): boolean {
- const isRTL = win.document.dir === 'rtl';
+export function isEndSide(side: Side): boolean {
+ const isRTL = document.dir === 'rtl';
switch (side) {
case 'start': return isRTL;
case 'end': return !isRTL;
diff --git a/core/src/utils/input-shims/hacks/input-blurring.ts b/core/src/utils/input-shims/hacks/input-blurring.ts
index d5d59cacea..881f5b5132 100644
--- a/core/src/utils/input-shims/hacks/input-blurring.ts
+++ b/core/src/utils/input-shims/hacks/input-blurring.ts
@@ -1,7 +1,8 @@
const SKIP_SELECTOR = 'input, textarea, [no-blur]';
-export function enableInputBlurring(doc: Document) {
+export function enableInputBlurring() {
+ const doc = document;
let focused = true;
let didScroll = false;
diff --git a/core/src/utils/input-shims/hacks/scroll-padding.ts b/core/src/utils/input-shims/hacks/scroll-padding.ts
index 718f3f466a..a3af006de3 100644
--- a/core/src/utils/input-shims/hacks/scroll-padding.ts
+++ b/core/src/utils/input-shims/hacks/scroll-padding.ts
@@ -1,6 +1,8 @@
const PADDING_TIMER_KEY = '$ionPaddingTimer';
-export function enableScrollPadding(doc: Document, keyboardHeight: number) {
+export function enableScrollPadding(keyboardHeight: number) {
+ const doc = document;
+
function onFocusin(ev: any) {
setScrollPadding(ev.target, keyboardHeight);
}
diff --git a/core/src/utils/input-shims/input-shims.ts b/core/src/utils/input-shims/input-shims.ts
index daa0ea5a6e..e249c8e573 100644
--- a/core/src/utils/input-shims/input-shims.ts
+++ b/core/src/utils/input-shims/input-shims.ts
@@ -12,9 +12,9 @@ const SCROLL_PADDING = true;
const HIDE_CARET = true;
export function startInputShims(
- doc: Document,
config: Config,
) {
+ const doc = document;
const keyboardHeight = config.getNumber('keyboardHeight', 290);
const scrollAssist = config.getBoolean('scrollAssist', true);
const hideCaret = config.getBoolean('hideCaretOnScroll', true);
@@ -62,11 +62,11 @@ export function startInputShims(
}
if (inputBlurring && INPUT_BLURRING) {
- enableInputBlurring(doc);
+ enableInputBlurring();
}
if (scrollPadding && SCROLL_PADDING) {
- enableScrollPadding(doc, keyboardHeight);
+ enableScrollPadding(keyboardHeight);
}
// Input might be already loaded in the DOM before ion-device-hacks did.
diff --git a/core/src/utils/media.ts b/core/src/utils/media.ts
index 6665589c0d..6802ae2f94 100644
--- a/core/src/utils/media.ts
+++ b/core/src/utils/media.ts
@@ -10,13 +10,13 @@ export const SIZE_TO_MEDIA: any = {
// Check if the window matches the media query
// at the breakpoint passed
// e.g. matchBreakpoint('sm') => true if screen width exceeds 576px
-export function matchBreakpoint(win: Window, breakpoint: string | undefined) {
+export function matchBreakpoint(breakpoint: string | undefined) {
if (breakpoint === undefined || breakpoint === '') {
return true;
}
- if ((win as any).matchMedia) {
+ if ((window as any).matchMedia) {
const mediaQuery = SIZE_TO_MEDIA[breakpoint];
- return win.matchMedia(mediaQuery).matches;
+ return window.matchMedia(mediaQuery).matches;
}
return false;
}
diff --git a/core/src/utils/overlays-interface.ts b/core/src/utils/overlays-interface.ts
index 11abbc18f5..e4f3ddcda8 100644
--- a/core/src/utils/overlays-interface.ts
+++ b/core/src/utils/overlays-interface.ts
@@ -1,7 +1,7 @@
import { EventEmitter } from '@stencil/core';
import { HTMLStencilElement } from '@stencil/core/internal';
-import { Animation, AnimationBuilder, Config, Mode } from '../interface';
+import { Animation, AnimationBuilder, Mode } from '../interface';
export interface OverlayEventDetail
{
data?: T;
@@ -13,7 +13,6 @@ export interface OverlayInterface {
el: HTMLElement;
animated: boolean;
keyboardClose: boolean;
- config: Config;
overlayIndex: number;
presented: boolean;
animation?: Animation;
diff --git a/core/src/utils/overlays.ts b/core/src/utils/overlays.ts
index c2c5387954..5d6ca6e48b 100644
--- a/core/src/utils/overlays.ts
+++ b/core/src/utils/overlays.ts
@@ -1,3 +1,4 @@
+import { config } from '../global/config';
import { ActionSheetOptions, AlertOptions, AnimationBuilder, BackButtonEvent, HTMLIonOverlayElement, IonicConfig, LoadingOptions, ModalOptions, OverlayInterface, PickerOptions, PopoverOptions, ToastOptions } from '../interface';
let lastId = 0;
@@ -24,7 +25,7 @@ export const pickerController = /*@__PURE__*/createController('ion-popover');
export const toastController = /*@__PURE__*/createController('ion-toast');
-export function createOverlay(tagName: string, opts: object | undefined): Promise {
+export const createOverlay = (tagName: string, opts: object | undefined): Promise => {
return customElements.whenDefined(tagName).then(() => {
const doc = document;
const element = doc.createElement(tagName) as HTMLIonOverlayElement;
@@ -45,9 +46,9 @@ export function createOverlay(tagName: string,
return element.componentOnReady() as any;
});
-}
+};
-export function connectListeners(doc: Document) {
+export const connectListeners = (doc: Document) => {
if (lastId === 0) {
lastId = 1;
// trap focus inside overlays
@@ -81,39 +82,39 @@ export function connectListeners(doc: Document) {
}
});
}
-}
+};
-export function dismissOverlay(doc: Document, data: any, role: string | undefined, overlayTag: string, id?: string): Promise {
+export const dismissOverlay = (doc: Document, data: any, role: string | undefined, overlayTag: string, id?: string): Promise => {
const overlay = getOverlay(doc, overlayTag, id);
if (!overlay) {
return Promise.reject('overlay does not exist');
}
return overlay.dismiss(data, role);
-}
+};
-export function getOverlays(doc: Document, overlayTag?: string): HTMLIonOverlayElement[] {
+export const getOverlays = (doc: Document, overlayTag?: string): HTMLIonOverlayElement[] => {
const overlays = (Array.from(getAppRoot(doc).children) as HTMLIonOverlayElement[]).filter(c => c.overlayIndex > 0);
if (overlayTag === undefined) {
return overlays;
}
overlayTag = overlayTag.toUpperCase();
return overlays.filter(c => c.tagName === overlayTag);
-}
+};
-export function getOverlay(doc: Document, overlayTag?: string, id?: string): HTMLIonOverlayElement | undefined {
+export const getOverlay = (doc: Document, overlayTag?: string, id?: string): HTMLIonOverlayElement | undefined => {
const overlays = getOverlays(doc, overlayTag);
return (id === undefined)
? overlays[overlays.length - 1]
: overlays.find(o => o.id === id);
-}
+};
-export async function present(
+export const present = async (
overlay: OverlayInterface,
name: keyof IonicConfig,
iosEnterAnimation: AnimationBuilder,
mdEnterAnimation: AnimationBuilder,
opts?: any
-) {
+) => {
if (overlay.presented) {
return;
}
@@ -123,15 +124,15 @@ export async function present(
// get the user's animation fn if one was provided
const animationBuilder = (overlay.enterAnimation)
? overlay.enterAnimation
- : overlay.config.get(name, overlay.mode === 'ios' ? iosEnterAnimation : mdEnterAnimation);
+ : config.get(name, overlay.mode === 'ios' ? iosEnterAnimation : mdEnterAnimation);
const completed = await overlayAnimation(overlay, animationBuilder, overlay.el, opts);
if (completed) {
overlay.didPresent.emit();
}
-}
+};
-export async function dismiss(
+export const dismiss = async (
overlay: OverlayInterface,
data: any | undefined,
role: string | undefined,
@@ -139,7 +140,7 @@ export async function dismiss(
iosLeaveAnimation: AnimationBuilder,
mdLeaveAnimation: AnimationBuilder,
opts?: any
-): Promise {
+): Promise => {
if (!overlay.presented) {
return false;
}
@@ -150,7 +151,7 @@ export async function dismiss(
const animationBuilder = (overlay.leaveAnimation)
? overlay.leaveAnimation
- : overlay.config.get(name, overlay.mode === 'ios' ? iosLeaveAnimation : mdLeaveAnimation);
+ : config.get(name, overlay.mode === 'ios' ? iosLeaveAnimation : mdLeaveAnimation);
await overlayAnimation(overlay, animationBuilder, overlay.el, opts);
overlay.didDismiss.emit({ data, role });
@@ -161,18 +162,18 @@ export async function dismiss(
overlay.el.remove();
return true;
-}
+};
-function getAppRoot(doc: Document) {
+const getAppRoot = (doc: Document) => {
return doc.querySelector('ion-app') || doc.body;
-}
+};
-async function overlayAnimation(
+const overlayAnimation = async (
overlay: OverlayInterface,
animationBuilder: AnimationBuilder,
baseEl: any,
opts: any
-): Promise {
+): Promise => {
if (overlay.animation) {
overlay.animation.destroy();
overlay.animation = undefined;
@@ -184,7 +185,7 @@ async function overlayAnimation(
const aniRoot = baseEl.shadowRoot || overlay.el;
const animation = await import('./animation').then(mod => mod.create(animationBuilder, aniRoot, opts));
overlay.animation = animation;
- if (!overlay.animated || !overlay.config.getBoolean('animated', true)) {
+ if (!overlay.animated || !config.getBoolean('animated', true)) {
animation.duration(0);
}
if (overlay.keyboardClose) {
@@ -200,9 +201,9 @@ async function overlayAnimation(
animation.destroy();
overlay.animation = undefined;
return hasCompleted;
-}
+};
-export function autoFocus(containerEl: HTMLElement): HTMLElement | undefined {
+export const autoFocus = (containerEl: HTMLElement): HTMLElement | undefined => {
const focusableEls = containerEl.querySelectorAll('a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex="0"]');
if (focusableEls.length > 0) {
const el = focusableEls[0] as HTMLInputElement;
@@ -210,30 +211,30 @@ export function autoFocus(containerEl: HTMLElement): HTMLElement | undefined {
return el;
}
return undefined;
-}
+};
-export function eventMethod(element: HTMLElement, eventName: string): Promise {
+export const eventMethod = (element: HTMLElement, eventName: string): Promise => {
let resolve: (detail: T) => void;
const promise = new Promise(r => resolve = r);
onceEvent(element, eventName, (event: any) => {
resolve(event.detail);
});
return promise;
-}
+};
-export function onceEvent(element: HTMLElement, eventName: string, callback: (ev: Event) => void) {
+export const onceEvent = (element: HTMLElement, eventName: string, callback: (ev: Event) => void) => {
const handler = (ev: Event) => {
element.removeEventListener(eventName, handler);
callback(ev);
};
element.addEventListener(eventName, handler);
-}
+};
-export function isCancel(role: string | undefined): boolean {
+export const isCancel = (role: string | undefined): boolean => {
return role === 'cancel' || role === BACKDROP;
-}
+};
-function isDescendant(parent: HTMLElement, child: HTMLElement | null) {
+const isDescendant = (parent: HTMLElement, child: HTMLElement | null) => {
while (child) {
if (child === parent) {
return true;
@@ -241,6 +242,6 @@ function isDescendant(parent: HTMLElement, child: HTMLElement | null) {
child = child.parentElement;
}
return false;
-}
+};
export const BACKDROP = 'backdrop';
diff --git a/core/src/utils/status-tap.ts b/core/src/utils/status-tap.ts
index d4d63f67f7..efe5f8d34c 100644
--- a/core/src/utils/status-tap.ts
+++ b/core/src/utils/status-tap.ts
@@ -1,11 +1,12 @@
import { readTask, writeTask } from '@stencil/core';
-export function startStatusTap(win: Window) {
+export function startStatusTap() {
+ const win = window;
win.addEventListener('statusTap', () => {
readTask(() => {
const width = win.innerWidth;
const height = win.innerHeight;
- const el = win.document.elementFromPoint(width / 2, height / 2) as (Element | null);
+ const el = document.elementFromPoint(width / 2, height / 2) as (Element | null);
if (!el) {
return;
}
diff --git a/core/src/utils/tap-click.ts b/core/src/utils/tap-click.ts
index dde74196ed..c06d68687c 100644
--- a/core/src/utils/tap-click.ts
+++ b/core/src/utils/tap-click.ts
@@ -2,7 +2,7 @@ import { Config } from '../interface';
import { now, pointerCoord } from './helpers';
-export function startTapClick(doc: Document, config: Config) {
+export function startTapClick(config: Config) {
let lastTouch = -MOUSE_WAIT * 10;
let lastActivated = 0;
let scrollingEl: HTMLElement | undefined;
@@ -133,6 +133,7 @@ export function startTapClick(doc: Document, config: Config) {
}
}
+ const doc = document;
doc.addEventListener('ionScrollStart', ev => {
scrollingEl = ev.target as HTMLElement;
cancelActive();
diff --git a/core/src/utils/theme.ts b/core/src/utils/theme.ts
index b732243c33..df0b2ddfcc 100644
--- a/core/src/utils/theme.ts
+++ b/core/src/utils/theme.ts
@@ -33,9 +33,9 @@ export function getClassMap(classes: string | string[] | undefined): CssClassMap
const SCHEME = /^[a-z][a-z0-9+\-.]*:/;
-export async function openURL(win: Window, url: string | undefined | null, ev: Event | undefined | null, direction: RouterDirection): Promise {
+export async function openURL(url: string | undefined | null, ev: Event | undefined | null, direction: RouterDirection): Promise {
if (url != null && url[0] !== '#' && !SCHEME.test(url)) {
- const router = win.document.querySelector('ion-router');
+ const router = document.querySelector('ion-router');
if (router) {
if (ev != null) {
ev.preventDefault();
diff --git a/core/src/utils/transition/index.ts b/core/src/utils/transition/index.ts
index dbc650f695..d4a495073b 100644
--- a/core/src/utils/transition/index.ts
+++ b/core/src/utils/transition/index.ts
@@ -215,7 +215,6 @@ function setZIndex(
export interface TransitionOptions extends NavOptions {
progressCallback?: ((ani: Animation | undefined) => void);
- window: Window;
baseEl: any;
enteringEl: HTMLElement;
leavingEl: HTMLElement | undefined;
diff --git a/core/stencil.config.ts b/core/stencil.config.ts
index a0de339280..342d5a1372 100644
--- a/core/stencil.config.ts
+++ b/core/stencil.config.ts
@@ -50,6 +50,15 @@ export const config: Config = {
{ components: ['ion-toast'] },
{ components: ['ion-toggle'] },
{ components: ['ion-virtual-scroll'] },
+ { components: [
+ 'ion-action-sheet-controller',
+ 'ion-alert-controller',
+ 'ion-loading-controller',
+ 'ion-modal-controller',
+ 'ion-popover-controller',
+ 'ion-picker-controller',
+ 'ion-toast-controller',
+ ]},
],
plugins: [
sass()
@@ -59,10 +68,10 @@ export const config: Config = {
type: 'dist',
esmLoaderPath: '../loader'
},
- {
- type: 'experimental-dist-module',
- externalRuntime: true,
- },
+ // {
+ // type: 'experimental-dist-module',
+ // externalRuntime: true,
+ // },
{
type: 'docs-readme',
strict: true