@praxisjs/composables 1.2.1 → 1.2.3

package/dist/utilities.js

@@ -1,5 +1,5 @@
 import { Composable } from "@praxisjs/core";
-import { signal, computed } from "@praxisjs/core/internal";
+import { computed, createEffect, disposeEffect, endBatch, signal, startBatch, } from "@praxisjs/core/internal";
 export class Clipboard extends Composable {
     resetDelay;
     _resetTimer;
@@ -14,8 +14,10 @@ export class Clipboard extends Composable {
         const copy = async (text) => {
             try {
                 await navigator.clipboard.writeText(text);
+                startBatch();
                 content.set(text);
                 copied.set(true);
+                endBatch();
                 clearTimeout(this._resetTimer);
                 this._resetTimer = setTimeout(() => { copied.set(false); }, resetDelay);
             }
@@ -31,66 +33,126 @@ export class Clipboard extends Composable {
 }
 export class Geolocation extends Composable {
     options;
-    _active = true;
+    _lat = signal(null);
+    _lng = signal(null);
+    _error = signal(null);
+    _loading = signal(true);
+    _active = false;
     constructor(options) {
         super();
         this.options = options;
     }
     setup() {
-        const lat = signal(null);
-        const lng = signal(null);
-        const error = signal(null);
-        const loading = signal(true);
+        return { lat: this._lat, lng: this._lng, error: this._error, loading: this._loading };
+    }
+    // Requested on mount rather than in setup(), which also runs for components that never mount.
+    onMount() {
+        if (this._active)
+            return;
+        this._active = true;
         navigator.geolocation.getCurrentPosition((pos) => {
             if (!this._active)
                 return;
-            lat.set(pos.coords.latitude);
-            lng.set(pos.coords.longitude);
-            loading.set(false);
+            startBatch();
+            this._lat.set(pos.coords.latitude);
+            this._lng.set(pos.coords.longitude);
+            this._loading.set(false);
+            endBatch();
         }, (err) => {
             if (!this._active)
                 return;
-            error.set(err);
-            loading.set(false);
+            startBatch();
+            this._error.set(err);
+            this._loading.set(false);
+            endBatch();
         }, this.options);
-        return { lat, lng, error, loading };
     }
     onUnmount() {
         this._active = false;
     }
 }
+const SECOND = 1_000;
+const MINUTE = 60_000;
+const HOUR = 3_600_000;
+const DAY = 86_400_000;
+const MONTH = 2_592_000_000;
+// setTimeout fires immediately for delays above 2^31 - 1 ms.
+const MAX_DELAY = 2_147_483_647;
+const UNITS = [
+    { below: MINUTE, size: SECOND, name: "second" },
+    { below: HOUR, size: MINUTE, name: "minute" },
+    { below: DAY, size: HOUR, name: "hour" },
+    { below: MONTH, size: DAY, name: "day" },
+    { below: Infinity, size: MONTH, name: "month" },
+];
+function unitIndex(diff) {
+    const abs = Math.abs(diff);
+    let i = 0;
+    while (abs >= UNITS[i].below)
+        i++;
+    return i;
+}
+/**
+ * Milliseconds until the text for `diff` (target − now, shrinking as time passes) changes: the
+ * next rounding step within its unit, or the moment it crosses into another unit.
+ */
+export function msUntilChange(diff) {
+    const i = unitIndex(diff);
+    const { size, below } = UNITS[i];
+    // Math.round(x) changes once x falls below its value minus one half.
+    let wait = diff - (Math.round(diff / size) - 0.5) * size + 1;
+    if (diff > 0) {
+        if (i > 0)
+            wait = Math.min(wait, diff - UNITS[i - 1].below + 1);
+    }
+    else if (below !== Infinity) {
+        wait = Math.min(wait, diff + below);
+    }
+    return Math.min(Math.max(Math.ceil(wait), 1), MAX_DELAY);
+}
 export class TimeAgo extends Composable {
     source;
     locale;
-    _interval;
+    _tick = signal(0);
+    _effect;
     constructor(source, locale = "pt-BR") {
         super();
         this.source = source;
         this.locale = locale;
     }
     setup() {
-        const tick = signal(Date.now());
-        this._interval = setInterval(() => { tick.set(Date.now()); }, 60_000);
         const rtf = new Intl.RelativeTimeFormat(this.locale, { numeric: "auto" });
         const read = this.source;
+        const tick = this._tick;
         const value = computed(() => {
             void tick();
             const diff = new Date(read()).getTime() - Date.now();
-            const abs = Math.abs(diff);
-            if (abs < 60_000)
-                return rtf.format(Math.round(diff / 1000), "second");
-            if (abs < 3_600_000)
-                return rtf.format(Math.round(diff / 60_000), "minute");
-            if (abs < 86_400_000)
-                return rtf.format(Math.round(diff / 3_600_000), "hour");
-            if (abs < 2_592_000_000)
-                return rtf.format(Math.round(diff / 86_400_000), "day");
-            return rtf.format(Math.round(diff / 2_592_000_000), "month");
+            const { size, name } = UNITS[unitIndex(diff)];
+            return rtf.format(Math.round(diff / size), name);
         });
         return { value };
     }
+    // One timer for the exact moment the text changes, instead of polling: re-armed whenever it
+    // fires or the source changes.
+    onMount() {
+        if (this._effect)
+            return;
+        const read = this.source;
+        const tick = this._tick;
+        this._effect = createEffect(() => {
+            tick();
+            const diff = new Date(read()).getTime() - Date.now();
+            // An invalid date has no next change; a NaN delay would fire at once, over and over.
+            if (Number.isNaN(diff))
+                return;
+            const timer = setTimeout(() => { tick.update((n) => n + 1); }, msUntilChange(diff));
+            return () => { clearTimeout(timer); };
+        });
+    }
     onUnmount() {
-        clearInterval(this._interval);
+        if (this._effect)
+            disposeEffect(this._effect);
+        this._effect = undefined;
     }
 }
 export class Pagination extends Composable {

package/dist/utilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAS3D,MAAM,OAAO,SAAU,SAAQ,UAAU;IAOV;IAFrB,WAAW,CAAiC;IAEpD,YAA6B,aAAa,IAAI;QAC5C,KAAK,EAAE,CAAC;QADmB,eAAU,GAAV,UAAU,CAAO;IAE9C,CAAC;IAED,KAAK;QACH,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,MAAM,IAAI,GAAG,KAAK,EAAE,IAAY,EAAiB,EAAE;YACjD,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC1C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAClB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAC1E,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,SAAS;QACP,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,UAAU;IAQZ;IAFrB,OAAO,GAAG,IAAI,CAAC;IAEvB,YAA6B,OAAyB;QACpD,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAkB;IAEtD,CAAC;IAED,KAAK;QACH,MAAM,GAAG,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAkC,IAAI,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7B,SAAS,CAAC,WAAW,CAAC,kBAAkB,CACtC,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC7B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC,EACD,IAAI,CAAC,OAAO,CACb,CAAC;QAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IACtC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,OAAQ,SAAQ,UAAU;IAMlB;IAIA;IAPX,SAAS,CAAkC;IAEnD,YACmB,MAGQ,EACR,SAAS,OAAO;QAEjC,KAAK,EAAE,CAAC;QANS,WAAM,GAAN,MAAM,CAGE;QACR,WAAM,GAAN,MAAM,CAAU;IAGnC,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAEtE,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QAEzB,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC1B,KAAK,IAAI,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAU,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3B,IAAI,GAAG,GAAG,MAAM;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;YACvE,IAAI,GAAG,GAAG,SAAS;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC5E,IAAI,GAAG,GAAG,UAAU;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,GAAG,GAAG,aAAa;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC;YACjF,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,SAAS;QACP,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,UAAU;IAcX;IAA7B,YAA6B,OAA0B;QACrD,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAmB;QAErD,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAE3C,OAAO;YACL,IAAI;YACJ,UAAU;YACV,MAAM;YACN,OAAO;YACP,OAAO;YACP,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;YACvC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5E,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,EAAE;gBAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,EAAE;gBAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3E,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;SACzC,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../src/utilities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,MAAM,EACN,UAAU,GAEX,MAAM,yBAAyB,CAAC;AASjC,MAAM,OAAO,SAAU,SAAQ,UAAU;IAOV;IAFrB,WAAW,CAAiC;IAEpD,YAA6B,aAAa,IAAI;QAC5C,KAAK,EAAE,CAAC;QADmB,eAAU,GAAV,UAAU,CAAO;IAE9C,CAAC;IAED,KAAK;QACH,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,MAAM,IAAI,GAAG,KAAK,EAAE,IAAY,EAAiB,EAAE;YACjD,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC1C,UAAU,EAAE,CAAC;gBACb,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAClB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjB,QAAQ,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAC1E,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,SAAS;QACP,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,UAAU;IAYZ;IANZ,IAAI,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IACnC,IAAI,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IACnC,MAAM,GAAG,MAAM,CAAkC,IAAI,CAAC,CAAC;IACvD,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,KAAK,CAAC;IAExB,YAA6B,OAAyB;QACpD,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAkB;IAEtD,CAAC;IAED,KAAK;QACH,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxF,CAAC;IAED,8FAA8F;IAC9F,OAAO;QACL,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,SAAS,CAAC,WAAW,CAAC,kBAAkB,CACtC,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,QAAQ,EAAE,CAAC;QACb,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;YACN,IAAI,CAAC,IAAI,CAAC,OAAO;gBAAE,OAAO;YAC1B,UAAU,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACzB,QAAQ,EAAE,CAAC;QACb,CAAC,EACD,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;IAED,SAAS;QACP,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CACF;AAED,MAAM,MAAM,GAAG,KAAK,CAAC;AACrB,MAAM,MAAM,GAAG,MAAM,CAAC;AACtB,MAAM,IAAI,GAAG,SAAS,CAAC;AACvB,MAAM,GAAG,GAAG,UAAU,CAAC;AACvB,MAAM,KAAK,GAAG,aAAa,CAAC;AAC5B,6DAA6D;AAC7D,MAAM,SAAS,GAAG,aAAa,CAAC;AAShC,MAAM,KAAK,GAAe;IACxB,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC/C,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC7C,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;IACxC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE;IACxC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;CAChD,CAAC;AAEF,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;QAAE,CAAC,EAAE,CAAC;IAClC,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACjC,qEAAqE;IACrE,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IAC7D,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;SAAM,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,OAAO,OAAQ,SAAQ,UAAU;IAOlB;IAIA;IARF,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,OAAO,CAAc;IAE7B,YACmB,MAGQ,EACR,SAAS,OAAO;QAEjC,KAAK,EAAE,CAAC;QANS,WAAM,GAAN,MAAM,CAGE;QACR,WAAM,GAAN,MAAM,CAAU;IAGnC,CAAC;IAED,KAAK;QACH,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QAExB,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC1B,KAAK,IAAI,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAU,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7D,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9C,OAAO,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,4FAA4F;IAC5F,+BAA+B;IAC/B,OAAO;QACL,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,GAAG,EAAE;YAC/B,IAAI,EAAE,CAAC;YACP,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,EAAU,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7D,qFAAqF;YACrF,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,OAAO;YAC/B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;YACpF,OAAO,GAAG,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS;QACP,IAAI,IAAI,CAAC,OAAO;YAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;IAC3B,CAAC;CACF;AAED,MAAM,OAAO,UAAW,SAAQ,UAAU;IAcX;IAA7B,YAA6B,OAA0B;QACrD,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAmB;QAErD,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAE3C,OAAO;YACL,IAAI;YACJ,UAAU;YACV,MAAM;YACN,OAAO;YACP,OAAO;YACP,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;YACvC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5E,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,EAAE;gBAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,OAAO,EAAE;gBAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,IAAI,EAAE,CAAC,CAAS,EAAE,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3E,KAAK,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;SACzC,CAAC;IACJ,CAAC;CACF"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@praxisjs/composables",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "type": "module",
+  "sideEffects": false,
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
@@ -10,15 +11,23 @@
       "types": "./dist/index.d.ts"
     }
   },
+  "files": [
+    "dist",
+    "src",
+    "!dist/**/__tests__",
+    "!src/**/__tests__",
+    "CHANGELOG.md"
+  ],
   "devDependencies": {
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@praxisjs/core": "2.2.0",
-    "@praxisjs/shared": "0.3.1"
+    "@praxisjs/core": "^2.3.1",
+    "@praxisjs/shared": "^0.3.2"
   },
   "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch"
+    "build": "tsc -p tsconfig.build.json",
+    "dev": "tsc -p tsconfig.build.json --watch",
+    "typecheck": "tsc --noEmit"
   }
 }

