cx 22.4.2 → 22.5.1

package/src/widgets/grid/Grid.js

@@ -907,7 +907,7 @@ export class Grid extends Widget {
       let data = store.getData();
       let skip = 0;
 
-      let { header } = instance;
+      let { header, state } = instance;
       let rowStyle = {};
 
       let lines = [];
@@ -921,7 +921,7 @@ export class Grid extends Widget {
 
             let v,
                c = ci.widget,
-               colSpan,
+               colSpan = 1,
                pad,
                cls = "",
                style = null;
@@ -934,7 +934,6 @@ export class Grid extends Widget {
                empty = false;
                cls = CSS.expand(c.footer.class(data)) || "";
                style = parseStyle(c.footer.style(data));
-
                if (c.footer.expand) {
                   colSpan = 1;
                   for (
@@ -959,6 +958,16 @@ export class Grid extends Widget {
 
             if (pad !== false) cls += (cls ? " " : "") + CSS.state("pad");
 
+            // apply column width to footers too, but only if colSpan == 1,
+            //  otherwise set 1px so that the footer is not participating in the layout
+
+            let maxWidth = 1;
+            if (colSpan == 1) maxWidth = state.colWidth[c.uniqueColumnId];
+            style = {
+               ...style,
+               maxWidth,
+            };
+
             return (
                <td key={i} className={cls} colSpan={colSpan} style={style}>
                   {v}
@@ -2475,7 +2484,7 @@ class GridComponent extends VDOM.Component {
             if (!futureState.cellEdit && wasCellEditing) {
                //If cell editing is in progress, moving the cursor may cause that the cell editor is unmounted before
                //the blur event which may cause data loss for components which do not have reactOn=change set, e.g. NumberField.
-               unfocusElement();
+               unfocusElement(null, false);
                let record = this.getRecordAt(prevState.cursor);
                if ((!this.cellEditorValid || cancelEdit) && this.cellEditUndoData)
                   record.store.set(widget.recordName, this.cellEditUndoData);

package/src/widgets/grid/GridRow.js

@@ -119,7 +119,7 @@ export class GridRowComponent extends VDOM.Component {
             e.stopPropagation();
 
             //close context menu
-            unfocusElement(e.target);
+            unfocusElement(e.target, false);
          }
       }
 
@@ -134,7 +134,7 @@ export class GridRowComponent extends VDOM.Component {
          selectRange: e.shiftKey,
          selectOptions: {
             toggle: e.ctrlKey && !e.shiftKey,
-            add: e.ctrlKey && e.shiftKey
+            add: e.ctrlKey && e.shiftKey,
          },
          cellIndex: this.getCellIndex(e),
       });
@@ -190,7 +190,7 @@ export class GridRowComponent extends VDOM.Component {
          selectRange: e.shiftKey,
          selectOptions: {
             toggle: e.ctrlKey && !e.shiftKey,
-            add: e.ctrlKey && e.shiftKey
+            add: e.ctrlKey && e.shiftKey,
          },
          cellIndex: this.getCellIndex(e),
       });

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

@@ -1,6 +1,9 @@
+import * as React from "react";
 import * as Cx from "../../core";
+import { Instance } from "../../ui/Instance";
+import { LinkButtonProps } from "./LinkButton";
 
-interface LinkProps extends Cx.HtmlElementProps {
+interface LinkProps extends LinkButtonProps {
    /** Set to `true` to disable the link. */
    disabled?: Cx.BooleanProp;
 
@@ -17,6 +20,7 @@ interface LinkProps extends Cx.HtmlElementProps {
 
    activeClass?: Cx.ClassProp;
    activeStyle?: Cx.StyleProp;
+   onClick?: string | ((e: React.SyntheticEvent<any>, instance: Instance) => void);
 }
 
 export class Link extends Cx.Widget<LinkProps> {}

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

@@ -1,7 +1,7 @@
 import * as Cx from "../../core";
 import { ButtonProps } from "../Button";
 
-interface LinkButtonProps extends ButtonProps {
+export interface LinkButtonProps extends ButtonProps {
    /** Url to the link's target location. Should start with `~/` or `#/` for pushState/hash based navigation. */
    href?: Cx.StringProp;