cx 24.7.3 → 24.7.4

package/src/widgets/nav/MenuSpacer.d.ts

@@ -1,5 +1,5 @@
-import * as Cx from '../../core';
-
-export interface MenuSpacerProps extends Cx.WidgetProps {}
-
-export class MenuSpacer extends Cx.Widget<MenuSpacerProps> {}
+import * as Cx from '../../core';
+
+export interface MenuSpacerProps extends Cx.WidgetProps {}
+
+export class MenuSpacer extends Cx.Widget<MenuSpacerProps> {}

package/src/widgets/nav/MenuSpacer.js

@@ -1,13 +1,13 @@
-import {Widget} from "../../ui/Widget";
-
-export class MenuSpacer extends Widget {
-   render(context, instance, key) {
-      return {
-         key: true,
-         atomic: true,
-         spacer: true
-      };
-   }
-}
-
+import {Widget} from "../../ui/Widget";
+
+export class MenuSpacer extends Widget {
+   render(context, instance, key) {
+      return {
+         key: true,
+         atomic: true,
+         spacer: true
+      };
+   }
+}
+
 MenuSpacer.prototype.isMenuSpacer = true;

package/src/widgets/nav/RedirectRoute.d.ts

@@ -1,9 +1,9 @@
-import * as Cx from "../../core";
-import { RouteProps } from "./Route";
-
-interface RedirectRouteProps extends RouteProps {
-   /** Redirection URL. */
-   redirect?: Cx.StringProp;
-}
-
-export class RedirectRoute extends Cx.Widget<RedirectRouteProps> {}
+import * as Cx from "../../core";
+import { RouteProps } from "./Route";
+
+interface RedirectRouteProps extends RouteProps {
+   /** Redirection URL. */
+   redirect?: Cx.StringProp;
+}
+
+export class RedirectRoute extends Cx.Widget<RedirectRouteProps> {}

package/src/widgets/nav/RedirectRoute.js

@@ -1,41 +1,41 @@
-import {Widget} from '../../ui/Widget';
-import {Route} from './Route';
-import {History} from '../../ui/app/History';
-import {Url} from '../../ui/app/Url';
-import {routeAppend} from "../../util/routeAppend";
-
-export class RedirectRoute extends Route
-{
-   checkVisible(context, instance, data) {
-
-      if (!data.visible)
-         return false;
-
-      if (!data.url && !data.route)
-         return true;
-
-      return super.checkVisible(context, instance, data);
-   }
-
-   declareData() {
-      super.declareData(...arguments, {
-         redirect: undefined
-      });
-   }
-
-   prepareData(context, instance) {
-      super.prepareData(...arguments);
-
-      var {data} = instance;
-
-      if (data.redirect && data.redirect[0] === '+')
-         data.redirect = routeAppend(context.lastRoute.reverse(), data.redirect.substring(1));
-
-      if (data.redirect && History.store)
-         History.replaceState({}, null, Url.resolve(data.redirect));
-      else
-         instance.set('url', data.redirect);
-   }
-}
-
+import {Widget} from '../../ui/Widget';
+import {Route} from './Route';
+import {History} from '../../ui/app/History';
+import {Url} from '../../ui/app/Url';
+import {routeAppend} from "../../util/routeAppend";
+
+export class RedirectRoute extends Route
+{
+   checkVisible(context, instance, data) {
+
+      if (!data.visible)
+         return false;
+
+      if (!data.url && !data.route)
+         return true;
+
+      return super.checkVisible(context, instance, data);
+   }
+
+   declareData() {
+      super.declareData(...arguments, {
+         redirect: undefined
+      });
+   }
+
+   prepareData(context, instance) {
+      super.prepareData(...arguments);
+
+      var {data} = instance;
+
+      if (data.redirect && data.redirect[0] === '+')
+         data.redirect = routeAppend(context.lastRoute.reverse(), data.redirect.substring(1));
+
+      if (data.redirect && History.store)
+         History.replaceState({}, null, Url.resolve(data.redirect));
+      else
+         instance.set('url', data.redirect);
+   }
+}
+
 Widget.alias('redirect-route', RedirectRoute);

package/src/widgets/nav/Route.d.ts

@@ -1,21 +1,21 @@
-import * as Cx from '../../core';
-
-export interface RouteProps extends Cx.PureContainerProps {
-
-   /** Url binding. Bind this to the global `url` variable. */
-   url?: Cx.StringProp,
-
-   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
-   path?: string,
-
-   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
-   route?: 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?: boolean
-}
-
-export class Route extends Cx.Widget<RouteProps> {}
+import * as Cx from '../../core';
+
+export interface RouteProps extends Cx.PureContainerProps {
+
+   /** Url binding. Bind this to the global `url` variable. */
+   url?: Cx.StringProp,
+
+   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
+   path?: string,
+
+   /** Target route, e.g. `~/user/:userId`. All routes should start with `~/`. */
+   route?: 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?: boolean
+}
+
+export class Route extends Cx.Widget<RouteProps> {}

package/src/widgets/nav/Route.js

