cx 24.9.1 → 24.9.2

package/src/widgets/overlay/Window.js

@@ -1,196 +1,196 @@
-import { Widget, VDOM, getContent } from "../../ui/Widget";
-import { Overlay, OverlayComponent } from "./Overlay";
-import { ContentPlaceholder } from "../../ui/layout/ContentPlaceholder";
-import { ZIndexManager } from "../../ui/ZIndexManager";
-import { Button } from "../Button";
-import { parseStyle } from "../../util/parseStyle";
-import { Localization } from "../../ui/Localization";
-import { stopPropagation } from "../../util/eventCallbacks";
-import { ddMouseDown, ddDetect, ddMouseUp } from "../drag-drop/ops";
-import { isDefined } from "../../util/isDefined";
-import { isString } from "../../util/isString";
-
-export class Window extends Overlay {
-   init() {
-      if (isDefined(this.closeable)) this.closable = this.closeable;
-
-      if (isString(this.headerStyle)) this.headerStyle = parseStyle(this.headerStyle);
-
-      if (isString(this.footerStyle)) this.footerStyle = parseStyle(this.footerStyle);
-
-      if (isString(this.bodyStyle)) this.bodyStyle = parseStyle(this.bodyStyle);
-
-      super.init();
-   }
-
-   declareData() {
-      return super.declareData(...arguments, {
-         title: undefined,
-         closable: undefined,
-         bodyStyle: { structured: true },
-         bodyClass: { structured: true },
-         headerStyle: { structured: true },
-         footerStyle: { structured: true },
-      });
-   }
-
-   initHelpers() {
-      return super.initHelpers(...arguments, {
-         header: Widget.create(this.header || { type: ContentPlaceholder, name: "header", scoped: true }),
-         footer: Widget.create(this.footer || { type: ContentPlaceholder, name: "footer", scoped: true }),
-         close:
-            this.closable &&
-            Button.create({
-               mod: "hollow",
-               dismiss: true,
-               icon: "close",
-               style: "margin-left: auto",
-               onTouchStart: stopPropagation,
-               onMouseDown: stopPropagation,
-            }),
-      });
-   }
-
-   exploreCleanup(context, instance) {
-      super.exploreCleanup(context, instance);
-
-      let { helpers } = instance;
-      let unregisterHeader = helpers.header && helpers.header.unregisterContentPlaceholder;
-      if (unregisterHeader) unregisterHeader();
-
-      let unregisterFooter = helpers.footer && helpers.footer.unregisterContentPlaceholder;
-      if (unregisterFooter) unregisterFooter();
-   }
-
-   renderHeader(context, instance, key) {
-      let { data } = instance;
-      let result = [];
-      if (data.title) result.push(data.title);
-      if (instance.helpers) {
-         let header = getContent(instance.helpers.header && instance.helpers.header.render(context, key));
-         if (header) result.push(header);
-         if (data.closable && instance.helpers.close) result.push(getContent(instance.helpers.close.render(context)));
-      }
-      return result;
-   }
-
-   renderFooter(context, instance, key) {
-      return getContent(instance.helpers && instance.helpers.footer && instance.helpers.footer.render(context, key));
-   }
-
-   render(context, instance, key) {
-      var header = this.renderHeader(context, instance, "header");
-      var footer = this.renderFooter(context, instance, "footer");
-      return (
-         <WindowComponent key={key} instance={instance} header={header} footer={footer}>
-            {this.renderContents(context, instance)}
-         </WindowComponent>
-      );
-   }
-}
-
-Window.prototype.baseClass = "window";
-Window.prototype.closable = true;
-Window.prototype.resizable = false;
-Window.prototype.fixed = false;
-Window.prototype.autoFocus = true;
-Window.prototype.focusable = true;
-Window.prototype.pad = true;
-
-Widget.alias("window", Window);
-Localization.registerPrototype("cx/widgets/Window", Window);
-
-class WindowComponent extends OverlayComponent {
-   renderOverlayBody() {
-      var { widget, data } = this.props.instance;
-      var { CSS, baseClass } = widget;
-
-      let header, footer;
-
-      if (this.props.header.length > 0) {
-         header = (
-            <header
-               key="header"
-               ref={(c) => {
-                  this.headerEl = c;
-               }}
-               className={CSS.element(baseClass, "header")}
-               style={data.headerStyle}
-               onMouseDown={this.onHeaderMouseDown.bind(this)}
-               onMouseUp={ddMouseUp}
-               onMouseMove={this.onHeaderMouseMove.bind(this)}
-               onTouchStart={this.onHeaderMouseDown.bind(this)}
-               onTouchEnd={ddMouseUp}
-               onTouchMove={this.onHeaderMouseMove.bind(this)}
-            >
-               {this.props.header}
-            </header>
-         );
-      }
-
-      if (this.props.footer) {
-         footer = (
-            <footer
-               key="footer"
-               ref={(c) => {
-                  this.footerEl = c;
-               }}
-               className={CSS.element(baseClass, "footer")}
-               style={data.footerStyle}
-            >
-               {this.props.footer}
-            </footer>
-         );
-      }
-
-      var body = (
-         <div
-            key="body"
-            ref={(c) => {
-               this.bodyEl = c;
-            }}
-            className={CSS.expand(CSS.element(widget.baseClass, "body", { pad: widget.pad }), data.bodyClass)}
-            style={data.bodyStyle}
-         >
-            {this.props.children}
-         </div>
-      );
-
-      return [header, body, footer];
-   }
-
-   getOverlayCssClass() {
-      var cls = super.getOverlayCssClass();
-      if (this.state.active) cls += " cxs-active";
-      return cls;
-   }
-
-   onFocusIn() {
-      super.onFocusIn();
-      if (!this.state.active) {
-         if (this.containerEl.contains(document.activeElement)) this.setZIndex(ZIndexManager.next());
-         this.setState({ active: true });
-      }
-   }
-
-   onFocusOut() {
-      super.onFocusOut();
-      if (this.state.active) {
-         this.setState({
-            active: false,
-         });
-      }
-   }
-
-   onHeaderMouseDown(e) {
-      e.stopPropagation();
-      ddMouseDown(e);
-   }
-
-   onHeaderMouseMove(e) {
-      e.stopPropagation();
-      if (!this.props.instance.widget.fixed && ddDetect(e)) {
-         this.startMoveOperation(e);
-      }
-   }
-}
+import { Widget, VDOM, getContent } from "../../ui/Widget";
+import { Overlay, OverlayComponent } from "./Overlay";
+import { ContentPlaceholder } from "../../ui/layout/ContentPlaceholder";
+import { ZIndexManager } from "../../ui/ZIndexManager";
+import { Button } from "../Button";
+import { parseStyle } from "../../util/parseStyle";
+import { Localization } from "../../ui/Localization";
+import { stopPropagation } from "../../util/eventCallbacks";
+import { ddMouseDown, ddDetect, ddMouseUp } from "../drag-drop/ops";
+import { isDefined } from "../../util/isDefined";
+import { isString } from "../../util/isString";
+
+export class Window extends Overlay {
+   init() {
+      if (isDefined(this.closeable)) this.closable = this.closeable;
+
+      if (isString(this.headerStyle)) this.headerStyle = parseStyle(this.headerStyle);
+
+      if (isString(this.footerStyle)) this.footerStyle = parseStyle(this.footerStyle);
+
+      if (isString(this.bodyStyle)) this.bodyStyle = parseStyle(this.bodyStyle);
+
+      super.init();
+   }
+
+   declareData() {
+      return super.declareData(...arguments, {
+         title: undefined,
+         closable: undefined,
+         bodyStyle: { structured: true },
+         bodyClass: { structured: true },
+         headerStyle: { structured: true },
+         footerStyle: { structured: true },
+      });
+   }
+
+   initHelpers() {
+      return super.initHelpers(...arguments, {
+         header: Widget.create(this.header || { type: ContentPlaceholder, name: "header", scoped: true }),
+         footer: Widget.create(this.footer || { type: ContentPlaceholder, name: "footer", scoped: true }),
+         close:
+            this.closable &&
+            Button.create({
+               mod: "hollow",
+               dismiss: true,
+               icon: "close",
+               style: "margin-left: auto",
+               onTouchStart: stopPropagation,
+               onMouseDown: stopPropagation,
+            }),
+      });
+   }
+
+   exploreCleanup(context, instance) {
+      super.exploreCleanup(context, instance);
+
+      let { helpers } = instance;
+      let unregisterHeader = helpers.header && helpers.header.unregisterContentPlaceholder;
+      if (unregisterHeader) unregisterHeader();
+
+      let unregisterFooter = helpers.footer && helpers.footer.unregisterContentPlaceholder;
+      if (unregisterFooter) unregisterFooter();
+   }
+
+   renderHeader(context, instance, key) {
+      let { data } = instance;
+      let result = [];
+      if (data.title) result.push(data.title);
+      if (instance.helpers) {
+         let header = getContent(instance.helpers.header && instance.helpers.header.render(context, key));
+         if (header) result.push(header);
+         if (data.closable && instance.helpers.close) result.push(getContent(instance.helpers.close.render(context)));
+      }
+      return result;
+   }
+
+   renderFooter(context, instance, key) {
+      return getContent(instance.helpers && instance.helpers.footer && instance.helpers.footer.render(context, key));
+   }
+
+   render(context, instance, key) {
+      var header = this.renderHeader(context, instance, "header");
+      var footer = this.renderFooter(context, instance, "footer");
+      return (
+         <WindowComponent key={key} instance={instance} header={header} footer={footer}>
+            {this.renderContents(context, instance)}
+         </WindowComponent>
+      );
+   }
+}
+
+Window.prototype.baseClass = "window";
+Window.prototype.closable = true;
+Window.prototype.resizable = false;
+Window.prototype.fixed = false;
+Window.prototype.autoFocus = true;
+Window.prototype.focusable = true;
+Window.prototype.pad = true;
+
+Widget.alias("window", Window);
+Localization.registerPrototype("cx/widgets/Window", Window);
+
+class WindowComponent extends OverlayComponent {
+   renderOverlayBody() {
+      var { widget, data } = this.props.instance;
+      var { CSS, baseClass } = widget;
+
+      let header, footer;
+
+      if (this.props.header.length > 0) {
+         header = (
+            <header
+               key="header"
+               ref={(c) => {
+                  this.headerEl = c;
+               }}
+               className={CSS.element(baseClass, "header")}
+               style={data.headerStyle}
+               onMouseDown={this.onHeaderMouseDown.bind(this)}
+               onMouseUp={ddMouseUp}
+               onMouseMove={this.onHeaderMouseMove.bind(this)}
+               onTouchStart={this.onHeaderMouseDown.bind(this)}
+               onTouchEnd={ddMouseUp}
+               onTouchMove={this.onHeaderMouseMove.bind(this)}
+            >
+               {this.props.header}
+            </header>
+         );
+      }
+
+      if (this.props.footer) {
+         footer = (
+            <footer
+               key="footer"
+               ref={(c) => {
+                  this.footerEl = c;
+               }}
+               className={CSS.element(baseClass, "footer")}
+               style={data.footerStyle}
+            >
+               {this.props.footer}
+            </footer>
+         );
+      }
+
+      var body = (
+         <div
+            key="body"
+            ref={(c) => {
+               this.bodyEl = c;
+            }}
+            className={CSS.expand(CSS.element(widget.baseClass, "body", { pad: widget.pad }), data.bodyClass)}
+            style={data.bodyStyle}
+         >
+            {this.props.children}
+         </div>
+      );
+
+      return [header, body, footer];
+   }
+
+   getOverlayCssClass() {
+      var cls = super.getOverlayCssClass();
+      if (this.state.active) cls += " cxs-active";
+      return cls;
+   }
+
+   onFocusIn() {
+      super.onFocusIn();
+      if (!this.state.active) {
+         if (this.containerEl.contains(document.activeElement)) this.setZIndex(ZIndexManager.next());
+         this.setState({ active: true });
+      }
+   }
+
+   onFocusOut() {
+      super.onFocusOut();
+      if (this.state.active) {
+         this.setState({
+            active: false,
+         });
+      }
+   }
+
+   onHeaderMouseDown(e) {
+      e.stopPropagation();
+      ddMouseDown(e);
+   }
+
+   onHeaderMouseMove(e) {
+      e.stopPropagation();
+      if (!this.props.instance.widget.fixed && ddDetect(e)) {
+         this.startMoveOperation(e);
+      }
+   }
+}

package/src/widgets/overlay/captureMouse.js

@@ -1,124 +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);
-
-   // 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 && 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 && 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,
+   };
+}