cx 26.0.14 → 26.1.1

package/src/svg/util/Rect.ts

@@ -1,105 +1,105 @@
-import { isNumber } from "../../util/isNumber";
-import { isArray } from "../../util/isArray";
-
-type RectMargin = string | Rect | Array<string | number>;
-
-export interface IRect {
-   l: number;
-   r: number;
-   t: number;
-   b: number;
-}
-
-export class Rect implements IRect {
-   isRect: boolean = true;
-   l: number = 0; //left;
-   r: number = 0; //right
-   t: number = 0; //top
-   b: number = 0; //bottom
-
-   constructor(config?: { t?: number; r?: number; b?: number; l?: number }) {
-      Object.assign(this, config);
-   }
-
-   width(): number {
-      return this.r - this.l;
-   }
-
-   height(): number {
-      return this.b - this.t;
-   }
-
-   valid(): boolean {
-      return this.r > this.l && this.b > this.t;
-   }
-
-   makeValid(): Rect {
-      return new Rect({
-         l: Math.min(this.l, this.r),
-         r: Math.max(this.l, this.r),
-         t: Math.min(this.t, this.b),
-         b: Math.max(this.t, this.b),
-      });
-   }
-
-   isEqual(r?: Rect): boolean {
-      if (!r || !r.isRect) return false;
-
-      return r.l == this.l && r.r == this.r && r.t == this.t && r.b == this.b;
-   }
-
-   static add(a: Rect, b: Rect): Rect {
-      return new Rect({
-         l: a.l + b.l,
-         t: a.t + b.t,
-         r: a.r + b.r,
-         b: a.b + b.b,
-      });
-   }
-
-   static multiply(a: Rect, b: Rect): Rect {
-      return new Rect({
-         l: a.l + (a.r - a.l) * b.l,
-         r: a.l + (a.r - a.l) * b.r,
-         t: a.t + (a.b - a.t) * b.t,
-         b: a.t + (a.b - a.t) * b.b,
-      });
-   }
-
-   static margin(r: Rect, m?: RectMargin): Rect {
-      var mr = Rect.convertMargin(m);
-      return Rect.add(r, mr);
-   }
-
-   static convertMargin(m?: RectMargin): Rect {
-      if (!m) return new Rect();
-
-      if ((m as any).isRect) return m as Rect;
-
-      if (isNumber(m)) return new Rect({ l: m as number, t: m as number, r: -(m as number), b: -(m as number) });
-
-      var mr = Rect.convert(m);
-      mr.b = -mr.b;
-      mr.r = -mr.r;
-      return mr;
-   }
-
-   static convert(r?: RectMargin | number): Rect {
-      if (!r) return new Rect({ l: 0, r: 0, t: 0, b: 0 });
-
-      if ((r as any).isRect) return r as Rect;
-
-      if (typeof r === "string") r = r.split(" ");
-
-      if (isArray(r)) {
-         return new Rect({
-            t: parseFloat(r[0] as any),
-            r: parseFloat(r[1] as any),
-            b: parseFloat(r[2] as any),
-            l: parseFloat(r[3] as any),
-         });
-      }
-
-      return new Rect(r as any);
-   }
-}
+import { isNumber } from "../../util/isNumber";
+import { isArray } from "../../util/isArray";
+
+type RectMargin = string | Rect | Array<string | number>;
+
+export interface IRect {
+   l: number;
+   r: number;
+   t: number;
+   b: number;
+}
+
+export class Rect implements IRect {
+   isRect: boolean = true;
+   l: number = 0; //left;
+   r: number = 0; //right
+   t: number = 0; //top
+   b: number = 0; //bottom
+
+   constructor(config?: { t?: number; r?: number; b?: number; l?: number }) {
+      Object.assign(this, config);
+   }
+
+   width(): number {
+      return this.r - this.l;
+   }
+
+   height(): number {
+      return this.b - this.t;
+   }
+
+   valid(): boolean {
+      return this.r > this.l && this.b > this.t;
+   }
+
+   makeValid(): Rect {
+      return new Rect({
+         l: Math.min(this.l, this.r),
+         r: Math.max(this.l, this.r),
+         t: Math.min(this.t, this.b),
+         b: Math.max(this.t, this.b),
+      });
+   }
+
+   isEqual(r?: Rect): boolean {
+      if (!r || !r.isRect) return false;
+
+      return r.l == this.l && r.r == this.r && r.t == this.t && r.b == this.b;
+   }
+
+   static add(a: Rect, b: Rect): Rect {
+      return new Rect({
+         l: a.l + b.l,
+         t: a.t + b.t,
+         r: a.r + b.r,
+         b: a.b + b.b,
+      });
+   }
+
+   static multiply(a: Rect, b: Rect): Rect {
+      return new Rect({
+         l: a.l + (a.r - a.l) * b.l,
+         r: a.l + (a.r - a.l) * b.r,
+         t: a.t + (a.b - a.t) * b.t,
+         b: a.t + (a.b - a.t) * b.b,
+      });
+   }
+
+   static margin(r: Rect, m?: RectMargin): Rect {
+      var mr = Rect.convertMargin(m);
+      return Rect.add(r, mr);
+   }
+
+   static convertMargin(m?: RectMargin): Rect {
+      if (!m) return new Rect();
+
+      if ((m as any).isRect) return m as Rect;
+
+      if (isNumber(m)) return new Rect({ l: m as number, t: m as number, r: -(m as number), b: -(m as number) });
+
+      var mr = Rect.convert(m);
+      mr.b = -mr.b;
+      mr.r = -mr.r;
+      return mr;
+   }
+
+   static convert(r?: RectMargin | number): Rect {
+      if (!r) return new Rect({ l: 0, r: 0, t: 0, b: 0 });
+
+      if ((r as any).isRect) return r as Rect;
+
+      if (typeof r === "string") r = r.split(" ");
+
+      if (isArray(r)) {
+         return new Rect({
+            t: parseFloat(r[0] as any),
+            r: parseFloat(r[1] as any),
+            b: parseFloat(r[2] as any),
+            l: parseFloat(r[3] as any),
+         });
+      }
+
+      return new Rect(r as any);
+   }
+}

