dtable-ui-component 7.0.4 → 7.0.5-pal.11

package/lib/AsyncUserSelect/index.css

@@ -29,10 +29,15 @@
   height: 12px;
 }
 
-.dtable-ui-user-select-popover .popover {
+.dtable-ui-user-select-popover {
+  z-index: 1060;
   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 {
@@ -58,6 +63,10 @@
   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 _reactstrap = require("reactstrap");
+var _ModalPortal = _interopRequireDefault(require("../ModalPortal"));
+var _utils = require("../utils/utils");
 var _ClickOutside = _interopRequireDefault(require("../ClickOutside"));
 var _DTableCustomizeSearchInput = _interopRequireDefault(require("../DTableCustomizeSearchInput"));
 var _userItem = _interopRequireDefault(require("./user-item"));
@@ -57,6 +58,10 @@ 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);
@@ -66,12 +71,27 @@ const AsyncUserSelect = _ref => {
     setSearchValue('');
     setHighlightIndex(-1);
   }, []);
+  const isEventInsideComponent = (0, _react.useCallback)(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 onClickOutside = (0, _react.useCallback)(e => {
-    if (isPopoverOpen && (!selectorRef.current || !selectorRef.current.contains(e.target))) {
+    if (isPopoverOpen && !isEventInsideComponent(e.target)) {
+      setIsPopoverOpen(false);
+      clearStatus();
+    }
+  }, [isPopoverOpen, clearStatus, isEventInsideComponent]);
+  const onClickOutsideMenu = (0, _react.useCallback)(event => {
+    if (isPopoverOpen && (0, _utils.getEventClassName)(event).includes('icon-fork-number')) {
+      return;
+    }
+    if (!isEventInsideComponent(event.target)) {
       setIsPopoverOpen(false);
       clearStatus();
     }
-  }, [isPopoverOpen, clearStatus]);
+  }, [isPopoverOpen, clearStatus, isEventInsideComponent]);
   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()) || '';
@@ -189,28 +209,39 @@ const AsyncUserSelect = _ref => {
     }
   }, [onEnter, onUpArrow, onDownArrow, onEsc]);
   (0, _react.useEffect)(() => {
-    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 (!isPopoverOpen) return;
     if (userListContainerRef.current && userItemContainerRef.current) {
-      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);
+      const userItemHeight = userItemContainerRef.current.getBoundingClientRect().height;
+      const listMaxHeight = userListContainerRef.current.clientHeight;
       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]);
+  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.jsx)(_ClickOutside.default, {
     onClickOutside: onClickOutside,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -238,54 +269,52 @@ const AsyncUserSelect = _ref => {
             })
           })]
         })
-      }), 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')
+      }), isPopoverOpen && popoverStyle && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ModalPortal.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ClickOutside.default, {
+          onClickOutside: onClickOutsideMenu,
+          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')
+              })]
             })]
-          })]
+          })
         })
       })]
     })

package/lib/DTableCustomizeSearchInput/index.css

@@ -70,6 +70,6 @@
 
 .dtable-ui-user-select-popover .select-search-control,
 .dtable-popover .select-search-control {
-  border-top-left-radius: 8px;
-  border-top-right-radius: 8px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
 }

package/lib/DTableCustomizeSelect/index.css

@@ -107,10 +107,6 @@
   white-space: nowrap;
 }
 
-.seatable-customize-select .selected-option .multicolor-icon {
-  font-size: 12px;
-}
-
 .seatable-customize-select .multiple-check-icon,
 .seatable-customize-select .header-icon .dtable-font,
 .seatable-option-group .select-label .header-icon .dtable-font {
@@ -125,6 +121,12 @@
   margin-left: 0 !important;
 }
 
+.seatable-customize-select .selected-option .dtable-icon-down3,
+.seatable-customize-select .selected-option .multicolor-icon {
+  color: var(--bs-icon-color) !important;
+  font-size: 12px;
+}
+
 .selector-group-select .selected-option-show .selected-option-item {
   align-items: center;
   border-radius: 4px;

package/lib/DTableSelect/dtable-select-label.css

@@ -13,3 +13,10 @@
   font-size: 12px;
   margin-top: 4px
 }
+
+.seatable-option.option-name {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

package/lib/DTableSelect/utils.js

@@ -214,7 +214,7 @@ const Option = props => {
         whiteSpace: 'pre-line'
       },
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "seatable-option",
+        className: "seatable-option option-name",
         children: label
       }), isSelected && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "dtable-font dtable-icon-check",

package/lib/ImagePreviewerLightbox/index.js

@@ -25,7 +25,11 @@ function ImagePreviewerLightbox(props) {
     dtableUuid = props.dtableUuid,
     deleteImage = props.deleteImage,
     downloadImage = props.downloadImage,
-    onRotateImage = props.onRotateImage;
+    onRotateImage = props.onRotateImage,
+    _props$isShowPreLine = props.isShowPreLine,
+    isShowPreLine = _props$isShowPreLine === void 0 ? true : _props$isShowPreLine,
+    _props$isShowNextLine = props.isShowNextLine,
+    isShowNextLine = _props$isShowNextLine === void 0 ? true : _props$isShowNextLine;
   const imageSrcList = imageItems.map(src => {
     let name = '';
     try {
@@ -111,8 +115,8 @@ function ImagePreviewerLightbox(props) {
     onCloseRequest: props.closeImagePopup,
     onMovePrevRequest: props.moveToPrevImage,
     onMoveNextRequest: props.moveToNextImage,
-    onClickMoveUp: moveToPrevRowImage,
-    onClickMoveDown: moveToNextRowImage,
+    onClickMoveUp: isShowPreLine && moveToPrevRowImage,
+    onClickMoveDown: isShowNextLine && moveToNextRowImage,
     onViewOriginal: props.onViewOriginal,
     onRotateImage: canRotateImage ? deg => {
       onRotateImage(currentImageIndex, deg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "7.0.4",
+  "version": "7.0.5pal.11",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "5.0.9",