@lemon-fe/components 1.4.13 → 1.4.14-alpha.1

package/es/data-grid/index.d.ts

@@ -17,7 +17,7 @@ declare const Editors: {
     Text: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").NumberEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
-    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/popup/index.js

@@ -62,6 +62,7 @@ function Popup(props) {
     open = _useState4[0],
     setOpen = _useState4[1];
   var inputRef = useRef(null);
+  var wrapperRef = useRef(null);
   var closeAction = useRef();
   var shouldModalOpen = openProp !== null && openProp !== void 0 ? openProp : open;
   useEffect(function () {
@@ -75,11 +76,14 @@ function Popup(props) {
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var handleCancel = function handleCancel() {
-    var _inputRef$current;
     setOpen(false);
     onOpenChange === null || onOpenChange === void 0 || onOpenChange(false);
     onCancel === null || onCancel === void 0 || onCancel();
-    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
+    if (inputRef.current !== null) {
+      inputRef.current.focus();
+    } else if (wrapperRef.current !== null) {
+      wrapperRef.current.focus();
+    }
   };
   var handleOpen = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -257,7 +261,9 @@ function Popup(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: prefix('wrapper'),
     onClick: handleOpen,
-    role: "button"
+    role: "button",
+    ref: wrapperRef,
+    tabIndex: -1
   }, trigger), modalElm);
 }
 export default Popup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.13",
+  "version": "1.4.14-alpha.1",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@dnd-kit/core": ">=6.0.0",
-    "@lemon-fe/hooks": "^1.4.0",
+    "@lemon-fe/hooks": "^1.4.14-alpha.1",
     "@lemon-fe/utils": "^1.3.0",
     "ag-grid-community": "29.2.0",
     "ag-grid-enterprise": "29.2.0",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "bdf13cf37730209f309871c203b8206526bcbdaf"
+  "gitHead": "57033c6a96c4e184fb28b629aa7318525fd6bbd3"
 }