cx 24.2.0 → 24.3.1

package/src/widgets/form/UploadButton.d.ts

@@ -1,34 +1,34 @@
-import * as Cx from "../../core";
-import { FieldProps } from "./Field";
-
-interface UploadButtonProps extends FieldProps {
-   /** Text description. */
-   text?: Cx.StringProp;
-
-   url?: Cx.StringProp;
-
-   /** Base CSS class to be applied to the element. Default is 'uploadbutton'. */
-   baseClass?: string;
-
-   /** Defaults to `false`. Set to `true` to enable multiple selection. */
-   multiple?: boolean;
-
-   method?: string;
-   uploadInProgressText?: string;
-
-   /** Defaults to `false`. Set to `true` to abort uploads if the button is destroyed (unmounted). */
-   abortOnDestroy?: boolean;
-
-   /** Defines file types that are accepted for upload. */
-   accept?: Cx.StringProp;
-
-   /** Name of the icon to be put on the left side of the button. */
-   icon?: Cx.StringProp;
-
-   onUploadStarting?: ((xhr: XMLHttpRequest, instance: any, file: File, formData: FormData) => boolean) | string;
-   onUploadComplete?: ((xhr: XMLHttpRequest, instance: any, file: File, formData: FormData) => void) | string;
-   onUploadProgress?: ((event: ProgressEvent, instance: any, file: File, formData: FormData) => void) | string;
-   onUploadError?: ((event: ProgressEvent, instance: any, file: File, formData: FormData) => void) | string;
-}
-
-export class UploadButton extends Cx.Widget<UploadButtonProps> {}
+import * as Cx from "../../core";
+import { FieldProps } from "./Field";
+
+interface UploadButtonProps extends FieldProps {
+   /** Text description. */
+   text?: Cx.StringProp;
+
+   url?: Cx.StringProp;
+
+   /** Base CSS class to be applied to the element. Default is 'uploadbutton'. */
+   baseClass?: string;
+
+   /** Defaults to `false`. Set to `true` to enable multiple selection. */
+   multiple?: boolean;
+
+   method?: string;
+   uploadInProgressText?: string;
+
+   /** Defaults to `false`. Set to `true` to abort uploads if the button is destroyed (unmounted). */
+   abortOnDestroy?: boolean;
+
+   /** Defines file types that are accepted for upload. */
+   accept?: Cx.StringProp;
+
+   /** Name of the icon to be put on the left side of the button. */
+   icon?: Cx.StringProp;
+
+   onUploadStarting?: ((xhr: XMLHttpRequest, instance: any, file: File, formData: FormData) => boolean) | string;
+   onUploadComplete?: ((xhr: XMLHttpRequest, instance: any, file: File, formData: FormData) => void) | string;
+   onUploadProgress?: ((event: ProgressEvent, instance: any, file: File, formData: FormData) => void) | string;
+   onUploadError?: ((event: ProgressEvent, instance: any, file: File, formData: FormData) => void) | string;
+}
+
+export class UploadButton extends Cx.Widget<UploadButtonProps> {}

package/src/widgets/grid/Grid.js

@@ -752,19 +752,17 @@ export class Grid extends Container {
                );
             }
 
-            headerRows.push(
-               <tbody key={"h" + key + lineIndex} className={CSS.element(baseClass, "header")}>
-                  {result.map((h, i) => (
-                     <tr key={i}>{h}</tr>
-                  ))}
-               </tbody>,
-            );
+            headerRows.push(...result.map((h, i) => <tr key={`${lineIndex}-${i}`}>{h}</tr>));
          }
       });
 
       if (headerRows.length == 0) return null;
 