package/src/ui/CSS.ts

@@ -1,87 +1,87 @@
-import { CSSHelper } from "./CSSHelper";
-import { parseStyle } from "../util/parseStyle";
-import { isArray } from "../util/isArray";
-
-function push(list: any[] | undefined, item: any): any[] {
-   if (!item) return list || [];
-   if (!list) list = [];
-   list.push(item);
-   return list;
-}
-
-function pushMore(list: any[] | undefined, itemArray: any[]): any[] {
-   if (!itemArray || itemArray.length == 0) return list || [];
-   if (!list) list = [];
-   list.push.apply(list, itemArray);
-   return list;
-}
-
-function pushMap(list: any[] | undefined, itemArray: any[] | undefined, mapF: (item: any) => any): any[] | undefined {
-   return itemArray ? pushMore(list, itemArray.map(mapF)) : list;
-}
-
-function join(list: any[] | undefined): string | undefined {
-   return list ? list.join(" ") : undefined;
-}
-
-export class CSS {
-   public static classPrefix: string;
-
-   static resolve(...args: any[]): any[] {
-      let list: any[] | undefined = undefined,
-         type: string,
-         arg: any,
-         i: number,
-         key: string;
-
-      for (i = 0; i < args.length; i++) {
-         arg = args[i];
-         if (arg) {
-            type = typeof arg;
-            if (type == "string") list = push(list, arg);
-            else if (type == "object") {
-               if (isArray(arg)) list = pushMore(list, this.resolve(...arg));
-               else for (key in arg) if (arg[key]) list = push(list, key);
-            }
-         }
-      }
-      return list || [];
-   }
-
-   static block(baseClass: string, styleModifiers?: any, stateModifiers?: any): string;
-   static block(baseClass?: string, styleModifiers?: any, stateModifiers?: any): string | undefined {
-      let list: any[] | undefined;
-      if (baseClass) list = push(list, this.classPrefix + "b-" + baseClass);
-      list = pushMap(list, this.resolve(styleModifiers), (m) => this.classPrefix + "m-" + m);
-      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
-      return join(list);
-   }
-
-   static element(baseClass: string, elementClass: string, stateModifiers?: any): string;
-   static element(baseClass?: string, elementClass?: string, stateModifiers?: any): string | undefined {
-      let list: any[] | undefined;
-      if (baseClass && elementClass) list = push(list, this.classPrefix + "e-" + baseClass + "-" + elementClass);
-      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
-      return join(list);
-   }
-
-   static state(stateModifiers: any): string | undefined {
-      return join(pushMap(undefined, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m));
-   }
-
-   static mod(mods: any): string | undefined {
-      return join(pushMap(undefined, this.resolve(mods), (m) => this.classPrefix + "m-" + m));
-   }
-
-   static expand(...args: any[]): string | undefined {
-      return join(this.resolve(...args));
-   }
-
-   static parseStyle(str: any): any {
-      return parseStyle(str);
-   }
-}
-
-CSS.classPrefix = "cx";
-
-CSSHelper.alias("cx", CSS);
+import { CSSHelper } from "./CSSHelper";
+import { parseStyle } from "../util/parseStyle";
+import { isArray } from "../util/isArray";
+
+function push(list: any[] | undefined, item: any): any[] {
+   if (!item) return list || [];
+   if (!list) list = [];
+   list.push(item);
+   return list;
+}
+
+function pushMore(list: any[] | undefined, itemArray: any[]): any[] {
+   if (!itemArray || itemArray.length == 0) return list || [];
+   if (!list) list = [];
+   list.push.apply(list, itemArray);
+   return list;
+}
+
+function pushMap(list: any[] | undefined, itemArray: any[] | undefined, mapF: (item: any) => any): any[] | undefined {
+   return itemArray ? pushMore(list, itemArray.map(mapF)) : list;
+}
+
+function join(list: any[] | undefined): string | undefined {
+   return list ? list.join(" ") : undefined;
+}
+
+export class CSS {
+   public static classPrefix: string;
+
+   static resolve(...args: any[]): any[] {
+      let list: any[] | undefined = undefined,
+         type: string,
+         arg: any,
+         i: number,
+         key: string;
+
+      for (i = 0; i < args.length; i++) {
+         arg = args[i];
+         if (arg) {
+            type = typeof arg;
+            if (type == "string") list = push(list, arg);
+            else if (type == "object") {
+               if (isArray(arg)) list = pushMore(list, this.resolve(...arg));
+               else for (key in arg) if (arg[key]) list = push(list, key);
+            }
+         }
+      }
+      return list || [];
+   }
+
+   static block(baseClass: string, styleModifiers?: any, stateModifiers?: any): string;
+   static block(baseClass?: string, styleModifiers?: any, stateModifiers?: any): string | undefined {
+      let list: any[] | undefined;
+      if (baseClass) list = push(list, this.classPrefix + "b-" + baseClass);
+      list = pushMap(list, this.resolve(styleModifiers), (m) => this.classPrefix + "m-" + m);
+      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
+      return join(list);
+   }
+
+   static element(baseClass: string, elementClass: string, stateModifiers?: any): string;
+   static element(baseClass?: string, elementClass?: string, stateModifiers?: any): string | undefined {
+      let list: any[] | undefined;
+      if (baseClass && elementClass) list = push(list, this.classPrefix + "e-" + baseClass + "-" + elementClass);
+      list = pushMap(list, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m);
+      return join(list);
+   }
+
+   static state(stateModifiers: any): string | undefined {
+      return join(pushMap(undefined, this.resolve(stateModifiers), (m) => this.classPrefix + "s-" + m));
+   }
+
+   static mod(mods: any): string | undefined {
+      return join(pushMap(undefined, this.resolve(mods), (m) => this.classPrefix + "m-" + m));
+   }
+
+   static expand(...args: any[]): string | undefined {
+      return join(this.resolve(...args));
+   }
+
+   static parseStyle(str: any): any {
+      return parseStyle(str);
+   }
+}
+
+CSS.classPrefix = "cx";
+
+CSSHelper.alias("cx", CSS);

