cx 24.4.7 → 24.4.8

package/src/widgets/Button.js

@@ -1,118 +1,118 @@
-import { Widget, VDOM, getContentArray } from "../ui/Widget";
-import { HtmlElement } from "./HtmlElement";
-import { yesNo } from "./overlay/alerts";
-import { Icon } from "./Icon";
-import { preventFocus } from "../ui/FocusManager";
-import { isFunction } from "../util/isFunction";
-import { isDefined } from "../util/isDefined";
-import { coalesce } from "../util/coalesce";
-
-export class Button extends HtmlElement {
-   declareData() {
-      super.declareData(...arguments, {
-         confirm: { structured: true },
-         pressed: undefined,
-         icon: undefined,
-         disabled: undefined,
-         enabled: undefined,
-      });
-   }
-
-   prepareData(context, instance) {
-      let { data } = instance;
-      data.stateMods = {
-         ...data.stateMods,
-         pressed: data.pressed,
-      };
-      if (isDefined(data.enabled)) data.disabled = !data.enabled;
-
-      super.prepareData(context, instance);
-   }
-
-   explore(context, instance) {
-      instance.data.parentDisabled = context.parentDisabled;
-      instance.data.parentStrict = context.parentStrict;
-
-      if (instance.cache("parentDisabled", context.parentDisabled)) instance.markShouldUpdate(context);
-      if (instance.cache("parentStrict", context.parentStrict)) instance.markShouldUpdate(context);
-
-      super.explore(context, instance);
-   }
-
-   attachProps(context, instance, props) {
-      super.attachProps(context, instance, props);
-
-      if (!this.focusOnMouseDown) {
-         props.onMouseDown = (e) => {
-            if (this.onMouseDown && instance.invoke("onMouseDown", e, instance) == false) return;
-            preventFocus(e);
-         };
-      }
-
-      if (this.dismiss) {
-         let { onClick } = props;
-
-         props.onClick = (...args) => {
-            if (onClick && onClick(...args) === false) return;
-
-            if (instance.parentOptions && isFunction(instance.parentOptions.dismiss)) instance.parentOptions.dismiss();
-         };
-      }
-
-      if (this.tag === "button") props.type = this.submit ? "submit" : "button";
-
-      delete props.confirm;
-      delete props.dismiss;
-      delete props.pressed;
-      delete props.submit;
-      delete props.focusOnMouseDown;
-      delete props.icon;
-      delete props.enabled;
-
-      let oldOnClick,
-         { data } = instance;
-
-      props.disabled = coalesce(data.parentStrict ? data.parentDisabled : null, data.disabled, data.parentDisabled);
-
-      if (data.confirm) {
-         oldOnClick = props.onClick;
-         props.onClick = () => {
-            yesNo(data.confirm).then((btn) => {
-               if (btn == "yes") oldOnClick.call(this, null, instance);
-            });
-         };
-      }
-
-      let icon, children;
-
-      if (data.icon) {
-         icon = Icon.render(data.icon, {
-            key: "icon",
-            className: this.CSS.element(this.baseClass, "icon"),
-         });
-         children = getContentArray(props.children);
-         props.children = [icon, ...children];
-         props.className = this.CSS.expand(
-            props.className,
-            this.CSS.state("icon"),
-            children.length == 0 && this.CSS.state("empty")
-         );
-
-         if (children.length == 0) {
-            props.children.push(
-               <span key="baseline" className={this.CSS.element(this.baseClass, "baseline")}>
-                  &nbsp;
-               </span>
-            );
-         }
-      }
-   }
-}
-
-Button.prototype.tag = "button";
-Button.prototype.baseClass = "button";
-Button.prototype.icon = false;
-Button.prototype.focusOnMouseDown = false;
-Button.prototype.submit = false;
-
-Widget.alias("button", Button);
+import { Widget, VDOM, getContentArray } from "../ui/Widget";
+import { HtmlElement } from "./HtmlElement";
+import { yesNo } from "./overlay/alerts";
+import { Icon } from "./Icon";
+import { preventFocus } from "../ui/FocusManager";
+import { isFunction } from "../util/isFunction";
+import { isDefined } from "../util/isDefined";
+import { coalesce } from "../util/coalesce";
+
+export class Button extends HtmlElement {
+   declareData() {
+      super.declareData(...arguments, {
+         confirm: { structured: true },
+         pressed: undefined,
+         icon: undefined,
+         disabled: undefined,
+         enabled: undefined,
+      });
+   }
+
+   prepareData(context, instance) {
+      let { data } = instance;
+      data.stateMods = {
+         ...data.stateMods,
+         pressed: data.pressed,
+      };
+      if (isDefined(data.enabled)) data.disabled = !data.enabled;
+
+      super.prepareData(context, instance);
+   }
+
+   explore(context, instance) {
+      instance.data.parentDisabled = context.parentDisabled;
+      instance.data.parentStrict = context.parentStrict;
+
+      if (instance.cache("parentDisabled", context.parentDisabled)) instance.markShouldUpdate(context);
+      if (instance.cache("parentStrict", context.parentStrict)) instance.markShouldUpdate(context);
+
+      super.explore(context, instance);
+   }
+
+   attachProps(context, instance, props) {
+      super.attachProps(context, instance, props);
+
+      if (!this.focusOnMouseDown) {
+         props.onMouseDown = (e) => {
+            if (this.onMouseDown && instance.invoke("onMouseDown", e, instance) == false) return;
+            preventFocus(e);
+         };
+      }
+
+      if (this.dismiss) {
+         let { onClick } = props;
+
+         props.onClick = (...args) => {
+            if (onClick && onClick(...args) === false) return;
+
+            if (instance.parentOptions && isFunction(instance.parentOptions.dismiss)) instance.parentOptions.dismiss();
+         };
+      }
+
+      if (this.tag === "button") props.type = this.submit ? "submit" : "button";
+
+      delete props.confirm;
+      delete props.dismiss;
+      delete props.pressed;
+      delete props.submit;
+      delete props.focusOnMouseDown;
+      delete props.icon;
+      delete props.enabled;
+
+      let oldOnClick,
+         { data } = instance;
+
+      props.disabled = coalesce(data.parentStrict ? data.parentDisabled : null, data.disabled, data.parentDisabled);
+
+      if (data.confirm) {
+         oldOnClick = props.onClick;
+         props.onClick = () => {
+            yesNo(data.confirm).then((btn) => {
+               if (btn == "yes") oldOnClick.call(this, null, instance);
+            });
+         };
+      }
+
+      let icon, children;
+
+      if (data.icon) {
+         icon = Icon.render(data.icon, {
+            key: "icon",
+            className: this.CSS.element(this.baseClass, "icon"),
+         });
+         children = getContentArray(props.children);
+         props.children = [icon, ...children];
+         props.className = this.CSS.expand(
+            props.className,
+            this.CSS.state("icon"),
+            children.length == 0 && this.CSS.state("empty")
+         );
+
+         if (children.length == 0) {
+            props.children.push(
+               <span key="baseline" className={this.CSS.element(this.baseClass, "baseline")}>
+                  &nbsp;
+               </span>
+            );
+         }
+      }
+   }
+}
+
+Button.prototype.tag = "button";
+Button.prototype.baseClass = "button";
+Button.prototype.icon = false;
+Button.prototype.focusOnMouseDown = false;
+Button.prototype.submit = false;
+
+Widget.alias("button", Button);

