cx 22.1.3 → 22.1.4

package/dist/ui.js

@@ -1629,8 +1629,7 @@ function unfocusElement(target, forceBlur) {
 	}
 
 	var activeElement = getActiveElement();
-	if (!target) target = activeElement;
-	else if (target != activeElement && !target.contains(activeElement)) return; //find the closest focusable parent of the target element and focus it instead
+	if (!target) target = activeElement; //find the closest focusable parent of the target element and focus it instead
 
 	var focusableParent =
 		(!forceBlur &&

package/dist/widgets.js

@@ -3337,7 +3337,7 @@ var Overlay = /*#__PURE__*/ (function(_Container) {
 	};
 
 	_proto.initInstance = function initInstance(context, instance) {
-		instance.positionChangeSubcribers = new SubscriberList();
+		instance.positionChangeSubscribers = new SubscriberList();
 
 		_Container.prototype.initInstance.call(this, context, instance);
 	};
@@ -3366,7 +3366,7 @@ var Overlay = /*#__PURE__*/ (function(_Container) {
 		}
 
 		if (instance.cache("dismiss", instance.dismiss)) instance.markShouldUpdate(context);
-		context.push("parentPositionChangeEvent", instance.positionChangeSubcribers);
+		context.push("parentPositionChangeEvent", instance.positionChangeSubscribers);
 
 		_Container.prototype.explore.call(this, context, instance);
 	};
@@ -3481,7 +3481,7 @@ var Overlay = /*#__PURE__*/ (function(_Container) {
 			});
 		}
 
-		instance.positionChangeSubcribers.notify();
+		instance.positionChangeSubscribers.notify();
 	};
 
 	_proto.handleResize = function handleResize(e, instance, component) {
@@ -3501,7 +3501,7 @@ var Overlay = /*#__PURE__*/ (function(_Container) {
 			});
 		}
 
-		instance.positionChangeSubcribers.notify();
+		instance.positionChangeSubscribers.notify();
 	};
 
 	return Overlay;
