@lobehub/ui 1.168.2 → 1.168.4

package/es/Hotkey/index.d.ts

@@ -6,7 +6,6 @@ export interface HotkeyProps extends Omit<FlexboxProps, 'children'> {
         kbdClassName?: string;
     };
     compact?: boolean;
-    desc?: string;
     inverseTheme?: boolean;
     isApple?: boolean;
     keys: string;

package/es/Hotkey/index.js

@@ -1,6 +1,6 @@
 'use client';
 
-var _excluded = ["classNames", "styles", "keys", "desc", "inverseTheme", "isApple", "compact", "className", "style"];
+var _excluded = ["classNames", "styles", "keys", "inverseTheme", "isApple", "compact", "className", "style"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -25,7 +25,6 @@ import { useStyles } from "./style";
 import { KeyMap } from "./type";
 import { checkIsAppleDevice, splitKeysByPlus, startCase } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 var mappingKey = function mappingKey(isAppleDevice) {
   var _ref;
   return _ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, KeyMap.Alt, isAppleDevice ? /*#__PURE__*/_jsx(Icon, {
@@ -84,7 +83,6 @@ var Hotkey = /*#__PURE__*/memo(function (_ref2) {
   var classNames = _ref2.classNames,
     styles = _ref2.styles,
     keys = _ref2.keys,
-    desc = _ref2.desc,
     inverseTheme = _ref2.inverseTheme,
     isApple = _ref2.isApple,
     compact = _ref2.compact,
@@ -109,7 +107,7 @@ var Hotkey = /*#__PURE__*/memo(function (_ref2) {
   var mapping = useMemo(function () {
     return mappingKey(isAppleDevice);
   }, [isAppleDevice]);
-  return /*#__PURE__*/_jsxs(Flexbox, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Flexbox, _objectSpread(_objectSpread({
     align: 'center',
     className: cx(s, className),
     gap: 2,
@@ -118,13 +116,7 @@ var Hotkey = /*#__PURE__*/memo(function (_ref2) {
       visibility: visibility
     }, style)
   }, rest), {}, {
-    children: [desc && /*#__PURE__*/_jsx("span", {
-      className: classNames === null || classNames === void 0 ? void 0 : classNames.descClassName,
-      style: _objectSpread({
-        marginRight: 10
-      }, styles === null || styles === void 0 ? void 0 : styles.descStyle),
-      children: desc
-    }), compact ? /*#__PURE__*/_jsx(Flexbox, {
+    children: compact ? /*#__PURE__*/_jsx(Flexbox, {
       align: 'center',
       as: 'kbd',
       className: classNames === null || classNames === void 0 ? void 0 : classNames.descClassName,
@@ -144,7 +136,7 @@ var Hotkey = /*#__PURE__*/memo(function (_ref2) {
         style: styles === null || styles === void 0 ? void 0 : styles.kbdStyle,
         children: (_mapping$key2 = mapping[key]) !== null && _mapping$key2 !== void 0 ? _mapping$key2 : startCase(key)
       }, index);
-    })]
+    })
   }));
 });
 export default Hotkey;

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/es/Tooltip/index.d.ts

@@ -1,5 +1,10 @@
-/// <reference types="react" />
-import { TooltipProps as AntdTooltipProps } from 'antd';
-export type TooltipProps = AntdTooltipProps;
-declare const Tooltip: import("react").NamedExoticComponent<AntdTooltipProps>;
+import { type TooltipProps as AntdTooltipProps } from 'antd';
+import { ReactNode } from 'react';
+import { type HotkeyProps } from "../Hotkey";
+export type TooltipProps = Omit<AntdTooltipProps, 'title'> & {
+    hotkey?: string;
+    hotkeyProps?: Omit<HotkeyProps, 'keys'>;
+    title: ReactNode;
+};
+declare const Tooltip: import("react").NamedExoticComponent<TooltipProps>;
 export default Tooltip;

package/es/Tooltip/index.js

@@ -1,7 +1,7 @@
 'use client';
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["className", "arrow"];
+var _excluded = ["hotkey", "className", "arrow", "title", "hotkeyProps"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -11,12 +11,18 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Tooltip as AntdTooltip } from 'antd';
 import { memo } from 'react';
+import { Flexbox } from 'react-layout-kit';
+import Hotkey from "../Hotkey";
 import { useStyles } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Tooltip = /*#__PURE__*/memo(function (_ref) {
-  var className = _ref.className,
+  var hotkey = _ref.hotkey,
+    className = _ref.className,
     _ref$arrow = _ref.arrow,
     arrow = _ref$arrow === void 0 ? false : _ref$arrow,
+    title = _ref.title,
+    hotkeyProps = _ref.hotkeyProps,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useStyles = useStyles(),
     styles = _useStyles.styles,
@@ -25,7 +31,19 @@ var Tooltip = /*#__PURE__*/memo(function (_ref) {
     arrow: arrow,
     classNames: {
       root: cx(styles.tooltip, className)
-    }
+    },
+    title: hotkey ? /*#__PURE__*/_jsxs(Flexbox, {
+      align: 'center',
+      gap: 8,
+      horizontal: true,
+      justify: 'space-between',
+      children: [/*#__PURE__*/_jsx("span", {
+        children: title
+      }), /*#__PURE__*/_jsx(Hotkey, _objectSpread({
+        inverseTheme: true,
+        keys: hotkey
+      }, hotkeyProps))]
+    }) : title
   }, rest));
 });
 export default Tooltip;

package/package.json

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