native-fn 1.2.0 → 1.2.1

package/dist/plugin/pip/index.cjs

@@ -350,9 +350,372 @@ var NotSupportedError = createCustomError('NotSupportedError');
 
 var InvalidStateError = createCustomError('InvalidStateError');
 
+function compareVersion(lhs, rhs) {
+    var pa = lhs.split('.');
+    var pb = rhs.split('.');
+    var length = Math.max(pa.length, pb.length);
+    for (var i = 0; i < length; i++) {
+        var a = void 0;
+        var b = void 0;
+        if (i < pa.length)
+            a = parseInt(pa[i], 10);
+        else
+            a = 0;
+        if (i < pb.length)
+            b = parseInt(pb[i], 10);
+        else
+            b = 0;
+        if (a > b)
+            return 1;
+        if (a < b)
+            return -1;
+    }
+    return 0;
+}
+
+function resolveWindowsVersion(string) {
+    if (typeof string === 'undefined')
+        return '';
+    var mapped = {
+        '4.90': 'ME',
+        'NT3.51': 'NT 3.11',
+        'NT4.0': 'NT 4.0',
+        'NT 5.0': '2000',
+        'NT 5.1': 'XP',
+        'NT 5.2': 'XP',
+        'NT 6.0': 'Vista',
+        'NT 6.1': '7',
+        'NT 6.2': '8',
+        'NT 6.3': '8.1',
+        'NT 6.4': '10',
+        'NT 10.0': '10',
+        'ARM': 'RT'
+    }[string];
+    if (typeof mapped !== 'undefined')
+        return mapped;
+    return string;
+}
+function resolveUnderscoreVersion(string) {
+    if (typeof string === 'undefined')
+        return '';
+    return string.replace(/_/g, '.');
+}
+var OS;
+(function (OS) {
+    OS["Unknown"] = "Unknown";
+    OS["Android"] = "Android";
+    OS["iOS"] = "iOS";
+    OS["Windows"] = "Windows";
+    OS["MacOS"] = "MacOS";
+})(OS || (OS = {}));
+var Devices;
+(function (Devices) {
+    Devices["Unknown"] = "Unknown";
+    Devices["Mobile"] = "Mobile";
+    Devices["Desktop"] = "Desktop";
+})(Devices || (Devices = {}));
+var Engines;
+(function (Engines) {
+    Engines["Unknown"] = "Unknown";
+    Engines["EdgeHTML"] = "EdgeHTML";
+    Engines["ArkWeb"] = "ArkWeb";
+    Engines["Blink"] = "Blink";
+    Engines["Presto"] = "Presto";
+    Engines["WebKit"] = "WebKit";
+    Engines["Trident"] = "Trident";
+    Engines["NetFront"] = "NetFront";
+    Engines["KHTML"] = "KHTML";
+    Engines["Tasman"] = "Tasman";
+    Engines["Gecko"] = "Gecko";
+})(Engines || (Engines = {}));
+var Browsers;
+(function (Browsers) {
+    Browsers["Unknown"] = "Unknown";
+    Browsers["Chrome"] = "Chrome";
+    Browsers["Safari"] = "Safari";
+    Browsers["Edge"] = "Edge";
+    Browsers["Firefox"] = "Firefox";
+    Browsers["Opera"] = "Opera";
+    Browsers["IE"] = "IE";
+    Browsers["SamsungInternet"] = "SamsungInternet";
+})(Browsers || (Browsers = {}));
+var USER_AGENT = (function () {
+    if (typeof globalThis.navigator.userAgent !== 'undefined')
+        return globalThis.navigator.userAgent;
+    return '';
+})();
+var HIGH_ENTROPY_BRAND_NAME_MAP = {
+    'Google Chrome': 'Chrome',
+    'Microsoft Edge': 'Edge',
+    'Microsoft Edge WebView2': 'Edge WebView2',
+    'Android WebView': 'Chrome WebView',
+    'HeadlessChrome': 'Chrome Headless',
+    'OperaMobile': 'Opera Mobi',
+};
+var OS_RESOLVER_MAP = [
+    [/windows nt (6\.[23]); arm/i, OS.Windows, resolveWindowsVersion],
+    [/windows (?:phone|mobile|iot)(?: os)?[\/ ]?([\d.]*( se)?)/i, OS.Windows, resolveWindowsVersion],
+    [/windows[\/ ](1[01]|2000|3\.1|7|8(\.1)?|9[58]|me|server 20\d\d( r2)?|vista|xp)/i, OS.Windows, resolveWindowsVersion],
+    [/windows nt ?([\d.)]*)(?!.+xbox)/i, OS.Windows, resolveWindowsVersion],
+    [/\bwin(?=3| ?9|n)(?:nt| 9x )?([\d.;]*)/i, OS.Windows, resolveWindowsVersion],
+    [/windows ce\/?([\d.]*)/i, OS.Windows, resolveWindowsVersion],
+    [/[adehimnop]{4,7}\b(?:.*os (\w+) like mac|; opera)/i, OS.iOS, resolveUnderscoreVersion],
+    [/(?:ios;fbsv|ios(?=.+ip(?:ad|hone))|ip(?:ad|hone)(?: |.+i(?:pad)?)os)[\/ ]([\w.]+)/i, OS.iOS, resolveUnderscoreVersion],
+    [/cfnetwork\/.+darwin/i, OS.iOS, resolveUnderscoreVersion],
+    [/mac os x ?([\w. ]*)/i, OS.MacOS, resolveUnderscoreVersion],
+    [/(?:macintosh|mac_powerpc\b)(?!.+(haiku|morphos))/i, OS.MacOS, resolveUnderscoreVersion],
+    [/droid ([\w.]+)\b.+(android[- ]x86)/i, OS.Android],
+    [/android\w*[-\/.; ]?([\d.]*)/i, OS.Android],
+];
+var ENGINE_RESOLVER_MAP = [
+    [/windows.+ edge\/([\w.]+)/i, Engines.EdgeHTML],
+    [/arkweb\/([\w.]+)/i, Engines.ArkWeb],
+    [/webkit\/537\.36.+chrome\/(?!27)([\w.]+)/i, Engines.Blink],
+    [/presto\/([\w.]+)/i, Engines.Presto],
+    [/webkit\/([\w.]+)/i, Engines.WebKit],
+    [/trident\/([\w.]+)/i, Engines.Trident],
+    [/netfront\/([\w.]+)/i, Engines.NetFront],
+    [/khtml[\/ ]\(?([\w.]+)/i, Engines.KHTML],
+    [/tasman[\/ ]\(?([\w.]+)/i, Engines.Tasman],
+    [/rv:([\w.]{1,9})\b.+gecko/i, Engines.Gecko]
+];
+var BROWSER_RESOLVER_MAP = [
+    [/\b(?:crmo|crios)\/([\w.]+)/i, Browsers.Chrome],
+    [/webview.+edge\/([\w.]+)/i, Browsers.Edge],
+    [/edg(?:e|ios|a)?\/([\w.]+)/i, Browsers.Edge],
+    [/opera mini\/([-\w.]+)/i, Browsers.Opera],
+    [/opera [mobileta]{3,6}\b.+version\/([-\w.]+)/i, Browsers.Opera],
+    [/opera(?:.+version\/|[\/ ]+)([\w.]+)/i, Browsers.Opera],
+    [/opios[\/ ]+([\w.]+)/i, Browsers.Opera],
+    [/\bop(?:rg)?x\/([\w.]+)/i, Browsers.Opera],
+    [/\bopr\/([\w.]+)/i, Browsers.Opera],
+    [/iemobile(?:browser|boat|jet)[\/ ]?([\d.]*)/i, Browsers.IE],
+    [/(?:ms|\()ie ([\w.]+)/i, Browsers.IE],
+    [/trident.+rv[: ]([\w.]{1,9})\b.+like gecko/i, Browsers.IE],
+    [/\bfocus\/([\w.]+)/i, Browsers.Firefox],
+    [/\bopt\/([\w.]+)/i, Browsers.Opera],
+    [/coast\/([\w.]+)/i, Browsers.Opera],
+    [/fxios\/([\w.-]+)/i, Browsers.Firefox],
+    [/samsungbrowser\/([\w.]+)/i, Browsers.SamsungInternet],
+    [/headlesschrome(?:\/([\w.]+)| )/i, Browsers.Chrome],
+    [/wv\).+chrome\/([\w.]+).+edgw\//i, Browsers.Edge],
+    [/ wv\).+(chrome)\/([\w.]+)/i, Browsers.Chrome],
+    [/chrome\/([\w.]+) mobile/i, Browsers.Chrome],
+    [/chrome\/v?([\w.]+)/i, Browsers.Chrome],
+    [/version\/([\w.,]+) .*mobile(?:\/\w+ | ?)safari/i, Browsers.Safari],
+    [/iphone .*mobile(?:\/\w+ | ?)safari/i, Browsers.Safari],
+    [/version\/([\w.,]+) .*safari/i, Browsers.Safari],
+    [/webkit.+?(?:mobile ?safari|safari)(\/[\w.]+)/i, Browsers.Safari, '1'],
+    [/(?:mobile|tablet);.*firefox\/([\w.-]+)/i, Browsers.Firefox],
+    [/mobile vr; rv:([\w.]+)\).+firefox/i, Browsers.Firefox],
+    [/firefox\/([\w.]+)/i, Browsers.Firefox],
+];
+
+var currentUserAgent = USER_AGENT;
+var parsedCache = null;
+var parsedFromHighEntropyValuesOS = {};
+var parsedFromHighEntropyValuesBrowser = {};
+var parsedFromHighEntropyValuesEngine = {};
+var parsedFromHighEntropyValuesDevice = null;
+function resolveVersion(string, resolver) {
+    if (typeof resolver === 'function')
+        return resolver(string);
+    if (typeof resolver === 'string')
+        return resolver;
+    if (typeof string === 'undefined')
+        return '';
+    return string;
+}
+function normalizeBrand(entry) {
+    if (entry === null || typeof entry === 'undefined')
+        return { brand: '', version: '' };
+    if (typeof entry === 'string')
+        return { brand: entry, version: '' };
+    return { brand: entry.brand, version: entry.version };
+}
+function getParsedCache() {
+    if (parsedCache !== null && parsedCache.userAgent === currentUserAgent)
+        return parsedCache;
+    parsedCache = {
+        userAgent: currentUserAgent,
+        os: parseOS(),
+        browser: parseBrowser(),
+        engine: parseEngine(),
+    };
+    return parsedCache;
+}
+function parseOS() {
+    var result = { name: OS.Unknown, version: '' };
+    for (var i = 0; i < OS_RESOLVER_MAP.length; i++) {
+        var map = OS_RESOLVER_MAP[i];
+        var matched = currentUserAgent.match(map[0]);
+        if (matched !== null) {
+            result.name = map[1];
+            result.version = resolveVersion(matched[1], map[2]);
+            break;
+        }
+    }
+    if (result.name === OS.iOS && compareVersion(result.version, '18.6') === 0) {
+        var version = /\) Version\/([\d.]+)/.exec(currentUserAgent);
+        if (version !== null) {
+            var major = parseInt(version[1].split('.')[0], 10);
+            if (major >= 26)
+                result.version = version[1];
+        }
+    }
+    if (currentUserAgent === USER_AGENT) {
+        if (typeof parsedFromHighEntropyValuesOS.name !== 'undefined')
+            result.name = parsedFromHighEntropyValuesOS.name;
+        if (typeof parsedFromHighEntropyValuesOS.version !== 'undefined')
+            result.version = parsedFromHighEntropyValuesOS.version;
+        if (result.name === OS.MacOS && typeof globalThis.navigator.standalone !== 'undefined' && globalThis.navigator.maxTouchPoints > 2)
+            result.name = OS.iOS;
+    }
+    return result;
+}
+function parseBrowser() {
+    var result = { name: Browsers.Unknown, version: '' };
+    for (var i = 0; i < BROWSER_RESOLVER_MAP.length; i++) {
+        var map = BROWSER_RESOLVER_MAP[i];
+        var matched = currentUserAgent.match(map[0]);
+        if (matched !== null) {
+            result.name = map[1];
+            result.version = resolveVersion(matched[1], map[2]);
+            break;
+        }
+    }
+    if (currentUserAgent === USER_AGENT) {
+        if (typeof parsedFromHighEntropyValuesBrowser.name !== 'undefined')
+            result.name = parsedFromHighEntropyValuesBrowser.name;
+        if (typeof parsedFromHighEntropyValuesBrowser.version !== 'undefined')
+            result.version = parsedFromHighEntropyValuesBrowser.version;
+    }
+    return result;
+}
+function parseEngine() {
+    var result = { name: Engines.Unknown, version: '' };
+    for (var i = 0; i < ENGINE_RESOLVER_MAP.length; i++) {
+        var map = ENGINE_RESOLVER_MAP[i];
+        var matched = currentUserAgent.match(map[0]);
+        if (matched !== null) {
+            result.name = map[1];
+            result.version = resolveVersion(matched[1], map[2]);
+            break;
+        }
+    }
+    if (currentUserAgent === USER_AGENT) {
+        if (typeof parsedFromHighEntropyValuesEngine.name !== 'undefined')
+            result.name = parsedFromHighEntropyValuesEngine.name;
+        if (typeof parsedFromHighEntropyValuesEngine.version !== 'undefined')
+            result.version = parsedFromHighEntropyValuesEngine.version;
+    }
+    return result;
+}
+function parseFromHighEntropyValues() {
+    if (typeof globalThis.navigator === 'undefined' || typeof globalThis.navigator.userAgentData === 'undefined' || typeof globalThis.navigator.userAgentData.getHighEntropyValues === 'undefined')
+        return Promise.resolve();
+    return globalThis.navigator.userAgentData
+        .getHighEntropyValues(['brands', 'fullVersionList', 'mobile', 'model', 'platform', 'platformVersion', 'architecture', 'formFactors', 'bitness', 'uaFullVersion', 'wow64'])
+        .then(function (result) {
+        try {
+            var brands = result.fullVersionList || result.brands || [];
+            var platformVersion = result.platformVersion;
+            var platform = result.platform;
+            var browserName = getParsedCache().browser.name;
+            var prevBrandName = null;
+            for (var i = 0; i < brands.length; i++) {
+                var brand = normalizeBrand(brands[i]);
+                var brandVersion = brand.version;
+                var brandName = brand.brand;
+                if (/not.a.brand/i.test(brandName))
+                    continue;
+                if (prevBrandName === null || (/Chrom/.test(prevBrandName) && brandName !== 'Chromium') || (prevBrandName === 'Edge' && /WebView2/.test(brandName))) {
+                    brandName = HIGH_ENTROPY_BRAND_NAME_MAP[brandName] || brandName;
+                    prevBrandName = browserName;
+                    if (prevBrandName === null || /Chrom/.test(prevBrandName) || !/Chrom/.test(brandName)) {
+                        browserName = brandName;
+                        if (browserName === 'Chrome' || browserName === 'Chrome WebView' || browserName === 'Chrome Headless')
+                            parsedFromHighEntropyValuesBrowser.name = Browsers.Chrome;
+                        else if (browserName === 'Edge' || browserName === 'Edge WebView2')
+                            parsedFromHighEntropyValuesBrowser.name = Browsers.Edge;
+                        else if (browserName === 'Opera Mobi')
+                            parsedFromHighEntropyValuesBrowser.name = Browsers.Opera;
+                        parsedFromHighEntropyValuesBrowser.version = brandVersion;
+                    }
+                    prevBrandName = brandName;
+                }
+                if (brandName === 'Chromium')
+                    parsedFromHighEntropyValuesEngine.version = brandVersion;
+            }
+            if (typeof platformVersion === 'string') {
+                if (getParsedCache().os.name === OS.Windows) {
+                    if (parseInt(platformVersion.split('.')[0], 10) >= 13)
+                        parsedFromHighEntropyValuesOS.version = '11';
+                    else
+                        parsedFromHighEntropyValuesOS.version = '10';
+                }
+                else {
+                    parsedFromHighEntropyValuesOS.version = platformVersion;
+                }
+            }
+            if (typeof platform === 'string') {
+                if (/android/i.test(platform))
+                    parsedFromHighEntropyValuesOS.name = OS.Android;
+                else if (/ios|iphone|ipad/i.test(platform))
+                    parsedFromHighEntropyValuesOS.name = OS.iOS;
+                else if (/windows|win32/i.test(platform))
+                    parsedFromHighEntropyValuesOS.name = OS.Windows;
+                else if (/macos|macintel/i.test(platform))
+                    parsedFromHighEntropyValuesOS.name = OS.MacOS;
+            }
+            if (result.mobile === true)
+                parsedFromHighEntropyValuesDevice = Devices.Mobile;
+            parsedCache = null;
+        }
+        catch (_) {
+        }
+    })
+        .catch(function () {
+    });
+}
+function parseFromNavigatorGPU() {
+    if (typeof globalThis.navigator === 'undefined' || typeof globalThis.navigator.gpu === 'undefined')
+        return Promise.resolve();
+    return globalThis.navigator.gpu
+        .requestAdapter()
+        .then(function (adapter) {
+        if (adapter !== null) {
+            var info = adapter.info;
+            info.architecture;
+            info.description;
+            info.device;
+            info.vendor;
+        }
+    })
+        .catch(function () {
+    });
+}
+Promise.all([
+    parseFromHighEntropyValues(),
+    parseFromNavigatorGPU(),
+]).then(function () {
+});
+EventListener.add(globalThis, {
+    type: 'languagechange', callback: function () {
+    }
+});
+var Platform = {
+    get os() {
+        return getParsedCache().os;
+    },
+    get browser() {
+        return getParsedCache().browser;
+    }};
+
 var PIP_PRESENTATION_MODE = 'picture-in-picture';
 var INLINE_PRESENTATION_MODE = 'inline';
