cx 25.5.0 → 25.5.2

package/src/ui/Container.js

@@ -1,154 +1,154 @@
-import { contentAppend, Widget } from "./Widget";
-import { StaticText } from "./StaticText";
-import { Text } from "./Text";
-import { innerTextTrim } from "../util/innerTextTrim";
-import { isString } from "../util/isString";
-import { isArray } from "../util/isArray";
-import { exploreChildren } from "./layout/exploreChildren";
-
-export class Container extends Widget {
-   init(context) {
-      if (typeof this.ws !== "undefined") this.preserveWhitespace = this.ws;
-
-      if (this.preserveWhitespace) this.trimWhitespace = false;
-
-      let items = this.items || this.children || [];
-      delete this.children;
-      this.items = [];
-
-      if (this.layout) {
-         let layout = Widget.create({ type: this.layout, items });
-         layout.init(context);
-         this.layout = null;
-         if (layout.noLayout) {
-            this.useParentLayout = true;
-            this.add(items);
-         } else {
-            this.add(layout);
-            this.layout = layout;
-         }
-      } else {
-         this.add(items);
-      }
-
-      super.init(context);
-   }
-
-   exploreItems(context, instance, items) {
-      instance.children = exploreChildren(context, instance, items, instance.cached.children, null, instance.store);
-      if (instance.cache("children", instance.children)) instance.markShouldUpdate(context);
-   }
-
-   explore(context, instance) {
-      super.explore(context, instance);
-      this.exploreItems(context, instance, this.items);
-   }
-
-   render(context, instance) {
-      return this.renderChildren(context, instance);
-   }
-
-   renderChildren(context, instance) {
-      let preserveComplexContent = this.useParentLayout;
-
-      function append(result, r) {
-         if (r == null) return;
-
-         //react element
-         if (!r.hasOwnProperty("content")) {
-            contentAppend(result, r);
-            return;
-         }
-
-         if (r.useParentLayout) return r.content.forEach((x) => append(result, x));
-
-         if (r.atomic || preserveComplexContent) {
-            result.push(r);
-         } else {
-            let first = true;
-            for (let k in r) if (contentAppend(result, r[k], !first)) first = false;
-         }
-      }
-
-      let result = [];
-      for (let i = 0; i < instance.children.length; i++) {
-         append(result, instance.children[i].vdom);
-      }
-
-      if (this.useParentLayout)
-         return {
-            useParentLayout: true,
-            content: result,
-         };
-
-      return result;
-   }
-
-   clear() {
-      if (this.layout) this.layout.clear();
-      else this.items = [];
-   }
-
-   add(...args) {
-      if (this.layout) return this.layout.add(...args);
-
-      args.forEach((a) => {
-         if (!a) return;
-         if (isArray(a)) a.forEach((c) => this.add(c));
-         else if (isString(a)) {
-            if (this.trimWhitespace) a = innerTextTrim(a);
-            if (a) this.addText(a);
-         } else if (a.isComponent) this.items.push(this.wrapItem(a));
-         else {
-            this.add(Widget.create(a, this.itemDefaults));
-         }
-      });
-   }
-
-   wrapItem(item) {
-      return item;
-   }
-
-   addText(text) {
-      if (this.plainText || text.indexOf("{") == -1 || text.indexOf("}") == -1)
-         this.add(Widget.create(StaticText, { text: text }));
-      else this.add(Widget.create(Text, { text: { tpl: text } }));
-   }
-
-   find(filter, options) {
-      if (!options) options = {};
-
-      if (!filter || !this.items) return [];
-
-      let alias = filter;
-
-      if (isString(filter)) filter = (w) => w.componentAlias == alias;
-
-      if (filter.isComponentType) filter = (w) => w instanceof alias;
-
-      let results = [];
-
-      for (let i = 0; i < this.items.length; i++) {
-         let w = this.items[i];
-
-         if (!w.initialized) w.init();
-
-         if (filter(w)) {
-            results.push(w);
-            if (options.first) break;
-         }
-
-         if (w.find) results.push(...w.find(filter, options));
-      }
-
-      return results;
-   }
-
-   findFirst(filter, options) {
-      return this.find(filter, { ...options, first: true })[0];
-   }
-}
-
-Container.prototype.trimWhitespace = true;
-Container.prototype.plainText = true;
-Container.prototype.styled = false;
+import { contentAppend, Widget } from "./Widget";
+import { StaticText } from "./StaticText";
+import { Text } from "./Text";
+import { innerTextTrim } from "../util/innerTextTrim";
+import { isString } from "../util/isString";
+import { isArray } from "../util/isArray";
+import { exploreChildren } from "./layout/exploreChildren";
+
+export class Container extends Widget {
+   init(context) {
+      if (typeof this.ws !== "undefined") this.preserveWhitespace = this.ws;
+
+      if (this.preserveWhitespace) this.trimWhitespace = false;
+
+      let items = this.items || this.children || [];
+      delete this.children;
+      this.items = [];
+
+      if (this.layout) {
+         let layout = Widget.create({ type: this.layout, items });
+         layout.init(context);
+         this.layout = null;
+         if (layout.noLayout) {
+            this.useParentLayout = true;
+            this.add(items);
+         } else {
+            this.add(layout);
+            this.layout = layout;
+         }
+      } else {
+         this.add(items);
+      }
+
+      super.init(context);
+   }
+
+   exploreItems(context, instance, items) {
+      instance.children = exploreChildren(context, instance, items, instance.cached.children, null, instance.store);
+      if (instance.cache("children", instance.children)) instance.markShouldUpdate(context);
+   }
+
+   explore(context, instance) {
+      super.explore(context, instance);
+      this.exploreItems(context, instance, this.items);
+   }
+
+   render(context, instance) {
+      return this.renderChildren(context, instance);
+   }
+
+   renderChildren(context, instance) {
+      let preserveComplexContent = this.useParentLayout;
+
+      function append(result, r) {
+         if (r == null) return;
+
+         //react element
+         if (!r.hasOwnProperty("content")) {
+            contentAppend(result, r);
+            return;
+         }
+
+         if (r.useParentLayout) return r.content.forEach((x) => append(result, x));
+
+         if (r.atomic || preserveComplexContent) {
+            result.push(r);
+         } else {
+            let first = true;
+            for (let k in r) if (contentAppend(result, r[k], !first)) first = false;
+         }
+      }
+
+      let result = [];
+      for (let i = 0; i < instance.children.length; i++) {
+         append(result, instance.children[i].vdom);
+      }
+
+      if (this.useParentLayout)
+         return {
+            useParentLayout: true,
+            content: result,
+         };
+
+      return result;
+   }
+
+   clear() {
+      if (this.layout) this.layout.clear();
+      else this.items = [];
+   }
+
+   add(...args) {
+      if (this.layout) return this.layout.add(...args);
+
+      args.forEach((a) => {
+         if (!a) return;
+         if (isArray(a)) a.forEach((c) => this.add(c));
+         else if (isString(a)) {
+            if (this.trimWhitespace) a = innerTextTrim(a);
+            if (a) this.addText(a);
+         } else if (a.isComponent) this.items.push(this.wrapItem(a));
+         else {
+            this.add(Widget.create(a, this.itemDefaults));
+         }
+      });
+   }
+
+   wrapItem(item) {
+      return item;
+   }
+
+   addText(text) {
+      if (this.plainText || text.indexOf("{") == -1 || text.indexOf("}") == -1)
+         this.add(Widget.create(StaticText, { text: text }));
+      else this.add(Widget.create(Text, { text: { tpl: text } }));
+   }
+
+   find(filter, options) {
+      if (!options) options = {};
+
+      if (!filter || !this.items) return [];
+
+      let alias = filter;
+
+      if (isString(filter)) filter = (w) => w.componentAlias == alias;
+
+      if (filter.isComponentType) filter = (w) => w instanceof alias;
+
+      let results = [];
+
+      for (let i = 0; i < this.items.length; i++) {
+         let w = this.items[i];
+
+         if (!w.initialized) w.init();
+
+         if (filter(w)) {
+            results.push(w);
+            if (options.first) break;
+         }
+
+         if (w.find) results.push(...w.find(filter, options));
+      }
+
+      return results;
+   }
+
+   findFirst(filter, options) {
+      return this.find(filter, { ...options, first: true })[0];
+   }
+}
+
+Container.prototype.trimWhitespace = true;
+Container.prototype.plainText = true;
+Container.prototype.styled = false;

