cx 26.1.2 → 26.1.4

package/src/widgets/Resizer.tsx

@@ -1,200 +1,200 @@
-/** @jsxImportSource react */
-import { Instance } from "../ui/Instance";
-import { NumberProp } from "../ui/Prop";
-import { RenderingContext } from "../ui/RenderingContext";
-import { VDOM, Widget, WidgetConfig, WidgetStyleConfig } from "../ui/Widget";
-import { captureMouseOrTouch, getCursorPos } from "./overlay/captureMouse";
-
-export interface ResizerConfig extends WidgetConfig, WidgetStyleConfig {
-   /** Make resizer horizontal. */
-   horizontal?: boolean;
-
-   /** Use the element after the the resizer for size measurements. */
-   forNextElement?: boolean;
-
-   /** A binding for the new size. */
-   size?: NumberProp;
-
-   /** Default value that will be set when the user double click on the resizer. */
-   defaultSize?: NumberProp;
-
-   /** Minimum size of the element. */
-   minSize?: NumberProp;
-
-   /** Maximum size of the element. */
-   maxSize?: NumberProp;
-}
-
-export class Resizer extends Widget<ResizerConfig> {
-   declare baseClass: string;
-   declare horizontal?: boolean;
-   declare forNextElement?: boolean;
-   declare defaultSize?: NumberProp | null;
-   declare minSize?: NumberProp;
-   declare maxSize?: NumberProp;
-
-   constructor(config?: ResizerConfig) {
-      super(config);
-   }
-
-   declareData(...args: Record<string, unknown>[]): void {
-      super.declareData(...args, {
-         size: undefined,
-         defaultSize: undefined,
-         minSize: undefined,
-         maxSize: undefined,
-      });
-   }
-
-   render(context: RenderingContext, instance: Instance<Resizer>, key: string): React.ReactNode {
-      let { data } = instance;
-
-      return <ResizerCmp key={key} instance={instance} data={data} />;
-   }
-}
-
-Resizer.prototype.baseClass = "resizer";
-Resizer.prototype.styled = true;
-Resizer.prototype.horizontal = false;
-Resizer.prototype.forNextElement = false;
-Resizer.prototype.defaultSize = null;
-Resizer.prototype.minSize = 0;
-Resizer.prototype.maxSize = 1e6;
-
-interface ResizerCmpProps {
-   instance: Instance<Resizer>;
-   data: Record<string, any>;
-}
-
-interface ResizerCmpState {
-   dragged: boolean;
-   offset: number;
-   initialPosition?: { clientX: number; clientY: number };
-}
-
-class ResizerCmp extends VDOM.Component<ResizerCmpProps, ResizerCmpState> {
-   declare el?: HTMLDivElement | null;
-   declare hasCapture?: boolean;
-
-   constructor(props: ResizerCmpProps) {
-      super(props);
-      this.state = {
-         dragged: false,
-         offset: 0,
-      };
-   }
-
-   shouldComponentUpdate(props: ResizerCmpProps, state: ResizerCmpState): boolean {
-      return state != this.state;
-   }
-
-   render(): React.ReactNode {
-      let { instance, data } = this.props;
-      let { widget } = instance;
-      let { baseClass, CSS } = widget;
-
-      return (
-         <div
-            ref={(el) => {
-               this.el = el;
-            }}
-            className={CSS.expand(
-               data.classNames,
-               CSS.state({
-                  vertical: !widget.horizontal,
-                  horizontal: widget.horizontal,
-               }),
-            )}
-            style={data.style}
-            onDoubleClick={(e) => {
-               instance.set("size", data.defaultSize);
-            }}
-            onMouseDown={(e) => {
-               let initialPosition = getCursorPos(e);
-               this.setState({ dragged: true, initialPosition });
-            }}
-            onMouseUp={(e) => {
-               this.setState({ dragged: false });
-            }}
-            onMouseMove={this.startCapture.bind(this)}
-            onMouseLeave={this.startCapture.bind(this)}
-         >
-            <div
-               className={CSS.element(baseClass, "handle", { dragged: this.state.dragged })}
-               style={{
-                  left: !widget.horizontal ? this.state.offset : 0,
-                  top: widget.horizontal ? this.state.offset : 0,
-               }}
-            />
-         </div>
-      );
-   }
-
-   startCapture(e: React.MouseEvent): void {
-      let { instance } = this.props;
-      let { widget } = instance;
-
-      if (this.state.dragged && !this.hasCapture) {
-         this.hasCapture = true;
-         captureMouseOrTouch(
-            e,
-            this.onHandleMove.bind(this),
-            this.onDragComplete.bind(this),
-            this.state.initialPosition!,
-            widget.horizontal ? "row-resize" : "col-resize",
-         );
-      }
-   }
-
-   onHandleMove(e: any, initialPosition: { clientX: number; clientY: number }): void {
-      let { instance } = this.props;
-      let { widget } = instance;
-      let currentPosition = getCursorPos(e);
-      const offset = !widget.horizontal
-         ? currentPosition.clientX - initialPosition.clientX
-         : currentPosition.clientY - initialPosition.clientY;
-
-      let size = this.getNewSize(0);
-      let newSize = this.getNewSize(offset);
-
-      let allowedOffset = widget.forNextElement ? size - newSize : newSize - size;
-
-      this.setState({ offset: allowedOffset });
-   }
-
-   getNewSize(offset: number): number {
-      let { instance, data } = this.props;
-      let { horizontal, forNextElement } = instance.widget;
-
-      if (
-         !this.el ||
-         (!forNextElement && !this.el.previousElementSibling) ||
-         (forNextElement && !this.el.nextElementSibling)
-      )
-         return 0;
-
-      let newSize: number;
-
-      if (horizontal) {
-         if (forNextElement) newSize = (this.el.nextElementSibling as HTMLElement).offsetHeight - offset;
-         else newSize = (this.el.previousElementSibling as HTMLElement).offsetHeight + offset;
-      } else {
-         if (forNextElement) newSize = (this.el.nextElementSibling as HTMLElement).offsetWidth - offset;
-         else newSize = (this.el.previousElementSibling as HTMLElement).offsetWidth + offset;
-      }
-
-      return Math.max(data.minSize as number, Math.min(newSize, data.maxSize as number));
-   }
-
-   onDragComplete(): void {
-      this.hasCapture = false;
-      let { instance } = this.props;
-
-      instance.set("size", this.getNewSize(this.state.offset));
-
-      this.setState({
-         dragged: false,
-         offset: 0,
-      });
-   }
-}
+/** @jsxImportSource react */
+import { Instance } from "../ui/Instance";
+import { NumberProp } from "../ui/Prop";
+import { RenderingContext } from "../ui/RenderingContext";
+import { VDOM, Widget, WidgetConfig, WidgetStyleConfig } from "../ui/Widget";
+import { captureMouseOrTouch, getCursorPos } from "./overlay/captureMouse";
+
+export interface ResizerConfig extends WidgetConfig, WidgetStyleConfig {
+   /** Make resizer horizontal. */
+   horizontal?: boolean;
+
+   /** Use the element after the the resizer for size measurements. */
+   forNextElement?: boolean;
+
+   /** A binding for the new size. */
+   size?: NumberProp;
+
+   /** Default value that will be set when the user double click on the resizer. */
+   defaultSize?: NumberProp;
+
+   /** Minimum size of the element. */
+   minSize?: NumberProp;
+
+   /** Maximum size of the element. */
+   maxSize?: NumberProp;
+}
+
+export class Resizer extends Widget<ResizerConfig> {
+   declare baseClass: string;
+   declare horizontal?: boolean;
+   declare forNextElement?: boolean;
+   declare defaultSize?: NumberProp | null;
+   declare minSize?: NumberProp;
+   declare maxSize?: NumberProp;
+
+   constructor(config?: ResizerConfig) {
+      super(config);
+   }
+
+   declareData(...args: Record<string, unknown>[]): void {
+      super.declareData(...args, {
+         size: undefined,
+         defaultSize: undefined,
+         minSize: undefined,
+         maxSize: undefined,
+      });
+   }
+
+   render(context: RenderingContext, instance: Instance<Resizer>, key: string): React.ReactNode {
+      let { data } = instance;
+
+      return <ResizerCmp key={key} instance={instance} data={data} />;
+   }
+}
+
+Resizer.prototype.baseClass = "resizer";
+Resizer.prototype.styled = true;
+Resizer.prototype.horizontal = false;
+Resizer.prototype.forNextElement = false;
+Resizer.prototype.defaultSize = null;
+Resizer.prototype.minSize = 0;
+Resizer.prototype.maxSize = 1e6;
+
+interface ResizerCmpProps {
+   instance: Instance<Resizer>;
+   data: Record<string, any>;
+}
+
+interface ResizerCmpState {
+   dragged: boolean;
+   offset: number;
+   initialPosition?: { clientX: number; clientY: number };
+}
+
+class ResizerCmp extends VDOM.Component<ResizerCmpProps, ResizerCmpState> {
+   declare el?: HTMLDivElement | null;
+   declare hasCapture?: boolean;
+
+   constructor(props: ResizerCmpProps) {
+      super(props);
+      this.state = {
+         dragged: false,
+         offset: 0,
+      };
+   }
+
+   shouldComponentUpdate(props: ResizerCmpProps, state: ResizerCmpState): boolean {
+      return state != this.state;
+   }
+
+   render(): React.ReactNode {
+      let { instance, data } = this.props;
+      let { widget } = instance;
+      let { baseClass, CSS } = widget;
+
+      return (
+         <div
+            ref={(el) => {
+               this.el = el;
+            }}
+            className={CSS.expand(
+               data.classNames,
+               CSS.state({
+                  vertical: !widget.horizontal,
+                  horizontal: widget.horizontal,
+               }),
+            )}
+            style={data.style}
+            onDoubleClick={(e) => {
+               instance.set("size", data.defaultSize);
+            }}
+            onMouseDown={(e) => {
+               let initialPosition = getCursorPos(e);
+               this.setState({ dragged: true, initialPosition });
+            }}
+            onMouseUp={(e) => {
+               this.setState({ dragged: false });
+            }}
+            onMouseMove={this.startCapture.bind(this)}
+            onMouseLeave={this.startCapture.bind(this)}
+         >
+            <div
+               className={CSS.element(baseClass, "handle", { dragged: this.state.dragged })}
+               style={{
+                  left: !widget.horizontal ? this.state.offset : 0,
+                  top: widget.horizontal ? this.state.offset : 0,
+               }}
+            />
+         </div>
+      );
+   }
+
+   startCapture(e: React.MouseEvent): void {
+      let { instance } = this.props;
+      let { widget } = instance;
+
+      if (this.state.dragged && !this.hasCapture) {
+         this.hasCapture = true;
+         captureMouseOrTouch(
+            e,
+            this.onHandleMove.bind(this),
+            this.onDragComplete.bind(this),
+            this.state.initialPosition!,
+            widget.horizontal ? "row-resize" : "col-resize",
+         );
+      }
+   }
+
+   onHandleMove(e: any, initialPosition: { clientX: number; clientY: number }): void {
+      let { instance } = this.props;
+      let { widget } = instance;
+      let currentPosition = getCursorPos(e);
+      const offset = !widget.horizontal
+         ? currentPosition.clientX - initialPosition.clientX
+         : currentPosition.clientY - initialPosition.clientY;
+
+      let size = this.getNewSize(0);
+      let newSize = this.getNewSize(offset);
+
+      let allowedOffset = widget.forNextElement ? size - newSize : newSize - size;
+
+      this.setState({ offset: allowedOffset });
+   }
+
+   getNewSize(offset: number): number {
+      let { instance, data } = this.props;
+      let { horizontal, forNextElement } = instance.widget;
+
+      if (
+         !this.el ||
+         (!forNextElement && !this.el.previousElementSibling) ||
+         (forNextElement && !this.el.nextElementSibling)
+      )
+         return 0;
+
+      let newSize: number;
+
+      if (horizontal) {
+         if (forNextElement) newSize = (this.el.nextElementSibling as HTMLElement).offsetHeight - offset;
+         else newSize = (this.el.previousElementSibling as HTMLElement).offsetHeight + offset;
+      } else {
+         if (forNextElement) newSize = (this.el.nextElementSibling as HTMLElement).offsetWidth - offset;
+         else newSize = (this.el.previousElementSibling as HTMLElement).offsetWidth + offset;
+      }
+
+      return Math.max(data.minSize as number, Math.min(newSize, data.maxSize as number));
+   }
+
+   onDragComplete(): void {
+      this.hasCapture = false;
+      let { instance } = this.props;
+
+      instance.set("size", this.getNewSize(this.state.offset));
+
+      this.setState({
+         dragged: false,
+         offset: 0,
+      });
+   }
+}

