shineout 3.6.6 → 3.6.7-beta.2

package/cjs/index.js

@@ -514,5 +514,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.6.6'
+  version: '3.6.7-beta.2'
 };

package/cjs/tag/tag.type.d.ts

@@ -2,7 +2,7 @@ import { TagProps as UnStyledTagProps, TagInputProps as UnStyledTagInputProps }
 /**
  * @title Tag
  */
-export type TagProps = Omit<UnStyledTagProps, 'jssStyle' | 'inlineStyle'>;
+export type TagProps = Omit<UnStyledTagProps, 'jssStyle' | 'inlineStyle' | 'onMouseDown'>;
 /**
  * @title Tag.Input
  */

package/dist/shineout.js

@@ -12217,7 +12217,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.6.6');
+/* harmony default export */ var version = ('3.6.7-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -29783,6 +29783,8 @@ var getPosition = function getPosition(target) {
 
 
 var defaultContext = {
+  addParent: function addParent(_ref) {},
+  removeParent: function removeParent(_ref) {},
   bindChild: function bindChild(_ref) {},
   removeChild: function removeChild(_ref) {}
 };
@@ -29813,21 +29815,32 @@ var usePopup = function usePopup(props) {
     setOpenState = _useState2[1];
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(popup_context),
     bindChild = _useContext.bindChild,
-    removeChild = _useContext.removeChild;
+    removeChild = _useContext.removeChild,
+    addParent = _useContext.addParent,
+    removeParent = _useContext.removeParent;
   var targetRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var popupRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    bindChild(popupRef);
-    return function () {
-      removeChild(popupRef);
-    };
-  }, []);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       triggerTimer: null,
       // 记录所有的子popup 点击子 popup 不关闭弹窗
       chain: [targetRef, popupRef]
     }),
     context = _useRef.current;
+  var handleAddParent = function handleAddParent(elRef) {
+    context.chain.push(elRef);
+
+    // 继续向上添加当前的 popupRef 到父级
+    addParent(elRef);
+  };
+  var handleRemoveParent = function handleRemoveParent(elRef) {
+    var index = context.chain.findIndex(function (item) {
+      return item === elRef;
+    });
+    if (index > -1) {
+      context.chain.splice(index, 1);
+      removeParent(elRef);
+    }
+  };
   var open = openState;
   var changeOpen = function changeOpen(openIn, delay) {
     if (context.triggerTimer) clearTimeout(context.triggerTimer);
@@ -29961,8 +29974,13 @@ var usePopup = function usePopup(props) {
   });
   var providerValue = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return {
+      addParent: handleAddParent,
+      removeParent: handleRemoveParent,
       bindChild: function bindChild(elRef) {
-        context.chain.push(elRef);
+        if (elRef.current) {
+          addParent(elRef);
+          context.chain.push(elRef);
+        }
       },
       removeChild: function removeChild(elRef) {
         var index = context.chain.findIndex(function (item) {
@@ -29970,10 +29988,19 @@ var usePopup = function usePopup(props) {
         });
         if (index > -1) {
           context.chain.splice(index, 1);
+          removeParent(elRef);
         }
       }
     };
   }, []);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (open) {
+      bindChild(popupRef);
+    }
+    return function () {
+      removeChild(popupRef);
+    };
+  }, [open]);
   return {
     open: open,
     position: position,
@@ -40191,7 +40218,7 @@ var TagInput = function TagInput(props) {
 
 
 
-var tag_excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "inlineStyle", "onKeyUp", "onCompleted", "onEnterPress", "closable"];
+var tag_excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "inlineStyle", "onKeyUp", "onCompleted", "onEnterPress", "closable", "onMouseDown"];
 
 
 
