dtable-ui-component 7.0.7 → 7.0.9-beta.1

package/lib/AsyncUserSelect/index.css

@@ -29,15 +29,10 @@
   height: 12px;
 }
 
-.dtable-ui-user-select-popover {
-  z-index: 1060;
-  width: 385px !important;
+.dtable-ui-user-select-popover .popover {
+  width: 385px;
   max-width: 385px;
   margin-top: -4px;
-  background-color: var(--bs-popover-bg);
-  box-shadow: var(--bs-border-secondary-shadow);
-  border: 1px solid var(--bs-border-secondary-color);
-  border-radius: 4px;
 }
 
 .dtable-ui-user-select-container {
@@ -63,10 +58,6 @@
   border-radius: 4px;
 }
 
-.dtable-ui-user-select-container .dtable-ui-user-list-container .dtable-ui-user-item-container .dtable-ui-user-item {
-  background: none !important;
-}
-
 .dtable-ui-user-select-container .dtable-ui-user-list-container .dtable-ui-user-item-container:hover,
 .dtable-ui-user-select-container .dtable-ui-user-list-container .dtable-ui-user-item-container-highlight {
   background-color: var(--bs-btn-background-hover);

package/lib/AsyncUserSelect/index.js

@@ -8,7 +8,8 @@ exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _ModalPortal = _interopRequireDefault(require("../ModalPortal"));
+var _reactstrap = require("reactstrap");
+var _ClickOutside = _interopRequireDefault(require("../ClickOutside"));
 var _DTableCustomizeSearchInput = _interopRequireDefault(require("../DTableCustomizeSearchInput"));
 var _userItem = _interopRequireDefault(require("./user-item"));
 var _lang = require("../lang");
@@ -56,10 +57,6 @@ const AsyncUserSelect = _ref => {
     _useState10 = (0, _slicedToArray2.default)(_useState1, 2),
     itemHeight = _useState10[0],
     setItemHeight = _useState10[1];
-  const _useState11 = (0, _react.useState)(null),
-    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    popoverPosition = _useState12[0],
-    setPopoverPosition = _useState12[1];
   const selectorRef = (0, _react.useRef)(null);
   const userSelectContainerRef = (0, _react.useRef)(null);
   const userListContainerRef = (0, _react.useRef)(null);
@@ -69,6 +66,12 @@ const AsyncUserSelect = _ref => {
     setSearchValue('');
     setHighlightIndex(-1);
   }, []);
+  const onClickOutside = (0, _react.useCallback)(e => {
+    if (isPopoverOpen && (!selectorRef.current || !selectorRef.current.contains(e.target))) {
+      setIsPopoverOpen(false);
+      clearStatus();
+    }
+  }, [isPopoverOpen, clearStatus]);
   const searchUsers = (0, _react.useCallback)(function () {
     let searchValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     const trimmedSearchValue = (searchValue === null || searchValue === void 0 ? void 0 : searchValue.trim()) || '';
@@ -186,127 +189,106 @@ const AsyncUserSelect = _ref => {
     }
   }, [onEnter, onUpArrow, onDownArrow, onEsc]);
   (0, _react.useEffect)(() => {
-    if (!isPopoverOpen) return;
+    if (userSelectContainerRef.current) {
+      const _userSelectContainerR = userSelectContainerRef.current.getBoundingClientRect(),
+        bottom = _userSelectContainerR.bottom;
+      if (bottom > window.innerHeight) {
+        userSelectContainerRef.current.style.top = "".concat(window.innerHeight - bottom, "px");
+      }
+    }
     if (userListContainerRef.current && userItemContainerRef.current) {
-      const userItemHeight = userItemContainerRef.current.getBoundingClientRect().height;
-      const listMaxHeight = userListContainerRef.current.clientHeight;
+      const userContainerStyle = getComputedStyle(userListContainerRef.current, null);
+      const userItemStyle = getComputedStyle(userItemContainerRef.current, null);
+      const userItemHeight = parseInt(userItemStyle.height);
+      const maxContainerItemNum = Math.floor(parseInt(userContainerStyle.maxHeight) / userItemHeight);
+      setMaxItemNum(maxContainerItemNum);
       setItemHeight(userItemHeight);
-      setMaxItemNum(Math.max(1, Math.floor(listMaxHeight / userItemHeight)));
     }
-  }, [isPopoverOpen, searchedUsers]);
+  }, []);
   (0, _react.useEffect)(() => {
     document.addEventListener('keydown', onHotKey, true);
     return () => {
       document.removeEventListener('keydown', onHotKey, true);
     };
   }, [onHotKey]);