package/src/ui/CSSHelper.ts

@@ -1,17 +1,17 @@
-var cssHelperCache: { [key: string]: any } = {};
-
-export class CSSHelper {
-   static get(code: string): any {
-      var helper = cssHelperCache[code];
-      if (!helper) throw new Error(`Unknown CSS helper '${code}'.`);
-      return helper;
-   }
-
-   static register(code: string, helper: any): void {
-      cssHelperCache[code] = helper;
-   }
-
-   static alias(code: string, helper: any): void {
-      cssHelperCache[code] = helper;
-   }
-}
+var cssHelperCache: { [key: string]: any } = {};
+
+export class CSSHelper {
+   static get(code: string): any {
+      var helper = cssHelperCache[code];
+      if (!helper) throw new Error(`Unknown CSS helper '${code}'.`);
+      return helper;
+   }
+
+   static register(code: string, helper: any): void {
+      cssHelperCache[code] = helper;
+   }
+
+   static alias(code: string, helper: any): void {
+      cssHelperCache[code] = helper;
+   }
+}

package/src/ui/ContentResolver.spec.tsx

@@ -1,6 +1,6 @@
 import { ContentResolver } from "./ContentResolver";
 import { Store } from "../data/Store";
-import { createTestRenderer } from "../util/test/createTestRenderer";
+import { createTestRenderer, act } from "../util/test/createTestRenderer";
 import assert from "assert";
 import { bind } from "./bind";
 import { createAccessorModelProxy } from "../data/createAccessorModelProxy";
