x-ui-design 0.8.62 → 0.8.64

package/dist/index.esm.js

@@ -3367,7 +3367,7 @@ const TimePicker = ({
   const [innerValue, setInnerValue] = useState(propValue || defaultValue ? new Date(propValue || defaultValue) : null);
   const [[showHour, showMinutes, showSeconds]] = useState(`${format}`.split(':'));
   const [tempValue, setTempValue] = useState(null);
-  const inputRef = useRef(null);
+  const triggerRef = useRef(null);
   const popupRef = useRef(null);
   const hourRef = useRef(null);
   const minuteRef = useRef(null);
@@ -3378,15 +3378,15 @@ const TimePicker = ({
     popupRef,
     placement,
     isOpen: open,
-    triggerRef: inputRef,
-    getPopupContainer: getPopupContainer?.(inputRef.current)
+    triggerRef: triggerRef,
+    getPopupContainer: getPopupContainer?.(triggerRef.current)
   });
   useEffect(() => {
     setInnerValue(propValue || defaultValue ? new Date(propValue || defaultValue) : null);
   }, [propValue]);
   useEffect(() => {
     const handleClickOutside = e => {
-      if (popupRef.current && !popupRef.current.contains(e.target) && inputRef.current && !inputRef.current.contains(e.target)) {
+      if (popupRef.current && !popupRef.current.contains(e.target) && triggerRef.current && !triggerRef.current.contains(e.target)) {
         setOpen(false);
         setTempValue(null);
         if (!innerValue) {
@@ -3635,7 +3635,7 @@ const TimePicker = ({
     className: `${prefixCls}-input-wrapper`,
     onClick: () => setOpen(true)
   }, /*#__PURE__*/React.createElement("input", {
-    ref: inputRef,
+    ref: triggerRef,
     size: INPUT_SIZE,
     placeholder: placeholder,
     className: `${prefixCls}-input`,
@@ -3662,7 +3662,7 @@ const TimePicker = ({
     }
   }, suffixIcon))), open && /*#__PURE__*/React.createElement(ConditionalWrapper, {
     condition: getPopupContainer !== undefined,
-    wrapper: element => getPopupContainer ? /*#__PURE__*/createPortal(element, getPopupContainer(inputRef.current)) : /*#__PURE__*/React.createElement(React.Fragment, null, element)
+    wrapper: element => getPopupContainer ? /*#__PURE__*/createPortal(element, getPopupContainer(triggerRef.current)) : /*#__PURE__*/React.createElement(React.Fragment, null, element)
   }, /*#__PURE__*/React.createElement("div", {
     ref: popupRef,
     style: dropdownPosition,
@@ -5187,6 +5187,8 @@ const Menu = ({
     });
   }, [openKeysProp, hasInteracted, _triggerSubMenuActionClick]);
   const onItemClick = useCallback((key, domEvent) => {
+    domEvent?.preventDefault();
+    domEvent?.stopPropagation();
     if (!selectable) {
       return;
     }
@@ -5395,8 +5397,7 @@ const Dropdown = ({
   const onTriggerClick = e => {
     e.preventDefault();
     e.stopPropagation();
-    console.log(triggerRef.current, triggers.includes('click'), !open);
-    if (triggerRef.current && triggers.includes('click')) {
+    if (triggers.includes('click') && triggerRef.current && !open && triggerRef.current?.contains(e.target)) {
       setOpenInternal(!open);
     }
   };
@@ -5412,8 +5413,12 @@ const Dropdown = ({
   };
   const popup = /*#__PURE__*/React.createElement(ConditionalWrapper, {
     condition: getPopupContainer !== undefined,
-    wrapper: element => getPopupContainer ? /*#__PURE__*/createPortal(element, getPopupContainer(triggerRef.current)) : /*#__PURE__*/React.createElement(React.Fragment, null, element)
-  }, /*#__PURE__*/React.createElement("div", {
+    wrapper: element => getPopupContainer ? /*#__PURE__*/createPortal(element, getPopupContainer(popupRef.current)) : /*#__PURE__*/React.createElement(React.Fragment, null, element)
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, console.log({
+    zIndex: 10000,
+    ...overlayStyle,
+    ...dropdownPosition
+  }), /*#__PURE__*/React.createElement("div", {
     ref: popupRef,
     className: `${prefixCls}-overlay ${prefixCls}-${placement} ${overlayClassName}`,
     style: {
@@ -5441,11 +5446,7 @@ const Dropdown = ({
     style: {
       padding: 8
     }
-  }, "Empty menu")));
-  console.log({
-    open,
-    popup
-  });
+  }, "Empty menu"))));
   return /*#__PURE__*/React.createElement("div", {
     ref: triggerRef,
     className: className,