package/src/browser.ts

@@ -1,33 +1,42 @@
 import { Composable } from "@praxisjs/core";
-import { batch, signal, computed } from "@praxisjs/core/internal";
+import { computed, endBatch, signal, startBatch } from "@praxisjs/core/internal";
+
+const hasWindow = typeof window !== "undefined";
+
+// Listeners and timers start in onMount and stop in onUnmount: setup() runs when the component is
+// constructed, which also happens for components that never mount (and on the server).
 
 export class MediaQuery extends Composable {
   declare matches: boolean;
 
   private _mql?: MediaQueryList;
-  private _handler?: (e: MediaQueryListEvent) => void;
-  private _view?: Record<string, unknown>;
+  private readonly _matches = signal(false);
+
+  private readonly _onChange = (e: MediaQueryListEvent) => {
+    this._matches.set(e.matches);
+  };
 
   constructor(private readonly query: string) {
     super();
   }
 
   setup() {
-    if (this._view) return this._view;
-    this._mql = window.matchMedia(this.query);
-    const matches = signal(this._mql.matches);
-    this._handler = (e) => {
-      matches.set(e.matches);
-    };
-    this._mql.addEventListener("change", this._handler);
-    this._view = { matches };
-    return this._view;
+    if (hasWindow) {
+      this._mql ??= window.matchMedia(this.query);
+      this._matches.set(this._mql.matches);
+    }
+    return { matches: this._matches };
+  }
+
+  onMount() {
+    const mql = this._mql;
+    if (!mql) return;
+    this._matches.set(mql.matches);
+    mql.addEventListener("change", this._onChange);
   }
 
   onUnmount() {
-    if (this._mql && this._handler) {
-      this._mql.removeEventListener("change", this._handler);
-    }
+    this._mql?.removeEventListener("change", this._onChange);
   }
 }
 