@@ -1,106 +1,106 @@
-import {Widget} from '../../ui/Widget';
-import {PureContainer} from '../../ui/PureContainer';
-import RouteMatcher from 'route-parser';
-import {ReadOnlyDataView} from '../../data/ReadOnlyDataView';
-import {routeAppend} from "../../util/routeAppend";
-
-export class Route extends PureContainer {
-   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, instance) {
-      super.initInstance(context, instance);
-      instance.store = new ReadOnlyDataView({
-         store: instance.store
-      });
-      instance.setStore = store => {
-         instance.store.setStore(store);
-      };
-   }
-
-   declareData() {
-      super.declareData(...arguments, {
-         url: undefined
-      });
-   }
-
-   checkVisible(context, instance, data) {
-
-      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, {data, store, cached}) {
-      super.prepareData(...arguments);
-
-      store.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 result) {
-            var binding = this.map[key];
-            if (binding)
-               store.set(binding, result[key]);
-         }
-      }
-   }
-
-   explore(context, instance) {
-      context.push('lastRoute', {
-         route: instance.cached.route,
-         result: instance.cached.result,
-         reverse: function (data) {
-            return instance.cached.matcher.reverse({
-               ...instance.cached.result,
-               remainder: '',
-               ...data
-            })
-         }
-      });
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context, instance) {
-      context.pop('lastRoute');
-   }
-}
-
-Route.prototype.recordName = '$route';
-Route.prototype.prefix = false;
-
+import {Widget} from '../../ui/Widget';
+import {PureContainer} from '../../ui/PureContainer';
+import RouteMatcher from 'route-parser';
+import {ReadOnlyDataView} from '../../data/ReadOnlyDataView';
+import {routeAppend} from "../../util/routeAppend";
+
+export class Route extends PureContainer {
+   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, instance) {
+      super.initInstance(context, instance);
+      instance.store = new ReadOnlyDataView({
+         store: instance.store
+      });
+      instance.setStore = store => {
+         instance.store.setStore(store);
+      };
+   }
+
+   declareData() {
+      super.declareData(...arguments, {
+         url: undefined
+      });
+   }
+
+   checkVisible(context, instance, data) {
+
+      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, {data, store, cached}) {
+      super.prepareData(...arguments);
+
+      store.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 result) {
+            var binding = this.map[key];
+            if (binding)
+               store.set(binding, result[key]);
+         }
+      }
+   }
+
+   explore(context, instance) {
+      context.push('lastRoute', {
+         route: instance.cached.route,
+         result: instance.cached.result,
+         reverse: function (data) {
+            return instance.cached.matcher.reverse({
+               ...instance.cached.result,
+               remainder: '',
+               ...data
+            })
+         }
+      });
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context, instance) {
+      context.pop('lastRoute');
+   }
+}
+
+Route.prototype.recordName = '$route';
+Route.prototype.prefix = false;
+
 Widget.alias('route', Route);

package/src/widgets/nav/Route.spec.js

@@ -1,27 +1,27 @@
-import { Cx } from "../../ui/Cx";
-import { VDOM } from "../../ui/VDOM";
-import { Route } from "./Route";
-import { Store } from "../../data/Store";
-import { HtmlElement } from "../HtmlElement";
-
-import renderer from "react-test-renderer";
-import assert from "assert";
-
-describe("Route", () => {
-   it("matching works for ~/widgets/color-pickers", () => {
-      let widget = (
-         <cx>
-            <Route url="~/widgets/color-pickers" route="~/widgets/color-pickers">
-               <div />
-            </Route>
-         </cx>
-      );
-
-      let store = new Store();
-
-      const component = renderer.create(<Cx widget={widget} store={store} />);
-
-      let tree = component.toJSON();
-      assert.equal(tree.type, "div");
-   });
-});
+import { Cx } from "../../ui/Cx";
+import { VDOM } from "../../ui/VDOM";
+import { Route } from "./Route";
+import { Store } from "../../data/Store";
+import { HtmlElement } from "../HtmlElement";
+
+import renderer from "react-test-renderer";
+import assert from "assert";
+
+describe("Route", () => {
+   it("matching works for ~/widgets/color-pickers", () => {
+      let widget = (
+         <cx>
+            <Route url="~/widgets/color-pickers" route="~/widgets/color-pickers">
+               <div />
+            </Route>
+         </cx>
+      );
+
+      let store = new Store();
+
+      const component = renderer.create(<Cx widget={widget} store={store} />);
+
+      let tree = component.toJSON();
+      assert.equal(tree.type, "div");
+   });
+});

package/src/widgets/nav/Scroller.d.ts

@@ -1,17 +1,17 @@
-import * as Cx from '../../core';
-
-interface ScrollerProps extends Cx.StyledContainerProps {
-
-   /** Base CSS class. Default is `hscroller`. */
-   baseClass?: string,
-
-   horizontal?: boolean,
-
-   vertical?: boolean
-
-   scrollIntoViewSelector?: Cx.StringProp
-}
-
-export class Scroller extends Cx.Widget<ScrollerProps> {}
-export class HScroller extends Cx.Widget<ScrollerProps> {}
-export class VScroller extends Cx.Widget<ScrollerProps> {}
+import * as Cx from '../../core';
+
+interface ScrollerProps extends Cx.StyledContainerProps {
+
+   /** Base CSS class. Default is `hscroller`. */
+   baseClass?: string,
+
+   horizontal?: boolean,
+
+   vertical?: boolean
+
+   scrollIntoViewSelector?: Cx.StringProp
+}
+
+export class Scroller extends Cx.Widget<ScrollerProps> {}
+export class HScroller extends Cx.Widget<ScrollerProps> {}
+export class VScroller extends Cx.Widget<ScrollerProps> {}