@sheinx/hooks 3.8.0-beta.8 → 3.8.0

package/esm/utils/dom/element.js

@@ -183,4 +183,8 @@ export var parsePxToNumber = function parsePxToNumber(str) {
 export var getFieldId = function getFieldId(name, formName) {
   if (!name) return undefined;
   return "".concat(formName ? "".concat(formName, "_") : '').concat(name);
+};
+export var getOriginField = function getOriginField(name, formName) {
+  if (!name || !formName) return '';
+  return name.replace("".concat(formName, "_"), '');
 };

package/esm/utils/highlight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"highlight.d.ts","sourceRoot":"","sources":["highlight.tsx"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,EAClC,QAAQ,EACR,WAAW,EACX,kBAAkB,EAClB,MAAM,GACP,EAAE;IACD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,CAAC,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GAAG,CAAC,CA8BJ"}
+{"version":3,"file":"highlight.d.ts","sourceRoot":"","sources":["highlight.tsx"],"names":[],"mappings":"AAIA,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,EAClC,QAAQ,EACR,WAAW,EACX,kBAAkB,EAClB,MAAM,GACP,EAAE;IACD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,CAAC,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GAAG,CAAC,CAkCJ"}

package/esm/utils/highlight.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { cloneElement } from 'react';
 import { escapeRegExp } from "./string";
 import { isArray } from "./is";
@@ -11,22 +17,31 @@ export function getHighlightText(_ref) {
   if (!enable || !searchWords) {
     return nodeList;
   }
-  var transformNode = function transformNode(node) {
-    var _node$props;
-    if (node && typeof ((_node$props = node.props) === null || _node$props === void 0 ? void 0 : _node$props.children) === 'string') {
-      return /*#__PURE__*/cloneElement(node, undefined, /*#__PURE__*/_jsx(HighlightText, {
-        textToHighlight: node.props.children,
+
+  // 递归转换节点
+  var transformNode = function transformNode(node, index) {
+    // 如果是合法的 React 元素
+    if ( /*#__PURE__*/React.isValidElement(node) && node.props && node.props.children) {
+      // 对 children 递归调用 getHighlightText 进行转换
+      var transformedChildren = getHighlightText({
+        nodeList: node.props.children,
         searchWords: searchWords,
-        highlightClassName: highlightClassName
-      }));
+        highlightClassName: highlightClassName,
+        enable: enable
+      });
+      return /*#__PURE__*/cloneElement(node, _objectSpread(_objectSpread({}, node.props), {}, {
+        key: index
+      }), transformedChildren);
     }
-    if (node && typeof node === 'string') {
+    // 如果节点为字符串，则直接高亮替换
+    if (typeof node === 'string') {
       return /*#__PURE__*/_jsx(HighlightText, {
         textToHighlight: node,
         searchWords: searchWords,
         highlightClassName: highlightClassName
       });
     }
+    // 其他情况直接返回原节点
     return node;
   };
   return isArray(nodeList) ? nodeList.map(transformNode) : transformNode(nodeList);
@@ -42,8 +57,7 @@ function HighlightText(_ref2) {
     searchWords = searchWords.slice(0, 500);
   }
 
-  // 注意这里的括号，这里使用了带capture group功能的正则，来split字符串
-  // 从而在strArr中可以保留匹配文本
+  // 带 capture group 的正则用于 split 保留匹配文本
   var re = new RegExp("(".concat(escapeRegExp(searchWords), ")"), 'i');
   var strArr = textToHighlight.split(re);
   return /*#__PURE__*/_jsx(_Fragment, {

package/esm/utils/lazyload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazyload.d.ts","sourceRoot":"","sources":["lazyload.ts"],"names":[],"mappings":"AAKA,KAAK,UAAU,GAAG;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;CACjC,CAAC;AAsBF,wBAAgB,QAAQ,SAgBvB;AAWD,wBAAgB,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,QAUvE;AA0BD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,iBA4BvC"}
+{"version":3,"file":"lazyload.d.ts","sourceRoot":"","sources":["lazyload.ts"],"names":[],"mappings":"AAKA,KAAK,UAAU,GAAG;IAChB,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;CACjC,CAAC;AAsBF,wBAAgB,QAAQ,SAgBvB;AAWD,wBAAgB,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,QAUvE;AA4DD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,iBA4BvC"}

package/esm/utils/lazyload.js

@@ -58,6 +58,34 @@ export function removeStack(id, removeListener) {
   }
   delete components[id];
 }
+
+// 检测容器是否高度受限
+var isRootHeightConstrained = function isRootHeightConstrained(root, targetElement) {
+  if (!root || root === document.body) {
+    var bodyRect = document.body.getBoundingClientRect();
+    var _targetRect = targetElement.getBoundingClientRect();
+    // body的底部和targetElement的顶部永远不可能有相交，则是受限的
+    if (bodyRect.bottom < _targetRect.top) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  // 当root的overflow是auto或hidden，则认为不是受限的
+  var rootStyle = window.getComputedStyle(root);
+  if (rootStyle.overflow === 'auto' || rootStyle.overflow === 'hidden') {
+    return false;
+  }
+
+  // 当root的底部与targetElement的顶部永远不可能有相交，则是受限的
+  var rootRect = root.getBoundingClientRect();
+  var targetRect = targetElement.getBoundingClientRect();
+  if (rootRect.top > targetRect.bottom || rootRect.bottom < targetRect.top) {
+    return true;
+  }
+  return false;
+};
 function getObserver(obj, id) {
   var _obj$container = obj.container,
     container = _obj$container === void 0 ? null : _obj$container,
@@ -67,6 +95,10 @@ function getObserver(obj, id) {
     offscreen = obj.offscreen,
     noRemove = obj.noRemove;
   var fixedContainer = getClosestPositionedContainer(element, ['fixed', 'absolute']);
+
+  // 获取最优的观察器配置
+  var candidateRoot = fixedContainer || container;
+  var observerRoot = isRootHeightConstrained(candidateRoot, element) ? null : candidateRoot;
   var observer = new IntersectionObserver(function (entries) {
     entries.forEach(function (en) {
       if (en.isIntersecting || en.intersectionRatio > 0) {
@@ -78,7 +110,7 @@ function getObserver(obj, id) {
       }
     });
   }, {
-    root: fixedContainer || container,
+    root: observerRoot,
     rootMargin: "".concat(offset, "px")
   });
   obj.observer = observer;

package/esm/utils/object.d.ts

@@ -45,5 +45,11 @@ export declare const getAllKeyPaths: (obj: ObjectType, parentKey?: string) => st
  * console.log(completeFields) // ['user', 'user.name', 'user.age', 'user[0].name', 'user[0].age', 'user[1].name', 'user[1].age']
  */
 export declare const getCompleteFieldKeys: (fields: string | string[], allFields: string[]) => string[];
+/**
+ * 将对象中的所有值设置为空, 如果值是数组，重置为空数组，如果是对象，重置为空对象，如果是基础类型，重置为undefined
+ * @param obj 对象
+ * @returns 空对象
+ */
+export declare const clearValue: (obj: ObjectType) => any;
 export {};
 //# sourceMappingURL=object.d.ts.map

package/esm/utils/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAGvC;AASD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,eAAO,MAAM,YAAY,QAAS,UAAU,UAG3C,CAAC;AAGF,eAAO,MAAM,SAAS,2CAEZ,UAAU,YACT,WAAW,eAwBrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,+DA4BxC;AAED,UAAU,cAAc;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,WACV,UAAU,QACZ,MAAM,SACL,GAAG,YACD,cAAc,eAiDxB,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAAW,WAAW,YAyB7E,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,UAAU,QAAQ,MAAM,eA0B1D,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAavD,CAAC;AAEF,eAAO,MAAM,OAAO,QAAS,UAAU,YAItC,CAAC;AAEF,eAAO,MAAM,WAAW,wFAQvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,UAAU,cAAa,MAAM,KAAQ,MAAM,EAoB9E,CAAC;AAGF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,WAAY,MAAM,GAAG,MAAM,EAAE,aAAa,MAAM,EAAE,KAAG,MAAM,EAmB3F,CAAA"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAGvC;AASD,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAGD,eAAO,MAAM,YAAY,QAAS,UAAU,UAG3C,CAAC;AAGF,eAAO,MAAM,SAAS,2CAEZ,UAAU,YACT,WAAW,eAwBrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,+DA4BxC;AAED,UAAU,cAAc;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,WACV,UAAU,QACZ,MAAM,SACL,GAAG,YACD,cAAc,eAiDxB,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAAW,WAAW,YAyB7E,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,UAAU,QAAQ,MAAM,eA0B1D,CAAC;AAEF,eAAO,MAAM,OAAO,WAAY,UAAU,QAAQ,MAAM,YAavD,CAAC;AAEF,eAAO,MAAM,OAAO,QAAS,UAAU,YAItC,CAAC;AAEF,eAAO,MAAM,WAAW,wFAQvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,UAAU,cAAa,MAAM,KAAQ,MAAM,EAoB9E,CAAC;AAGF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,oBAAoB,WAAY,MAAM,GAAG,MAAM,EAAE,aAAa,MAAM,EAAE,KAAG,MAAM,EAmB3F,CAAA;AAGD;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAS,UAAU,KAAG,GAW5C,CAAC"}

package/esm/utils/object.js

@@ -325,4 +325,24 @@ export var getCompleteFieldKeys = function getCompleteFieldKeys(fields, allField
 
   // 返回之前去重
   return Array.from(new Set(completeFields));
+};
+
+/**
+ * 将对象中的所有值设置为空, 如果值是数组，重置为空数组，如果是对象，重置为空对象，如果是基础类型，重置为undefined
+ * @param obj 对象
+ * @returns 空对象
+ */
+export var clearValue = function clearValue(obj) {
+  if (isArray(obj)) {
+    return obj.map(function (item) {
+      return clearValue(item);
+    });
+  }
+  if (isObject(obj)) {
+    return Object.keys(obj).reduce(function (acc, key) {
+      acc[key] = clearValue(obj[key]);
+      return acc;
+    }, {});
+  }
+  return undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.8.0-beta.8",
+  "version": "3.8.0",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -18,8 +18,8 @@
     "immer": "10.0.2"
   },
   "peerDependencies": {
-    "react": ">=16.8",
-    "react-dom": ">=16.8",
+    "react": ">=16.14.0",
+    "react-dom": ">=16.14.0",
     "core-js": ">=3"
   },
   "repository": {