cx 25.4.1 → 25.5.1

package/src/ui/layout/LabelsTopLayout.js

@@ -1,135 +1,135 @@
-import {VDOM, getContent, contentAppend} from '../Widget';
-import {Container} from '../Container';
-import {PureContainer} from '../PureContainer';
-import {isArray} from '../../util/isArray';
-import {isUndefined} from '../../util/isUndefined';
-import {isNumber} from "../../util/isNumber";
-
-function validContent(r) {
-   let content = [];
-   for (let key in r)
-      if (key != "label")
-         contentAppend(content, r[key]);
-   return content;
-}
-
-export class LabelsTopLayout extends Container {
-
-   init() {
-      if (this.vertical && isUndefined(this.columns))
-         this.columns = 1;
-
-      super.init();
-   }
-
-   render(context, instance, key) {
-      let {children, data} = instance;
-
-      let state = {
-         rows: [],
-         currentRow: 0,
-         labelCells: [],
-         fieldCells: [],
-         rowCapacities: [this.columns]
-      };
-
-      const processContent = (r) => {
-         if (!r)
-            return;
-         if (isArray(r.content) && r.useParentLayout)
-            r.content.forEach((x) => processContent(x));
-         else if (r.atomic && r.type == "layout-cell")
-            this.addItem(state, isArray(r.content) && r.content.length == 1 ? r.content[0] : r.content, r.data);
-         else
-            this.addItem(state, r, {});
-      };
-
-      children.forEach(item => processContent(item.vdom));
-
-      this.addRow(state);
-
-      return <table key={key} className={data.classNames} style={data.style}>
-         <tbody>
-         {state.rows}
-         </tbody>
-      </table>;
-   }
-
-   addRow(state) {
-      if (state.labelCells.length > 0)
-         state.rows.push(<tr key={state.rows.length}>{state.labelCells}</tr>);
-
-      if (state.fieldCells.length > 0)
-         state.rows.push(<tr key={state.rows.length}>{state.fieldCells}</tr>);
-
-      state.labelCells = [];
-      state.fieldCells = [];
-      state.currentRow++;
-      if (state.currentRow == state.rowCapacities.length)
-         state.rowCapacities.push(this.columns);
-   }
-
-
-   addItem(state, item, data) {
-
-      while (state.labelCells.length == state.rowCapacities[state.currentRow])
-         this.addRow(state);
-
-      if (data.rowSpan > 1) {
-         for (let row = state.currentRow + 1; row < state.currentRow + data.rowSpan; row++) {
-            if (row == state.rowCapacities.length)
-               state.rowCapacities.push(this.columns);
-            state.rowCapacities[row] -= data.colSpan || 1;
-         }
-      }
-
-      if (data.colSpan > 1)
-         state.rowCapacities[state.currentRow] -= data.colSpan - 1;
-
-      state.labelCells.push(
-         <td className={this.CSS.element(this.baseClass, "label")} key={state.labelCells.length} colSpan={data.colSpan}>
-            {getContent(item.label)}
-         </td>
-      );
-      state.fieldCells.push(
-         <td className={this.CSS.element(this.baseClass, "field")}
-             key={state.fieldCells.length}
-             colSpan={data.colSpan}
-             rowSpan={isNumber(data.rowSpan) ? 2 * data.rowSpan - 1 : undefined}
-             style={data.style}
-         >
-            {validContent(item)}
-         </td>
-      );
-   }
-}
-
-LabelsTopLayout.prototype.baseClass = 'labelstoplayout';
-LabelsTopLayout.prototype.vertical = false;
-LabelsTopLayout.prototype.columns = undefined;
-LabelsTopLayout.prototype.styled = true;
-
-export class LabelsTopLayoutCell extends PureContainer {
-
-   declareData(...args) {
-      super.declareData(...args, {
-         colSpan: undefined,
-         rowSpan: undefined
-      })
-   }
-
-   render(context, instance, key) {
-
-      let { content } = this.renderChildren(context, instance);
-
-      return {
-         atomic: true,
-         type: 'layout-cell',
-         data: instance.data,
-         content
-      }
-   }
-}
-
-LabelsTopLayoutCell.prototype.styled = true;
+import {VDOM, getContent, contentAppend} from '../Widget';
+import {Container} from '../Container';
+import {PureContainer} from '../PureContainer';
+import {isArray} from '../../util/isArray';
+import {isUndefined} from '../../util/isUndefined';
+import {isNumber} from "../../util/isNumber";
+
+function validContent(r) {
+   let content = [];
+   for (let key in r)
+      if (key != "label")
+         contentAppend(content, r[key]);
+   return content;
+}
+
+export class LabelsTopLayout extends Container {
+
+   init() {
+      if (this.vertical && isUndefined(this.columns))
+         this.columns = 1;
+
+      super.init();
+   }
+
+   render(context, instance, key) {
+      let {children, data} = instance;
+
+      let state = {
+         rows: [],
+         currentRow: 0,
+         labelCells: [],
+         fieldCells: [],
+         rowCapacities: [this.columns]
+      };
+
+      const processContent = (r) => {
+         if (!r)
+            return;
+         if (isArray(r.content) && r.useParentLayout)
+            r.content.forEach((x) => processContent(x));
+         else if (r.atomic && r.type == "layout-cell")
+            this.addItem(state, isArray(r.content) && r.content.length == 1 ? r.content[0] : r.content, r.data);
+         else
+            this.addItem(state, r, {});
+      };
+
+      children.forEach(item => processContent(item.vdom));
+
+      this.addRow(state);
+
+      return <table key={key} className={data.classNames} style={data.style}>
+         <tbody>
+         {state.rows}
+         </tbody>
+      </table>;
+   }
+
+   addRow(state) {
+      if (state.labelCells.length > 0)
+         state.rows.push(<tr key={state.rows.length}>{state.labelCells}</tr>);
+
+      if (state.fieldCells.length > 0)
+         state.rows.push(<tr key={state.rows.length}>{state.fieldCells}</tr>);
+
+      state.labelCells = [];
+      state.fieldCells = [];
+      state.currentRow++;
+      if (state.currentRow == state.rowCapacities.length)
+         state.rowCapacities.push(this.columns);
+   }
+
+
+   addItem(state, item, data) {
+
+      while (state.labelCells.length == state.rowCapacities[state.currentRow])
+         this.addRow(state);
+
+      if (data.rowSpan > 1) {
+         for (let row = state.currentRow + 1; row < state.currentRow + data.rowSpan; row++) {
+            if (row == state.rowCapacities.length)
+               state.rowCapacities.push(this.columns);
+            state.rowCapacities[row] -= data.colSpan || 1;
+         }
+      }
+
+      if (data.colSpan > 1)
+         state.rowCapacities[state.currentRow] -= data.colSpan - 1;
+
+      state.labelCells.push(
+         <td className={this.CSS.element(this.baseClass, "label")} key={state.labelCells.length} colSpan={data.colSpan}>
+            {getContent(item.label)}
+         </td>
+      );
+      state.fieldCells.push(
+         <td className={this.CSS.element(this.baseClass, "field")}
+             key={state.fieldCells.length}
+             colSpan={data.colSpan}
+             rowSpan={isNumber(data.rowSpan) ? 2 * data.rowSpan - 1 : undefined}
+             style={data.style}
+         >
+            {validContent(item)}
+         </td>
+      );
+   }
+}
+
+LabelsTopLayout.prototype.baseClass = 'labelstoplayout';
+LabelsTopLayout.prototype.vertical = false;
+LabelsTopLayout.prototype.columns = undefined;
+LabelsTopLayout.prototype.styled = true;
+
+export class LabelsTopLayoutCell extends PureContainer {
+
+   declareData(...args) {
+      super.declareData(...args, {
+         colSpan: undefined,
+         rowSpan: undefined
+      })
+   }
+
+   render(context, instance, key) {
+
+      let { content } = this.renderChildren(context, instance);
+
+      return {
+         atomic: true,
+         type: 'layout-cell',
+         data: instance.data,
+         content
+      }
+   }
+}
+
+LabelsTopLayoutCell.prototype.styled = true;
 LabelsTopLayoutCell.prototype.useParentLayout = true;