-var lastPipVideo = null;
+var videoElement = null;
+var lastFallbackVideoElement = null;
 var eventsBridged = false;
 var PIP_BRIDGE_KEY = (function () {
     if (typeof Symbol === 'function') {
@@ -367,43 +730,57 @@ var onChangeSubscriptionManager = createSubscriptionManager(attachOnChange, deta
 var onErrorSubscriptionManager = createSubscriptionManager(attachOnError, detachOnError);
 var Pip = {
     get supported() {
-        return getEnabled();
+        return getSupported();
     },
     get element() {
         return getElement();
     },
-    get isPip() {
-        return getIsPip();
+    get isActive() {
+        return getIsActive();
     },
     request: request,
     exit: exit,
-    onChange: onChangeSubscriptionManager.subscribe,
-    onError: onErrorSubscriptionManager.subscribe,
+    toggle: toggle,
+    onChange: onChange,
+    onError: onError,
     Constants: {},
     Errors: {
         NotSupportedError: NotSupportedError,
         InvalidStateError: InvalidStateError,
     },
 };
+function getHTMLVideoElement() {
+    var selected = globalThis.document.querySelector('video');
+    if (selected !== null)
+        return selected;
+    if (videoElement === null)
+        return videoElement = globalThis.document.createElement('video');
+    return videoElement;
+}
 function hasStandardApi() {
     return typeof globalThis.document.pictureInPictureEnabled !== 'undefined';
 }
+function hasWebkitApi() {
+    return typeof getHTMLVideoElement().webkitSetPresentationMode === 'function';
+}
 function getDefaultTarget() {
     var video = globalThis.document.querySelector('video');
-    return video !== null ? video : undefined;
+    if (video !== null)
+        return video;
+    return undefined;
 }
-function createPipEventPayload(nativeEvent, element, isPip) {
+function createPipEventPayload(nativeEvent, element, isActive) {
     return {
         nativeEvent: nativeEvent,
         element: element,
-        isPip: isPip
+        isActive: isActive
     };
 }
-function emitChange(nativeEvent, element, isPip) {
-    onChangeSubscriptionManager.emit(createPipEventPayload(nativeEvent, element, isPip));
+function emitChange(nativeEvent, element, isActive) {
+    onChangeSubscriptionManager.emit(createPipEventPayload(nativeEvent, element, isActive));
 }
-function emitError(nativeEvent, element, isPip) {
-    onErrorSubscriptionManager.emit(createPipEventPayload(nativeEvent, element, isPip));
+function emitError(nativeEvent, element, isActive) {
+    onErrorSubscriptionManager.emit(createPipEventPayload(nativeEvent, element, isActive));
 }
 function onEnterPictureInPicture(event) {
     var target = event.target;
@@ -418,16 +795,16 @@ function onLeavePictureInPicture(event) {
 function onPictureInPictureError(event) {
     var target = event.target;
     if (target instanceof globalThis.HTMLVideoElement)
-        emitError(event, target, getIsPip());
+        emitError(event, target, getIsActive());
 }
 function onWebkitPresentationModeChanged(event) {
     if (this.webkitPresentationMode === PIP_PRESENTATION_MODE) {
-        lastPipVideo = this;
+        lastFallbackVideoElement = this;
         emitChange(event, this, true);
         return;
     }
-    if (this.webkitPresentationMode === INLINE_PRESENTATION_MODE && lastPipVideo === this) {
-        lastPipVideo = null;
+    if (this.webkitPresentationMode === INLINE_PRESENTATION_MODE && lastFallbackVideoElement === this) {
+        lastFallbackVideoElement = null;
         emitChange(event, this, false);
     }
 }
@@ -448,19 +825,19 @@ function bridgeEvents() {
     if (eventsBridged)
         return;
     eventsBridged = true;
-    if (hasStandardApi())
+    if (hasStandardApi() && !hasWebkitApi())
         return;
     bridgeWebkitVideoEvents();
     if (typeof globalThis.MutationObserver === 'undefined')
         return;
     var observer = new globalThis.MutationObserver(function (records) {
-        if (lastPipVideo !== null) {
+        if (lastFallbackVideoElement !== null) {
             var removed = false;
             for (var i = 0; i < records.length; i++) {
                 var removedNodes = records[i].removedNodes;
                 for (var j = 0; j < removedNodes.length; j++) {
                     var node = removedNodes[j];
-                    if (node === lastPipVideo || (node.nodeType === Node.ELEMENT_NODE && node.contains(lastPipVideo))) {
+                    if (node === lastFallbackVideoElement || (node.nodeType === Node.ELEMENT_NODE && node.contains(lastFallbackVideoElement))) {
                         removed = true;
                         break;
                     }
@@ -468,8 +845,8 @@ function bridgeEvents() {
                 if (removed)
                     break;
             }
-            if (removed && !globalThis.document.contains(lastPipVideo))
-                lastPipVideo = null;
+            if (removed && !globalThis.document.contains(lastFallbackVideoElement))
+                lastFallbackVideoElement = null;
         }
         for (var i = 0; i < records.length; i++) {
             var addedNodes = records[i].addedNodes;
@@ -516,26 +893,21 @@ function attachOnError() {
 function detachOnError() {
     EventListener.remove(globalThis.document, { type: 'pictureinpictureerror', callback: onPictureInPictureError, options: false });
 }
-function getEnabled() {
+function getSupported() {
     if (typeof globalThis.document.pictureInPictureEnabled === 'boolean')
         return globalThis.document.pictureInPictureEnabled;
-    var video;
-    var selected = globalThis.document.querySelector('video');
-    if (selected !== null)
-        video = selected;
-    else
-        video = globalThis.document.createElement('video');
+    var video = getHTMLVideoElement();
     return typeof video.webkitSupportsPresentationMode === 'function' && video.webkitSupportsPresentationMode(PIP_PRESENTATION_MODE);
 }
 function getElement() {
     var currentElement = globalThis.document.pictureInPictureElement;
     if (currentElement !== null && typeof currentElement !== 'undefined')
         return currentElement;
-    if (lastPipVideo !== null && lastPipVideo.webkitPresentationMode === PIP_PRESENTATION_MODE)
-        return lastPipVideo;
+    if (lastFallbackVideoElement !== null && lastFallbackVideoElement.webkitPresentationMode === PIP_PRESENTATION_MODE)
+        return lastFallbackVideoElement;
     return null;
 }
-function getIsPip() {
+function getIsActive() {
     return getElement() !== null;
 }
 function request(target) {
@@ -544,12 +916,14 @@ function request(target) {
             target = getDefaultTarget();
         if (typeof target === 'undefined')
             return reject(new NotSupportedError('Failed to enter Picture-in-Picture mode.'));
+        if (getIsActive() && getElement() !== target && Platform.browser.name === Browsers.Safari && Platform.os.name === OS.iOS)
+            return reject(new NotSupportedError('There is already a Picture-in-Picture element in this document.'));
         var tagName = target.tagName.toLowerCase();
         if (tagName !== 'video')
             return reject(new NotSupportedError('The "' + tagName + '" element does not support Picture-in-Picture requests.'));
         var method = target.requestPictureInPicture;
-        var isWebkitPipActive = lastPipVideo !== null && lastPipVideo.webkitPresentationMode === PIP_PRESENTATION_MODE;
-        if (typeof method === 'function' && !isWebkitPipActive) {
+        var isWebkitPipActive = lastFallbackVideoElement !== null && lastFallbackVideoElement.webkitPresentationMode === PIP_PRESENTATION_MODE;
+        if (typeof method === 'function' && !hasWebkitApi() && !isWebkitPipActive) {
             var result = method.call(target);
             if (typeof result !== 'undefined' && typeof result.then === 'function') {
                 result
@@ -570,12 +944,8 @@ function request(target) {
             if (typeof target !== 'undefined' && typeof target.webkitSupportsPresentationMode === 'function' && target.webkitSupportsPresentationMode(PIP_PRESENTATION_MODE) && typeof target.webkitSetPresentationMode === 'function') {
                 if (target.disablePictureInPicture)
                     return reject(new NotSupportedError('Picture-in-Picture is disabled on this element.'));
-                if (!hasStandardApi())
-                    bridgeSingleVideoNode(target);
+                bridgeSingleVideoNode(target);
                 target.webkitSetPresentationMode(PIP_PRESENTATION_MODE);
-                if (target.webkitPresentationMode !== PIP_PRESENTATION_MODE)
-                    return reject(new InvalidStateError('Picture-in-Picture transition is already in progress.'));
-                lastPipVideo = target;
                 return resolve();
             }
             reject(new NotSupportedError('The "' + tagName + '" element does not support Picture-in-Picture requests.'));
@@ -586,7 +956,7 @@ function request(target) {
 function exit() {
     return new Promise(function (resolve, reject) {
         var method = globalThis.document.exitPictureInPicture;
-        if (typeof method === 'function') {
+        if (typeof method === 'function' && !hasWebkitApi()) {
             var result = method.call(globalThis.document);
             if (typeof result !== 'undefined' && typeof result.then === 'function') {
                 result
@@ -604,9 +974,8 @@ function exit() {
             return resolve();
         }
         function fallbackToWebkit() {
-            if (lastPipVideo !== null && typeof lastPipVideo.webkitSetPresentationMode === 'function' && lastPipVideo.webkitPresentationMode === PIP_PRESENTATION_MODE) {
-                lastPipVideo.webkitSetPresentationMode(INLINE_PRESENTATION_MODE);
-                lastPipVideo = null;
+            if (lastFallbackVideoElement !== null && typeof lastFallbackVideoElement.webkitSetPresentationMode === 'function') {
+                lastFallbackVideoElement.webkitSetPresentationMode(INLINE_PRESENTATION_MODE);
                 return resolve();
             }
             var videos = globalThis.document.querySelectorAll('video');
@@ -614,17 +983,49 @@ function exit() {
                 var video = videos[i];
                 if (typeof video.webkitSetPresentationMode === 'function' && video.webkitPresentationMode === PIP_PRESENTATION_MODE) {
                     video.webkitSetPresentationMode(INLINE_PRESENTATION_MODE);
-                    lastPipVideo = null;
                     return resolve();
                 }
             }
-            if (globalThis.document.pictureInPictureElement === null || typeof globalThis.document.pictureInPictureElement === 'undefined')
-                return resolve();
-            reject(new NotSupportedError('Failed to exit Picture-in-Picture mode.'));
+            return resolve();
         }
         fallbackToWebkit();
     });
 }
+function toggle(target) {
+    var current = getElement();
+    if (typeof target !== 'undefined') {
+        if (current === target)
+            return this.exit();
+        else
+            return this.request(target);
+    }
+    if (current !== null)
+        return this.exit();
+    else
+        return this.request(target);
+}
+function onChange(targetOrListener, listenerOrOptions, options) {
+    if (typeof targetOrListener === 'function')
+        return onChangeSubscriptionManager.subscribe(targetOrListener, listenerOrOptions);
+    var target = targetOrListener;
+    var listener = listenerOrOptions;
+    function wrappedListener(payload) {
+        if (payload.element === target)
+            listener(payload);
+    }
+    return onChangeSubscriptionManager.subscribe(wrappedListener, options);
+}
+function onError(targetOrListener, listenerOrOptions, options) {
+    if (typeof targetOrListener === 'function')
+        return onErrorSubscriptionManager.subscribe(targetOrListener, listenerOrOptions);
+    var target = targetOrListener;
+    var listener = listenerOrOptions;
+    function wrappedListener(payload) {
+        if (payload.element === target)
+            listener(payload);
+    }
+    return onErrorSubscriptionManager.subscribe(wrappedListener, options);
+}
 bridgeEvents();
 
 module.exports = Pip;

package/dist/plugin/pip/index.d.ts

@@ -5,11 +5,14 @@ declare const InvalidStateError: ErrorConstructor;
 declare interface PipInstance {
     get supported(): boolean;
     get element(): HTMLVideoElement | null;
-    get isPip(): boolean;
+    get isActive(): boolean;
     request(target?: HTMLVideoElement): Promise<void>;
     exit(): Promise<void>;
+    toggle(target?: HTMLVideoElement): Promise<void>;
     onChange(listener: (payload: PipEventPayload) => void, options?: AddEventListenerOptions): () => void;
+    onChange(target: HTMLVideoElement, listener: (payload: PipEventPayload) => void, options?: AddEventListenerOptions): () => void;
     onError(listener: (payload: PipEventPayload) => void, options?: AddEventListenerOptions): () => void;
+    onError(target: HTMLVideoElement, listener: (payload: PipEventPayload) => void, options?: AddEventListenerOptions): () => void;
     Constants: {};
     Errors: {
         NotSupportedError: typeof NotSupportedError;
@@ -19,7 +22,7 @@ declare interface PipInstance {
 declare interface PipEventPayload {
     nativeEvent: Event;
     element: HTMLVideoElement;
-    isPip: boolean;
+    isActive: boolean;
 }
 
 declare global {