cx 26.0.12 → 26.0.14

package/src/widgets/nav/Route.ts

@@ -1,142 +1,142 @@
-import { Widget } from "../../ui/Widget";
-import { PureContainerBase, PureContainerConfig } from "../../ui/PureContainer";
-import RouteMatcher from "route-parser";
-import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
-import { routeAppend } from "../../util/routeAppend";
-import { StringProp, BooleanProp, Prop } from "../../ui/Prop";
-import { RenderingContext } from "../../ui/RenderingContext";
-import { Instance } from "../../ui/Instance";
-
-export interface RouteConfig extends PureContainerConfig {
-   /** Url binding. Bind this to the global `url` variable. */
-   url?: StringProp;
-
-   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
-   route?: string;
-
-   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
-   path?: string;
-
-   /** Name used to expose local data. Defaults to `$route`. */
-   recordName?: string;
-
-   /** Match route even if given `route` is only a prefix of the current `url`. */
-   prefix?: BooleanProp;
-
-   /** Parameters mapping */
-   params?: Prop<any>;
-
-   /** Parameter name mapping */
-   map?: Record<string, string>;
-}
-
-// Base class for extending with custom Config types
-export class RouteBase<Config extends RouteConfig = RouteConfig> extends PureContainerBase<Config> {
-   declare url?: string;
-   declare route: string;
-   declare path?: string;
-   declare prefix?: boolean;
-   declare recordName: string;
-   declare params?: Prop<any>;
-   declare map?: Record<string, string>;
-   declare matcher?: any;
-   init() {
-      if (this.path) this.route = this.path;
-
-      super.init();
-
-      if (this.route && this.route[0] !== "+")
-         this.matcher = new RouteMatcher(this.route + (this.prefix ? "(*remainder)" : ""));
-   }
-
-   initInstance(context: RenderingContext, instance: Instance) {
-      instance.store = new ReadOnlyDataView({
-         store: instance.parentStore,
-      });
-      super.initInstance(context, instance);
-   }
-
-   applyParentStore(instance: Instance) {
-      instance.store.setStore(instance.parentStore);
-   }
-
-   declareData(...args: any[]): void {
-      super.declareData(...args, {
-         url: undefined,
-      });
-   }
-
-   checkVisible(context: RenderingContext, instance: Instance, data: any) {
-      if (!data.visible) return false;
-
-      if (data.url !== instance.cached.url) {
-         instance.cached.url = data.url;
-         let matcher = this.matcher;
-         let route = this.route;
-         if (this.route[0] === "+") {
-            route = routeAppend(context.lastRoute.route, this.route.substring(1));
-            if (!instance.cached.matcher || instance.cached.route !== route)
-               instance.cached.matcher = new RouteMatcher(route + (this.prefix ? "(*remainder)" : ""));
-            matcher = instance.cached.matcher;
-         }
-         instance.cached.result = matcher.match(data.url);
-         instance.cached.matcher = matcher;
-         instance.cached.route = data.route = route;
-      }
-      if (!instance.cached.result) return false;
-
-      return super.checkVisible(context, instance, data);
-   }
-
-   prepareData(context: RenderingContext, instance: Instance) {
-      super.prepareData(context, instance);
-
-      const { store, cached } = instance;
-
-      (store as ReadOnlyDataView).setData({
-         [this.recordName]: cached.result,
-      });
-
-      //TODO: Replace comparison with deepEquals
-      if (this.params && this.params.bind) {
-         var params = store.get(this.params.bind);
-         if (JSON.stringify(params) != JSON.stringify(cached.result)) {
-            store.set(this.params.bind, cached.result);
-         }
-      }
-
-      if (this.map) {
-         for (var key in cached.result) {
-            var binding = this.map[key];
-            if (binding) store.set(binding, cached.result[key]);
-         }
-      }
-   }
-
-   explore(context: RenderingContext, instance: Instance) {
-      context.push("lastRoute", {
-         route: instance.cached.route,
-         result: instance.cached.result,
-         reverse: function (data: any) {
-            return instance.cached.matcher.reverse({
-               ...instance.cached.result,
-               remainder: "",
-               ...data,
-            });
-         },
-      });
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context: RenderingContext, instance: Instance) {
-      context.pop("lastRoute");
-   }
-}
-
-RouteBase.prototype.recordName = "$route";
-RouteBase.prototype.prefix = false;
-
-// Closed type for direct usage
-export class Route extends RouteBase<RouteConfig> {}
-
-Widget.alias("route", Route);
+import { Widget } from "../../ui/Widget";
+import { PureContainerBase, PureContainerConfig } from "../../ui/PureContainer";
+import RouteMatcher from "route-parser";
+import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
+import { routeAppend } from "../../util/routeAppend";
+import { StringProp, BooleanProp, Prop } from "../../ui/Prop";
+import { RenderingContext } from "../../ui/RenderingContext";
+import { Instance } from "../../ui/Instance";
+
+export interface RouteConfig extends PureContainerConfig {
+   /** Url binding. Bind this to the global `url` variable. */
+   url?: StringProp;
+
+   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
+   route?: string;
+
+   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
+   path?: string;
+
+   /** Name used to expose local data. Defaults to `$route`. */
+   recordName?: string;
+
+   /** Match route even if given `route` is only a prefix of the current `url`. */
+   prefix?: BooleanProp;
+
+   /** Parameters mapping */
+   params?: Prop<any>;
+
+   /** Parameter name mapping */
+   map?: Record<string, string>;
+}
+
+// Base class for extending with custom Config types
+export class RouteBase<Config extends RouteConfig = RouteConfig> extends PureContainerBase<Config> {
+   declare url?: string;
+   declare route: string;
+   declare path?: string;
+   declare prefix?: boolean;
+   declare recordName: string;
+   declare params?: Prop<any>;
+   declare map?: Record<string, string>;
+   declare matcher?: any;
+   init() {
+      if (this.path) this.route = this.path;
+
+      super.init();
+
+      if (this.route && this.route[0] !== "+")
+         this.matcher = new RouteMatcher(this.route + (this.prefix ? "(*remainder)" : ""));
+   }
+
+   initInstance(context: RenderingContext, instance: Instance) {
+      instance.store = new ReadOnlyDataView({
+         store: instance.parentStore,
+      });
+      super.initInstance(context, instance);
+   }
+
+   applyParentStore(instance: Instance) {
+      instance.store.setStore(instance.parentStore);
+   }
+
+   declareData(...args: any[]): void {
+      super.declareData(...args, {
+         url: undefined,
+      });
+   }
+
+   checkVisible(context: RenderingContext, instance: Instance, data: any) {
+      if (!data.visible) return false;
+
+      if (data.url !== instance.cached.url) {
+         instance.cached.url = data.url;
+         let matcher = this.matcher;
+         let route = this.route;
+         if (this.route[0] === "+") {
+            route = routeAppend(context.lastRoute.route, this.route.substring(1));
+            if (!instance.cached.matcher || instance.cached.route !== route)
+               instance.cached.matcher = new RouteMatcher(route + (this.prefix ? "(*remainder)" : ""));
+            matcher = instance.cached.matcher;
+         }
+         instance.cached.result = matcher.match(data.url);
+         instance.cached.matcher = matcher;
+         instance.cached.route = data.route = route;
+      }
+      if (!instance.cached.result) return false;
+
+      return super.checkVisible(context, instance, data);
+   }
+
+   prepareData(context: RenderingContext, instance: Instance) {
+      super.prepareData(context, instance);
+
+      const { store, cached } = instance;
+
+      (store as ReadOnlyDataView).setData({
+         [this.recordName]: cached.result,
+      });
+
+      //TODO: Replace comparison with deepEquals
+      if (this.params && this.params.bind) {
+         var params = store.get(this.params.bind);
+         if (JSON.stringify(params) != JSON.stringify(cached.result)) {
+            store.set(this.params.bind, cached.result);
+         }
+      }
+
+      if (this.map) {
+         for (var key in cached.result) {
+            var binding = this.map[key];
+            if (binding) store.set(binding, cached.result[key]);
+         }
+      }
+   }
+
+   explore(context: RenderingContext, instance: Instance) {
+      context.push("lastRoute", {
+         route: instance.cached.route,
+         result: instance.cached.result,
+         reverse: function (data: any) {
+            return instance.cached.matcher.reverse({
+               ...instance.cached.result,
+               remainder: "",
+               ...data,
+            });
+         },
+      });
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context: RenderingContext, instance: Instance) {
+      context.pop("lastRoute");
+   }
+}
+
+RouteBase.prototype.recordName = "$route";
+RouteBase.prototype.prefix = false;
+
+// Closed type for direct usage
+export class Route extends RouteBase<RouteConfig> {}
+
+Widget.alias("route", Route);