package/src/ui/DataProxy.js

@@ -1,45 +1,31 @@
-import { NestedDataView } from "../data/NestedDataView";
-import { UseParentLayout } from "../ui/layout/UseParentLayout";
-import { PureContainer } from "./PureContainer";
-import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
-
-export class DataProxy extends PureContainer {
-   init() {
-      if (!this.data) this.data = {};
-
-      if (this.alias) this.data[this.alias] = this.value;
-
-      // nesting is required to avoid resetting the store on every render and recalculating the data
-      this.container = PureContainer.create({
-         type: PureContainer,
-         items: this.children || this.items,
-         layout: this.layout,
-         controller: this.controller,
-         outerLayout: this.outerLayout,
-         ws: this.ws,
-      });
-      this.children = [this.container];
-      delete this.items;
-      delete this.controller;
-      delete this.outerLayout;
-      this.layout = UseParentLayout;
-      super.init();
-   }
-
-   initInstance(context, instance) {
-      instance.store = new NestedDataView({
-         store: instance.parentStore,
-         nestedData: new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true }),
-         immutable: this.immutable,
-         sealed: this.sealed,
-      });
-      super.initInstance(context, instance);
-   }
-
-   applyParentStore(instance) {
-      instance.store.setStore(instance.parentStore);
-   }
-}
-
-DataProxy.prototype.immutable = false;
-DataProxy.prototype.sealed = false;
+import { NestedDataView } from "../data/NestedDataView";
+import { UseParentLayout } from "../ui/layout/UseParentLayout";
+import { PureContainer } from "./PureContainer";
+import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
+
+export class DataProxy extends PureContainer {
+   init() {
+      if (!this.data) this.data = {};
+
+      if (this.alias) this.data[this.alias] = this.value;
+
+      super.init();
+   }
+
+   initInstance(context, instance) {
+      instance.store = new NestedDataView({
+         store: instance.parentStore,
+         nestedData: new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true }),
+         immutable: this.immutable,
+         sealed: this.sealed,
+      });
+      super.initInstance(context, instance);
+   }
+
+   applyParentStore(instance) {
+      instance.store.setStore(instance.parentStore);
+   }
+}
+
+DataProxy.prototype.immutable = false;
+DataProxy.prototype.sealed = false;

