fix(ui): fix init cascader focus

DevCloudFE · Oct 25, 2022 · c7c155d · c7c155d
1 parent 7175681
commit c7c155d
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/packages/ui/src/components/cascader/List.tsx b/packages/ui/src/components/cascader/List.tsx
@@ -76,12 +76,33 @@ function List<V extends DId, T extends DCascaderItem<V>>(
   const shouldInitFocus = dRoot && isUndefined(dFocusItem);
 
   const handleKeyDown = useEventCallback<ComboboxKeyDownRef>((key) => {
-    if (isFocus || shouldInitFocus) {
-      const focusNode = (node: AbstractTreeNode<V, T> | undefined) => {
-        if (node) {
-          onFocusChange(node);
-        }
-      };
+    const focusNode = (node: AbstractTreeNode<V, T> | undefined) => {
+      if (node) {
+        onFocusChange(node);
+      }
+    };
+    if (shouldInitFocus) {
+      switch (key) {
+        case 'next':
+          focusNode(vsRef.current?.scrollToStart());
+          break;
+
+        case 'prev':
+          focusNode(vsRef.current?.scrollToEnd());
+          break;
+
+        case 'first':
+          focusNode(vsRef.current?.scrollToStart());
+          break;
+
+        case 'last':
+          focusNode(vsRef.current?.scrollToEnd());
+          break;
+
+        default:
+          break;
+      }
+    } else if (isFocus) {
       switch (key) {
         case 'next':
           focusNode(vsRef.current?.scrollToStep(1));