package/src/widgets/nav/Scroller.tsx

@@ -1,29 +1,29 @@
 /** @jsxImportSource react */
-import * as React from "react";
 import { Icon } from "../Icon";
 import { VDOM } from "../../ui/Widget";
-import { Container, ContainerConfig } from "../../ui/Container";
+import { StyledContainerBase, StyledContainerConfig } from "../../ui/Container";
 import { ResizeManager } from "../../ui/ResizeManager";
 import { isString, scrollElementIntoView } from "../../util";
 import { RenderingContext } from "../../ui/RenderingContext";
 import { Instance } from "../../ui/Instance";
 import { BooleanProp, StringProp } from "../../ui/Prop";
 
-export interface ScrollerConfig extends ContainerConfig {
-   /** Base CSS class. Default is `hscroller`. */
-   baseClass?: string;
+export interface ScrollerConfig extends StyledContainerConfig {
    horizontal?: BooleanProp;
    vertical?: BooleanProp;
    scrollIntoViewSelector?: StringProp;
 }
 
-export class Scroller extends Container {
-   declare public baseClass: string;
-   declare public styled: boolean;
+export class Scroller extends StyledContainerBase<ScrollerConfig> {
+   declare baseClass: string;
    declare public horizontal?: any;
    declare public vertical?: any;
    declare public scrollIntoViewSelector?: any;
 
+   constructor(config?: ScrollerConfig) {
+      super(config);
+   }
+
    init() {
       if (!this.vertical) this.horizontal = true; //default
 
@@ -45,7 +45,6 @@ export class Scroller extends Container {
    }
 }
 
-Scroller.prototype.styled = true;
 Scroller.prototype.baseClass = "scroller";
 
 interface HScrollerComponentProps {

package/src/widgets/nav/Tab.ts

@@ -1,12 +1,12 @@
 import { Widget, VDOM } from "../../ui/Widget";
-import { HtmlElement, HtmlElementConfig, HtmlElementInstance } from "../HtmlElement";
+import { HtmlElement, HtmlElementConfigBase, HtmlElementInstance } from "../HtmlElement";
 import { Instance } from "../../ui/Instance";
 import { RenderingContext } from "../../ui/RenderingContext";
 import { preventFocusOnTouch } from "../../ui/FocusManager";
 import { isUndefined } from "../../util/isUndefined";
 import { BooleanProp, Prop, StringProp } from "../../ui/Prop";
 
-export interface TabConfig extends HtmlElementConfig {
+export interface TabConfig extends HtmlElementConfigBase {
    /** A value to be written to the `value` property if the tab is clicked. */
    tab?: Prop<string | number>;
 

package/src/widgets/overlay/ContextMenu.ts

@@ -1,42 +1,42 @@
-import { Dropdown, DropdownConfig } from "./Dropdown";
-import { getCursorPos } from "./captureMouse";
-import { View } from "../../data/View";
-import { Instance } from "../../ui/Instance";
-
-export interface ContextMenuConfig extends DropdownConfig {}
-
-export class ContextMenu extends Dropdown {
-   constructor(config?: ContextMenuConfig) {
-      super(config);
-   }
-}
-ContextMenu.prototype.trackMouse = true;
-ContextMenu.prototype.dismissOnFocusOut = true;
-ContextMenu.prototype.firstChildDefinesWidth = true;
-ContextMenu.prototype.matchWidth = false;
-ContextMenu.prototype.placementOrder = "down-right right up-right down-left left up-left";
-ContextMenu.prototype.offset = 0;
-ContextMenu.prototype.autoFocus = true;
-ContextMenu.prototype.autoFocusFirstChild = false;
-ContextMenu.prototype.focusable = true;
-
-export const openContextMenu = (
-   e: React.MouseEvent,
-   content: any,
-   storeOrInstance?: View | Instance,
-   options?: any,
-) => {
-   e.preventDefault();
-   e.stopPropagation();
-   let position = getCursorPos(e);
-   let menu = ContextMenu.create({
-      relatedElement: e.currentTarget,
-      mousePosition: {
-         x: position.clientX,
-         y: position.clientY,
-      },
-      trackMouse: true,
-      items: content,
-   });
-   return menu.open(storeOrInstance, options);
-};
+import { Store } from "../../data/Store";
+import { Instance } from "../../ui/Instance";
+import { Dropdown, DropdownConfig } from "./Dropdown";
+import { getCursorPos } from "./captureMouse";
+
+export interface ContextMenuConfig extends DropdownConfig {}
+
+export class ContextMenu extends Dropdown {
+   constructor(config?: ContextMenuConfig) {
+      super(config);
+   }
+}
+ContextMenu.prototype.trackMouse = true;
+ContextMenu.prototype.dismissOnFocusOut = true;
+ContextMenu.prototype.firstChildDefinesWidth = true;
+ContextMenu.prototype.matchWidth = false;
+ContextMenu.prototype.placementOrder = "down-right right up-right down-left left up-left";
+ContextMenu.prototype.offset = 0;
+ContextMenu.prototype.autoFocus = true;
+ContextMenu.prototype.autoFocusFirstChild = false;
+ContextMenu.prototype.focusable = true;
+
+export const openContextMenu = (
+   e: React.MouseEvent,
+   content: any,
+   storeOrInstance?: Store | Instance,
+   options?: any,
+) => {
+   e.preventDefault();
+   e.stopPropagation();
+   let position = getCursorPos(e);
+   let menu = ContextMenu.create({
+      relatedElement: e.currentTarget,
+      mousePosition: {
+         x: position.clientX,
+         y: position.clientY,
+      },
+      trackMouse: true,
+      items: content,
+   });
+   return menu.open(storeOrInstance, options);
+};