@@ -35,27 +44,20 @@ export class ColorScheme extends Composable {
   declare isDark: boolean;
   declare isLight: boolean;
 
-  private _mql?: MediaQueryList;
-  private _handler?: (e: MediaQueryListEvent) => void;
-  private _view?: Record<string, unknown>;
+  private readonly _query = new MediaQuery("(prefers-color-scheme: dark)");
 
   setup() {
-    if (this._view) return this._view;
-    this._mql = window.matchMedia("(prefers-color-scheme: dark)");
-    const isDark = signal(this._mql.matches);
+    const isDark = this._query.setup().matches;
     const isLight = computed(() => !isDark());
-    this._handler = (e) => {
-      isDark.set(e.matches);
-    };
-    this._mql.addEventListener("change", this._handler);
-    this._view = { isDark, isLight };
-    return this._view;
+    return { isDark, isLight };
+  }
+
+  onMount() {
+    this._query.onMount();
   }
 
   onUnmount() {
-    if (this._mql && this._handler) {
-      this._mql.removeEventListener("change", this._handler);
-    }
+    this._query.onUnmount();
   }
 }
 
@@ -63,127 +65,139 @@ export class Mouse extends Composable {
   declare x: number;
   declare y: number;
 
-  private _handler!: (e: MouseEvent) => void;
-  private _view?: Record<string, unknown>;
+  private readonly _x = signal(0);
+  private readonly _y = signal(0);
+
+  private readonly _onMove = (e: MouseEvent) => {
+    startBatch();
+    this._x.set(e.clientX);
+    this._y.set(e.clientY);
+    endBatch();
+  };
 
   setup() {
-    if (this._view) return this._view;
-    const x = signal(0);
-    const y = signal(0);
-    this._handler = (e) => {
-      batch(() => {
-        x.set(e.clientX);
-        y.set(e.clientY);
-      });
-    };
-    window.addEventListener("mousemove", this._handler);
-    this._view = { x, y };
-    return this._view;
+    return { x: this._x, y: this._y };
+  }
+
+  onMount() {
+    window.addEventListener("mousemove", this._onMove);
   }
 
   onUnmount() {
-    window.removeEventListener("mousemove", this._handler);
+    window.removeEventListener("mousemove", this._onMove);
   }
 }
 
