cx 26.9.2 → 26.9.3

package/src/widgets/form/Field.spec.tsx

@@ -0,0 +1,50 @@
+import { createModel } from "../../data/createAccessorModelProxy";
+import { Store } from "../../data/Store";
+import { createTestRenderer } from "../../util/test/createTestRenderer";
+import { TextField } from "./TextField";
+import { LabeledContainer } from "./LabeledContainer";
+import assert from "assert";
+
+interface Model {
+   name: string;
+   caption: string;
+   hint: string;
+}
+
+function collectText(node: any): string {
+   if (node == null) return "";
+   if (typeof node === "string") return node;
+   if (Array.isArray(node)) return node.map(collectText).join("");
+   return collectText(node.children);
+}
+
+describe("Field", () => {
+   const m = createModel<Model>();
+
+   it("accepts an accessor chain as label", async () => {
+      let store = new Store({ data: { caption: "Full name" } });
+      let component = await createTestRenderer(store, <TextField value={m.name} label={m.caption} />);
+      assert.ok(collectText(component.toJSON()).includes("Full name"));
+   });
+
+   it("accepts an accessor chain as help", async () => {
+      let store = new Store({ data: { hint: "As on your passport" } });
+      let component = await createTestRenderer(store, <TextField value={m.name} help={m.hint} />);
+      assert.ok(collectText(component.toJSON()).includes("As on your passport"));
+   });
+});
+
+describe("LabeledContainer", () => {
+   const m = createModel<Model>();
+
+   it("accepts an accessor chain as label", async () => {
+      let store = new Store({ data: { caption: "Contact" } });
+      let component = await createTestRenderer(
+         store,
+         <LabeledContainer label={m.caption}>
+            <TextField value={m.name} />
+         </LabeledContainer>,
+      );
+      assert.ok(collectText(component.toJSON()).includes("Contact"));
+   });
+});

package/src/widgets/form/Field.tsx

@@ -252,7 +252,7 @@ export class Field<
     if (this.help != null) {
       let helpConfig: any = {};
 
-      if ((this.help as any).isComponentType) helpConfig = this.help;
+      if ((this.help as any).isComponentType === true) helpConfig = this.help;
       else if (isSelector(this.help)) helpConfig.text = this.help;
       else Object.assign(helpConfig, this.help);
 
@@ -269,7 +269,7 @@ export class Field<
         class: this.labelClass,
       };
 
-      if ((this.label as any).isComponentType) labelConfig = this.label;
+      if ((this.label as any).isComponentType === true) labelConfig = this.label;
       else if (isSelector(this.label)) labelConfig.text = this.label;
       else Object.assign(labelConfig, this.label);
 

package/src/widgets/form/LabeledContainer.ts

@@ -43,7 +43,7 @@ export class LabeledContainer extends FieldGroup<LabeledContainerConfig> {
             required: true,
          };
 
-         if ((this.label as any).isComponentType) labelConfig = this.label as Record<string, unknown>;
+         if ((this.label as any).isComponentType === true) labelConfig = this.label as Record<string, unknown>;
          else if (isSelector(this.label)) labelConfig.text = this.label;
          else Object.assign(labelConfig, this.label);
 

package/src/widgets/index.ts

