@rc-component/util 1.4.0 → 1.6.0

package/es/Dom/focus.d.ts

@@ -1,11 +1,4 @@
 export declare function getFocusNodeList(node: HTMLElement, includePositive?: boolean): HTMLElement[];
-/** @deprecated Do not use since this may failed when used in async */
-export declare function saveLastFocusNode(): void;
-/** @deprecated Do not use since this may failed when used in async */
-export declare function clearLastFocusNode(): void;
-/** @deprecated Do not use since this may failed when used in async */
-export declare function backLastFocusNode(): void;
-export declare function limitTabRange(node: HTMLElement, e: KeyboardEvent): void;
 export interface InputFocusOptions extends FocusOptions {
     cursor?: 'start' | 'end' | 'all';
 }
@@ -13,3 +6,14 @@ export interface InputFocusOptions extends FocusOptions {
  * Focus element and set cursor position for input/textarea elements.
  */
 export declare function triggerFocus(element?: HTMLElement, option?: InputFocusOptions): void;
+/**
+ * Lock focus in the element.
+ * It will force back to the first focusable element when focus leaves the element.
+ */
+export declare function lockFocus(element: HTMLElement): VoidFunction;
+/**
+ * Lock focus within an element.
+ * When locked, focus will be restricted to focusable elements within the specified element.
+ * If multiple elements are locked, only the last locked element will be effective.
+ */
+export declare function useLockFocus(lock: boolean, getElement: () => HTMLElement | null): void;

package/es/Dom/focus.js

@@ -1,3 +1,4 @@
+import { useEffect } from 'react';
 import isVisible from "./isVisible";
 function focusable(node, includePositive = false) {
   if (isVisible(node)) {
@@ -39,44 +40,6 @@ export function getFocusNodeList(node, includePositive = false) {
   }
   return res;
 }
-let lastFocusElement = null;
-
-/** @deprecated Do not use since this may failed when used in async */
-export function saveLastFocusNode() {
-  lastFocusElement = document.activeElement;
-}
-
-/** @deprecated Do not use since this may failed when used in async */
-export function clearLastFocusNode() {
-  lastFocusElement = null;
-}
-
-/** @deprecated Do not use since this may failed when used in async */
-export function backLastFocusNode() {
-  if (lastFocusElement) {
-    try {
-      // 元素可能已经被移动了
-      lastFocusElement.focus();
-
-      /* eslint-disable no-empty */
-    } catch (e) {
-      // empty
-    }
-    /* eslint-enable no-empty */
-  }
-}
-export function limitTabRange(node, e) {
-  if (e.keyCode === 9) {
-    const tabNodeList = getFocusNodeList(node);
-    const lastTabNode = tabNodeList[e.shiftKey ? 0 : tabNodeList.length - 1];
-    const leavingTab = lastTabNode === document.activeElement || node === document.activeElement;
-    if (leavingTab) {
-      const target = tabNodeList[e.shiftKey ? tabNodeList.length - 1 : 0];
-      target.focus();
-      e.preventDefault();
-    }
-  }
-}
 // Used for `rc-input` `rc-textarea` `rc-input-number`
 /**
  * Focus element and set cursor position for input/textarea elements.
@@ -102,4 +65,92 @@ export function triggerFocus(element, option) {
         element.setSelectionRange(0, len);
     }
   }
+}
+
+// ======================================================
+// ==                    Lock Focus                    ==
+// ======================================================
+let lastFocusElement = null;
+let focusElements = [];
+function getLastElement() {
+  return focusElements[focusElements.length - 1];
+}
+function hasFocus(element) {
+  const {
+    activeElement
+  } = document;
+  return element === activeElement || element.contains(activeElement);
+}
+function syncFocus() {
+  const lastElement = getLastElement();
+  const {
+    activeElement
+  } = document;
+  if (lastElement && !hasFocus(lastElement)) {
+    const focusableList = getFocusNodeList(lastElement);
+    const matchElement = focusableList.includes(lastFocusElement) ? lastFocusElement : focusableList[0];
+    matchElement?.focus();
+  } else {
+    lastFocusElement = activeElement;
+  }
+}
+function onWindowKeyDown(e) {
+  if (e.key === 'Tab') {
+    const {
+      activeElement
+    } = document;
+    const lastElement = getLastElement();
+    const focusableList = getFocusNodeList(lastElement);
+    const last = focusableList[focusableList.length - 1];
+    if (e.shiftKey && activeElement === focusableList[0]) {
+      // Tab backward on first focusable element
+      lastFocusElement = last;
+    } else if (!e.shiftKey && activeElement === last) {
+      // Tab forward on last focusable element
+      lastFocusElement = focusableList[0];
+    }
+  }
+}
+
+/**
+ * Lock focus in the element.
+ * It will force back to the first focusable element when focus leaves the element.
+ */
+export function lockFocus(element) {
+  if (element) {
+    // Refresh focus elements
+    focusElements = focusElements.filter(ele => ele !== element);
+    focusElements.push(element);
+
+    // Just add event since it will de-duplicate
+    window.addEventListener('focusin', syncFocus);
+    window.addEventListener('keydown', onWindowKeyDown, true);
+    syncFocus();
+  }
+
+  // Always return unregister function
+  return () => {
+    lastFocusElement = null;
+    focusElements = focusElements.filter(ele => ele !== element);
+    if (focusElements.length === 0) {
+      window.removeEventListener('focusin', syncFocus);
+      window.removeEventListener('keydown', onWindowKeyDown, true);
+    }
+  };
+}
+
+/**
+ * Lock focus within an element.
+ * When locked, focus will be restricted to focusable elements within the specified element.
+ * If multiple elements are locked, only the last locked element will be effective.
+ */
+export function useLockFocus(lock, getElement) {
+  useEffect(() => {
+    if (lock) {
+      const element = getElement();
+      if (element) {
+        return lockFocus(element);
+      }
+    }
+  }, [lock]);
 }

package/es/getScrollBarSize.d.ts

@@ -1,7 +1,5 @@
-type ScrollBarSize = {
+export default function getScrollBarSize(fresh?: boolean): number;
+export declare function getTargetScrollBarSize(target: HTMLElement): {
     width: number;
     height: number;
 };
-export default function getScrollBarSize(fresh?: boolean): number;
-export declare function getTargetScrollBarSize(target: HTMLElement): ScrollBarSize;
-export {};

package/es/index.d.ts

@@ -3,7 +3,7 @@ export { default as useMergedState } from './hooks/useMergedState';
 export { default as useControlledState } from './hooks/useControlledState';
 export { supportNodeRef, supportRef, useComposeRef } from './ref';
 export { default as get } from './utils/get';
-export { default as set, merge } from './utils/set';
+export { default as set, merge, mergeWith } from './utils/set';
 export { default as warning, noteOnce } from './warning';
 export { default as omit } from './omit';
 export { default as toArray } from './Children/toArray';

package/es/index.js

@@ -3,7 +3,7 @@ export { default as useMergedState } from "./hooks/useMergedState";
 export { default as useControlledState } from "./hooks/useControlledState";
 export { supportNodeRef, supportRef, useComposeRef } from "./ref";
 export { default as get } from "./utils/get";
-export { default as set, merge } from "./utils/set";
+export { default as set, merge, mergeWith } from "./utils/set";
 export { default as warning, noteOnce } from "./warning";
 export { default as omit } from "./omit";
 export { default as toArray } from "./Children/toArray";

package/es/utils/set.d.ts

@@ -1,6 +1,18 @@
 export type Path = (string | number | symbol)[];
 export default function set<Entity = any, Output = Entity, Value = any>(entity: Entity, paths: Path, value: Value, removeIfUndefined?: boolean): Output;
+export type MergeFn = (current: any, next: any) => any;
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
+ */
+export declare function mergeWith<T extends object>(sources: T[], config?: {
+    prepareArray?: MergeFn;
+}): T;
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
  */
 export declare function merge<T extends object>(...sources: T[]): T;

package/es/utils/set.js

@@ -38,10 +38,20 @@ function createEmpty(source) {
 }
 const keys = typeof Reflect === 'undefined' ? Object.keys : Reflect.ownKeys;
 
+// ================================ Merge ================================
+
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
  */
-export function merge(...sources) {
+export function mergeWith(sources, config = {}) {
+  const {
+    prepareArray
+  } = config;
+  const finalPrepareArray = prepareArray || (() => []);
   let clone = createEmpty(sources[0]);
   sources.forEach(src => {
     function internalMerge(path, parentLoopSet) {
@@ -55,7 +65,7 @@ export function merge(...sources) {
           const originValue = get(clone, path);
           if (isArr) {
             // Array will always be override
-            clone = set(clone, path, []);
+            clone = set(clone, path, finalPrepareArray(originValue, value));
           } else if (!originValue || typeof originValue !== 'object') {
             // Init container if not exist
             clone = set(clone, path, createEmpty(value));
@@ -71,4 +81,12 @@ export function merge(...sources) {
     internalMerge([]);
   });
   return clone;
+}
+
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
+ */
+export function merge(...sources) {
+  return mergeWith(sources);
 }

package/lib/Dom/focus.d.ts

@@ -1,11 +1,4 @@
 export declare function getFocusNodeList(node: HTMLElement, includePositive?: boolean): HTMLElement[];
-/** @deprecated Do not use since this may failed when used in async */
-export declare function saveLastFocusNode(): void;
-/** @deprecated Do not use since this may failed when used in async */
-export declare function clearLastFocusNode(): void;
-/** @deprecated Do not use since this may failed when used in async */
-export declare function backLastFocusNode(): void;
-export declare function limitTabRange(node: HTMLElement, e: KeyboardEvent): void;
 export interface InputFocusOptions extends FocusOptions {
     cursor?: 'start' | 'end' | 'all';
 }
@@ -13,3 +6,14 @@ export interface InputFocusOptions extends FocusOptions {
  * Focus element and set cursor position for input/textarea elements.
  */
 export declare function triggerFocus(element?: HTMLElement, option?: InputFocusOptions): void;
+/**
+ * Lock focus in the element.
+ * It will force back to the first focusable element when focus leaves the element.
+ */
+export declare function lockFocus(element: HTMLElement): VoidFunction;
+/**
+ * Lock focus within an element.
+ * When locked, focus will be restricted to focusable elements within the specified element.
+ * If multiple elements are locked, only the last locked element will be effective.
+ */
+export declare function useLockFocus(lock: boolean, getElement: () => HTMLElement | null): void;

package/lib/Dom/focus.js

@@ -3,12 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.backLastFocusNode = backLastFocusNode;
-exports.clearLastFocusNode = clearLastFocusNode;
 exports.getFocusNodeList = getFocusNodeList;
-exports.limitTabRange = limitTabRange;
-exports.saveLastFocusNode = saveLastFocusNode;
+exports.lockFocus = lockFocus;
 exports.triggerFocus = triggerFocus;
+exports.useLockFocus = useLockFocus;
+var _react = require("react");
 var _isVisible = _interopRequireDefault(require("./isVisible"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function focusable(node, includePositive = false) {
@@ -51,44 +50,6 @@ function getFocusNodeList(node, includePositive = false) {
   }
   return res;
 }
-let lastFocusElement = null;
-
-/** @deprecated Do not use since this may failed when used in async */
-function saveLastFocusNode() {
-  lastFocusElement = document.activeElement;
-}
-
-/** @deprecated Do not use since this may failed when used in async */
-function clearLastFocusNode() {
-  lastFocusElement = null;
-}
-
-/** @deprecated Do not use since this may failed when used in async */
-function backLastFocusNode() {
-  if (lastFocusElement) {
-    try {
-      // 元素可能已经被移动了
-      lastFocusElement.focus();
-
-      /* eslint-disable no-empty */
-    } catch (e) {
-      // empty
-    }
-    /* eslint-enable no-empty */
-  }
-}
-function limitTabRange(node, e) {
-  if (e.keyCode === 9) {
-    const tabNodeList = getFocusNodeList(node);
-    const lastTabNode = tabNodeList[e.shiftKey ? 0 : tabNodeList.length - 1];
-    const leavingTab = lastTabNode === document.activeElement || node === document.activeElement;
-    if (leavingTab) {
-      const target = tabNodeList[e.shiftKey ? tabNodeList.length - 1 : 0];
-      target.focus();
-      e.preventDefault();
-    }
-  }
-}
 // Used for `rc-input` `rc-textarea` `rc-input-number`
 /**
  * Focus element and set cursor position for input/textarea elements.
@@ -114,4 +75,92 @@ function triggerFocus(element, option) {
         element.setSelectionRange(0, len);
     }
   }
+}
+
+// ======================================================
+// ==                    Lock Focus                    ==
+// ======================================================
+let lastFocusElement = null;
+let focusElements = [];
+function getLastElement() {
+  return focusElements[focusElements.length - 1];
+}
+function hasFocus(element) {
+  const {
+    activeElement
+  } = document;
+  return element === activeElement || element.contains(activeElement);
+}
+function syncFocus() {
+  const lastElement = getLastElement();
+  const {
+    activeElement
+  } = document;
+  if (lastElement && !hasFocus(lastElement)) {
+    const focusableList = getFocusNodeList(lastElement);
+    const matchElement = focusableList.includes(lastFocusElement) ? lastFocusElement : focusableList[0];
+    matchElement?.focus();
+  } else {
+    lastFocusElement = activeElement;
+  }
+}
+function onWindowKeyDown(e) {
+  if (e.key === 'Tab') {
+    const {
+      activeElement
+    } = document;
+    const lastElement = getLastElement();
+    const focusableList = getFocusNodeList(lastElement);
+    const last = focusableList[focusableList.length - 1];
+    if (e.shiftKey && activeElement === focusableList[0]) {
+      // Tab backward on first focusable element
+      lastFocusElement = last;
+    } else if (!e.shiftKey && activeElement === last) {
+      // Tab forward on last focusable element
+      lastFocusElement = focusableList[0];
+    }
+  }
+}
+
+/**
+ * Lock focus in the element.
+ * It will force back to the first focusable element when focus leaves the element.
+ */
+function lockFocus(element) {
+  if (element) {
+    // Refresh focus elements
+    focusElements = focusElements.filter(ele => ele !== element);
+    focusElements.push(element);
+
+    // Just add event since it will de-duplicate
+    window.addEventListener('focusin', syncFocus);
+    window.addEventListener('keydown', onWindowKeyDown, true);
+    syncFocus();
+  }
+
+  // Always return unregister function
+  return () => {
+    lastFocusElement = null;
+    focusElements = focusElements.filter(ele => ele !== element);
+    if (focusElements.length === 0) {
+      window.removeEventListener('focusin', syncFocus);
+      window.removeEventListener('keydown', onWindowKeyDown, true);
+    }
+  };
+}
+
+/**
+ * Lock focus within an element.
+ * When locked, focus will be restricted to focusable elements within the specified element.
+ * If multiple elements are locked, only the last locked element will be effective.
+ */
+function useLockFocus(lock, getElement) {
+  (0, _react.useEffect)(() => {
+    if (lock) {
+      const element = getElement();
+      if (element) {
+        return lockFocus(element);
+      }
+    }
+  }, [lock]);
 }

package/lib/getScrollBarSize.d.ts

@@ -1,7 +1,5 @@
-type ScrollBarSize = {
+export default function getScrollBarSize(fresh?: boolean): number;
+export declare function getTargetScrollBarSize(target: HTMLElement): {
     width: number;
     height: number;
 };
-export default function getScrollBarSize(fresh?: boolean): number;
-export declare function getTargetScrollBarSize(target: HTMLElement): ScrollBarSize;
-export {};

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export { default as useMergedState } from './hooks/useMergedState';
 export { default as useControlledState } from './hooks/useControlledState';
 export { supportNodeRef, supportRef, useComposeRef } from './ref';
 export { default as get } from './utils/get';
-export { default as set, merge } from './utils/set';
+export { default as set, merge, mergeWith } from './utils/set';
 export { default as warning, noteOnce } from './warning';
 export { default as omit } from './omit';
 export { default as toArray } from './Children/toArray';

package/lib/index.js

@@ -15,6 +15,12 @@ Object.defineProperty(exports, "merge", {
     return _set.merge;
   }
 });
+Object.defineProperty(exports, "mergeWith", {
+  enumerable: true,
+  get: function () {
+    return _set.mergeWith;
+  }
+});
 Object.defineProperty(exports, "noteOnce", {
   enumerable: true,
   get: function () {

package/lib/utils/set.d.ts

@@ -1,6 +1,18 @@
 export type Path = (string | number | symbol)[];
 export default function set<Entity = any, Output = Entity, Value = any>(entity: Entity, paths: Path, value: Value, removeIfUndefined?: boolean): Output;
+export type MergeFn = (current: any, next: any) => any;
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
+ */
+export declare function mergeWith<T extends object>(sources: T[], config?: {
+    prepareArray?: MergeFn;
+}): T;
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
  */
 export declare function merge<T extends object>(...sources: T[]): T;

package/lib/utils/set.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = set;
 exports.merge = merge;
+exports.mergeWith = mergeWith;
 var _get = _interopRequireDefault(require("./get"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function internalSet(entity, paths, value, removeIfUndefined) {
@@ -46,10 +47,20 @@ function createEmpty(source) {
 }
 const keys = typeof Reflect === 'undefined' ? Object.keys : Reflect.ownKeys;
 
+// ================================ Merge ================================
+
 /**
- * Merge objects which will create
+ * Merge multiple objects. Support custom merge logic.
+ * @param sources object sources
+ * @param config.prepareArray Customize array prepare function.
+ * It will return empty [] by default.
+ * So when match array, it will auto be override with next array in sources.
  */
-function merge(...sources) {
+function mergeWith(sources, config = {}) {
+  const {
+    prepareArray
+  } = config;
+  const finalPrepareArray = prepareArray || (() => []);
   let clone = createEmpty(sources[0]);
   sources.forEach(src => {
     function internalMerge(path, parentLoopSet) {
@@ -63,7 +74,7 @@ function merge(...sources) {
           const originValue = (0, _get.default)(clone, path);
           if (isArr) {
             // Array will always be override
-            clone = set(clone, path, []);
+            clone = set(clone, path, finalPrepareArray(originValue, value));
           } else if (!originValue || typeof originValue !== 'object') {
             // Init container if not exist
             clone = set(clone, path, createEmpty(value));
@@ -79,4 +90,12 @@ function merge(...sources) {
     internalMerge([]);
   });
   return clone;
+}
+
+/**
+ * Merge multiple objects into a new single object.
+ * Arrays will be replaced by default.
+ */
+function merge(...sources) {
+  return mergeWith(sources);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/util",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Common Utils For React Component",
   "keywords": [
     "react",