@next2d/ui 1.18.7 → 1.18.9

package/dist/Job.d.ts

@@ -1,4 +1,4 @@
-import { EventDispatcher, Event } from "@next2d/events";
+import { EventDispatcher } from "@next2d/events";
 /**
  * @class
  * @memberOf next2d.ui
@@ -16,6 +16,7 @@ export declare class Job extends EventDispatcher {
     private _$forceStop;
     private _$to;
     private _$currentTime;
+    private _$timerId;
     /**
      * @param {object}   target
      * @param {object}   [from=null]
@@ -119,15 +120,15 @@ export declare class Job extends EventDispatcher {
      * @param  {object} object
      * @return {array}
      * @method
-     * @public
+     * @private
      */
-    entries(object: any): any[];
+    _$entries(object: any): any[];
     /**
-     * @return {Promise}
+     * @return {void}
      * @method
      * @public
      */
-    start(): Promise<void>;
+    start(): void;
     /**
      * @return {void}
      * @method
@@ -135,12 +136,11 @@ export declare class Job extends EventDispatcher {
      */
     stop(): void;
     /**
-     * @param  {Event} event
      * @return {void}
      * @method
      * @private
      */
-    _$update(event: Event): void;
+    _$update(): void;
     /**
      * @param  {object} target
      * @param  {object} from

package/dist/Job.js

@@ -1,6 +1,6 @@
 import { Easing } from "./Easing";
 import { EventDispatcher, Event } from "@next2d/events";
-import { $setTimeout, $performance } from "@next2d/share";
+import { $setTimeout, $performance, $cancelAnimationFrame } from "@next2d/share";
 /**
  * @class
  * @memberOf next2d.ui
@@ -85,6 +85,12 @@ export class Job extends EventDispatcher {
          * @private
          */
         this._$currentTime = 0;
+        /**
+         * @type {number}
+         * @default 0
+         * @private
+         */
+        this._$timerId = 0;
     }
     /**
      * @description 指定されたクラスのストリングを返します。
@@ -211,50 +217,44 @@ export class Job extends EventDispatcher {
         // setup
         this._$stopFlag = false;
         this._$startTime = $performance.now();
-        this._$names = this.entries(this._$from);
-        // add event
-        this.addEventListener(Event.ENTER_FRAME, (event) => {
-            this._$update(event);
-        });
+        this._$names = this._$entries(this._$from);
+        // start
+        this._$update();
     }
     /**
      * @param  {object} object
      * @return {array}
      * @method
-     * @public
+     * @private
      */
-    entries(object) {
+    _$entries(object) {
         const entries = Object.entries(object);
         for (let idx = 0; idx < entries.length; ++idx) {
             const values = entries[idx];
             const value = values[1];
             if (value && typeof value === "object") {
-                values[1] = this.entries(value);
+                values[1] = this._$entries(value);
             }
         }
         return entries;
     }
     /**
-     * @return {Promise}
+     * @return {void}
      * @method
      * @public
      */
     start() {
-        return new Promise((resolve) => {
-            if (!this.hasEventListener(Event.COMPLETE)) {
-                this.addEventListener(Event.COMPLETE, (event) => {
-                    this.removeEventListener(Event.COMPLETE, event.listener);
-                    resolve();
-                });
-            }
-            if (this._$delay) {
-                $setTimeout(() => {
-                    this.initialize();
-                }, this._$delay * 1000);
-                return;
-            }
-            this.initialize();
-        });
+        if (this._$timerId) {
+            $cancelAnimationFrame(this._$timerId);
+        }
+        this._$forceStop = false;
+        if (this._$delay) {
+            $setTimeout(() => {
+                this.initialize();
+            }, this._$delay * 1000);
+            return;
+        }
+        this.initialize();
     }
     /**
      * @return {void}
@@ -262,44 +262,45 @@ export class Job extends EventDispatcher {
      * @public
      */
     stop() {
+        if (this._$timerId) {
+            $cancelAnimationFrame(this._$timerId);
+        }
         if (this.hasEventListener(Event.STOP)) {
             this.dispatchEvent(new Event(Event.STOP));
+            this.removeAllEventListener(Event.STOP);
         }
-        if (this.hasEventListener(Event.ENTER_FRAME)) {
-            this.removeAllEventListener(Event.ENTER_FRAME);
-        }
-        if (this.hasEventListener(Event.UPDATE)) {
-            this.removeAllEventListener(Event.UPDATE);
-        }
-        if (this.hasEventListener(Event.COMPLETE)) {
-            this.removeAllEventListener(Event.COMPLETE);
-        }
+        this._$names = null;
         this._$forceStop = true;
         this._$stopFlag = true;
     }
     /**
-     * @param  {Event} event
      * @return {void}
      * @method
      * @private
      */
-    _$update(event) {
+    _$update() {
         if (this._$stopFlag) {
             return;
         }
-        this._$currentTime = ($performance.now() - this._$startTime) * 0.001;
-        if (this._$names) {
-            this._$updateProperty(this._$target, this._$from, this._$to, this._$names);
+        if (!this._$names) {
+            return this.stop();
         }
+        // update current time
+        this._$currentTime = ($performance.now() - this._$startTime) * 0.001;
+        this._$updateProperty(this._$target, this._$from, this._$to, this._$names);
         if (this.hasEventListener(Event.UPDATE)) {
             this.dispatchEvent(new Event(Event.UPDATE));
         }
         if (this._$currentTime >= this._$duration) {
-            this.removeEventListener(Event.ENTER_FRAME, event.listener);
             if (this.hasEventListener(Event.COMPLETE)) {
                 this.dispatchEvent(new Event(Event.COMPLETE));
             }
         }
+        else {
+            this._$timerId = requestAnimationFrame(() => {
+                this._$update();
+            });
+        }
     }
     /**
      * @param  {object} target

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next2d/ui",
-  "version": "1.18.7",
+  "version": "1.18.9",
   "description": "Next2D UI Packages",
   "author": "Toshiyuki Ienaga<ienaga@tvon.jp> (https://github.com/ienaga/)",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "url": "git+https://github.com/Next2D/Player.git"
   },
   "peerDependencies": {
-    "@next2d/events": "1.18.7",
-    "@next2d/share": "1.18.7"
+    "@next2d/events": "1.18.9",
+    "@next2d/share": "1.18.9"
   }
 }