@@ -40222,6 +40249,7 @@ var Tag = function Tag(props) {
     onCompleted = props.onCompleted,
     onEnterPress = props.onEnterPress,
     closable = props.closable,
+    onMouseDown = props.onMouseDown,
     rest = objectWithoutProperties_default()(props, tag_excluded);
   if (props.type) {
     tag_devUseWarning.deprecated('type', 'color', 'Tag');
@@ -40295,6 +40323,7 @@ var Tag = function Tag(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: tagStyle.closeIcon,
       onClick: handleClose,
+      onMouseDown: onMouseDown,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
         className: tagStyle.closeIconWrapper,
         children: icons_config.tag.Close
@@ -40449,10 +40478,6 @@ var More = function More(props) {
         className: compressedClassName,
         visible: visible,
         onVisibleChange: setVisible,
-        getPopupContainer: function getPopupContainer() {
-          var _props$morePopoverCon;
-          return (_props$morePopoverCon = props.morePopoverContainer) === null || _props$morePopoverCon === void 0 ? void 0 : _props$morePopoverCon.current;
-        },
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: styles.moreWrapper,
           onClick: function onClick(e) {
@@ -40546,6 +40571,7 @@ var result_Result = function Result(props) {
   var render = useRender();
   var resultRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var prevMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(more);
+  var removeLock = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var showInput = allowOnFilter;
   var mounted = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var styles = props.classes;
@@ -40621,6 +40647,12 @@ var result_Result = function Result(props) {
       })
     }, 'input');
   };
+  var handleCloseMouseDown = function handleCloseMouseDown() {
+    removeLock.current = true;
+    setTimeout(function () {
+      removeLock.current = false;
+    }, 0);
+  };
   var renderResultItem = function renderResultItem(item, index, nodes, v) {
     var handleClose = function handleClose() {
       onRemove === null || onRemove === void 0 || onRemove(item, v);
@@ -40661,6 +40693,7 @@ var result_Result = function Result(props) {
       className: classnames_default()(styles.tag, more === 1 && styles.tagOnly, resultClassName),
       closable: closeable && 'only',
       onClose: closeable && handleClose,
+      onMouseDown: closeable ? handleCloseMouseDown : undefined,
       onClick: handleClick,
       jssStyle: jssStyle,
       inlineStyle: true
@@ -40747,8 +40780,7 @@ var result_Result = function Result(props) {
     compressed: compressed,
     renderCompressed: renderCompressed,
     compressedClassName: compressedClassName,
-    showNum: moreNumber,
-    morePopoverContainer: props.morePopoverContainer
+    showNum: moreNumber
   }, 'more');
   var renderResult = function renderResult() {
     if (empty) {
@@ -40777,6 +40809,7 @@ var result_Result = function Result(props) {
   var handleResetMore = function handleResetMore() {
     if (!compressed) return;
     if (isCompressedBound()) return;
+    if (removeLock.current) return;
     setMore(-1);
     setShouldResetMore(true);
   };
@@ -41302,8 +41335,7 @@ var Cascader = function Cascader(props0) {
         onResultItemClick: handleResultItemClick,
         checkUnMatched: checkUnMatched,
         getDataByValues: getDataByValues,
-        setInputText: setInputText,
-        morePopoverContainer: targetRef
+        setInputText: setInputText
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -49613,7 +49645,7 @@ var useForm = function useForm(props) {
           if (errors.length > 0) {
             var errorFields = [];
             for (var _key in context.errors) {
-              if (context.errors[_key]) {
+              if (context.errors[_key] && context.names.has(_key)) {
                 var _context$errors$_key;
                 errorFields.push({
                   name: _key,
@@ -49929,7 +49961,6 @@ var useForm = function useForm(props) {
       }
       if (validateFieldSet.size === 0 && updateFieldSet.size === 0) {
         context.names.delete(n);
-        delete context.errors[n];
         delete context.defaultValues[n];
       }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
@@ -55740,8 +55771,7 @@ function Select(props0) {
         checkUnMatched: checkUnMatched,
         onRemove: handleRemove,
         classes: styles,
-        setInputText: setInputText,
-        morePopoverContainer: targetRef
+        setInputText: setInputText
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -66244,8 +66274,7 @@ var TreeSelect = function TreeSelect(props0) {
         getDataByValues: getResultByValue,
         onRemove: handleRemove,
         classes: styles,
-        setInputText: setInputText,
-        morePopoverContainer: targetRef
+        setInputText: setInputText
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -70082,7 +70111,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.6'
+  version: '3.6.7-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;