@@ -4119,6 +4119,7 @@ var Dropdown = /*#__PURE__*/ (function(_Overlay) {
 			return _this.updateDropdownPosition(instance, component);
 		};
 
+		instance.initialScreenPosition = null;
 		var el = instance.relatedElement.parentElement;
 
 		while (el) {
@@ -4158,10 +4159,18 @@ var Dropdown = /*#__PURE__*/ (function(_Overlay) {
 		if (this.pipeValidateDropdownPosition) instance.invoke("pipeValidateDropdownPosition", null, instance);
 		if (component.offParentPositionChange) component.offParentPositionChange();
 		delete component.parentBounds;
+		delete component.initialScreenPosition;
+	};
+
+	_proto.dismissAfterScroll = function dismissAfterScroll(data, instance, component) {
+		if (this.onDismissAfterScroll && instance.invoke("onDismissAfterScroll", data, instance, component) === false)
+			return;
+		if (instance.dismiss) instance.dismiss();
 	};
 
 	_proto.updateDropdownPosition = function updateDropdownPosition(instance, component) {
-		var el = component.el;
+		var el = component.el,
+			initialScreenPosition = component.initialScreenPosition;
 		var data = instance.data,
 			relatedElement = instance.relatedElement;
 		var parentBounds = (component.parentBounds = getTopLevelBoundingClientRect(relatedElement)); //getBoundingClientRect() will return an empty rect if the element is hidden or removed
@@ -4217,13 +4226,20 @@ var Dropdown = /*#__PURE__*/ (function(_Overlay) {
 			}
 		}
 
-		var params = {
-			style: style,
-			placement: placement,
-			parentBounds: parentBounds
-		};
-		if (this.onDropdownPositionDidUpdate) instance.invoke("onDropdownPositionDidUpdate", params, instance, component);
-		instance.positionChangeSubcribers.notify();
+		if (!initialScreenPosition) initialScreenPosition = component.initialScreenPosition = parentBounds;
+		if (
+			Math.abs(parentBounds.top - initialScreenPosition.top) > this.closeOnScrollDistance ||
+			Math.abs(parentBounds.left - initialScreenPosition.left) > this.closeOnScrollDistance
+		)
+			this.dismissAfterScroll(
+				{
+					parentBounds: parentBounds,
+					initialScreenPosition: initialScreenPosition
+				},
+				instance,
+				component
+			);
+		instance.positionChangeSubscribers.notify();
 	};
 
 	_proto.applyFixedPositioningPlacementStyles = function applyFixedPositioningPlacementStyles(
@@ -4680,6 +4696,7 @@ Dropdown.prototype.touchFriendly = false;
 Dropdown.prototype.arrow = false;
 Dropdown.prototype.pad = false;
 Dropdown.prototype.elementExplode = 0;
+Dropdown.prototype.closeOnScrollDistance = 50;
 Dropdown.prototype.screenPadding = 5;
 Dropdown.prototype.firstChildDefinesHeight = false;
 Dropdown.prototype.firstChildDefinesWidth = false;
@@ -4831,16 +4848,19 @@ var Tooltip = /*#__PURE__*/ (function(_Dropdown) {
 	};
 
 	_proto.dismissTooltip = function dismissTooltip(instance) {
-		if (instance && instance.dismissTooltip) {
-			if (
-				instance.data &&
-				instance.data.alwaysVisible &&
-				this.relatedElement.ownerDocument.body.contains(this.relatedElement)
-			)
-				return;
-			instance.dismissTooltip();
-			instance.dismissTooltip = null;
-		}
+		if (!instance || !instance.dismissTooltip) return;
+		if (
+			instance.data &&
+			instance.data.alwaysVisible &&
+			this.relatedElement.ownerDocument.body.contains(this.relatedElement)
+		)
+			return;
+		instance.dismissTooltip();
+		instance.dismissTooltip = null;
+	};
+
+	_proto.dismissAfterScroll = function dismissAfterScroll(data, instance) {
+		this.dismissTooltip(instance);
 	};
 
 	_proto.checkVisible = function checkVisible(context, instance, data) {
@@ -6139,7 +6159,6 @@ MenuItem.prototype.checkedIcon = "check";
 MenuItem.prototype.uncheckedIcon = "dummy";
 MenuItem.prototype.keyboardShortcut = false;
 MenuItem.prototype.openOnFocus = true;
-MenuItem.prototype.closeDropdownOnScrollDistance = 100;
 Widget.alias("submenu", MenuItem);
 Localization.registerPrototype("cx/widgets/MenuItem", MenuItem);
 
@@ -6195,15 +6214,10 @@ var MenuItemComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 						pipeValidateDropdownPosition: function pipeValidateDropdownPosition(cb) {
 							_this2.validateDropdownPosition = cb;
 						},
-						onDropdownPositionDidUpdate: function onDropdownPositionDidUpdate(params) {
-							var parentBounds = params.parentBounds;
-							var initialScreenPosition = _this2.initialScreenPosition;
-							if (!initialScreenPosition) initialScreenPosition = _this2.initialScreenPosition = params.parentBounds;
-							if (
-								Math.abs(parentBounds.top - initialScreenPosition.top) > widget.closeDropdownOnScrollDistance ||
-								Math.abs(parentBounds.left - initialScreenPosition.left) > widget.closeDropdownOnScrollDistance
-							)
-								_this2.closeDropdown();
+						onDismissAfterScroll: function onDismissAfterScroll() {
+							_this2.closeDropdown();
+
+							return false;
 						}
 					}
 				)
@@ -10014,7 +10028,6 @@ LookupField.prototype.submitOnEnterKey = false;
 LookupField.prototype.submitOnDropdownEnterKey = false;
 LookupField.prototype.pageSize = 100;
 LookupField.prototype.infinite = false;
-LookupField.prototype.closeDropdownOnScrollDistance = 100;
 LookupField.prototype.quickSelectAll = false;
 Localization.registerPrototype("cx/widgets/LookupField", LookupField);
 Widget.alias("lookupfield", LookupField);
@@ -10233,15 +10246,10 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 						};
 					}
 				},
-				onDropdownPositionDidUpdate: function onDropdownPositionDidUpdate(params) {
-					var parentBounds = params.parentBounds;
-					var initialScreenPosition = _this7.initialScreenPosition;
-					if (!initialScreenPosition) initialScreenPosition = _this7.initialScreenPosition = params.parentBounds;
-					if (
-						Math.abs(parentBounds.top - initialScreenPosition.top) > widget.closeDropdownOnScrollDistance ||
-						Math.abs(parentBounds.left - initialScreenPosition.left) > widget.closeDropdownOnScrollDistance
-					)
-						_this7.closeDropdown(null, true);
+				onDismissAfterScroll: function onDismissAfterScroll() {
+					_this7.closeDropdown(null, true);
+
+					return false;
 				}
 			}
 		);
@@ -10895,7 +10903,6 @@ var LookupComponent = /*#__PURE__*/ (function(_VDOM$Component) {
 		} //delete results valid only while the dropdown is open
 
 		delete this.tmpCachedResult;
-		delete this.initialScreenPosition;
 	};
 
 	_proto3.openDropdown = function openDropdown(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "22.1.3",
+   "version": "22.1.4",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/ui/FocusManager.js

@@ -1,20 +1,14 @@
-import {
-   isSelfOrDescendant,
-   findFirst,
-   findFirstChild,
-   isFocusable,
-   closestParent,
-} from "../util/DOM";
+import { isSelfOrDescendant, findFirst, findFirstChild, isFocusable, closestParent } from "../util/DOM";
 import { batchUpdates } from "./batchUpdates";
 import { SubscriberList } from "../util/SubscriberList";
 import { isTouchEvent } from "../util/isTouchEvent";
 import { getActiveElement } from "../util/getActiveElement";
 
 /*
-*  Purpose of FocusManager is to provide focusout notifications.
-*  IE and Firefox do not provide relatedTarget info in blur events which makes it impossible
-*  to determine if focus went outside or stayed inside the component.
-*/
+ *  Purpose of FocusManager is to provide focusout notifications.
+ *  IE and Firefox do not provide relatedTarget info in blur events which makes it impossible
+ *  to determine if focus went outside or stayed inside the component.
+ */
 
 let subscribers = new SubscriberList(),
    timerInterval = 300,
@@ -53,10 +47,7 @@ export class FocusManager {
    }
 
    static nudge() {
-      if (
-         typeof document !== "undefined" &&
-         getActiveElement() !== lastActiveElement
-      ) {
+      if (typeof document !== "undefined" && getActiveElement() !== lastActiveElement) {
          if (!pending) {
             pending = true;
             setTimeout(function () {
@@ -160,17 +151,13 @@ export function preventFocusOnTouch(e, force = false) {
 
 export function unfocusElement(target = null, forceBlur = true) {
    const activeElement = getActiveElement();
-
    if (!target) target = activeElement;
-   else if (target != activeElement && !target.contains(activeElement))
-      return;
 
    //find the closest focusable parent of the target element and focus it instead
-   let focusableParent = !forceBlur &&
-      closestParent(target, (el) => isFocusable(el)) ||
-      document.body;
+   let focusableParent = (!forceBlur && closestParent(target, (el) => isFocusable(el))) || document.body;
+
    if (focusableParent === document.body) activeElement.blur();
    else focusableParent.focus();
 
    FocusManager.nudge();
-}
+}

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

@@ -152,9 +152,6 @@ interface LookupFieldProps extends FieldProps {
    /** Number of additional items to be loaded in `infinite` mode. Default is 100. */
    pageSize?: number;
 
-   /** The dropdown will be automatically closed if the page is scrolled a certain distance.  */
-   closeDropdownOnScrollDistance?: number;
-
    /** Set to `true` to allow quick selection of all displayed lookup items on `ctrl + a` keys combination.  */
    quickSelectAll?: boolean;
 }

package/src/widgets/form/LookupField.js

@@ -236,7 +236,6 @@ LookupField.prototype.submitOnEnterKey = false;
 LookupField.prototype.submitOnDropdownEnterKey = false;
 LookupField.prototype.pageSize = 100;
 LookupField.prototype.infinite = false;
-LookupField.prototype.closeDropdownOnScrollDistance = 100;
 LookupField.prototype.quickSelectAll = false;
 
 Localization.registerPrototype("cx/widgets/LookupField", LookupField);
@@ -371,16 +370,9 @@ class LookupComponent extends VDOM.Component {
                };
             }
          },
-         onDropdownPositionDidUpdate: (params) => {
-            let { parentBounds } = params;
-            let { initialScreenPosition } = this;
-            if (!initialScreenPosition) initialScreenPosition = this.initialScreenPosition = params.parentBounds;
-
-            if (
-               Math.abs(parentBounds.top - initialScreenPosition.top) > widget.closeDropdownOnScrollDistance ||
-               Math.abs(parentBounds.left - initialScreenPosition.left) > widget.closeDropdownOnScrollDistance
-            )
-               this.closeDropdown(null, true);
+         onDismissAfterScroll: () => {
+            this.closeDropdown(null, true);
+            return false;
          },
       };
 
@@ -543,7 +535,6 @@ class LookupComponent extends VDOM.Component {
             !data.disabled &&
             !data.empty &&
             (widget.alwaysShowClear || (!data.required && !this.props.multiple) || multipleEntries)
-
          ) {
             insideButton = (
                <div
@@ -720,15 +711,13 @@ class LookupComponent extends VDOM.Component {
          let newRecords = reset ? [] : [...(records || [])];
          let singleSelect = itemsData.length == 1;
          let optionKey = null;
-         if (singleSelect)
-            optionKey = this.getOptionKey(itemsData[0]);
+         if (singleSelect) optionKey = this.getOptionKey(itemsData[0]);
 
          // deselect
          if (singleSelect && selectedKeys.find((k) => areKeysEqual(optionKey, k))) {
             newRecords = records.filter((v) => !areKeysEqual(optionKey, this.getLocalKey({ $value: v })));
-         }
-         else {
-            itemsData.forEach(itemData => {
+         } else {
+            itemsData.forEach((itemData) => {
                let valueData = {
                   $value: {},
                };
@@ -787,8 +776,8 @@ class LookupComponent extends VDOM.Component {
             let { quickSelectAll, multiple } = this.props.instance.widget;
             if (!quickSelectAll || !multiple) return;
 
-            let optionsToSelect = this.state.options.map(o => ({
-               $option: o
+            let optionsToSelect = this.state.options.map((o) => ({
+               $option: o,
             }));
             this.select(e, optionsToSelect, true);
             e.stopPropagation();
@@ -798,7 +787,6 @@ class LookupComponent extends VDOM.Component {
          default:
             if (this.listKeyDown) this.listKeyDown(e);
             break;
-
       }
    }
 
@@ -896,7 +884,6 @@ class LookupComponent extends VDOM.Component {
 
       //delete results valid only while the dropdown is open
       delete this.tmpCachedResult;
-      delete this.initialScreenPosition;
    }
 
    openDropdown(e) {
@@ -968,10 +955,10 @@ class LookupComponent extends VDOM.Component {
             let params = !widget.infinite
                ? query
                : {
-                  query,
-                  page: 1,
-                  pageSize,
-               };
+                    query,
+                    page: 1,
+                    pageSize,
+                 };
 
             if (!result) result = instance.invoke("onQuery", params, instance);
 

package/src/widgets/nav/MenuItem.d.ts

@@ -19,8 +19,6 @@ export interface MenuItemProps extends Cx.HtmlElementProps {
    keyboardShortcut?: KeyboardShortcut;
    tooltip?: string | Cx.Config;
    openOnFocus?: boolean;
-   /** The dropdown will be automatically closed if the page is scrolled a certain distance.  */
-   closeDropdownOnScrollDistance?: number;
 
    /**
     * Click handler.

package/src/widgets/nav/MenuItem.js

@@ -109,7 +109,6 @@ MenuItem.prototype.checkedIcon = "check";
 MenuItem.prototype.uncheckedIcon = "dummy";
 MenuItem.prototype.keyboardShortcut = false;
 MenuItem.prototype.openOnFocus = true;
-MenuItem.prototype.closeDropdownOnScrollDistance = 100;
 
 Widget.alias("submenu", MenuItem);
 Localization.registerPrototype("cx/widgets/MenuItem", MenuItem);
@@ -145,19 +144,10 @@ class MenuItemComponent extends VDOM.Component {
             pipeValidateDropdownPosition: (cb) => {
                this.validateDropdownPosition = cb;
             },
-            onDropdownPositionDidUpdate: (params) => {
-               let { parentBounds } = params;
-               let { initialScreenPosition } = this;
-
-               if (!initialScreenPosition)
-                  initialScreenPosition = this.initialScreenPosition = params.parentBounds;
-
-               if (
-                  Math.abs(parentBounds.top - initialScreenPosition.top) > widget.closeDropdownOnScrollDistance ||
-                  Math.abs(parentBounds.left - initialScreenPosition.left) > widget.closeDropdownOnScrollDistance
-               )
-                  this.closeDropdown();
-            }
+            onDismissAfterScroll: () => {
+               this.closeDropdown();
+               return false;
+            },
          });
       }
       return this.dropdown;
@@ -261,7 +251,10 @@ class MenuItemComponent extends VDOM.Component {
    onDropdownKeyDown(e) {
       debug(menuFlag, "MenuItem", "dropdownKeyDown");
       let { horizontal } = this.props.instance;
-      if (e.keyCode == KeyCode.esc || (!isTextInputElement(e.target) && (horizontal ? e.keyCode == KeyCode.up : e.keyCode == KeyCode.left))) {
+      if (
+         e.keyCode == KeyCode.esc ||
+         (!isTextInputElement(e.target) && (horizontal ? e.keyCode == KeyCode.up : e.keyCode == KeyCode.left))
+      ) {
          FocusManager.focus(this.el);
          e.preventDefault();
          e.stopPropagation();

package/src/widgets/overlay/Dropdown.d.ts

@@ -18,6 +18,9 @@ export interface DropdownProps extends OverlayProps {
    firstChildDefinesHeight?: boolean;
    firstChildDefinesWidth?: boolean;
 
+   /** The dropdown will be automatically closed if the page is scrolled a certain distance.  */
+   closeOnScrollDistance?: number;
+
    onResolveRelatedElement?(beaconEl: Element, instance: any);
 }
 

package/src/widgets/overlay/Dropdown.js

@@ -19,8 +19,7 @@ export class Dropdown extends Overlay {
          this.trackMouseX = true;
          this.trackMouseY = true;
       }
-      if (this.autoFocus && !this.hasOwnProperty(this.focusable))
-         this.focusable = true;
+      if (this.autoFocus && !this.hasOwnProperty(this.focusable)) this.focusable = true;
       super.init();
    }
 
@@ -51,6 +50,8 @@ export class Dropdown extends Overlay {
       var scrollableParents = (component.scrollableParents = [window]);
       component.updateDropdownPosition = (e) => this.updateDropdownPosition(instance, component);
 
+      instance.initialScreenPosition = null;
+
       var el = instance.relatedElement.parentElement;
       while (el) {
          scrollableParents.push(el);
@@ -67,7 +68,9 @@ export class Dropdown extends Overlay {
          instance.invoke("pipeValidateDropdownPosition", component.updateDropdownPosition, instance);
 
       if (instance.parentPositionChangeEvent)
-         component.offParentPositionChange = instance.parentPositionChangeEvent.subscribe(component.updateDropdownPosition);
+         component.offParentPositionChange = instance.parentPositionChangeEvent.subscribe(
+            component.updateDropdownPosition
+         );
    }
 
    overlayDidUpdate(instance, component) {
@@ -90,10 +93,17 @@ export class Dropdown extends Overlay {
       if (component.offParentPositionChange) component.offParentPositionChange();
 
       delete component.parentBounds;
+      delete component.initialScreenPosition;
+   }
+
+   dismissAfterScroll(data, instance, component) {
+      if (this.onDismissAfterScroll && instance.invoke("onDismissAfterScroll", data, instance, component) === false)
+         return;
+      if (instance.dismiss) instance.dismiss();
    }
 
    updateDropdownPosition(instance, component) {
-      var { el } = component;
+      var { el, initialScreenPosition } = component;
       var { data, relatedElement } = instance;
       var parentBounds = (component.parentBounds = getTopLevelBoundingClientRect(relatedElement));
 
@@ -150,13 +160,15 @@ export class Dropdown extends Overlay {
          }
       }
 
-      let params = {
-         style, placement, parentBounds
-      };
+      if (!initialScreenPosition) initialScreenPosition = component.initialScreenPosition = parentBounds;
 
-      if (this.onDropdownPositionDidUpdate) instance.invoke("onDropdownPositionDidUpdate", params, instance, component);
+      if (
+         Math.abs(parentBounds.top - initialScreenPosition.top) > this.closeOnScrollDistance ||
+         Math.abs(parentBounds.left - initialScreenPosition.left) > this.closeOnScrollDistance
+      )
+         this.dismissAfterScroll({ parentBounds, initialScreenPosition }, instance, component);
 
-      instance.positionChangeSubcribers.notify();
+      instance.positionChangeSubscribers.notify();
    }
 
    applyFixedPositioningPlacementStyles(style, placement, contentSize, rel, el, noAuto) {
@@ -534,8 +546,7 @@ export class Dropdown extends Overlay {
       //if relatedElement is not provided, a beacon is rendered to and used to resolve a nearby element as a target
       //if onResolveTarget doesn't provide another element, the beacon itself is used as a target
       let beacon = null;
-      if (this.relatedElement)
-         instance.relatedElement = this.relatedElement;
+      if (this.relatedElement) instance.relatedElement = this.relatedElement;
 
       if (!this.relatedElement || instance.needsBeacon) {
          beacon = (
@@ -571,6 +582,7 @@ Dropdown.prototype.touchFriendly = false;
 Dropdown.prototype.arrow = false;
 Dropdown.prototype.pad = false;
 Dropdown.prototype.elementExplode = 0;
+Dropdown.prototype.closeOnScrollDistance = 50;
 Dropdown.prototype.screenPadding = 5;
 Dropdown.prototype.firstChildDefinesHeight = false;
 Dropdown.prototype.firstChildDefinesWidth = false;

package/src/widgets/overlay/Overlay.js

@@ -26,8 +26,7 @@ import { KeyCode } from "../../util/KeyCode";
 
 export class Overlay extends Container {
    init() {
-      if (this.center)
-         this.centerX = this.centerY = this.center;
+      if (this.center) this.centerX = this.centerY = this.center;
 
       super.init();
    }
@@ -60,7 +59,7 @@ export class Overlay extends Container {
    }
 
    initInstance(context, instance) {
-      instance.positionChangeSubcribers = new SubscriberList();
+      instance.positionChangeSubscribers = new SubscriberList();
       super.initInstance(context, instance);
    }
 
@@ -83,7 +82,7 @@ export class Overlay extends Container {
 
       if (instance.cache("dismiss", instance.dismiss)) instance.markShouldUpdate(context);
 
-      context.push("parentPositionChangeEvent", instance.positionChangeSubcribers);
+      context.push("parentPositionChangeEvent", instance.positionChangeSubscribers);
 
       super.explore(context, instance);
    }
@@ -112,15 +111,14 @@ export class Overlay extends Container {
 
    overlayDidMount(instance, component) {
       let { el } = component;
-      if (this.centerX)
-         if (!el.style.left) el.style.left = `${(window.innerWidth - el.offsetWidth) / 2}px`;
+      if (this.centerX) if (!el.style.left) el.style.left = `${(window.innerWidth - el.offsetWidth) / 2}px`;
       if (this.centerY)
          if (!el.style.top) el.style.top = `${Math.max(0, (window.innerHeight - el.offsetHeight) / 2)}px`;
    }
 
-   overlayDidUpdate(instance, component) { }
+   overlayDidUpdate(instance, component) {}
 
-   overlayWillUnmount(instance, component) { }
+   overlayWillUnmount(instance, component) {}
 
    handleFocusOut(instance, component) {
       if (this.onFocusOut) instance.invoke("onFocusOut", instance, component);
@@ -193,7 +191,7 @@ export class Overlay extends Container {
             }
          });
       }
-      instance.positionChangeSubcribers.notify();
+      instance.positionChangeSubscribers.notify();
    }
 
    handleResize(e, instance, component) {
@@ -209,7 +207,7 @@ export class Overlay extends Container {
             }
          });
       }
-      instance.positionChangeSubcribers.notify();
+      instance.positionChangeSubscribers.notify();
    }
 }
 
@@ -373,7 +371,7 @@ export class OverlayComponent extends VDOM.Component {
       FocusManager.nudge();
    }
 
-   onFocusIn() { }
+   onFocusIn() {}
 
    onFocusOut() {
       let { widget } = this.props.instance;

package/src/widgets/overlay/Tooltip.js

@@ -107,16 +107,19 @@ export class Tooltip extends Dropdown {
    }
 
    dismissTooltip(instance) {
-      if (instance && instance.dismissTooltip) {
-         if (
-            instance.data &&
-            instance.data.alwaysVisible &&
-            this.relatedElement.ownerDocument.body.contains(this.relatedElement)
-         )
-            return;
-         instance.dismissTooltip();
-         instance.dismissTooltip = null;
-      }
+      if (!instance || !instance.dismissTooltip) return;
+      if (
+         instance.data &&
+         instance.data.alwaysVisible &&
+         this.relatedElement.ownerDocument.body.contains(this.relatedElement)
+      )
+         return;
+      instance.dismissTooltip();
+      instance.dismissTooltip = null;
+   }
+
+   dismissAfterScroll(data, instance) {
+      this.dismissTooltip(instance);
    }
 
    checkVisible(context, instance, data) {