@lobehub/ui 1.168.3 → 1.168.4

package/es/HotkeyInput/index.d.ts

@@ -9,6 +9,7 @@ export interface HotkeyInputProps {
     onChange?: (value: string) => void;
     onConflict?: (conflictKey: string) => void;
     placeholder?: string;
+    resetValue?: string;
     style?: CSSProperties;
     texts?: {
         conflicts?: string;

package/es/HotkeyInput/index.js

@@ -32,6 +32,7 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
     value = _ref$value === void 0 ? '' : _ref$value,
     _ref$defaultValue = _ref.defaultValue,
     defaultValue = _ref$defaultValue === void 0 ? '' : _ref$defaultValue,
+    resetValue = _ref.resetValue,
     onChange = _ref.onChange,
     onConflict = _ref.onConflict,
     _ref$placeholder = _ref.placeholder,
@@ -79,6 +80,7 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
     stop = _useRecordHotkeys2$.stop,
     isRecording = _useRecordHotkeys2$.isRecording,
     resetKeys = _useRecordHotkeys2$.resetKeys;
+  var oldValue = resetValue || defaultValue;
   useHotkeys('*', function () {
     var _inputRef$current;
     (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.blur();
@@ -145,7 +147,9 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
 
   // 检查快捷键冲突
   var checkHotkeyConflict = useCallback(function (newHotkey) {
-    return hotkeyConflicts.some(function (conflictKey) {
+    return hotkeyConflicts.filter(function (conflictKey) {
+      return conflictKey !== oldValue;
+    }).some(function (conflictKey) {
       var newKeys = splitKeysByPlus(newHotkey);
       var conflictKeys = splitKeysByPlus(conflictKey);
       return isEqual(newKeys.sort(), conflictKeys.sort());
@@ -193,7 +197,7 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
   var handleReset = function handleReset(e) {
     e.preventDefault();
     e.stopPropagation();
-    onChange === null || onChange === void 0 || onChange(defaultValue);
+    onChange === null || onChange === void 0 || onChange(oldValue);
     resetKeys();
     setHasConflict(false);
     setHasInvalidCombination(false);
@@ -239,7 +243,7 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
         style: {
           pointerEvents: 'none'
         }
-      }), allowReset && value && value !== defaultValue && !disabled && /*#__PURE__*/_jsx(ActionIcon, {
+      }), allowReset && value && value !== oldValue && !disabled && /*#__PURE__*/_jsx(ActionIcon, {
         active: true,
         icon: Undo2Icon,
         onClick: handleReset,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/ui",
-  "version": "1.168.3",
+  "version": "1.168.4",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",