cx 24.8.6 → 24.9.0

package/src/widgets/form/TextField.scss

@@ -1,55 +1,55 @@
-@mixin cx-textfield(
-   $name: "textfield",
-   $state-style-map: $cx-std-field-state-style-map,
-   $placeholder: $cx-input-placeholder,
-   $empty-text: $cx-empty-text,
-   $left-icon-state-style-map: $cx-input-left-icon-state-style-map,
-   $clear-state-style-map: $cx-clear-state-style-map,
-   $icon-size: $cx-default-input-icon-size,
-   $width: $cx-default-input-width,
-   $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} {
-      @include cxb-field($besm, $state-style-map, $width: $width, $input: true);
-   }
-
-   $padding: cx-get-state-rule($state-style-map, default, "padding");
-
-   .#{$element}#{$name}-input {
-      @include cxe-field-input($besm, $state-style-map, $placeholder: $placeholder);
-
-      .#{$state}icon > & {
-         padding-left: cx-calc(2 * cx-left($padding), $icon-size);
-      }
-
-      .#{$state}clear > & {
-         padding-right: cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-clear-spacing);
-      }
-   }
-
-   .#{$element}#{$name}-left-icon {
-      @include cxe-field-button($besm, $left-icon-state-style-map);
-      pointer-events: none;
-   }
-
-   .#{$element}#{$name}-clear {
-      @include cxe-field-button($besm, $clear-state-style-map);
-   }
-
-   .#{$element}#{$name}-icon {
-      @include cxe-field-button-icon($besm, $icon-size);
-   }
-
-   .#{$element}#{$name}-empty-text {
-      @include cxe-field-empty-text($empty-text);
-   }
-}
-
-@if (cx-should-include("cx/widgets/TextField")) {
-   @include cx-textfield();
-}
+@mixin cx-textfield(
+   $name: "textfield",
+   $state-style-map: $cx-std-field-state-style-map,
+   $placeholder: $cx-input-placeholder,
+   $empty-text: $cx-empty-text,
+   $left-icon-state-style-map: $cx-input-left-icon-state-style-map,
+   $clear-state-style-map: $cx-clear-state-style-map,
+   $icon-size: $cx-default-input-icon-size,
+   $width: $cx-default-input-width,
+   $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} {
+      @include cxb-field($besm, $state-style-map, $width: $width, $input: true);
+   }
+
+   $padding: cx-get-state-rule($state-style-map, default, "padding");
+
+   .#{$element}#{$name}-input {
+      @include cxe-field-input($besm, $state-style-map, $placeholder: $placeholder);
+
+      .#{$state}icon > & {
+         padding-left: cx-calc(2 * cx-left($padding), $icon-size);
+      }
+
+      .#{$state}clear > & {
+         padding-right: cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-clear-spacing);
+      }
+   }
+
+   .#{$element}#{$name}-left-icon {
+      pointer-events: none;
+      @include cxe-field-button($besm, $left-icon-state-style-map);
+   }
+
+   .#{$element}#{$name}-clear {
+      @include cxe-field-button($besm, $clear-state-style-map);
+   }
+
+   .#{$element}#{$name}-icon {
+      @include cxe-field-button-icon($besm, $icon-size);
+   }
+
+   .#{$element}#{$name}-empty-text {
+      @include cxe-field-empty-text($empty-text);
+   }
+}
+
+@if (cx-should-include("cx/widgets/TextField")) {
+   @include cx-textfield();
+}

package/src/widgets/grid/TreeNode.scss

