@meursyphus/flitter 0.0.8 → 0.0.9

package/index.cjs

@@ -12675,39 +12675,58 @@ var RenderOwner_default = RenderOwner;
 
 // src/scheduler/Scheduler.ts
 var Scheduler = class {
-  constructor() {
+  constructor({
+    renderFrameDispatcher
+  }) {
     __publicField(this, "phase");
     __publicField(this, "persistenceCallbacks");
     __publicField(this, "postFrameCallbacks");
+    __publicField(this, "renderFrameDispatcher");
+    __publicField(this, "hasScheduledFrame", false);
     this.phase = 0 /* idle */;
     this.persistenceCallbacks = [];
     this.postFrameCallbacks = [];
+    this.renderFrameDispatcher = renderFrameDispatcher;
+    renderFrameDispatcher.setOnFrame(() => this.handleDrawFrame());
   }
-  consumePostCallbacks() {
+  flushPostCallbacks() {
     this.postFrameCallbacks.forEach((callback) => {
       callback();
     });
     this.postFrameCallbacks = [];
   }
-  schedule() {
+  ensureVisualUpdate() {
     switch (this.phase) {
       case 0 /* idle */:
       case 2 /* postFrameCallbacks */:
-        this.performSchedule();
+        this.schedule();
         break;
       case 1 /* persistenceCallbacks */:
         break;
     }
   }
-  performSchedule() {
+  schedule() {
+    if (this.hasScheduledFrame)
+      return;
+    this.renderFrameDispatcher.dispatch();
+    this.hasScheduledFrame = true;
+  }
+  handleDrawFrame() {
+    assert(
+      this.phase === 0 /* idle */,
+      "Scheduler should be idle on beginning frame"
+    );
+    this.hasScheduledFrame = false;
     this.phase = 1 /* persistenceCallbacks */;
+    this.flushPersistenceCallbacks();
+    this.phase = 2 /* postFrameCallbacks */;
+    this.flushPostCallbacks();
+    this.phase = 0 /* idle */;
+  }
+  flushPersistenceCallbacks() {
     this.persistenceCallbacks.forEach((callback) => {
       callback();
     });
-    this.phase = 2 /* postFrameCallbacks */;
-    this.consumePostCallbacks();
-    this.postFrameCallbacks = [];
-    this.phase = 0 /* idle */;
   }
   addPersistenceCallbacks(callback) {
     this.persistenceCallbacks.push(() => callback());
@@ -12722,9 +12741,6 @@ var Scheduler_default = Scheduler;
 var RenderFrameDispatcher = class {
   constructor({ onFrame } = {}) {
     __publicField(this, "onFrame");
-    // Actually we don't need to invoke browser to render because browser automatically render its own state periodically
-    // so Here we just call onFrame callback.
-    __publicField(this, "idle", true);
     this.onFrame = onFrame;
   }
   setOnFrame(callback) {
@@ -12733,13 +12749,9 @@ var RenderFrameDispatcher = class {
   dispatch() {
     if (typeof window === "undefined")
       return;
-    if (!this.idle)
-      return;
-    this.idle = false;
     window.requestAnimationFrame(() => {
       var _a;
       (_a = this.onFrame) == null ? void 0 : _a.call(this);
-      this.idle = true;
     });
   }
 };
@@ -12940,19 +12952,18 @@ var AppRunner = class {
       window: _window,
       onResize: this.handleViewResize
     });
-    const renderDispatcher = new RenderFrameDispatcher_default();
+    const renderFrameDispatcher = new RenderFrameDispatcher_default();
+    const scheduler = new Scheduler_default({ renderFrameDispatcher });
     const buildOwner = new BuildOwner_default({
-      onNeedVisualUpdate: () => renderDispatcher.dispatch()
+      onNeedVisualUpdate: () => scheduler.ensureVisualUpdate()
     });
     const renderOwner = new RenderOwner_default({
-      onNeedVisualUpdate: () => renderDispatcher.dispatch(),
+      onNeedVisualUpdate: () => scheduler.ensureVisualUpdate(),
       renderContext,
       hitTestDispatcher: new HitTestDispatcher()
     });
-    const scheduler = new Scheduler_default();
     scheduler.addPersistenceCallbacks(() => buildOwner.flushBuild());
     scheduler.addPersistenceCallbacks(() => renderOwner.drawFrame());
-    renderDispatcher.setOnFrame(() => scheduler.schedule());
     this.buildOwner = buildOwner;
     this.renderOwner = renderOwner;
     this.scheduler = scheduler;
@@ -13002,7 +13013,7 @@ var AppRunner = class {
     this.layout();
     this.renderOwner.rearrangeDomOrder();
     this.paint();
-    this.scheduler.consumePostCallbacks();
+    this.scheduler.flushPostCallbacks();
   }
   rebuild() {
     this.root.children[0].rebuild();

package/index.d.cts

@@ -3408,14 +3408,29 @@ declare class RenderOwner {
     private flushPaint;
 }
 
+declare class RenderFrameDispatcher {
+    private onFrame?;
+    constructor({ onFrame }?: {
+        onFrame?: () => void;
+    });
+    setOnFrame(callback: () => void): void;
+    dispatch(): void;
+}
+
 declare class Scheduler {
     phase: SchedulerPhase;
     private persistenceCallbacks;
     private postFrameCallbacks;
-    constructor();
-    consumePostCallbacks(): void;
-    schedule(): void;
-    private performSchedule;
+    private renderFrameDispatcher;
+    constructor({ renderFrameDispatcher, }: {
+        renderFrameDispatcher: RenderFrameDispatcher;
+    });
+    flushPostCallbacks(): void;
+    ensureVisualUpdate(): void;
+    private hasScheduledFrame;
+    private schedule;
+    private handleDrawFrame;
+    private flushPersistenceCallbacks;
     addPersistenceCallbacks(callback: () => void): void;
     addPostFrameCallbacks(callback: () => void): void;
 }
@@ -3425,16 +3440,6 @@ declare enum SchedulerPhase {
     postFrameCallbacks = 2
 }
 
-declare class RenderFrameDispatcher {
-    private onFrame?;
-    constructor({ onFrame }?: {
-        onFrame?: () => void;
-    });
-    setOnFrame(callback: () => void): void;
-    private idle;
-    dispatch(): void;
-}
-
 declare class RenderView extends RenderObject {
     constructor({ renderOwner }: {
         renderOwner: RenderOwner;

package/index.d.ts

@@ -3408,14 +3408,29 @@ declare class RenderOwner {
     private flushPaint;
 }
 
+declare class RenderFrameDispatcher {
+    private onFrame?;
+    constructor({ onFrame }?: {
+        onFrame?: () => void;
+    });
+    setOnFrame(callback: () => void): void;
+    dispatch(): void;
+}
+
 declare class Scheduler {
     phase: SchedulerPhase;
     private persistenceCallbacks;
     private postFrameCallbacks;
-    constructor();
-    consumePostCallbacks(): void;
-    schedule(): void;
-    private performSchedule;
+    private renderFrameDispatcher;
+    constructor({ renderFrameDispatcher, }: {
+        renderFrameDispatcher: RenderFrameDispatcher;
+    });
+    flushPostCallbacks(): void;
+    ensureVisualUpdate(): void;
+    private hasScheduledFrame;
+    private schedule;
+    private handleDrawFrame;
+    private flushPersistenceCallbacks;
     addPersistenceCallbacks(callback: () => void): void;
     addPostFrameCallbacks(callback: () => void): void;
 }
@@ -3425,16 +3440,6 @@ declare enum SchedulerPhase {
     postFrameCallbacks = 2
 }
 
-declare class RenderFrameDispatcher {
-    private onFrame?;
-    constructor({ onFrame }?: {
-        onFrame?: () => void;
-    });
-    setOnFrame(callback: () => void): void;
-    private idle;
-    dispatch(): void;
-}
-
 declare class RenderView extends RenderObject {
     constructor({ renderOwner }: {
         renderOwner: RenderOwner;

package/index.global.js

@@ -13389,39 +13389,58 @@
 
   // src/scheduler/Scheduler.ts
   var Scheduler = class {
-    constructor() {
+    constructor({
+      renderFrameDispatcher
+    }) {
       __publicField(this, "phase");
       __publicField(this, "persistenceCallbacks");
       __publicField(this, "postFrameCallbacks");
+      __publicField(this, "renderFrameDispatcher");
+      __publicField(this, "hasScheduledFrame", false);
       this.phase = 0 /* idle */;
       this.persistenceCallbacks = [];
       this.postFrameCallbacks = [];
+      this.renderFrameDispatcher = renderFrameDispatcher;
+      renderFrameDispatcher.setOnFrame(() => this.handleDrawFrame());
     }
-    consumePostCallbacks() {
+    flushPostCallbacks() {
       this.postFrameCallbacks.forEach((callback) => {
         callback();
       });
       this.postFrameCallbacks = [];
     }
-    schedule() {
+    ensureVisualUpdate() {
       switch (this.phase) {
         case 0 /* idle */:
         case 2 /* postFrameCallbacks */:
-          this.performSchedule();
+          this.schedule();
           break;
         case 1 /* persistenceCallbacks */:
           break;
       }
     }
-    performSchedule() {
+    schedule() {
+      if (this.hasScheduledFrame)
+        return;
+      this.renderFrameDispatcher.dispatch();
+      this.hasScheduledFrame = true;
+    }
+    handleDrawFrame() {
+      assert(
+        this.phase === 0 /* idle */,
+        "Scheduler should be idle on beginning frame"
+      );
+      this.hasScheduledFrame = false;
       this.phase = 1 /* persistenceCallbacks */;
+      this.flushPersistenceCallbacks();
+      this.phase = 2 /* postFrameCallbacks */;
+      this.flushPostCallbacks();
+      this.phase = 0 /* idle */;
+    }
+    flushPersistenceCallbacks() {
       this.persistenceCallbacks.forEach((callback) => {
         callback();
       });
-      this.phase = 2 /* postFrameCallbacks */;
-      this.consumePostCallbacks();
-      this.postFrameCallbacks = [];
-      this.phase = 0 /* idle */;
     }
     addPersistenceCallbacks(callback) {
       this.persistenceCallbacks.push(() => callback());
@@ -13436,9 +13455,6 @@
   var RenderFrameDispatcher = class {
     constructor({ onFrame } = {}) {
       __publicField(this, "onFrame");
-      // Actually we don't need to invoke browser to render because browser automatically render its own state periodically
-      // so Here we just call onFrame callback.
-      __publicField(this, "idle", true);
       this.onFrame = onFrame;
     }
     setOnFrame(callback) {
@@ -13447,13 +13463,9 @@
     dispatch() {
       if (typeof window === "undefined")
         return;
-      if (!this.idle)
-        return;
-      this.idle = false;
       window.requestAnimationFrame(() => {
         var _a;
         (_a = this.onFrame) == null ? void 0 : _a.call(this);
-        this.idle = true;
       });
     }
   };
@@ -13654,19 +13666,18 @@
         window: _window,
         onResize: this.handleViewResize
       });
-      const renderDispatcher = new RenderFrameDispatcher_default();
+      const renderFrameDispatcher = new RenderFrameDispatcher_default();
+      const scheduler = new Scheduler_default({ renderFrameDispatcher });
       const buildOwner = new BuildOwner_default({
-        onNeedVisualUpdate: () => renderDispatcher.dispatch()
+        onNeedVisualUpdate: () => scheduler.ensureVisualUpdate()
       });
       const renderOwner = new RenderOwner_default({
-        onNeedVisualUpdate: () => renderDispatcher.dispatch(),
+        onNeedVisualUpdate: () => scheduler.ensureVisualUpdate(),
         renderContext,
         hitTestDispatcher: new HitTestDispatcher()
       });
-      const scheduler = new Scheduler_default();
       scheduler.addPersistenceCallbacks(() => buildOwner.flushBuild());
       scheduler.addPersistenceCallbacks(() => renderOwner.drawFrame());
-      renderDispatcher.setOnFrame(() => scheduler.schedule());
       this.buildOwner = buildOwner;
       this.renderOwner = renderOwner;
       this.scheduler = scheduler;
@@ -13716,7 +13727,7 @@
       this.layout();
       this.renderOwner.rearrangeDomOrder();
       this.paint();
-      this.scheduler.consumePostCallbacks();
+      this.scheduler.flushPostCallbacks();
     }
     rebuild() {
       this.root.children[0].rebuild();

package/index.js

@@ -12675,39 +12675,58 @@ var RenderOwner_default = RenderOwner;
 
 // src/scheduler/Scheduler.ts
 var Scheduler = class {
-  constructor() {
+  constructor({
+    renderFrameDispatcher
+  }) {
     __publicField(this, "phase");
     __publicField(this, "persistenceCallbacks");
     __publicField(this, "postFrameCallbacks");
+    __publicField(this, "renderFrameDispatcher");
+    __publicField(this, "hasScheduledFrame", false);
     this.phase = 0 /* idle */;
     this.persistenceCallbacks = [];
     this.postFrameCallbacks = [];
+    this.renderFrameDispatcher = renderFrameDispatcher;
+    renderFrameDispatcher.setOnFrame(() => this.handleDrawFrame());
   }
-  consumePostCallbacks() {
+  flushPostCallbacks() {
     this.postFrameCallbacks.forEach((callback) => {
       callback();
     });
     this.postFrameCallbacks = [];
   }
-  schedule() {
+  ensureVisualUpdate() {
     switch (this.phase) {
       case 0 /* idle */:
       case 2 /* postFrameCallbacks */:
-        this.performSchedule();
+        this.schedule();
         break;
       case 1 /* persistenceCallbacks */:
         break;
     }
   }
-  performSchedule() {
+  schedule() {
+    if (this.hasScheduledFrame)
+      return;
+    this.renderFrameDispatcher.dispatch();
+    this.hasScheduledFrame = true;
+  }
+  handleDrawFrame() {
+    assert(
+      this.phase === 0 /* idle */,
+      "Scheduler should be idle on beginning frame"
+    );
+    this.hasScheduledFrame = false;
     this.phase = 1 /* persistenceCallbacks */;
+    this.flushPersistenceCallbacks();
+    this.phase = 2 /* postFrameCallbacks */;
+    this.flushPostCallbacks();
+    this.phase = 0 /* idle */;
+  }
+  flushPersistenceCallbacks() {
     this.persistenceCallbacks.forEach((callback) => {
       callback();
     });
-    this.phase = 2 /* postFrameCallbacks */;
-    this.consumePostCallbacks();
-    this.postFrameCallbacks = [];
-    this.phase = 0 /* idle */;
   }
   addPersistenceCallbacks(callback) {
     this.persistenceCallbacks.push(() => callback());
@@ -12722,9 +12741,6 @@ var Scheduler_default = Scheduler;
 var RenderFrameDispatcher = class {
   constructor({ onFrame } = {}) {
     __publicField(this, "onFrame");
-    // Actually we don't need to invoke browser to render because browser automatically render its own state periodically
-    // so Here we just call onFrame callback.
-    __publicField(this, "idle", true);
     this.onFrame = onFrame;
   }
   setOnFrame(callback) {
@@ -12733,13 +12749,9 @@ var RenderFrameDispatcher = class {
   dispatch() {
     if (typeof window === "undefined")
       return;
-    if (!this.idle)
-      return;
-    this.idle = false;
     window.requestAnimationFrame(() => {
       var _a;
       (_a = this.onFrame) == null ? void 0 : _a.call(this);
-      this.idle = true;
     });
   }
 };
@@ -12940,19 +12952,18 @@ var AppRunner = class {
       window: _window,
       onResize: this.handleViewResize
     });
-    const renderDispatcher = new RenderFrameDispatcher_default();
+    const renderFrameDispatcher = new RenderFrameDispatcher_default();
+    const scheduler = new Scheduler_default({ renderFrameDispatcher });
     const buildOwner = new BuildOwner_default({
-      onNeedVisualUpdate: () => renderDispatcher.dispatch()
+      onNeedVisualUpdate: () => scheduler.ensureVisualUpdate()
     });
     const renderOwner = new RenderOwner_default({
-      onNeedVisualUpdate: () => renderDispatcher.dispatch(),
+      onNeedVisualUpdate: () => scheduler.ensureVisualUpdate(),
       renderContext,
       hitTestDispatcher: new HitTestDispatcher()
     });
-    const scheduler = new Scheduler_default();
     scheduler.addPersistenceCallbacks(() => buildOwner.flushBuild());
     scheduler.addPersistenceCallbacks(() => renderOwner.drawFrame());
-    renderDispatcher.setOnFrame(() => scheduler.schedule());
     this.buildOwner = buildOwner;
     this.renderOwner = renderOwner;
     this.scheduler = scheduler;
@@ -13002,7 +13013,7 @@ var AppRunner = class {
     this.layout();
     this.renderOwner.rearrangeDomOrder();
     this.paint();
-    this.scheduler.consumePostCallbacks();
+    this.scheduler.flushPostCallbacks();
   }
   rebuild() {
     this.root.children[0].rebuild();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meursyphus/flitter",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "A declarative, widget-based library built on SVG for simplifying data visualization with a Flutter-like syntax.",
   "keywords": [
     "flitter",