+const MODIFIERS = ["ctrl", "shift", "alt", "meta"];
+
 export class KeyCombo extends Composable {
   declare pressed: boolean;
 
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  private _keydownHandler = (_e: KeyboardEvent) => {};
-  private _keyupHandler!: () => void;
-  private _view?: Record<string, unknown>;
+  private readonly _pressed = signal(false);
+  // Parsed once: the keydown handler runs for every key press on the page.
+  private readonly _key: string | undefined;
+  private readonly _ctrl: boolean;
+  private readonly _shift: boolean;
+  private readonly _alt: boolean;
+  private readonly _meta: boolean;
+
+  private readonly _onKeyDown = (e: KeyboardEvent) => {
+    if (
+      (!this._ctrl || e.ctrlKey) &&
+      (!this._shift || e.shiftKey) &&
+      (!this._alt || e.altKey) &&
+      (!this._meta || e.metaKey) &&
+      e.key.toLowerCase() === this._key
+    ) {
+      this._pressed.set(true);
+    }
+  };
+
+  private readonly _onKeyUp = () => {
+    this._pressed.set(false);
+  };
 
-  constructor(private readonly combo: string) {
+  constructor(combo: string) {
     super();
+    const parts = combo.toLowerCase().split("+").map((p) => p.trim());
+    this._key = parts.find((p) => !MODIFIERS.includes(p));
+    this._ctrl = parts.includes("ctrl");
+    this._shift = parts.includes("shift");
+    this._alt = parts.includes("alt");
+    this._meta = parts.includes("meta");
   }
 
   setup() {
-    if (this._view) return this._view;
-    const parts = this.combo
-      .toLowerCase()
-      .split("+")
-      .map((p) => p.trim());
-    const pressed = signal(false);
-
-    const modifiers = ["ctrl", "shift", "alt", "meta"];
-    const key = parts.find((p) => !modifiers.includes(p));
-
-    // A combo with no non-modifier key is invalid and should never fire
-    if (!key) {
-      this._keyupHandler = () => {
-        pressed.set(false);
-      };
-      window.addEventListener("keydown", this._keydownHandler);
-      window.addEventListener("keyup", this._keyupHandler);
-      this._view = { pressed };
-      return this._view;
-    }
+    return { pressed: this._pressed };
+  }
 
-    this._keydownHandler = (e) => {
-      const ctrl = parts.includes("ctrl") ? e.ctrlKey : true;
-      const shift = parts.includes("shift") ? e.shiftKey : true;
-      const alt = parts.includes("alt") ? e.altKey : true;
-      const meta = parts.includes("meta") ? e.metaKey : true;
-      if (ctrl && shift && alt && meta && e.key.toLowerCase() === key) {
-        pressed.set(true);
-      }
-    };
-    this._keyupHandler = () => {
-      pressed.set(false);
-    };
-
-    window.addEventListener("keydown", this._keydownHandler);
-    window.addEventListener("keyup", this._keyupHandler);
-    this._view = { pressed };
-    return this._view;
+  onMount() {
+    // A combo with no non-modifier key is invalid and never fires.
+    if (this._key !== undefined) window.addEventListener("keydown", this._onKeyDown);
+    window.addEventListener("keyup", this._onKeyUp);
   }
 
   onUnmount() {
-    window.removeEventListener("keydown", this._keydownHandler);
-    window.removeEventListener("keyup", this._keyupHandler);
+    window.removeEventListener("keydown", this._onKeyDown);
+    window.removeEventListener("keyup", this._onKeyUp);
   }
 }
 
+const ACTIVITY_EVENTS = ["mousemove", "keydown", "click", "scroll", "touchstart"];
+
 export class Idle extends Composable {
   declare idle: boolean;
 
-  private _listeners: Array<[string, () => void]> = [];
+  private readonly _idle = signal(false);
   private _timer?: ReturnType<typeof setTimeout>;
-  private _view?: Record<string, unknown>;
+  private _lastActivity = 0;
+
+  // Activity only records a timestamp: rescheduling a timer on every mousemove or scroll event was
+  // the expensive part. The single pending timer checks the timestamp when it fires.
+  private readonly _onActivity = () => {
+    this._lastActivity = Date.now();
+    if (this._timer === undefined) {
+      this._idle.set(false);
+      this._schedule(this.timeout);
+    }
+  };
+
+  private readonly _check = () => {
+    const remaining = this.timeout - (Date.now() - this._lastActivity);
+    if (remaining > 0) {
+      this._schedule(remaining);
+    } else {
+      this._timer = undefined;
+      this._idle.set(true);
+    }
+  };
 
   constructor(private readonly timeout = 60_000) {
     super();
   }
 
+  private _schedule(delay: number) {
+    this._timer = setTimeout(this._check, delay);
+  }
+
   setup() {
-    if (this._view) return this._view;
-    const idle = signal(false);
-    const reset = () => {
-      idle.set(false);
-      clearTimeout(this._timer);
-      this._timer = setTimeout(() => {
-        idle.set(true);
-      }, this.timeout);
-    };
-
-    ["mousemove", "keydown", "click", "scroll", "touchstart"].forEach(
-      (event) => {
-        window.addEventListener(event, reset, { passive: true });
-        this._listeners.push([event, reset]);
-      },
-    );
-
-    reset();
-    this._view = { idle };
-    return this._view;
+    return { idle: this._idle };
+  }
+
+  onMount() {
+    for (const event of ACTIVITY_EVENTS) {
+      window.addEventListener(event, this._onActivity, { passive: true });
+    }
+    clearTimeout(this._timer);
+    this._timer = undefined;
+    this._onActivity();
   }
 
   onUnmount() {
     clearTimeout(this._timer);
-    this._listeners.forEach(([event, handler]) => {
-      window.removeEventListener(event, handler);
-    });
-    this._listeners = [];
+    this._timer = undefined;
+    for (const event of ACTIVITY_EVENTS) {
+      window.removeEventListener(event, this._onActivity);
+    }
   }
 }