@@ -1,89 +1,88 @@
-@mixin cx-treenode(
-   $name: "treenode",
-   $icon-size: $cx-default-icon-size,
-   $handle-size: $cx-default-input-tool-size,
-   $handle-state-style-map: $cx-input-right-icon-state-style-map,
-   $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} {
-      padding-left: $handle-size + $icon-size * 0.25;
-
-      &.#{$state}icon {
-         padding-left: $handle-size + $icon-size + $icon-size * 0.25;
-      }
-
-      position: relative;
-
-      @for $i from 1 through 20 {
-         &.#{$state}level-#{$i} {
-            margin-left: #{($i * 20)}px;
-         }
-      }
-   }
-
-   .#{$element}#{$name}-handle {
-      position: absolute;
-
-      @include cx-add-state-rules($handle-state-style-map, default);
-
-      left: 0;
-      top: 50%;
-      margin-top: -$handle-size * 0.5;
-      bottom: 0;
-      width: $handle-size + $icon-size;
-      height: $handle-size;
-
-      &:hover {
-         @include cx-add-state-rules($handle-state-style-map, hover);
-      }
-
-      &:active {
-         @include cx-add-state-rules($handle-state-style-map, active);
-      }
-   }
-
-   .#{$element}#{$name}-arrow {
-      display: block;
-      position: absolute;
-      left: 0;
-      top: 50%;
-      margin-top: -$icon-size * 0.5;
-      margin-left: ($handle-size - $icon-size) * 0.5;
-      height: $icon-size;
-      width: $icon-size;
-      line-height: $icon-size;
-      transform: rotate(-90deg);
-      transition: transform 0.2s;
-
-      .#{$state}expanded & {
-         transform: rotate(0);
-      }
-   }
-
-   .#{$element}#{$name}-icon {
-      display: block;
-      position: absolute;
-      left: 0;
-      top: 50%;
-      margin-top: -$icon-size * 0.5;
-      margin-left: ($handle-size + $icon-size) * 0.5;
-      height: $icon-size;
-      width: $icon-size;
-      line-height: $icon-size;
-   }
-
-   .#{$block}grid.#{$mod}tree {
-      td {
-         border-top: none;
-      }
-   }
-}
-
-@if (cx-should-include("cx/widgets/TreeNode")) {
-   @include cx-treenode();
-}
+@mixin cx-treenode(
+   $name: "treenode",
+   $icon-size: $cx-default-icon-size,
+   $handle-size: $cx-default-input-tool-size,
+   $handle-state-style-map: $cx-input-right-icon-state-style-map,
+   $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} {
+      padding-left: $handle-size + $icon-size * 0.25;
+      position: relative;
+
+      &.#{$state}icon {
+         padding-left: $handle-size + $icon-size + $icon-size * 0.25;
+      }
+
+      @for $i from 1 through 20 {
+         &.#{$state}level-#{$i} {
+            margin-left: #{($i * 20)}px;
+         }
+      }
+   }
+
+   .#{$element}#{$name}-handle {
+      position: absolute;
+
+      @include cx-add-state-rules($handle-state-style-map, default);
+
+      left: 0;
+      top: 50%;
+      margin-top: -$handle-size * 0.5;
+      bottom: 0;
+      width: $handle-size + $icon-size;
+      height: $handle-size;
+
+      &:hover {
+         @include cx-add-state-rules($handle-state-style-map, hover);
+      }
+
+      &:active {
+         @include cx-add-state-rules($handle-state-style-map, active);
+      }
+   }
+
+   .#{$element}#{$name}-arrow {
+      display: block;
+      position: absolute;
+      left: 0;
+      top: 50%;
+      margin-top: -$icon-size * 0.5;
+      margin-left: ($handle-size - $icon-size) * 0.5;
+      height: $icon-size;
+      width: $icon-size;
+      line-height: $icon-size;
+      transform: rotate(-90deg);
+      transition: transform 0.2s;
+
+      .#{$state}expanded & {
+         transform: rotate(0);
+      }
+   }
+
+   .#{$element}#{$name}-icon {
+      display: block;
+      position: absolute;
+      left: 0;
+      top: 50%;
+      margin-top: -$icon-size * 0.5;
+      margin-left: ($handle-size + $icon-size) * 0.5;
+      height: $icon-size;
+      width: $icon-size;
+      line-height: $icon-size;
+   }
+
+   .#{$block}grid.#{$mod}tree {
+      td {
+         border-top: none;
+      }
+   }
+}
+
+@if (cx-should-include("cx/widgets/TreeNode")) {
+   @include cx-treenode();
+}

package/src/widgets/nav/Menu.scss

