onejs-core 2.0.4 → 2.0.5

package/definitions/globals.d.ts

@@ -1,13 +1,18 @@
-declare namespace OneJS {
-    class Event<F extends Function> {
-        // Must have at least an unique member, because an empty class behaves like `any`
-        #Invoke(...args: any): any
-    }
-
-    type EventKeys<T> = { [k in keyof T]-?: T[k] extends Event<any> ? k : never }[keyof T]
-
-    type EventGenericType<T> = T extends Event<infer F> ? F : never
-}
+type Instance<T> = T extends new (...a: any) => infer I ? I : never
+
+type EventNames<T> = {
+    [K in keyof T]:
+    K extends `add_${infer E}`
+    ? `remove_${E}` extends keyof T ? E : never
+    : never
+}[keyof T]
+
+type Handler<T, E extends string> =
+    `add_${E}` extends keyof T
+    ? T[`add_${E}`] extends (arg: infer A) => any
+    ? A
+    : never
+    : never
 
 declare const onejs: {
     add_onReload(handler: () => void): void
@@ -20,10 +25,20 @@ declare const onejs: {
     //     objects: Record<string, any>
     // }
 
-    subscribe<T, K extends OneJS.EventKeys<T>>(
+    subscribe<T, K extends EventNames<T>>(
         eventSource: T,
         eventName: K,
-        handler: OneJS.EventGenericType<T[K]>
+        handler: Function
+    ): CS.System.Action
+
+    subscribe<
+        C extends new (...a: any) => any,
+        I extends Instance<C>,
+        E extends EventNames<I>
+    >(
+        eventSource: C,
+        eventName: E,
+        handler: Function
     ): CS.System.Action
 
     subscribe(eventName: string, handler: () => void): CS.System.Action

package/dist/utils/responsive.d.ts

@@ -0,0 +1,4 @@
+export type Breakpoint = "base" | "xs" | "sm" | "md" | "lg" | "xl";
+export type Responsive = number | Partial<Record<Breakpoint, number>>;
+/** Pick the right value for the current width. */
+export declare function resolveResponsive<T>(val: Responsive, w?: number): number;

package/dist/utils/responsive.js

@@ -0,0 +1,23 @@
+const BP = {
+    xs: 480,
+    sm: 640,
+    md: 768,
+    lg: 1024,
+    xl: 1280,
+};
+/** Current viewport width (UI Toolkit) */
+const getWidth = () => document.body.ve.resolvedStyle.width;
+/** Pick the right value for the current width. */
+export function resolveResponsive(val, w = getWidth()) {
+    if (typeof val !== "object")
+        return val;
+    let picked = val.base;
+    for (const [bp, px] of Object.entries(BP)) {
+        if (w >= px && val[bp] !== undefined)
+            picked = val[bp];
+    }
+    setTimeout(() => {
+        console.log(CS.UnityEngine.Screen.dpi);
+    }, 1);
+    return picked;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "onejs-core",
     "description": "The JS part of OneJS, a UI framework and Scripting Engine for Unity.",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "main": "./dist/index.js",
     "types": "./typings.d.ts",
     "bin": {

package/scripts/postcss/onejs-tw-config.cjs

@@ -30,6 +30,9 @@ exports.plugins = [
             ".wrap": {
                 "white-space": "normal",
             },
+            ".font-bold": {
+                "-unity-font-style": "bold",
+            },
             ".bold": {
                 "-unity-font-style": "bold",
             },

package/tsconfig.json

@@ -9,6 +9,7 @@
         "jsxFactory": "h",
         "jsxFragmentFactory": "Fragment",
         "skipLibCheck": false,
+        "strictNullChecks": true,
         "forceConsistentCasingInFileNames": true,
         "declaration": true,
         "typeRoots": [ ],