package/src/widgets/Sandbox.ts

@@ -1,103 +1,103 @@
-import { Widget } from "../ui/Widget";
-import { PureContainerBase, PureContainerConfig } from "../ui/PureContainer";
-import { Binding, BindingInput } from "../data/Binding";
-import { ExposedValueView, ExposedValueViewConfig } from "../data/ExposedValueView";
-import { RenderingContext } from "../ui/RenderingContext";
-import { Instance } from "../ui/Instance";
-import { StringProp, WritableProp } from "../ui/Prop";
-
-export interface SandboxConfig extends PureContainerConfig {
-   /** Binding to the object that holds sandbox data. */
-   storage: WritableProp<Record<string, any>>;
-
-   /** Key used to identify the sandbox instance within the storage. */
-   key?: StringProp;
-
-   /** Alias for `key`. */
-   accessKey?: StringProp;
-
-   /** Alias used to expose sandbox data. Default is `$page`. */
-   recordName?: string;
-
-   /** Alias for `recordName`. */
-   recordAlias?: string;
-
-   /** Indicate that parent store data should not be mutated. */
-   immutable?: boolean;
-
-   /** Indicate that sandbox store data should not be mutated. */
-   sealed?: boolean;
-}
-
-export interface SandboxInstance extends Instance {
-   store: ExposedValueView;
-}
-
-export class Sandbox extends PureContainerBase<SandboxConfig, SandboxInstance> {
-   declare storage: WritableProp<Record<string, any>>;
-   declare key?: StringProp;
-   declare recordName?: string;
-   declare recordAlias?: string;
-   declare accessKey?: StringProp;
-   declare immutable?: boolean;
-   declare sealed?: boolean;
-   declare storageBinding: Binding;
-   init(): void {
-      if (this.recordAlias) this.recordName = this.recordAlias;
-
-      if (this.accessKey) this.key = this.accessKey;
-
-      this.storageBinding = Binding.get(this.storage);
-
-      super.init();
-   }
-
-   initInstance(context: RenderingContext, instance: SandboxInstance): void {
-      instance.store = new ExposedValueView({
-         store: instance.parentStore,
-         containerBinding: this.storageBinding,
-         key: null,
-         recordName: this.recordName,
-         immutable: this.immutable,
-      });
-      super.initInstance(context, instance);
-   }
-
-   applyParentStore(instance: SandboxInstance): void {
-      instance.store.setStore(instance.parentStore);
-   }
-
-   declareData(...args: Record<string, unknown>[]): void {
-      super.declareData(
-         {
-            storage: undefined,
-            key: undefined,
-         },
-         ...args,
-      );
-   }
-
-   prepareData(context: RenderingContext, instance: SandboxInstance): void {
-      var { store, data } = instance;
-      if (store.getKey() !== data.key) {
-         //when navigating to a page using the same widget tree as the previous page
-         //everything needs to be reinstantiated, e.g. user/1 => user/2
-         instance.store = new ExposedValueView({
-            store: store,
-            containerBinding: this.storageBinding,
-            key: data.key,
-            recordName: this.recordName,
-            immutable: this.immutable,
-            sealed: this.sealed,
-         });
-         instance.clearChildrenCache();
-      }
-      super.prepareData(context, instance);
-   }
-}
-
-Sandbox.prototype.recordName = "$page";
-Sandbox.prototype.immutable = false;
-Sandbox.prototype.sealed = false;
-
-Widget.alias("sandbox", Sandbox);
+import { Widget } from "../ui/Widget";
+import { PureContainerBase, PureContainerConfig } from "../ui/PureContainer";
+import { Binding, BindingInput } from "../data/Binding";
+import { ExposedValueView, ExposedValueViewConfig } from "../data/ExposedValueView";
+import { RenderingContext } from "../ui/RenderingContext";
+import { Instance } from "../ui/Instance";
+import { StringProp, WritableProp } from "../ui/Prop";
+
+export interface SandboxConfig extends PureContainerConfig {
+   /** Binding to the object that holds sandbox data. */
+   storage: WritableProp<Record<string, any>>;
+
+   /** Key used to identify the sandbox instance within the storage. */
+   key?: StringProp;
+
+   /** Alias for `key`. */
+   accessKey?: StringProp;
+
+   /** Alias used to expose sandbox data. Default is `$page`. */
+   recordName?: string;
+
+   /** Alias for `recordName`. */
+   recordAlias?: string;
+
+   /** Indicate that parent store data should not be mutated. */
+   immutable?: boolean;
+
+   /** Indicate that sandbox store data should not be mutated. */
+   sealed?: boolean;
+}
+
+export interface SandboxInstance extends Instance {
+   store: ExposedValueView;
+}
+
+export class Sandbox extends PureContainerBase<SandboxConfig, SandboxInstance> {
+   declare storage: WritableProp<Record<string, any>>;
+   declare key?: StringProp;
+   declare recordName?: string;
+   declare recordAlias?: string;
+   declare accessKey?: StringProp;
+   declare immutable?: boolean;
+   declare sealed?: boolean;
+   declare storageBinding: Binding;
+   init(): void {
+      if (this.recordAlias) this.recordName = this.recordAlias;
+
+      if (this.accessKey) this.key = this.accessKey;
+
+      this.storageBinding = Binding.get(this.storage);
+
+      super.init();
+   }
+
+   initInstance(context: RenderingContext, instance: SandboxInstance): void {
+      instance.store = new ExposedValueView({
+         store: instance.parentStore,
+         containerBinding: this.storageBinding,
+         key: null,
+         recordName: this.recordName,
+         immutable: this.immutable,
+      });
+      super.initInstance(context, instance);
+   }
+
+   applyParentStore(instance: SandboxInstance): void {
+      instance.store.setStore(instance.parentStore);
+   }
+
+   declareData(...args: Record<string, unknown>[]): void {
+      super.declareData(
+         {
+            storage: undefined,
+            key: undefined,
+         },
+         ...args,
+      );
+   }
+
+   prepareData(context: RenderingContext, instance: SandboxInstance): void {
+      var { store, data } = instance;
+      if (store.getKey() !== data.key) {
+         //when navigating to a page using the same widget tree as the previous page
+         //everything needs to be reinstantiated, e.g. user/1 => user/2
+         instance.store = new ExposedValueView({
+            store: store,
+            containerBinding: this.storageBinding,
+            key: data.key,
+            recordName: this.recordName,
+            immutable: this.immutable,
+            sealed: this.sealed,
+         });
+         instance.clearChildrenCache();
+      }
+      super.prepareData(context, instance);
+   }
+}
+
+Sandbox.prototype.recordName = "$page";
+Sandbox.prototype.immutable = false;
+Sandbox.prototype.sealed = false;
+
+Widget.alias("sandbox", Sandbox);