-      return headerRows;
+      return (
+         <tbody key={"h" + key} className={CSS.element(baseClass, "header")}>
+            {headerRows}
+         </tbody>
+      );
    }
 
    onHeaderMouseMove(e, column, columnInstance, gridInstance, headerLine) {

package/src/widgets/overlay/captureMouse.js

@@ -1,133 +1,124 @@
-import { batchUpdates } from '../../ui/batchUpdates';
-import { getParentFrameBoundingClientRect } from '../../util/getParentFrameBoundingClientRect';
-
-export function captureMouse2(e, { onMouseMove, onMouseUp, onDblClick, captureData, cursor }) {
-
-   let surface = document.createElement('div');
-   surface.className = 'cxb-mousecapture';
-   surface.style.cursor = cursor || getComputedStyle(e.currentTarget).cursor;
-
-   document.body.appendChild(surface);
-
-   let active = true;
-   surface.addEventListener('mousemove', move);
-   surface.addEventListener('mouseup', end);
-   if (onDblClick)
-      surface.addEventListener('dblclick', doubleClick);
-
-   function tear() {
-      if (surface == null) return;
-      surface.removeEventListener('mousemove', move);
-      surface.removeEventListener('mouseup', end);
-      if (onDblClick)
-         surface.removeEventListener('dblclick', onDblClick);
-      document.body.removeChild(surface);
-      surface = null;
-   }
-
-   function doubleClick(e) {
-      try {
-         onDblClick(e);
-      } finally {
-         tear();
-      }
-   }
-
-   e.stopPropagation();
-
-   function move(e) {
-      if (!active) {
-         tear();
-         return;
-      }
-
-      //if mouse moves double clicking is off
-      onDblClick = null;
-
-      batchUpdates(() => {
-         if (onMouseMove)
-            onMouseMove(e, captureData);
-         e.stopPropagation();
-         e.preventDefault(); //disable text selection
-      });
-   }
-
-   function end(e) {
-      active = false;
-      batchUpdates(() => {
-         // if (surface.releaseCapture)
-         //    surface.releaseCapture();
-
-         if (!onDblClick)
-            surface.style.display = "none";
-         try {
-            if (onMouseUp)
-               onMouseUp(e, captureData);
-         } finally {
-            if (onDblClick) {
-               //keep the surface a little longer to detect double clicks
-               setTimeout(tear, 1500);
-            } else
-               tear();
-         }
-      });
-   }
-}
-
-export function captureMouseOrTouch2(e, { onMouseMove, onMouseUp, onDblClick, captureData, cursor }) {
-
-   if (e.type.indexOf('touch') == 0) {
-
-      let el = e.currentTarget;
-
-      let move = e => {
-         batchUpdates(() => {
-            if (onMouseMove)
-               onMouseMove(e, captureData);
-            e.preventDefault();
-         })
-      };
-
-      let end = e=> {
-         batchUpdates(() => {
-            el.removeEventListener('touchmove', move);
-            el.removeEventListener('touchend', end);
-
-            if (onMouseUp)
-               onMouseUp(e);
-
-            e.preventDefault();
-         })
-      };
-
-      el.addEventListener('touchmove', move);
-      el.addEventListener('touchend', end);
-
-      e.stopPropagation();
-   }
-   else
-      captureMouse2(e, { onMouseMove, onMouseUp, captureData, onDblClick, cursor });
-}
-
-export function captureMouse(e, onMouseMove, onMouseUp, captureData, cursor) {
-
-   captureMouse2(e, {
-      onMouseMove,
-      onMouseUp,
-      captureData,
-      cursor
-   })
-}
-
-export function captureMouseOrTouch(e, onMouseMove, onMouseUp, captureData, cursor) {
-   captureMouseOrTouch2(e, {onMouseMove, onMouseUp, captureData, cursor});
-}
-
-export function getCursorPos(e) {
-   let p = (e.touches && e.touches[0]) || e;
-   let offset = getParentFrameBoundingClientRect(e.target);
-   return {
-      clientX: p.clientX + offset.left,
-      clientY: p.clientY + offset.top
-   }
-}
+import { batchUpdates } from "../../ui/batchUpdates";
+import { getParentFrameBoundingClientRect } from "../../util/getParentFrameBoundingClientRect";
+
+export function captureMouse2(e, { onMouseMove, onMouseUp, onDblClick, captureData, cursor }) {
+   let surface = document.createElement("div");
+   surface.className = "cxb-mousecapture";
+   surface.style.cursor = cursor || getComputedStyle(e.currentTarget).cursor;
+
+   document.body.appendChild(surface);
+
+   // In case when the event originates from an iframe,
+   // we use that document as events do not bubble up.   //
+   let parentDocument = e.target.ownerDocument;
+   let options = { capture: true };
+
+   let active = true;
+   parentDocument.addEventListener("mousemove", move, options);
+   parentDocument.addEventListener("mouseup", end, options);
+   if (onDblClick) parentDocument.addEventListener("dblclick", doubleClick), options;
+
+   function tear() {
+      if (surface == null) return;
+      parentDocument.removeEventListener("mousemove", move, options);
+      parentDocument.removeEventListener("mouseup", end, options);
+      if (onDblClick) parentDocument.removeEventListener("dblclick", onDblClick, options);
+      document.body.removeChild(surface);
+      surface = null;
+   }
+
+   function doubleClick(e) {
+      try {
+         onDblClick(e);
+      } finally {
+         tear();
+      }
+   }
+
+   e.stopPropagation();
+
+   function move(e) {
+      if (!active) {
+         tear();
+         return;
+      }
+
+      //if mouse moves double clicking is off
+      onDblClick = null;
+
+      batchUpdates(() => {
+         if (onMouseMove) onMouseMove(e, captureData);
+         e.stopPropagation();
+         e.preventDefault(); //disable text selection
+      });
+   }
+
+   function end(e) {
+      active = false;
+      batchUpdates(() => {
+         // if (surface.releaseCapture)
+         //    surface.releaseCapture();
+
+         if (!onDblClick) surface.style.display = "none";
+         try {
+            if (onMouseUp) onMouseUp(e, captureData);
+         } finally {
+            if (onDblClick) {
+               //keep the surface a little longer to detect double clicks
+               setTimeout(tear, 1500);
+            } else tear();
+         }
+      });
+   }
+}
+
+export function captureMouseOrTouch2(e, { onMouseMove, onMouseUp, onDblClick, captureData, cursor }) {
+   if (e.type.indexOf("touch") == 0) {
+      let el = e.currentTarget;
+
+      let move = (e) => {
+         batchUpdates(() => {
+            if (onMouseMove) onMouseMove(e, captureData);
+            e.preventDefault();
+         });
+      };
+
+      let end = (e) => {
+         batchUpdates(() => {
+            el.removeEventListener("touchmove", move);
+            el.removeEventListener("touchend", end);
+
+            if (onMouseUp) onMouseUp(e);
+
+            e.preventDefault();
+         });
+      };
+
+      el.addEventListener("touchmove", move);
+      el.addEventListener("touchend", end);
+
+      e.stopPropagation();
+   } else captureMouse2(e, { onMouseMove, onMouseUp, captureData, onDblClick, cursor });
+}
+
+export function captureMouse(e, onMouseMove, onMouseUp, captureData, cursor) {
+   captureMouse2(e, {
+      onMouseMove,
+      onMouseUp,
+      captureData,
+      cursor,
+   });
+}
+
+export function captureMouseOrTouch(e, onMouseMove, onMouseUp, captureData, cursor) {
+   captureMouseOrTouch2(e, { onMouseMove, onMouseUp, captureData, cursor });
+}
+
+export function getCursorPos(e) {
+   let p = (e.touches && e.touches[0]) || e;
+   let offset = getParentFrameBoundingClientRect(e.target);
+   return {
+      clientX: p.clientX + offset.left,
+      clientY: p.clientY + offset.top,
+   };
+}