@@ -1,41 +1,41 @@
-export { Widget } from "../ui/Widget";
-export { Text } from "../ui/Text";
-export { StaticText } from "../ui/StaticText";
-export { PureContainer } from "../ui/PureContainer";
-export { IsolatedScope } from "../ui/IsolatedScope";
-export { DetachedScope } from "../ui/DetachedScope";
-export { Restate, PrivateStore } from "../ui/Restate";
-export { DataProxy } from "../ui/DataProxy";
-export { Content } from "../ui/layout/Content";
-export { ContentPlaceholder, ContentPlaceholderScope } from "../ui/layout/ContentPlaceholder";
-export { LabelsTopLayout, LabelsTopLayoutCell } from "../ui/layout/LabelsTopLayout";
-export { LabelsLeftLayout } from "../ui/layout/LabelsLeftLayout";
-export { ContentResolver } from "../ui/ContentResolver";
-export { Rescope } from "../ui/Rescope";
-export { Repeater } from "../ui/Repeater";
-
-export * from "./cx";
-export * from "./HtmlElement";
-export * from "./Button";
-export * from "./DocumentTitle";
-export * from "./List";
-export * from "./Sandbox";
-export * from "./CxCredit";
-export * from "./Heading";
-export * from "./Section";
-export * from "./FlexBox";
-export * from "./Icon";
-export * from "./ProgressBar";
-export * from "./Resizer";
-export * from "./HighlightedSearchText";
-export * from "./autoFocus";
-export * from "./ReactElementWrapper";
-
-export * from "./icons/index";
-export * from "./overlay/index";
-export * from "./nav/index";
-export * from "./form/index";
-export * from "./grid/index";
-export * from "./drag-drop/index";
-
-export * from "./enableAllInternalDependencies";
+export { Widget } from "../ui/Widget";
+export { Text } from "../ui/Text";
+export { StaticText } from "../ui/StaticText";
+export { PureContainer } from "../ui/PureContainer";
+export { IsolatedScope } from "../ui/IsolatedScope";
+export { DetachedScope } from "../ui/DetachedScope";
+export { Restate, PrivateStore } from "../ui/Restate";
+export { DataProxy } from "../ui/DataProxy";
+export { Content } from "../ui/layout/Content";
+export { ContentPlaceholder, ContentPlaceholderScope } from "../ui/layout/ContentPlaceholder";
+export { LabelsTopLayout, LabelsTopLayoutCell } from "../ui/layout/LabelsTopLayout";
+export { LabelsLeftLayout } from "../ui/layout/LabelsLeftLayout";
+export { ContentResolver } from "../ui/ContentResolver";
+export { Rescope } from "../ui/Rescope";
+export { Repeater } from "../ui/Repeater";
+
+export * from "./cx";
+export * from "./HtmlElement";
+export * from "./Button";
+export * from "./DocumentTitle";
+export * from "./List";
+export * from "./Sandbox";
+export * from "./CxCredit";
+export * from "./Heading";
+export * from "./Section";
+export * from "./FlexBox";
+export * from "./Icon";
+export * from "./ProgressBar";
+export * from "./Resizer";
+export * from "./HighlightedSearchText";
+export * from "./autoFocus";
+export * from "./ReactElementWrapper";
+
+export * from "./icons/index";
+export * from "./overlay/index";
+export * from "./nav/index";
+export * from "./form/index";
+export * from "./grid/index";
+export * from "./drag-drop/index";
+
+export * from "./enableAllInternalDependencies";

package/src/widgets/overlay/Overlay.tsx

@@ -240,10 +240,14 @@ export class OverlayBase<
       } else if (context.options.dismiss) instance.dismiss = context.options.dismiss;
 
       if (instance.dismiss) {
-         context.push("parentOptions", {
+         let parentOptions = {
             ...context.parentOptions,
             dismiss: instance.dismiss,
-         });
+         };
+         context.push("parentOptions", parentOptions);
+         // The overlay's own instance captured parentOptions before this point, so
+         // a controller attached to the overlay would not see its own dismiss.
+         instance.parentOptions = parentOptions;
       }
 
       if (instance.cache("dismiss", instance.dismiss)) instance.markShouldUpdate(context);

package/src/widgets/overlay/Window.spec.tsx

@@ -0,0 +1,59 @@
+import { createModel } from "../../data/createAccessorModelProxy";
+import { Store } from "../../data/Store";
+import { Controller } from "../../ui/Controller";
+import { act, createTestRenderer } from "../../util/test/createTestRenderer";
+import { Window } from "./Window";
+import assert from "assert";
+
+interface Model {
+   visible: boolean;
+}
+
+describe("Window", () => {
+   const m = createModel<Model>();
+
+   it("can be dismissed by a controller attached to the window", async () => {
+      let controller: WindowController | undefined;
+
+      class WindowController extends Controller {
+         onInit() {
+            controller = this;
+         }
+      }
+
+      let store = new Store({ data: { visible: true } });
+      await createTestRenderer(
+         store,
+         <Window visible={m.visible} inline controller={WindowController}>
+            Content
+         </Window>,
+      );
+
+      assert.ok(controller, "controller was not initialized");
+      assert.equal(typeof controller.instance.parentOptions?.dismiss, "function");
+      await act(async () => controller!.instance.parentOptions.dismiss());
+      assert.equal(store.get(m.visible), false);
+   });
+
+   it("can be dismissed by a controller inside the window", async () => {
+      let controller: ContentController | undefined;
+
+      class ContentController extends Controller {
+         onInit() {
+            controller = this;
+         }
+      }
+
+      let store = new Store({ data: { visible: true } });
+      await createTestRenderer(
+         store,
+         <Window visible={m.visible} inline>
+            <div controller={ContentController}>Content</div>
+         </Window>,
+      );
+
+      assert.ok(controller, "controller was not initialized");
+      await act(async () => controller!.instance.parentOptions.dismiss());
+      assert.equal(store.get(m.visible), false);
+   });
+});