@@ -1,74 +1,74 @@
-@mixin cx-menu($name: "menu", $state-style-map: $cx-menu-state-style-map, $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} {
-      box-sizing: border-box;
-      margin: 0;
-      padding: 0;
-      list-style: none;
-
-      &.#{$state}horizontal {
-         white-space: nowrap;
-
-         & > .#{$element}#{$name}-item {
-            display: inline-block;
-            user-select: none;
-
-            @each $size, $value in $cx-menu-padding-options {
-               &.#{$state}size-#{$size} > .#{$mod}#{$name} {
-                  margin: 0 cx-right($value) 0 cx-left($value);
-               }
-            }
-         }
-      }
-
-      @each $size, $value in $cx-menu-padding-options {
-         &.#{$state}vertical.#{$state}#{$size}-item-padding .#{$mod}#{$name} {
-            margin: $value;
-            display: block;
-         }
-      }
-
-      @include cx-add-state-rules($state-style-map, default);
-
-      .#{$element}#{$name}-item {
-         & > hr {
-            border: none;
-            border-top: 1px solid $cx-default-menu-separator-color;
-            margin: map-get($cx-menu-padding-options, medium);
-         }
-
-         &.#{$state}hidden {
-            visibility: hidden;
-            position: absolute;
-         }
-      }
-
-      &.#{$state}overflow {
-         overflow: hidden;
-         display: flex;
-
-         & > .#{$element}#{$name}-item:last-child {
-            visibility: hidden;
-            position: absolute;
-            max-height: 100%;
-         }
-
-         &.#{$state}pack > .#{$element}#{$name}-item:last-child {
-            visibility: visible;
-            position: relative;
-         }
-      }
-   }
-
-   .#{$element}#{$name}-spacer {
-      flex: 1 1 0%;
-   }
-}
-
-@if (cx-should-include("cx/widgets/Menu")) {
-   @include cx-menu();
-}
+@mixin cx-menu($name: "menu", $state-style-map: $cx-menu-state-style-map, $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} {
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+      list-style: none;
+
+      @include cx-add-state-rules($state-style-map, default);
+
+      &.#{$state}horizontal {
+         white-space: nowrap;
+
+         & > .#{$element}#{$name}-item {
+            display: inline-block;
+            user-select: none;
+
+            @each $size, $value in $cx-menu-padding-options {
+               &.#{$state}size-#{$size} > .#{$mod}#{$name} {
+                  margin: 0 cx-right($value) 0 cx-left($value);
+               }
+            }
+         }
+      }
+
+      @each $size, $value in $cx-menu-padding-options {
+         &.#{$state}vertical.#{$state}#{$size}-item-padding .#{$mod}#{$name} {
+            margin: $value;
+            display: block;
+         }
+      }
+
+      .#{$element}#{$name}-item {
+         & > hr {
+            border: none;
+            border-top: 1px solid $cx-default-menu-separator-color;
+            margin: map-get($cx-menu-padding-options, medium);
+         }
+
+         &.#{$state}hidden {
+            visibility: hidden;
+            position: absolute;
+         }
+      }
+
+      &.#{$state}overflow {
+         overflow: hidden;
+         display: flex;
+
+         & > .#{$element}#{$name}-item:last-child {
+            visibility: hidden;
+            position: absolute;
+            max-height: 100%;
+         }
+
+         &.#{$state}pack > .#{$element}#{$name}-item:last-child {
+            visibility: visible;
+            position: relative;
+         }
+      }
+   }
+
+   .#{$element}#{$name}-spacer {
+      flex: 1 1 0%;
+   }
+}
+
+@if (cx-should-include("cx/widgets/Menu")) {
+   @include cx-menu();
+}

package/src/widgets/overlay/FlyweightTooltipTracker.js

