Skip to content

added mobile check on the focus after blur event #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2021
Merged

added mobile check on the focus after blur event #611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/generate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import * as React from 'react';
import { useState, useRef, useEffect, useMemo } from 'react';
import KeyCode from 'rc-util/lib/KeyCode';
import isMobile from 'rc-util/lib/isMobile';
import classNames from 'classnames';
import useMergedState from 'rc-util/lib/hooks/useMergedState';
import type { ScrollTo } from 'rc-virtual-list/lib/List';
Expand Down Expand Up @@ -368,12 +369,19 @@ export default function generateSelector<
const mergedShowSearch =
showSearch !== undefined ? showSearch : isMultiple || mode === 'combobox';

// ======================== Mobile ========================
const [mobile, setMobile] = useState(false);
useEffect(() => {
// Only update on the client side
setMobile(isMobile());
}, []);

// ============================== Ref ===============================
const selectorDomRef = useRef<HTMLDivElement>(null);

React.useImperativeHandle(ref, () => ({
focus: selectorRef.current.focus,
blur: selectorRef.current.blur,
focus: selectorRef.current?.focus,
blur: selectorRef.current?.blur,
scrollTo: listRef.current?.scrollTo as ScrollTo,
}));

Expand Down Expand Up @@ -885,8 +893,8 @@ export default function generateSelector<

cancelSetMockFocused();

if (!popupElement.contains(document.activeElement)) {
selectorRef.current.focus();
if (!mobile && !popupElement.contains(document.activeElement)) {
selectorRef.current?.focus();
}
});

Expand Down