-  (0, _react.useEffect)(() => {
-    if (!isPopoverOpen) return;
-    const isInside = target => {
-      if (!target) return false;
-      if (selectorRef.current && selectorRef.current.contains(target)) return true;
-      if (userSelectContainerRef.current && userSelectContainerRef.current.contains(target)) return true;
-      return false;
-    };
-    const handleDocumentMouseDown = e => {
-      if (isInside(e.target)) return;
-      setIsPopoverOpen(false);
-      clearStatus();
-    };
-    document.addEventListener('mousedown', handleDocumentMouseDown, true);
-    return () => {
-      document.removeEventListener('mousedown', handleDocumentMouseDown, true);
-    };
-  }, [isPopoverOpen, clearStatus]);
-  const getSelectorRect = () => {
-    if (!selectorRef.current) return null;
-    return selectorRef.current.getBoundingClientRect();
-  };
-  (0, _react.useLayoutEffect)(() => {
-    if (!isPopoverOpen) {
-      setPopoverPosition(null);
-      return;
-    }
-    const rect = getSelectorRect();
-    if (!rect) return;
-    setPopoverPosition({
-      position: 'fixed',
-      top: rect.bottom + 8,
-      left: rect.left,
-      width: rect.width
-    });
-  }, [isPopoverOpen, selectedUsers]);
-  const popoverStyle = popoverPosition;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: (0, _classnames.default)('dtable-ui-selected-users-container form-control d-flex align-items-center', className, {
-        'focus': isPopoverOpen
-      }),
-      onClick: onTogglePopover,
-      ref: selectorRef,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "dtable-ui-users-input",
-        children: [selectedUsers.map((user, index) => {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_userItem.default, {
-            user: user,
-            deleteUser: deselectUser
-          }, "dtable-ui-user-selector-selected-user-".concat(index));
-        }), selectedUsers.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "dtable-ui-user-select-placeholder",
-          children: emptyPlaceholder || (0, _lang.getLocale)('Search_users')
-        }), !showDeptBtn && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-          className: "select-dropdown-indicator d-inline-flex align-items-center",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableIcon.default, {
-            symbol: "down",
-            color: "var(--bs-icon-color)"
-          })
-        })]
-      })
-    }), isPopoverOpen && popoverStyle && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ModalPortal.default, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "dtable-ui-user-select-popover dtable-ui-user-select-container",
-        ref: userSelectContainerRef,
-        style: popoverStyle,
-        onMouseDown: e => e.stopPropagation(),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "seatable-select-search",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableCustomizeSearchInput.default, {
-            className: "option-search-control",
-            placeholder: searchPlaceholder || (0, _lang.getLocale)('Search_users'),
-            onChange: onSearchValueChanged,
-            clearValue: () => onSearchValueChanged(''),
-            autoFocus: true,
-            isClearable: true,
-            value: searchValue
-          })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "dtable-ui-user-list-container",
-          ref: userListContainerRef,
-          children: [searchedUsers.length > 0 && searchedUsers.map((user, index) => {
-            return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-              className: (0, _classnames.default)('dtable-ui-user-item-container', {
-                'dtable-ui-user-item-container-highlight': index === highlightIndex
-              }),
-              ref: index === 0 ? userItemContainerRef : null,
-              onClick: () => onUserClick(user),
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_userItem.default, {
-                user: user,
-                enableShowIDInOrgWhenSearchUser: enableShowIDInOrgWhenSearchUser
-              }, "dtable-ui-user-selector-searched-user-".concat(index)), selectedUsers.find(u => u.email === user.email) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                className: "dtable-ui-collaborator-check-icon",
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
-                  className: "dtable-font dtable-icon-check",
-                  "aria-hidden": "true"
-                })
-              })]
-            }, user.email);
-          }), searchedUsers.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "no-user-search-result",
-            children: searchValue ? (0, _lang.getLocale)('User_not_found') : (0, _lang.getLocale)('Enter_characters_to_start_searching')
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ClickOutside.default, {
+    onClickOutside: onClickOutside,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: (0, _classnames.default)('dtable-ui-selected-users-container form-control d-flex align-items-center', className, {
+          'focus': isPopoverOpen
+        }),
+        onClick: onTogglePopover,
+        ref: selectorRef,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "dtable-ui-users-input",
+          children: [selectedUsers.map((user, index) => {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_userItem.default, {
+              user: user,
+              deleteUser: deselectUser
+            }, "dtable-ui-user-selector-selected-user-".concat(index));
+          }), selectedUsers.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "dtable-ui-user-select-placeholder",
+            children: emptyPlaceholder || (0, _lang.getLocale)('Search_users')
+          }), !showDeptBtn && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            className: "select-dropdown-indicator d-inline-flex align-items-center",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableIcon.default, {
+              symbol: "down",
+              color: "var(--bs-icon-color)"
+            })
+          })]
+        })
+      }), selectorRef.current && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.Popover, {
+        placement: "bottom-start",
+        isOpen: isPopoverOpen,
+        target: selectorRef.current,
+        hideArrow: true,
+        fade: false,
+        className: "dtable-ui-user-select-popover",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "dtable-ui-user-select-container",
+          ref: userSelectContainerRef,
+          onMouseDown: e => e.stopPropagation(),
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "seatable-select-search",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableCustomizeSearchInput.default, {
+              className: "option-search-control",
+              placeholder: searchPlaceholder || (0, _lang.getLocale)('Search_users'),
+              onChange: onSearchValueChanged,
+              clearValue: () => onSearchValueChanged(''),
+              autoFocus: true,
+              isClearable: true,
+              value: searchValue
+            })
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            className: "dtable-ui-user-list-container",
+            ref: userListContainerRef,
+            children: [searchedUsers.length > 0 && searchedUsers.map((user, index) => {
+              return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+                className: (0, _classnames.default)('dtable-ui-user-item-container', {
+                  'dtable-ui-user-item-container-highlight': index === highlightIndex
+                }),
+                ref: userItemContainerRef,
+                onClick: () => onUserClick(user),
+                children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_userItem.default, {
+                  user: user,
+                  enableShowIDInOrgWhenSearchUser: enableShowIDInOrgWhenSearchUser
+                }, "dtable-ui-user-selector-searched-user-".concat(index)), selectedUsers.find(u => u.email === user.email) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+                  className: "dtable-ui-collaborator-check-icon",
+                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+                    className: "dtable-font dtable-icon-check",
+                    "aria-hidden": "true"
+                  })
+                })]
+              }, user.email);
+            }), searchedUsers.length === 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+              className: "no-user-search-result",
+              children: searchValue ? (0, _lang.getLocale)('User_not_found') : (0, _lang.getLocale)('Enter_characters_to_start_searching')
+            })]
           })]