@@ -1,36 +1,39 @@
-import { Widget } from "../../ui/Widget";
-import { VDOM } from "../../ui/VDOM";
-import { tooltipMouseMove, tooltipMouseLeave } from "./tooltip-ops";
-import { closest, isObject } from "../../util";
-
-export class FlyweightTooltipTracker extends Widget {
-   initInstance(context, instance) {
-      let handler = (e) => this.handleMouseMove(e, instance);
-      document.addEventListener("mousemove", handler);
-      instance.subscribeOnDestroy(() => {
-         document.removeEventListener("mousemove", handler);
-      });
-   }
-
-   render(context, instance, key) {
-      return null;
-   }
-
-   handleMouseMove(e, instance) {
-      if (!this.onGetTooltip) return;
-      if (instance.lastTarget != e.target) {
-         instance.lastTarget = e.target;
-         let tooltip = null;
-         instance.parentEl = closest(e.target, (element) => {
-            tooltip = instance.invoke("onGetTooltip", element, instance);
-            if (tooltip) return true;
-         });
-         instance.tooltip = tooltip;
-      }
-      if (!instance.parentEl) tooltipMouseMove(e, instance, null);
-      else
-         tooltipMouseMove(e, instance, instance.tooltip, {
-            target: instance.parentEl,
-         });
-   }
-}
+import { Widget } from "../../ui/Widget";
+import { VDOM } from "../../ui/VDOM";
+import { tooltipMouseMove, tooltipMouseLeave } from "./tooltip-ops";
+import { closest, isObject } from "../../util";
+
+export class FlyweightTooltipTracker extends Widget {
+   initInstance(context, instance) {
+      let handler = (e) => this.handleMouseMove(e, instance);
+      document.addEventListener("mousemove", handler);
+      instance.subscribeOnDestroy(() => {
+         document.removeEventListener("mousemove", handler);
+      });
+   }
+
+   render(context, instance, key) {
+      return null;
+   }
+
+   handleMouseMove(e, instance) {
+      if (!this.onGetTooltip) return;
+      let parentEl, tooltip;
+      if (instance.lastTarget == e.target) return;
+
+      instance.lastTarget = e.target;
+      parentEl = closest(e.target, (element) => {
+         tooltip = instance.invoke("onGetTooltip", element, instance);
+         if (tooltip) return true;
+      });
+
+      if (!parentEl) tooltipMouseLeave(e, instance, instance.tooltip, { target: instance.parentEl });
+      else {
+         instance.tooltip = tooltip;
+         instance.parentEl = parentEl;
+         tooltipMouseMove(e, instance, instance.tooltip, {
+            target: parentEl,
+         });
+      }
+   }
+}

package/src/widgets/overlay/Tooltip.js

@@ -166,7 +166,7 @@ export function getTooltipInstance(e, parentInstance, tooltip, options = {}) {
    if (
       tooltipInstance &&
       (tooltipInstance.widget.relatedElement != target ||
-         tooltipInstance.config != tooltip ||
+         !shallowEquals(tooltipInstance.config, tooltip) ||
          tooltipInstance.store.store != parentInstance.store)
    ) {
       if (tooltipInstance.dismissTooltip) tooltipInstance.dismissTooltip();
@@ -189,6 +189,7 @@ export function getTooltipInstance(e, parentInstance, tooltip, options = {}) {
       });
       tooltipInstance = parentInstance.tooltips[name] = parentInstance.getDetachedChild(tooltipWidget, name, store);
       tooltipInstance.config = tooltip;
+      tooltipInstance.tooltipName = name;
 
       if (tooltip.alwaysVisible || tooltip.trackMouse || tooltip.trackMouseX || tooltip.trackMouseY) {
          tooltipInstance.init(new RenderingContext());
@@ -219,6 +220,8 @@ function tooltipMouseMove(e, parentInstance, tooltip, options = {}) {
          dismiss();
       });
       instance.dismissTooltip = () => {
+         if (instance.parent.tooltips[instance.tooltipName] === instance)
+            delete instance.parent.tooltips[instance.tooltipName];
          unsubscribeDismiss();
          dismiss();
       };
@@ -244,7 +247,9 @@ function tooltipMouseMove(e, parentInstance, tooltip, options = {}) {
 
 function tooltipMouseLeave(e, parentInstance, tooltip, options) {
    let instance = getTooltipInstance(e, parentInstance, tooltip, options);
-   if (instance) {
+
+   // do not process leave events twice even if called multiple times
+   if (instance && instance.mouseOverTarget) {
       instance.mouseOverTarget = false;
       instance.widget.handleMouseLeavesParent(instance);
    }