package/src/ui/layout/exploreChildren.d.ts

@@ -1,15 +1,12 @@
-import * as Cx from '../../core';
-import {RenderingContext} from '../RenderingContext';
-import {View} from '../../data/View';
-import {Instance} from '../Instance';
-
-export function exploreChildren(
-   context: RenderingContext,
-   instance: Instance,
-   children: Instance[],
-   previousResult: Instance[],
-   key?: string,
-   store?: View,
-   beforeCallback?: () => void,
-   afterCallback?: () => void
-) : Instance[];
+import { View } from "../../data/View";
+import { Instance } from "../Instance";
+import { RenderingContext } from "../RenderingContext";
+
+export function exploreChildren(
+   context: RenderingContext,
+   instance: Instance,
+   children: Instance[],
+   previousResult: Instance[],
+   key?: string,
+   store?: View,
+): Instance[];

package/src/ui/layout/exploreChildren.js

@@ -1,40 +1,27 @@
-import {reverseSlice} from "../../util/reverseSlice";
-
-export function exploreChildren(context, instance, children, previousResult, key, store, beforeCallback, afterCallback) {
-   let newChildren = previousResult || [];
-   let oldChildren = previousResult || newChildren;
-   let identical = previousResult ? 0 : -1;
-
-   // if (children.length)
-   //    context.exploreStack.hop();
-
-   for (let c = 0; c < children.length; c++) {
-      let cell = instance.getChild(context, children[c], key, store);
-
-      // if (beforeCallback)
-      //    beforeCallback(cell);
-
-      if (cell.checkVisible(context)) {
-         if (identical >= 0) {
-            if (cell == oldChildren[identical])
-               identical++;
-            else {
-               newChildren = newChildren.slice(0, identical);
-               identical = -1;
-               newChildren.push(cell);
-            }
-         }
-         else
-            newChildren.push(cell);
-
-         context.exploreStack.push(cell);
-         if (cell.needsExploreCleanup)
-            context.exploreStack.push(cell);
-      }
-   }
-
-   if (identical >= 0 && identical != newChildren.length)
-      newChildren = newChildren.slice(0, identical);
-
-   return newChildren;
-}
+export function exploreChildren(context, instance, children, previousResult, key, store) {
+   let newChildren = previousResult || [];
+   let oldChildren = previousResult || newChildren;
+   let identical = previousResult ? 0 : -1;
+
+   for (let c = 0; c < children.length; c++) {
+      let cell = instance.getChild(context, children[c], key, store);
+
+      if (cell.checkVisible(context)) {
+         if (identical >= 0) {
+            if (cell == oldChildren[identical]) identical++;
+            else {
+               newChildren = newChildren.slice(0, identical);
+               identical = -1;
+               newChildren.push(cell);
+            }
+         } else newChildren.push(cell);
+
+         context.exploreStack.push(cell);
+         if (cell.needsExploreCleanup) context.exploreStack.push(cell);
+      }
+   }
+
+   if (identical >= 0 && identical != newChildren.length) newChildren = newChildren.slice(0, identical);
+
+   return newChildren;
+}