@@ -16,7 +16,7 @@ interface TestModel {
 }
 
 describe("ContentResolver", () => {
-   it("resolves content based on params", () => {
+   it("resolves content based on params", async () => {
       let widget = (
          <cx>
             <div>
@@ -31,7 +31,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -47,7 +47,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("re-resolves when params change", () => {
+   it("re-resolves when params change", async () => {
       let resolveCount = 0;
 
       let widget = (
@@ -70,7 +70,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -86,7 +86,9 @@ describe("ContentResolver", () => {
       });
       assert.equal(resolveCount, 1);
 
-      store.set("value", 2);
+      await act(async () => {
+         store.set("value", 2);
+      });
       tree = component.toJSON();
       assert.deepEqual(tree, {
          type: "div",
@@ -102,7 +104,7 @@ describe("ContentResolver", () => {
       assert.equal(resolveCount, 2);
    });
 
-   it("does not re-resolve if params are unchanged", () => {
+   it("does not re-resolve if params are unchanged", async () => {
       let resolveCount = 0;
 
       let widget = (
@@ -126,7 +128,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
       assert.equal(resolveCount, 1);
 
       // Change unrelated data
@@ -135,7 +137,7 @@ describe("ContentResolver", () => {
       assert.equal(resolveCount, 1);
    });
 
-   it("supports literal values in params", () => {
+   it("supports literal values in params", async () => {
       let receivedParams: any = null;
 
       let widget = (
@@ -154,7 +156,7 @@ describe("ContentResolver", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -172,7 +174,7 @@ describe("ContentResolver", () => {
       assert.equal(receivedParams.name, "test");
    });
 
-   it("supports mode=prepend", () => {
+   it("supports mode=prepend", async () => {
       let widget = (
          <cx>
             <div>
@@ -185,7 +187,7 @@ describe("ContentResolver", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -206,7 +208,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("supports mode=append", () => {
+   it("supports mode=append", async () => {
       let widget = (
          <cx>
             <div>
@@ -219,7 +221,7 @@ describe("ContentResolver", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -240,7 +242,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("supports mode=replace (default)", () => {
+   it("supports mode=replace (default)", async () => {
       let widget = (
          <cx>
             <div>
@@ -253,7 +255,7 @@ describe("ContentResolver", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -295,7 +297,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       // Initially loading should be true
       assert.equal(store.get("loading"), true);
@@ -323,7 +325,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("supports typed params with accessor chains", () => {
+   it("supports typed params with accessor chains", async () => {
       const model = createAccessorModelProxy<TestModel>();
 
       // This test verifies type inference works correctly.
@@ -362,7 +364,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -378,7 +380,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("infers types from literal params", () => {
+   it("infers types from literal params", async () => {
       // When using literal values, TypeScript can infer their types
       let widget = (
          <cx>
@@ -399,7 +401,7 @@ describe("ContentResolver", () => {
 
       let store = new Store();
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -415,7 +417,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("supports simple Prop params (non-structured)", () => {
+   it("supports simple Prop params (non-structured)", async () => {
       const model = createAccessorModelProxy<TestModel>();
 
       // Test using a single AccessorChain as params instead of an object
@@ -444,7 +446,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -460,7 +462,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("supports simple bind() as params", () => {
+   it("supports simple bind() as params", async () => {
       let widget = (
          <cx>
             <div>
@@ -480,7 +482,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {
@@ -496,7 +498,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("resolves Selector<string> | null to string | null", () => {
+   it("resolves Selector<string> | null to string | null", async () => {
       const text: string | null = "Hello {user.name}";
 
       let widget = (
@@ -524,7 +526,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
       let tree = component.toJSON();
       assert.deepEqual(tree, {
          type: "div",
@@ -533,7 +535,7 @@ describe("ContentResolver", () => {
       });
    });
 
-   it("resolves Prop<string> to string (not any)", () => {
+   it("resolves Prop<string> to string (not any)", async () => {
       const model = createAccessorModelProxy<TestModel>();
 
       // When params is typed as Prop<string>, onResolve should receive string (not any)
@@ -565,7 +567,7 @@ describe("ContentResolver", () => {
          },
       });
 
-      const component = createTestRenderer(store, widget);
+      const component = await createTestRenderer(store, widget);
 
       let tree = component.toJSON();
       assert.deepEqual(tree, {