@aloudata/aloudata-design 2.15.2 → 2.15.4

package/dist/AldSelect/BaseSelect.js

@@ -183,12 +183,18 @@ var BaseSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }
     });
   }, [displayMenu, isMultipleMode, onToggleOpen, onOptionSelect]);
+  var onSelectClick = React.useCallback(function (e) {
+    if (disabled) {
+      return;
+    }
+    onClick === null || onClick === void 0 ? void 0 : onClick(e);
+  }, [disabled, onClick]);
   return /*#__PURE__*/React.createElement("div", {
     className: mergedClassName,
     style: _objectSpread(_objectSpread({}, widthStyle), style),
     ref: selectRef,
     id: id,
-    onClick: onClick,
+    onClick: onSelectClick,
     onMouseEnter: function onMouseEnter() {
       setIsHover(true);
     },

package/dist/RenameInput/index.d.ts

@@ -6,11 +6,15 @@ interface IProps {
     className?: string;
     width?: number;
     fontStyle?: CSSProperties;
+    /**
+     * @deprecated 如果要控制编辑态请使用 isEdit
+     */
     focus?: boolean;
+    isEdit?: boolean;
     maxLength?: number;
     distance?: [left: number, right: number];
     validateValue?: (value: string) => boolean;
     readonly?: boolean;
 }
-declare const RenameInput: ({ value: propsValue, onConfirm, className, width, fontStyle, focus, maxLength, validateValue, onError, readonly, }: IProps) => React.JSX.Element;
+declare const RenameInput: ({ value: propsValue, onConfirm, className, width, fontStyle, maxLength, validateValue, onError, readonly, isEdit: propsIsEdit, }: IProps) => React.JSX.Element;
 export default RenameInput;

package/dist/RenameInput/index.js

@@ -13,21 +13,21 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 var defaultWidth = 20;
-var PADDING_WIDTH = 2;
+var PADDING_WIDTH = 4;
 var RenameInput = function RenameInput(_ref) {
   var propsValue = _ref.value,
     onConfirm = _ref.onConfirm,
     className = _ref.className,
     width = _ref.width,
     fontStyle = _ref.fontStyle,
-    _ref$focus = _ref.focus,
-    focus = _ref$focus === void 0 ? false : _ref$focus,
     maxLength = _ref.maxLength,
     validateValue = _ref.validateValue,
     onError = _ref.onError,
     _ref$readonly = _ref.readonly,
-    readonly = _ref$readonly === void 0 ? false : _ref$readonly;
-  var _useState = useState(false),
+    readonly = _ref$readonly === void 0 ? false : _ref$readonly,
+    _ref$isEdit = _ref.isEdit,
+    propsIsEdit = _ref$isEdit === void 0 ? false : _ref$isEdit;
+  var _useState = useState(propsIsEdit),
     _useState2 = _slicedToArray(_useState, 2),
     isEdit = _useState2[0],
     setIsEdit = _useState2[1];
@@ -35,6 +35,9 @@ var RenameInput = function RenameInput(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     value = _useState4[0],
     setValue = _useState4[1];
+  useEffect(function () {
+    setValue(propsValue);
+  }, [propsValue]);
   var divRef = useRef(null);
   var inputRef = useRef(null);
   var handleBlur = useCallback(function () {
@@ -50,10 +53,23 @@ var RenameInput = function RenameInput(_ref) {
     }
   }, [width, value, isEdit]);
   useEffect(function () {
-    if (focus && inputRef.current) {
-      inputRef.current.select();
+    if (isEdit) {
+      setValue(propsValue);
+    }
+  }, [isEdit, propsValue]);
+  useEffect(function () {
+    if (propsIsEdit) {
+      setIsEdit(true);
+      setTimeout(function () {
+        if (inputRef.current) {
+          inputRef.current.focus();
+          inputRef.current.select();
+        }
+      }, 100);
+    } else {
+      setIsEdit(false);
     }
-  }, [focus]);
+  }, [propsIsEdit]);
   if (isEdit && !readonly) {
     return /*#__PURE__*/React.createElement("div", {
       className: "ald-rename-input"
@@ -76,7 +92,6 @@ var RenameInput = function RenameInput(_ref) {
         }
         setIsEdit(false);
       },
-      autoFocus: focus,
       onFocus: function onFocus() {
         var _inputRef$current2;
         (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.select();
@@ -104,12 +119,12 @@ var RenameInput = function RenameInput(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, 'ald-rename-input-text'),
     style: fontStyle,
-    onMouseEnter: function onMouseEnter() {
+    onMouseMove: function onMouseMove() {
       setIsEdit(true);
+      setValue(propsValue);
     },
     onClick: function onClick() {
       var _inputRef$current6;
-      setValue(propsValue);
       (_inputRef$current6 = inputRef.current) === null || _inputRef$current6 === void 0 ? void 0 : _inputRef$current6.select();
     }
   }, propsValue);

package/dist/RenameInput/style/index.less

@@ -16,11 +16,14 @@
   align-items: center;
   padding: 2px;
   border: 1px solid transparent;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
+    'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
 
 .ald-rename-input-wrapper {
   box-sizing: border-box;
-  height: 24px;
+  height: 22px;
   border: 0;
   padding: 2px;
   font-size: 13px;