update aspectRatioReset

docs/uncompiled/artplayer/index.js

@@ -1832,11 +1832,9 @@ function aspectRatioMix(art) {
         }
     });
     (0, _utils.def)(art, "aspectRatioReset", {
-        set (value) {
-            if (value) {
-                const { aspectRatio  } = art;
-                art.aspectRatio = aspectRatio;
-            }
+        value () {
+            const { aspectRatio  } = art;
+            art.aspectRatio = aspectRatio;
         }
     });
 }
@@ -1907,14 +1905,14 @@ function fullscreenMix(art) {
             async set (value) {
                 if (value) {
                     art.normalSize = "fullscreen";
-                    art.aspectRatioReset = true;
+                    art.aspectRatioReset();
                     art.autoSize = false;
                     await (0, _screenfullDefault.default).request($player);
                     (0, _utils.addClass)($player, "art-fullscreen");
                     art.emit("resize");
                     notice.show = "";
                 } else {
-                    art.aspectRatioReset = true;
+                    art.aspectRatioReset();
                     art.autoSize = art.option.autoSize;
                     await (0, _screenfullDefault.default).exit();
                     (0, _utils.removeClass)($player, "art-fullscreen");
@@ -2093,26 +2091,32 @@ var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
 parcelHelpers.defineInteropFlag(exports);
 var _utils = require("../utils");
 function fullscreenWebMix(art) {
-    const { notice , constructor , template: { $container , $player  }  } = art;
+    const { option , notice , constructor , template: { $container , $player  }  } = art;
+    let cssText = "";
     (0, _utils.def)(art, "fullscreenWeb", {
         get () {
             return (0, _utils.hasClass)($player, "art-fullscreen-web");
         },
         set (value) {
             if (value) {
+                cssText = $player.style.cssText;
                 if (constructor.FULLSCREEN_WEB_IN_BODY) (0, _utils.append)(document.body, $player);
                 art.normalSize = "fullscreenWeb";
                 (0, _utils.addClass)($player, "art-fullscreen-web");
-                art.aspectRatioReset = true;
+                art.aspectRatioReset();
                 art.autoSize = false;
                 art.emit("resize");
                 art.emit("fullscreenWeb", true);
                 notice.show = "";
             } else {
                 if (constructor.FULLSCREEN_WEB_IN_BODY) (0, _utils.append)($container, $player);
+                if (cssText) {
+                    $player.style.cssText = cssText;
+                    cssText = "";
+                }
                 (0, _utils.removeClass)($player, "art-fullscreen-web");
-                art.aspectRatioReset = true;
-                art.autoSize = art.option.autoSize;
+                art.aspectRatioReset();
+                art.autoSize = option.autoSize;
                 art.emit("resize");
                 art.emit("fullscreenWeb", false);
                 notice.show = "";
@@ -2590,7 +2594,7 @@ function normalSizeMix(art) {
     ];
     (0, _utils.def)(art, "normalSize", {
         get () {
-            return sizeProps.every((name)=>!art[name]);
+            return sizeProps.find((name)=>art[name]) || "";
         },
         set (name) {
             sizeProps.filter((item)=>item !== name).forEach((item)=>{
@@ -4116,7 +4120,7 @@ function resizeInit(art, events) {
     const { option  } = art;
     const resizeFn = (0, _utils.throttle)(()=>{
         if (art.normalSize) art.autoSize = option.autoSize;
-        art.aspectRatioReset = true;
+        art.aspectRatioReset();
         art.notice.show = "";
         art.emit("resize");
     }, art.constructor.RESIZE_TIME);
@@ -5113,7 +5117,7 @@ class Plugins {
 }
 exports.default = Plugins;
 
-},{"../utils":"jmgNb","./miniProgressBar":"dMA6v","./autoOrientation":"aROGj","./autoPlayback":"kQ2fc","./fastForward":"fgbhT","./lock":"j2mDF","@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6"}],"dMA6v":[function(require,module,exports) {
+},{"../utils":"jmgNb","./miniProgressBar":"dMA6v","./autoPlayback":"kQ2fc","./fastForward":"fgbhT","./lock":"j2mDF","@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6","./autoOrientation":"aROGj"}],"dMA6v":[function(require,module,exports) {
 var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
 parcelHelpers.defineInteropFlag(exports);
 function miniProgressBar(art) {
@@ -5139,64 +5143,7 @@ function miniProgressBar(art) {
 }
 exports.default = miniProgressBar;
 
-},{"@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6"}],"aROGj":[function(require,module,exports) {
-var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
-parcelHelpers.defineInteropFlag(exports);
-var _utils = require("../utils");
-function autoOrientation(art) {
-    const { option , constructor , template: { $player , $video  }  } = art;
-    art.on("fullscreenWeb", (state)=>{
-        if (state) {
-            const { videoWidth , videoHeight  } = $video;
-            const { clientWidth: viewWidth , clientHeight: viewHeight  } = document.documentElement;
-            if (videoWidth > videoHeight && viewWidth < viewHeight || videoWidth < videoHeight && viewWidth > viewHeight) // There is a conflict with the fullscreen event, and it is changed to asynchronous execution
-            setTimeout(()=>{
-                (0, _utils.setStyle)($player, "width", `${viewHeight}px`);
-                (0, _utils.setStyle)($player, "height", `${viewWidth}px`);
-                (0, _utils.setStyle)($player, "transform-origin", "0 0");
-                (0, _utils.setStyle)($player, "transform", `rotate(90deg) translate(0, -${viewWidth}px)`);
-                (0, _utils.addClass)($player, "art-auto-orientation");
-                art.isRotate = true;
-                art.emit("resize");
-            }, constructor.MOBILE_AUTO_ORIENTATION_TIME);
-        } else if ((0, _utils.hasClass)($player, "art-auto-orientation")) {
-            (0, _utils.setStyle)($player, "width", null);
-            (0, _utils.setStyle)($player, "height", null);
-            (0, _utils.setStyle)($player, "transform", null);
-            (0, _utils.setStyle)($player, "transform-origin", null);
-            (0, _utils.removeClass)($player, "art-auto-orientation");
-            art.isRotate = false;
-            art.aspectRatioReset = true;
-            art.autoSize = option.autoSize;
-            art.notice.show = "";
-            art.emit("resize");
-        }
-    });
-    art.on("fullscreen", async (state)=>{
-        const lastOrientation = screen.orientation.type;
-        if (state) {
-            const { videoWidth , videoHeight  } = $video;
-            const { clientWidth: viewWidth , clientHeight: viewHeight  } = document.documentElement;
-            if (videoWidth > videoHeight && viewWidth < viewHeight || videoWidth < videoHeight && viewWidth > viewHeight) {
-                const oppositeOrientation = lastOrientation.startsWith("portrait") ? "landscape" : "portrait";
-                await screen.orientation.lock(oppositeOrientation);
-                (0, _utils.addClass)($player, "art-auto-orientation-fullscreen");
-            }
-        } else if ((0, _utils.hasClass)($player, "art-auto-orientation-fullscreen")) {
-            await screen.orientation.lock(lastOrientation);
-            (0, _utils.removeClass)($player, "art-auto-orientation-fullscreen");
-        }
-    });
-    return {
-        name: "autoOrientation",
-        get state () {
-            return (0, _utils.hasClass)($player, "art-auto-orientation");
-        }
-    };
-}
-exports.default = autoOrientation;
-
-},{"../utils":"jmgNb","@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6"}],"kQ2fc":[function(require,module,exports) {
+},{"@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6"}],"kQ2fc":[function(require,module,exports) {
 var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
 parcelHelpers.defineInteropFlag(exports);
 var _utils = require("../utils");
@@ -5342,6 +5289,57 @@ function lock(art) {
 }
 exports.default = lock;
 
+},{"../utils":"jmgNb","@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6"}],"aROGj":[function(require,module,exports) {
+var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
+parcelHelpers.defineInteropFlag(exports);
+var _utils = require("../utils");
+function autoOrientation(art) {
+    const { constructor , template: { $player , $video  }  } = art;
+    art.on("fullscreenWeb", (state)=>{
+        if (state) {
+            const { videoWidth , videoHeight  } = $video;
+            const { clientWidth: viewWidth , clientHeight: viewHeight  } = document.documentElement;
+            if (videoWidth > videoHeight && viewWidth < viewHeight || videoWidth < videoHeight && viewWidth > viewHeight) // There is a conflict with the fullscreen event, and it is changed to asynchronous execution
+            setTimeout(()=>{
+                (0, _utils.setStyle)($player, "width", `${viewHeight}px`);
+                (0, _utils.setStyle)($player, "height", `${viewWidth}px`);
+                (0, _utils.setStyle)($player, "transform-origin", "0 0");
+                (0, _utils.setStyle)($player, "transform", `rotate(90deg) translate(0, -${viewWidth}px)`);
+                (0, _utils.addClass)($player, "art-auto-orientation");
+                art.isRotate = true;
+                art.emit("resize");
+            }, constructor.MOBILE_AUTO_ORIENTATION_TIME);
+        } else if ((0, _utils.hasClass)($player, "art-auto-orientation")) {
+            (0, _utils.removeClass)($player, "art-auto-orientation");
+            art.isRotate = false;
+            art.notice.show = "";
+            art.emit("resize");
+        }
+    });
+    art.on("fullscreen", async (state)=>{
+        const lastOrientation = screen.orientation.type;
+        if (state) {
+            const { videoWidth , videoHeight  } = $video;
+            const { clientWidth: viewWidth , clientHeight: viewHeight  } = document.documentElement;
+            if (videoWidth > videoHeight && viewWidth < viewHeight || videoWidth < videoHeight && viewWidth > viewHeight) {
+                const oppositeOrientation = lastOrientation.startsWith("portrait") ? "landscape" : "portrait";
+                await screen.orientation.lock(oppositeOrientation);
+                (0, _utils.addClass)($player, "art-auto-orientation-fullscreen");
+            }
+        } else if ((0, _utils.hasClass)($player, "art-auto-orientation-fullscreen")) {
+            await screen.orientation.lock(lastOrientation);
+            (0, _utils.removeClass)($player, "art-auto-orientation-fullscreen");
+        }
+    });
+    return {
+        name: "autoOrientation",
+        get state () {
+            return (0, _utils.hasClass)($player, "art-auto-orientation");
+        }
+    };
+}
+exports.default = autoOrientation;
+
 },{"../utils":"jmgNb","@parcel/transformer-js/src/esmodule-helpers.js":"5dUr6"}],"c9n1Y":[function(require,module,exports) {
 var parcelHelpers = require("@parcel/transformer-js/src/esmodule-helpers.js");
 parcelHelpers.defineInteropFlag(exports);

docs/uncompiled/artplayer/index.js.map

@@ -1 +1 @@
-{"mappings":"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 truncated
+{"mappings":"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 truncated

packages/artplayer/src/events/resizeInit.js

@@ -7,7 +7,7 @@ export default function resizeInit(art, events) {
         if (art.normalSize) {
             art.autoSize = option.autoSize;
         }
-        art.aspectRatioReset = true;
+        art.aspectRatioReset();
         art.notice.show = '';
         art.emit('resize');
     }, art.constructor.RESIZE_TIME);

packages/artplayer/src/player/aspectRatioMix.js

@@ -44,11 +44,9 @@ export default function aspectRatioMix(art) {
     });
 
     def(art, 'aspectRatioReset', {
-        set(value) {
-            if (value) {
-                const { aspectRatio } = art;
-                art.aspectRatio = aspectRatio;
-            }
+        value() {
+            const { aspectRatio } = art;
+            art.aspectRatio = aspectRatio;
         },
     });
 }

packages/artplayer/src/player/fullscreenMix.js

@@ -20,14 +20,14 @@ export default function fullscreenMix(art) {
             async set(value) {
                 if (value) {
                     art.normalSize = 'fullscreen';
-                    art.aspectRatioReset = true;
+                    art.aspectRatioReset();
                     art.autoSize = false;
                     await screenfull.request($player);
                     addClass($player, 'art-fullscreen');
                     art.emit('resize');
                     notice.show = '';
                 } else {
-                    art.aspectRatioReset = true;
+                    art.aspectRatioReset();
                     art.autoSize = art.option.autoSize;
                     await screenfull.exit();
                     removeClass($player, 'art-fullscreen');

packages/artplayer/src/player/fullscreenWebMix.js

@@ -2,23 +2,26 @@ import { addClass, removeClass, hasClass, def, append } from '../utils';
 
 export default function fullscreenWebMix(art) {
     const {
+        option,
         notice,
         constructor,
         template: { $container, $player },
     } = art;
 
+    let cssText = '';
     def(art, 'fullscreenWeb', {
         get() {
             return hasClass($player, 'art-fullscreen-web');
         },
         set(value) {
             if (value) {
+                cssText = $player.style.cssText;
                 if (constructor.FULLSCREEN_WEB_IN_BODY) {
                     append(document.body, $player);
                 }
                 art.normalSize = 'fullscreenWeb';
                 addClass($player, 'art-fullscreen-web');
-                art.aspectRatioReset = true;
+                art.aspectRatioReset();
                 art.autoSize = false;
                 art.emit('resize');
                 art.emit('fullscreenWeb', true);
@@ -27,9 +30,13 @@ export default function fullscreenWebMix(art) {
                 if (constructor.FULLSCREEN_WEB_IN_BODY) {
                     append($container, $player);
                 }
+                if (cssText) {
+                    $player.style.cssText = cssText;
+                    cssText = '';
+                }
                 removeClass($player, 'art-fullscreen-web');
-                art.aspectRatioReset = true;
-                art.autoSize = art.option.autoSize;
+                art.aspectRatioReset();
+                art.autoSize = option.autoSize;
                 art.emit('resize');
                 art.emit('fullscreenWeb', false);
                 notice.show = '';

packages/artplayer/src/player/normalSizeMix.js

@@ -5,7 +5,7 @@ export default function normalSizeMix(art) {
 
     def(art, 'normalSize', {
         get() {
-            return sizeProps.every((name) => !art[name]);
+            return sizeProps.find((name) => art[name]) || '';
         },
         set(name) {
             sizeProps

packages/artplayer/src/plugins/autoOrientation.js

@@ -2,7 +2,6 @@ import { setStyle, addClass, removeClass, hasClass } from '../utils';
 
 export default function autoOrientation(art) {
     const {
-        option,
         constructor,
         template: { $player, $video },
     } = art;
@@ -28,14 +27,8 @@ export default function autoOrientation(art) {
             }
         } else {
             if (hasClass($player, 'art-auto-orientation')) {
-                setStyle($player, 'width', null);
-                setStyle($player, 'height', null);
-                setStyle($player, 'transform', null);
-                setStyle($player, 'transform-origin', null);
                 removeClass($player, 'art-auto-orientation');
                 art.isRotate = false;
-                art.aspectRatioReset = true;
-                art.autoSize = option.autoSize;
                 art.notice.show = '';
                 art.emit('resize');
             }

packages/artplayer/types/player.d.ts

@@ -5,7 +5,8 @@ export type Flip = 'normal' | 'horizontal' | 'vertical' | (string & Record<never
 export declare class Player {
     get aspectRatio(): AspectRatio;
     set aspectRatio(ratio: AspectRatio);
-    set aspectRatioReset(state: boolean);
+    get normalSize(): string;
+    set normalSize(name: string);
     get playbackRate(): PlaybackRate;
     set playbackRate(rate: PlaybackRate);
     get autoSize(): boolean;
@@ -70,4 +71,5 @@ export declare class Player {
     getBlobUrl(): Promise<string>;
     screenshot(): Promise<string>;
     airplay(): void;
+    aspectRatioReset(state: boolean): void;
 }