-        })]
-      })
-    })]
+        })
+      })]
+    })
   });
 };
 var _default = exports.default = AsyncUserSelect;

package/lib/DTableToolTip/index.css

@@ -10,11 +10,11 @@
 .dtable-tooltip .tooltip .tooltip-inner {
   width: fit-content;
   max-width: 242px;
-  font-size: 14px;
+  font-size: 12px;
   text-align: start;
   background-color: var(--bs-body-color);
   color: var(--bs-body-bg);
-  border-radius: 4px;
+  border-radius: 8px;
   padding: 4px 8px;
   line-height: 20px;
   font-weight: normal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "7.0.7",
+  "version": "7.0.9-beta.1",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "5.0.9",
@@ -112,7 +112,7 @@
     "less-loader": "^11.1.3",
     "mini-css-extract-plugin": "^2.4.5",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.5.12",
+    "postcss": "^8.5.23",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^6.2.1",
     "postcss-normalize": "^10.0.1",
@@ -136,7 +136,7 @@
     "terser-webpack-plugin": "^5.2.5",
     "url-loader": "^4.1.1",
     "webpack": "^5.105.4",
-    "webpack-dev-server": "^5.2.5",
+    "webpack-dev-server": "^5.2.6",
     "worker-loader": "3.0.8"
   }
 }