shineout 3.10.1-beta.5 → 3.10.1

package/cjs/index.js

@@ -545,5 +545,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.10.1-beta.5'
+  version: '3.10.1'
 };

package/dist/shineout.js

@@ -8674,7 +8674,8 @@ var defaultConfig = {
   input: {},
   avatar: {},
   direction: 'ltr',
-  popupContainer: null
+  popupContainer: null,
+  popupEsc: true
 };
 var state = createWithHooks(defaultConfig);
 var config_config = snapshot(state.mutate);
@@ -8712,7 +8713,7 @@ var setConfig = function setConfig(option) {
 
 
 
-var _excluded = ["jssStyle", "type", "className", "children", "icon", "iconClassName", "title", "titleStyle", "iconSize", "closable", "hideClose", "bordered", "closeItem", "onClose", "classNames", "styles"];
+var _excluded = ["jssStyle", "type", "className", "children", "icon", "iconClassName", "title", "titleClassName", "titleStyle", "iconSize", "closable", "hideClose", "bordered", "closeItem", "onClose", "classNames", "styles"];
 
 
 
@@ -8736,6 +8737,7 @@ var Alert = function Alert(props) {
     icon = props.icon,
     iconClassName = props.iconClassName,
     title = props.title,
+    titleClassName = props.titleClassName,
     titleStyle = props.titleStyle,
     iconSize = props.iconSize,
     closable = props.closable,
@@ -8815,7 +8817,7 @@ var Alert = function Alert(props) {
   };
   var renderTitle = function renderTitle() {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      className: classnames_default()(alertStyle.title, props.titleClassName, semClass('title')),
+      className: classnames_default()(alertStyle.title, titleClassName, semClass('title')),
       style: objectSpread2_default()(objectSpread2_default()({}, titleStyle), semStyle('title')),
       children: title
     });
@@ -13686,7 +13688,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.10.1-beta.5');
+/* harmony default export */ var version = ('3.10.1');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -32544,7 +32546,8 @@ var usePopup = function usePopup(props) {
     mouseLeaveDelay = props.mouseLeaveDelay,
     targetEvents = props.targetEvents,
     _props$defaultOpen = props.defaultOpen,
-    defaultOpen = _props$defaultOpen === void 0 ? false : _props$defaultOpen;
+    defaultOpen = _props$defaultOpen === void 0 ? false : _props$defaultOpen,
+    esc = props.esc;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(defaultOpen),
     _useState2 = slicedToArray_default()(_useState, 2),
     openState = _useState2[0],
@@ -32705,6 +32708,24 @@ var usePopup = function usePopup(props) {
     effect: (trigger === 'click' || trigger === 'hover') && open,
     event: 'mousedown'
   });
+
+  // ESC 关闭弹出层（仅 click 触发）
+  // 使用 capturing 阶段确保优先于 Modal 的 bubbling 阶段 handler
+  // hover/focus 触发的弹出层不参与 ESC 处理，避免拦截 Modal 等上层组件的 ESC 事件
+  var enableEsc = (esc !== null && esc !== void 0 ? esc : true) && trigger === 'click';
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!open || !enableEsc) return;
+    var handleEsc = function handleEsc(e) {
+      if (e.key === 'Escape' || e.keyCode === 27) {
+        e.stopPropagation();
+        handleBlur();
+      }
+    };
+    document.addEventListener('keydown', handleEsc, true);
+    return function () {
+      document.removeEventListener('keydown', handleEsc, true);
+    };
+  }, [open, enableEsc]);
   var providerValue = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return {
       addParent: handleAddParent,
@@ -34148,7 +34169,8 @@ var Popover = function Popover(props) {
       autoMode: 'popover',
       priorityDirection: priorityDirection,
       mouseEnterDelay: props.mouseEnterDelay,
-      mouseLeaveDelay: props.mouseLeaveDelay
+      mouseLeaveDelay: props.mouseLeaveDelay,
+      esc: config.popupEsc
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -36589,7 +36611,7 @@ var spin_Spin = function Spin() {
 
 
 
-var button_excluded = ["jssStyle", "className", "style", "children", "loading", "href", "text", "outline", "shape", "size", "type", "space", "target", "mode", "htmlType", "renderLoading"],
+var button_excluded = ["jssStyle", "className", "classNames", "styles", "style", "children", "loading", "href", "text", "outline", "shape", "size", "type", "space", "target", "mode", "htmlType", "renderLoading"],
   button_excluded2 = ["htmlType", "onRef"];
 
 
@@ -36606,6 +36628,8 @@ var Button = function Button(props) {
   var _jssStyle$button, _React$Children$map;
   var jssStyle = props.jssStyle,
     className = props.className,
+    classNamesProp = props.classNames,
+    stylesProp = props.styles,
     style = props.style,
     children = props.children,
     loading = props.loading,
@@ -36649,7 +36673,7 @@ var Button = function Button(props) {
     disabled: !!disabled,
     loading: !!loading
   };
-  var _useSemantic = useSemantic(props.classNames, props.styles, globalSemanticConfig, semInfo),
+  var _useSemantic = useSemantic(classNamesProp, stylesProp, globalSemanticConfig, semInfo),
     _useSemantic2 = slicedToArray_default()(_useSemantic, 2),
     semClass = _useSemantic2[0],
     semStyle = _useSemantic2[1];
@@ -44808,7 +44832,8 @@ var Cascader = function Cascader(props0) {
       onCollapse: onCollapse,
       disabled: false,
       trigger: 'click',
-      position: getRTLPosition(positionProp, direction === 'rtl')
+      position: getRTLPosition(positionProp, direction === 'rtl'),
+      esc: config.popupEsc
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -51001,7 +51026,8 @@ var DatePicker = function DatePicker(props0) {
       onCollapse: onCollapse,
       disabled: disabledStatus === 'all',
       trigger: 'click',
-      position: getRTLPosition(listPosition, direction === 'rtl')
+      position: getRTLPosition(listPosition, direction === 'rtl'),
+      esc: config.popupEsc
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -52767,7 +52793,8 @@ var Dropdown = function Dropdown(props) {
       position: getRTLPosition(props.position || dfp, isRtl),
       autoMode: 'menu',
       priorityDirection: 'vertical',
-      mouseLeaveDelay: 200
+      mouseLeaveDelay: 200,
+      esc: config.popupEsc
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -60736,7 +60763,8 @@ function Select(props0) {
       onCollapse: onCollapse,
       disabled: false,
       trigger: trigger,
-      position: getRTLPosition(positionProp, direction === 'rtl')
+      position: getRTLPosition(positionProp, direction === 'rtl'),
+      esc: config.popupEsc
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -73647,7 +73675,8 @@ var TreeSelect = function TreeSelect(props0) {
       onCollapse: onCollapse,
       disabled: false,
       trigger: 'click',
-      position: getRTLPosition(positionProp, direction === 'rtl')
+      position: getRTLPosition(positionProp, direction === 'rtl'),
+      esc: config.popupEsc
     }),
     open = _usePopup.open,
     position = _usePopup.position,
@@ -79938,7 +79967,7 @@ var watermark_interface = __webpack_require__(6640);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.10.1-beta.5'
+  version: '3.10.1'
 });
 }();
 /******/ 	return __webpack_exports__;