package/src/ui/DetachedScope.js

@@ -1,98 +1,98 @@
-import { PureContainer } from "./PureContainer";
-import { SubscribableView } from "../data/SubscribableView";
-import { getSelector } from "../data/getSelector";
-import { Cx } from "./Cx";
-import { VDOM } from "./Widget";
-import { IsolatedScope } from "./IsolatedScope";
-
-export class DetachedScope extends IsolatedScope {
-   declareData() {
-      return super.declareData(...arguments, {
-         exclusiveData: { structured: true },
-      });
-   }
-
-   init() {
-      if (typeof this.exclusive === "string") this.exclusiveData = { bind: this.exclusive };
-      if (Array.isArray(this.exclusive)) {
-         this.exclusiveData = {};
-         this.exclusive.forEach((x, i) => {
-            this.exclusiveData[String(i)] = { bind: x };
-         });
-      }
-
-      this.container = PureContainer.create({
-         type: PureContainer,
-         items: this.children || this.items,
-      });
-      delete this.items;
-      delete this.children;
-
-      if (this.name)
-         this.options = {
-            ...this.options,
-            name: this.name,
-         };
-
-      super.init();
-   }
-
-   initInstance(context, instance) {
-      instance.subStore = new ContainmentStore({
-         store: instance.store,
-         selector: getSelector(this.exclusiveData || this.data),
-      });
-   }
-
-   applyParentStore(instance) {
-      instance.store = instance.parentStore;
-      instance.subStore.setStore(instance.parentStore);
-   }
-
-   render(context, instance, key) {
-      return (
-         <Cx
-            key={key}
-            widget={this.container}
-            store={instance.subStore}
-            parentInstance={instance}
-            subscribe
-            options={this.options}
-            onError={this.onError}
-         />
-      );
-   }
-}
-
-class ContainmentStore extends SubscribableView {
-   getData() {
-      return this.store.getData();
-   }
-
-   setItem(...args) {
-      return this.wrapper(() => {
-         this.store.setItem(...args);
-      });
-   }
-
-   deleteItem(...args) {
-      return this.wrapper(() => {
-         this.store.deleteItem(...args);
-      });
-   }
-
-   wrapper(callback) {
-      if (this.store.silently(callback)) {
-         let data = this.getData();
-         let containedData = this.selector(data);
-         if (containedData === this.cache.containedData) {
-            this.store.notify();
-         } else {
-            this.cache.containedData = containedData;
-            this.notify();
-         }
-         return true;
-      }
-      return false;
-   }
-}
+import { PureContainer } from "./PureContainer";
+import { SubscribableView } from "../data/SubscribableView";
+import { getSelector } from "../data/getSelector";
+import { Cx } from "./Cx";
+import { VDOM } from "./Widget";
+import { IsolatedScope } from "./IsolatedScope";
+
+export class DetachedScope extends IsolatedScope {
+   declareData() {
+      return super.declareData(...arguments, {
+         exclusiveData: { structured: true },
+      });
+   }
+
+   init() {
+      if (typeof this.exclusive === "string") this.exclusiveData = { bind: this.exclusive };
+      if (Array.isArray(this.exclusive)) {
+         this.exclusiveData = {};
+         this.exclusive.forEach((x, i) => {
+            this.exclusiveData[String(i)] = { bind: x };
+         });
+      }
+
+      this.container = PureContainer.create({
+         type: PureContainer,
+         items: this.children || this.items,
+      });
+      delete this.items;
+      delete this.children;
+
+      if (this.name)
+         this.options = {
+            ...this.options,
+            name: this.name,
+         };
+
+      super.init();
+   }
+
+   initInstance(context, instance) {
+      instance.subStore = new ContainmentStore({
+         store: instance.store,
+         selector: getSelector(this.exclusiveData || this.data),
+      });
+   }
+
+   applyParentStore(instance) {
+      instance.store = instance.parentStore;
+      instance.subStore.setStore(instance.parentStore);
+   }
+
+   render(context, instance, key) {
+      return (
+         <Cx
+            key={key}
+            widget={this.container}
+            store={instance.subStore}
+            parentInstance={instance}
+            subscribe
+            options={this.options}
+            onError={this.onError}
+         />
+      );
+   }
+}
+
+class ContainmentStore extends SubscribableView {
+   getData() {
+      return this.store.getData();
+   }
+
+   setItem(...args) {
+      return this.wrapper(() => {
+         this.store.setItem(...args);
+      });
+   }
+
+   deleteItem(...args) {
+      return this.wrapper(() => {
+         this.store.deleteItem(...args);
+      });
+   }
+
+   wrapper(callback) {
+      if (this.store.silently(callback)) {
+         let data = this.getData();
+         let containedData = this.selector(data);
+         if (containedData === this.cache.containedData) {
+            this.store.notify();
+         } else {
+            this.cache.containedData = containedData;
+            this.notify();
+         }
+         return true;
+      }
+      return false;
+   }
+}