@lobehub/ui 2.0.6 → 2.0.8

package/es/Drawer/Drawer.js

@@ -96,7 +96,6 @@ var Drawer = /*#__PURE__*/memo(function (_ref) {
       style: _objectSpread({
         background: theme.colorBgLayout,
         borderRight: "1px solid ".concat(theme.colorBorderSecondary),
-        height: '100%',
         overflowX: 'hidden',
         overflowY: 'auto'
       }, styles === null || styles === void 0 ? void 0 : styles.sidebar),
@@ -109,7 +108,6 @@ var Drawer = /*#__PURE__*/memo(function (_ref) {
       paddingInline: 16,
       style: _objectSpread({
         background: theme.colorBgContainer,
-        height: '100%',
         overflowX: 'hidden',
         overflowY: 'auto'
       }, styles === null || styles === void 0 ? void 0 : styles.sidebarContent),

package/es/Hotkey/const.d.ts

@@ -6,6 +6,7 @@ export declare const KeyMapEnum: {
     readonly BracketLeft: "bracketleft";
     readonly BracketRight: "bracketright";
     readonly Comma: "comma";
+    readonly Control: "control";
     readonly Ctrl: "ctrl";
     readonly Down: "down";
     readonly Enter: "enter";

package/es/Hotkey/const.js

@@ -10,7 +10,7 @@ export var KeyMapEnum = {
   BracketRight: 'bracketright',
   // ]
   Comma: 'comma',
-  // ,
+  Control: 'control',
   Ctrl: 'ctrl',
   Down: 'down',
   Enter: 'enter',

package/es/Hotkey/utils.d.ts

@@ -1,3 +1,4 @@
+export declare const NORMATIVE_MODIFIER: ("shift" | "alt" | "control" | "ctrl" | "meta" | "mod")[];
 export declare const splitKeysByPlus: (keys: string) => string[];
 export declare const startCase: (str: string) => string;
 export declare const checkIsAppleDevice: (isApple?: boolean) => boolean;

package/es/Hotkey/utils.js

@@ -1,6 +1,25 @@
 import { KeyMapEnum } from "./const";
+
+// https://superuser.com/questions/1238058/key-combination-order
+export var NORMATIVE_MODIFIER = [
+// win: Ctrl ,mac: Control
+KeyMapEnum.Ctrl, KeyMapEnum.Control,
+// win: Alt ,mac: Option
+KeyMapEnum.Alt,
+// win: Shift ,mac: Shift
+KeyMapEnum.Shift,
+//  win: Win ,mac: Command
+KeyMapEnum.Meta, KeyMapEnum.Mod];
+var orderMap = Object.fromEntries(NORMATIVE_MODIFIER.map(function (key, index) {
+  return [key, index];
+}));
 export var splitKeysByPlus = function splitKeysByPlus(keys) {
-  return keys.replaceAll('++', "+".concat(KeyMapEnum.Equal)).split('+');
+  return keys.replaceAll('++', "+".concat(KeyMapEnum.Equal)).split('+').sort(function (x, y) {
+    var _orderMap$x$toLowerCa, _orderMap$y$toLowerCa;
+    var idxX = (_orderMap$x$toLowerCa = orderMap[x.toLowerCase()]) !== null && _orderMap$x$toLowerCa !== void 0 ? _orderMap$x$toLowerCa : orderMap.length;
+    var idxY = (_orderMap$y$toLowerCa = orderMap[y.toLowerCase()]) !== null && _orderMap$y$toLowerCa !== void 0 ? _orderMap$y$toLowerCa : orderMap.length;
+    return idxX - idxY;
+  });
 };
 export var startCase = function startCase(str) {
   return str.replaceAll(/([A-Z])/g, ' $1').replace(/^./, function (s) {

package/es/HotkeyInput/HotkeyInput.js

@@ -22,12 +22,10 @@ import { Flexbox } from 'react-layout-kit';
 import useControlledState from 'use-merge-value';
 import ActionIcon from "../ActionIcon";
 import Hotkey from "../Hotkey";
-import { checkIsAppleDevice, splitKeysByPlus } from "../Hotkey/utils";
+import { NORMATIVE_MODIFIER, checkIsAppleDevice, splitKeysByPlus } from "../Hotkey/utils";
 import { useStyles } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-// 修饰键列表
-var MODIFIER_KEYS = new Set(['alt', 'mod', 'shift', 'meta', 'ctrl', 'control']);
 var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? '' : _ref$value,
@@ -149,7 +147,7 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
         var key = _step.value;
         // 处理不同表示的修饰键
         var normalizedKey = key.toLowerCase();
-        if (MODIFIER_KEYS.has(normalizedKey)) {
+        if (NORMATIVE_MODIFIER.includes(normalizedKey)) {
           // 统一修饰键表示
           if (!isAppleDevice && normalizedKey === 'ctrl' || isAppleDevice && normalizedKey === 'meta') {
             if (!modifiers.includes('mod')) modifiers.push('mod');
@@ -176,12 +174,13 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
 
     // 只允许一个非修饰键，如果有多个，只保留最后一个
     var finalKey = normalKeys.length > 0 ? [normalKeys.at(-1)] : [];
-    var validKeys = [].concat(modifiers, finalKey);
-
-    // 组合必须包含至少一个按键
+    var shortcuts = [modifiers, finalKey];
     return {
-      isValid: validKeys.length > 0,
-      keys: validKeys
+      // 组合必须包含至少一个按键
+      isValid: shortcuts.every(function (k) {
+        return k.length > 0;
+      }),
+      keys: shortcuts.flat()
     };
   }, []);
 
@@ -198,7 +197,7 @@ var HotkeyInput = /*#__PURE__*/memo(function (_ref) {
     }).some(function (conflictKey) {
       var newKeys = splitKeysByPlus(newHotkey);
       var conflictKeys = splitKeysByPlus(conflictKey);
-      return isEqual(newKeys.sort(), conflictKeys.sort());
+      return isEqual(newKeys, conflictKeys);
     });
   }, [hotkeyConflicts]);
 

package/package.json

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