dtable-ui-component 6.0.119 → 6.0.120-xms.21

package/lib/DTableDropdownItem/index.js

@@ -78,6 +78,12 @@ const DTableDropdownItem = _ref => {
     }), tooltip && id && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableToolTip.default, {
       target: id,
       placement: "right",
+      modifiers: [{
+        name: 'offset',
+        options: {
+          offset: [0, 8]
+        }
+      }],
       children: tooltip
     })]
   }));

package/lib/DTableModalHeader/index.js

@@ -10,6 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _reactstrap = require("reactstrap");
 var _IconButton = _interopRequireDefault(require("../IconButton"));
+var _lang = require("../lang");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["children"];
@@ -26,7 +27,10 @@ const DTableModalHeader = _ref => {
     onClick: props.toggle,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
       icon: "x",
-      className: "dtable-modal-close-inner"
+      className: "dtable-modal-close-inner",
+      id: "seatable-modal-x",
+      tooltip: (0, _lang.getLocale)('Close'),
+      title: (0, _lang.getLocale)('Close')
     })
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.ModalHeader, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {

package/lib/DTableToolTip/index.js

@@ -16,7 +16,8 @@ const DTableToolTip = _ref => {
     placement = 'bottom',
     className,
     children,
-    shortcut
+    shortcut,
+    modifiers
   } = _ref;
   const hasShortcut = Boolean(shortcut);
   const renderContent = () => {
@@ -58,7 +59,7 @@ const DTableToolTip = _ref => {
       options: {
         boundariesElement: 'window'
       }
-    }]
+    }, ...(modifiers || [])]
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactstrap.UncontrolledTooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, tooltipProps), {}, {
     children: renderContent()

package/lib/IconButton/index.js

@@ -9,25 +9,52 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _DTableToolTip = _interopRequireDefault(require("../DTableToolTip"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["disabled", "className", "icon", "children"];
+const _excluded = ["disabled", "className", "id", "icon", "title", "placement", "tooltip", "children", "style", "onClick", "size"];
 const IconButton = _ref => {
   let {
       disabled,
       className,
+      id,
       icon,
-      children
+      title,
+      placement,
+      tooltip,
+      children,
+      style,
+      onClick,
+      size
     } = _ref,
-    otherProperties = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    others = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  const iconFontSize = size === 'sm' ? '12px' : size === 'middle' ? '14px' : '16px';
+  const iconStyle = (0, _objectSpread2.default)({
+    fontSize: iconFontSize
+  }, style);
+  const iconWrapper = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: (0, _classnames.default)('seatable-icon-btn', className, {
       'disabled': disabled
-    })
-  }, otherProperties), {}, {
+    }),
+    id: id,
+    style: iconStyle,
+    role: "button",
+    "aria-label": title,
+    onClick: onClick
+  }, others), {}, {
     children: [icon && /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
       className: (0, _classnames.default)('seatable-icon dtable-font', "dtable-icon-".concat(icon)),
       "aria-hidden": "true"
     }), children]
   }));
+  if (tooltip && id) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [iconWrapper, /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableToolTip.default, {
+        target: id,
+        placement: placement,
+        children: tooltip
+      })]
+    });
+  }
+  return iconWrapper;
 };
 var _default = exports.default = IconButton;

package/lib/NotificationPopover/index.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactstrap = require("reactstrap");
 var _IconButton = _interopRequireDefault(require("../IconButton"));
+var _lang = require("../lang");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 class NotificationPopover extends _react.default.Component {
@@ -62,7 +63,10 @@ class NotificationPopover extends _react.default.Component {
           className: "notification-header",
           children: [headerText, /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
             icon: "x",
-            onClick: this.props.onNotificationListToggle
+            onClick: this.props.onNotificationListToggle,
+            id: "notification-popover-x",
+            tooltip: (0, _lang.getLocale)('Close'),
+            title: (0, _lang.getLocale)('Close')
           })]
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "notification-body",

package/lib/RowExpandDialog/header/index.js

@@ -43,13 +43,15 @@ const Header = _ref => {
       children: [copyURL && /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
         icon: "url",
         onClick: () => copyURL(),
-        "aria-label": (0, _lang.getLocale)('Get_URL'),
-        title: (0, _lang.getLocale)('Get_URL')
+        tooltip: (0, _lang.getLocale)('Get_URL'),
+        title: (0, _lang.getLocale)('Get_URL'),
+        id: "row-expand-url"
       }), children, /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
         icon: "x",
         onClick: onToggle,
         title: (0, _lang.getLocale)('Close_expanded_record'),
-        "aria-label": (0, _lang.getLocale)('Close_expanded_record')
+        tooltip: (0, _lang.getLocale)('Close_expanded_record'),
+        id: "row-expand-x"
       })]
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.119",
+  "version": "6.0.120xms.21",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "^5.0.8",