package/src/widgets/Button.scss

@@ -1,117 +1,117 @@
-@mixin cx-button(
-   $name: "button",
-   $state-style-map: $cx-button-state-style-map,
-   $mods: $cx-button-mods,
-   $icon-size: $cx-default-icon-size,
-   $besm: $cx-besm
-) {
-   $block: map-get($besm, block);
-   $element: map-get($besm, element);
-   $state: map-get($besm, state);
-   $mod: map-get($besm, mod);
-
-   .#{$block}#{$name} {
-      position: relative;
-      box-sizing: border-box;
-      display: inline-block;
-
-      $line-height: cx-get-state-rule($state-style-map, default, "line-height", 1.2em);
-      $padding: cx-get-state-rule($state-style-map, default, "padding", 0);
-      $border-width: cx-get-state-rule($state-style-map, default, "border-width", 1px);
-
-      height: cx-calc(
-         $line-height,
-         cx-top($padding),
-         cx-bottom($padding),
-         cx-top($border-width),
-         cx-bottom($border-width)
-      );
-
-      @include cx-add-state-rules($state-style-map, "default");
-
-      &::-moz-focus-inner {
-         border: 0;
-         padding: 0;
-         margin: -1px;
-      }
-
-      &:hover {
-         @include cx-add-state-rules($state-style-map, "hover");
-      }
-
-      &:focus {
-         @include cx-add-state-rules($state-style-map, "focus");
-      }
-
-      &:hover:focus {
-         @include cx-add-state-rules($state-style-map, "hover-focus");
-      }
-
-      &:active,
-      &.#{$state}pressed {
-         @include cx-add-state-rules($state-style-map, "active");
-      }
-
-      &[disabled],
-      &.#{$state}disabled {
-         @include cx-add-state-rules($state-style-map, "disabled");
-      }
-
-      @each $modname, $config in $mods {
-         &.#{$mod}#{$modname} {
-            @include cx-add-state-rules($config, default);
-
-            &[disabled],
-            &.#{$state}disabled {
-               @include cx-add-state-rules($config, disabled);
-            }
-
-            &:hover {
-               @include cx-add-state-rules($config, hover);
-            }
-
-            &:focus {
-               @include cx-add-state-rules($config, focus);
-            }
-
-            &:active,
-            &.#{$state}pressed {
-               @include cx-add-state-rules($config, active);
-            }
-         }
-      }
-   }
-
-   $padding: cx-get-state-rule($state-style-map, default, padding);
-
-   .#{$element}#{$name}-icon {
-      display: inline-block;
-      position: absolute;
-      top: 50%;
-      left: cx-left($padding) * 0.5;
-      margin-top: -$icon-size * 0.5;
-      height: $icon-size;
-      width: $icon-size;
-      line-height: $icon-size;
-      text-align: center;
-   }
-
-   .#{$element}#{$name}-baseline {
-      display: inline-block;
-      width: 1px;
-      margin-left: -1px;
-   }
-
-   .#{$block}#{$name}.#{$state}icon {
-      padding: cx-top($padding) cx-right($padding) cx-bottom($padding) cx-calc(cx-left($padding), $icon-size);
-
-      &.#{$state}empty {
-         padding: cx-top($padding) cx-right($padding) * 0.5 cx-bottom($padding)
-            cx-calc(cx-left($padding) * 0.5, $icon-size);
-      }
-   }
-}
-
-@if (cx-should-include("cx/widgets/Button")) {
-   @include cx-button;
-}
+@mixin cx-button(
+   $name: "button",
+   $state-style-map: $cx-button-state-style-map,
+   $mods: $cx-button-mods,
+   $icon-size: $cx-default-icon-size,
+   $besm: $cx-besm
+) {
+   $block: map-get($besm, block);
+   $element: map-get($besm, element);
+   $state: map-get($besm, state);
+   $mod: map-get($besm, mod);
+
+   .#{$block}#{$name} {
+      position: relative;
+      box-sizing: border-box;
+      display: inline-block;
+
+      $line-height: cx-get-state-rule($state-style-map, default, "line-height", 1.2em);
+      $padding: cx-get-state-rule($state-style-map, default, "padding", 0);
+      $border-width: cx-get-state-rule($state-style-map, default, "border-width", 1px);
+
+      height: cx-calc(
+         $line-height,
+         cx-top($padding),
+         cx-bottom($padding),
+         cx-top($border-width),
+         cx-bottom($border-width)
+      );
+
+      @include cx-add-state-rules($state-style-map, "default");
+
+      &::-moz-focus-inner {
+         border: 0;
+         padding: 0;
+         margin: -1px;
+      }
+
+      &:hover {
+         @include cx-add-state-rules($state-style-map, "hover");
+      }
+
+      &:focus {
+         @include cx-add-state-rules($state-style-map, "focus");
+      }
+
+      &:hover:focus {
+         @include cx-add-state-rules($state-style-map, "hover-focus");
+      }
+
+      &:active,
+      &.#{$state}pressed {
+         @include cx-add-state-rules($state-style-map, "active");
+      }
+
+      &[disabled],
+      &.#{$state}disabled {
+         @include cx-add-state-rules($state-style-map, "disabled");
+      }
+
+      @each $modname, $config in $mods {
+         &.#{$mod}#{$modname} {
+            @include cx-add-state-rules($config, default);
+
+            &[disabled],
+            &.#{$state}disabled {
+               @include cx-add-state-rules($config, disabled);
+            }
+
+            &:hover {
+               @include cx-add-state-rules($config, hover);
+            }
+
+            &:focus {
+               @include cx-add-state-rules($config, focus);
+            }
+
+            &:active,
+            &.#{$state}pressed {
+               @include cx-add-state-rules($config, active);
+            }
+         }
+      }
+   }
+
+   $padding: cx-get-state-rule($state-style-map, default, padding);
+
+   .#{$element}#{$name}-icon {
+      display: inline-block;
+      position: absolute;
+      top: 50%;
+      left: cx-left($padding) * 0.5;
+      margin-top: -$icon-size * 0.5;
+      height: $icon-size;
+      width: $icon-size;
+      line-height: $icon-size;
+      text-align: center;
+   }
+
+   .#{$element}#{$name}-baseline {
+      display: inline-block;
+      width: 1px;
+      margin-left: -1px;
+   }
+
+   .#{$block}#{$name}.#{$state}icon {
+      padding: cx-top($padding) cx-right($padding) cx-bottom($padding) cx-calc(cx-left($padding), $icon-size);
+
+      &.#{$state}empty {
+         padding: cx-top($padding) cx-right($padding) * 0.5 cx-bottom($padding)
+            cx-calc(cx-left($padding) * 0.5, $icon-size);
+      }
+   }
+}
+
+@if (cx-should-include("cx/widgets/Button")) {
+   @include cx-button;
+}