Merge branch 'master' of github.com:wangdicoder/tiny-design

wangdicoder · wangdicoder · commit 8f5e2060219e · 2026-04-09T19:36:21.000+10:00
diff --git a/.changeset/feat-select-scroll-to-selected.md b/.changeset/feat-select-scroll-to-selected.md
@@ -0,0 +1,5 @@
+---
+"@tiny-design/react": minor
+---
+
+Add `scrollToSelected` prop to Select component that automatically scrolls the dropdown to the first selected option when opened
diff --git a/packages/react/src/select/__tests__/select.test.tsx b/packages/react/src/select/__tests__/select.test.tsx
@@ -1,4 +1,4 @@
-import { render, fireEvent, screen, waitFor } from '@testing-library/react';
+import { render, fireEvent, screen, waitFor, act } from '@testing-library/react';
 import Select from '../index';
 
 const { Option, OptGroup } = Select;
@@ -7,6 +7,14 @@ const { Option, OptGroup } = Select;
 const getOptions = () => document.querySelectorAll('.ty-select-option');
 
 describe('<Select />', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   it('should match the snapshot', () => {
     const { asFragment } = render(
       <Select>
@@ -157,6 +165,31 @@ describe('<Select />', () => {
     expect(onSearch).toHaveBeenCalledWith('test');
   });
 
+  it('should focus the search input after opening', () => {
+    const { container } = render(
+      <Select showSearch>
+        <Option value="a">Apple</Option>
+        <Option value="b">Banana</Option>
+      </Select>
+    );
+
+    const selector = container.querySelector('.ty-select__selector') as HTMLElement;
+    fireEvent.click(selector);
+
+    act(() => {
+      jest.runAllTimers();
+    });
+
+    const searchInput = container.querySelector('.ty-select__search') as HTMLInputElement;
+    expect(searchInput).toHaveFocus();
+
+    fireEvent.change(searchInput, { target: { value: 'ban' } });
+
+    const options = getOptions();
+    expect(options.length).toBe(1);
+    expect(options[0]).toHaveTextContent('Banana');
+  });
+
   // Keyboard
   it('should navigate with arrow keys and select with Enter', () => {
     const onChange = jest.fn();
@@ -386,6 +419,55 @@ describe('<Select />', () => {
     expect(onSelect).toHaveBeenCalledWith('a');
   });
 
+  // scrollToSelected
+  it('should set scrollTop when dropdown opens with a selected value', () => {
+    const options = Array.from({ length: 50 }, (_, i) => ({
+      value: `opt-${i}`,
+      label: `Option ${i}`,
+    }));
+
+    const { container } = render(<Select options={options} defaultValue="opt-40" />);
+    const selector = container.querySelector('.ty-select__selector') as HTMLElement;
+
+    // Mock offsetTop on selected option before opening
+    const origDescriptor = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'offsetTop');
+    Object.defineProperty(HTMLElement.prototype, 'offsetTop', {
+      configurable: true,
+      get() {
+        if (this.getAttribute?.('aria-selected') === 'true') return 400;
+        return 0;
+      },
+    });
+
+    fireEvent.click(selector);
+    jest.runAllTimers();
+
+    const dropdown = document.querySelector('.ty-select__dropdown') as HTMLElement;
+    expect(dropdown.scrollTop).toBe(400);
+
+    if (origDescriptor) {
+      Object.defineProperty(HTMLElement.prototype, 'offsetTop', origDescriptor);
+    }
+  });
+
+  it('should not scroll when scrollToSelected is false', () => {
+    const options = Array.from({ length: 50 }, (_, i) => ({
+      value: `opt-${i}`,
+      label: `Option ${i}`,
+    }));
+
+    const { container } = render(
+      <Select options={options} defaultValue="opt-40" scrollToSelected={false} />
+    );
+    const selector = container.querySelector('.ty-select__selector') as HTMLElement;
+    fireEvent.click(selector);
+
+    jest.runAllTimers();
+
+    const dropdown = document.querySelector('.ty-select__dropdown') as HTMLElement;
+    expect(dropdown.scrollTop).toBe(0);
+  });
+
   // Custom filter function
   it('should support custom filterOption function', () => {
     const { container } = render(
diff --git a/packages/react/src/select/demo/ScrollToSelected.tsx b/packages/react/src/select/demo/ScrollToSelected.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Select } from '@tiny-design/react';
+
+const options = Array.from({ length: 30 }, (_, i) => ({
+  value: `option-${i + 1}`,
+  label: `Option ${i + 1}`,
+}));
+
+export default function ScrollToSelectedDemo() {
+  return (
+    <div style={{ display: 'flex', gap: 16 }}>
+      <Select
+        style={{ width: 200 }}
+        placeholder="Enabled (default)"
+        defaultValue="option-25"
+        options={options}
+      />
+      <Select
+        style={{ width: 200 }}
+        placeholder="Disabled"
+        defaultValue="option-25"
+        scrollToSelected={false}
+        options={options}
+      />
+    </div>
+  );
+}
diff --git a/packages/react/src/select/index.md b/packages/react/src/select/index.md
@@ -12,6 +12,8 @@ import CustomDemo from './demo/Custom';
 import CustomSource from './demo/Custom.tsx?raw';
 import RenderDemo from './demo/Render';
 import RenderSource from './demo/Render.tsx?raw';
+import ScrollToSelectedDemo from './demo/ScrollToSelected';
+import ScrollToSelectedSource from './demo/ScrollToSelected.tsx?raw';
 
 # Select
 
@@ -61,6 +63,15 @@ Multiple selection mode displays selected items as tags. Set `mode="multiple"` a
 
 <DemoBlock component={MultipleDemo} source={MultipleSource} />
 
+    </Demo>
+    <Demo>
+
+### Scroll to Selected
+
+Automatically scrolls the dropdown to the selected option when opened. Enabled by default, set `scrollToSelected={false}` to disable.
+
+<DemoBlock component={ScrollToSelectedDemo} source={ScrollToSelectedSource} />
+
     </Demo>
   </Column>
   <Column>
@@ -130,6 +141,7 @@ Use `optionRender` to customize dropdown items and `labelRender` to customize th
 | defaultOpen             | Initial open state of dropdown                   | boolean                                                       | false       |
 | open                    | Controlled open state of dropdown                | boolean                                                       | -           |
 | onDropdownVisibleChange | Callback when dropdown open state changes        | (open: boolean) => void                                       | -           |
+| scrollToSelected        | Scroll to selected option when dropdown opens    | boolean                                                       | true        |
 | dropdownStyle           | Style of dropdown menu                           | CSSProperties                                                 | -           |
 | style                   | Style of container                               | CSSProperties                                                 | -           |
 | className               | Class name of container                          | string                                                        | -           |
diff --git a/packages/react/src/select/index.zh_CN.md b/packages/react/src/select/index.zh_CN.md
@@ -12,6 +12,8 @@ import CustomDemo from './demo/Custom';
 import CustomSource from './demo/Custom.tsx?raw';
 import RenderDemo from './demo/Render';
 import RenderSource from './demo/Render.tsx?raw';
+import ScrollToSelectedDemo from './demo/ScrollToSelected';
+import ScrollToSelectedSource from './demo/ScrollToSelected.tsx?raw';
 
 # Select 选择器
 
@@ -61,6 +63,15 @@ Select 组件的基本用法。
 
 <DemoBlock component={MultipleDemo} source={MultipleSource} />
 
+    </Demo>
+    <Demo>
+
+### 滚动到选中项
+
+打开下拉菜单时自动滚动到已选中的选项。默认开启，设置 `scrollToSelected={false}` 可关闭。
+
+<DemoBlock component={ScrollToSelectedDemo} source={ScrollToSelectedSource} />
+
     </Demo>
   </Column>
   <Column>
@@ -130,6 +141,7 @@ Select 组件的基本用法。
 | defaultOpen             | 下拉菜单的初始展开状态                   | boolean                                                       | false       |
 | open                    | 下拉菜单的受控展开状态                   | boolean                                                       | -           |
 | onDropdownVisibleChange | 下拉菜单展开状态变化时的回调             | (open: boolean) => void                                       | -           |
+| scrollToSelected        | 下拉菜单打开时是否滚动到已选中的选项     | boolean                                                       | true        |
 | dropdownStyle           | 下拉菜单的样式                           | CSSProperties                                                 | -           |
 | style                   | 容器的样式对象                           | CSSProperties                                                 | -           |
 | className               | 容器的类名                               | string                                                        | -           |
diff --git a/packages/react/src/select/select.tsx b/packages/react/src/select/select.tsx
@@ -33,6 +33,7 @@ const Select = (props: SelectProps): React.ReactElement => {
     placeholder,
     className,
     children,
+    scrollToSelected = true,
     dropdownStyle,
     ...otherProps
   } = props;
@@ -47,6 +48,18 @@ const Select = (props: SelectProps): React.ReactElement => {
 
   const ref = useRef<HTMLDivElement | null>(null);
   const searchInputRef = useRef<HTMLInputElement | null>(null);
+  const dropdownRef = useCallback(
+    (node: HTMLUListElement | null) => {
+      if (!node || !scrollToSelected) return;
+      requestAnimationFrame(() => {
+        const selectedEl = node.querySelector('[aria-selected="true"]') as HTMLElement | null;
+        if (selectedEl) {
+          node.scrollTop = selectedEl.offsetTop - node.offsetTop;
+        }
+      });
+    },
+    [scrollToSelected]
+  );
   const listboxId = useId();
 
   const configContext = useContext(ConfigContext);
@@ -198,7 +211,6 @@ const Select = (props: SelectProps): React.ReactElement => {
       combo.closeDropdown();
     } else {
       combo.openDropdown();
-      setTimeout(() => searchInputRef.current?.focus(), 0);
     }
   };
 
@@ -244,6 +256,16 @@ const Select = (props: SelectProps): React.ReactElement => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchValue]);
 
+  useEffect(() => {
+    if (!combo.isOpen || !showSearch || disabled) return;
+
+    const frameId = requestAnimationFrame(() => {
+      searchInputRef.current?.focus();
+    });
+
+    return () => cancelAnimationFrame(frameId);
+  }, [combo.isOpen, showSearch, disabled]);
+
   const hasValue = hasSomeValue;
 
   // Context value
@@ -352,6 +374,7 @@ const Select = (props: SelectProps): React.ReactElement => {
     return (
       <SelectContext.Provider value={contextValue}>
         <ul
+          ref={dropdownRef}
           className={`${prefixCls}__dropdown`}
           style={{ minWidth: selectorWidth || undefined, ...dropdownStyle }}
           role="listbox"
diff --git a/packages/react/src/select/types.ts b/packages/react/src/select/types.ts
@@ -52,6 +52,7 @@ export interface SelectProps
   defaultOpen?: boolean;
   open?: boolean;
   onDropdownVisibleChange?: (open: boolean) => void;
+  scrollToSelected?: boolean;
   dropdownStyle?: React.CSSProperties;
   children?: React.ReactNode;
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@tiny-design/react": minor
 +---
++
 +Add `scrollToSelected` prop to Select component that automatically scrolls the dropdown to the first selected option when opened
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ export interface SelectProps`
`52`	`52`	`defaultOpen?: boolean;`
`53`	`53`	`open?: boolean;`
`54`	`54`	`onDropdownVisibleChange?: (open: boolean) => void;`
	`55`	`+ scrollToSelected?: boolean;`
`55`	`56`	`dropdownStyle?: React.CSSProperties;`
`56`	`57`	`children?: React.ReactNode;`
`57`	`58`	`}`