test: Update code for test usage

Author: zombieJ

src/Picker.tsx

@@ -25,7 +25,11 @@ import { isEqual } from './utils/dateUtil';
 import getDataOrAriaProps, { toArray } from './utils/miscUtil';
 import PanelContext, { ContextOperationRefProps } from './PanelContext';
 import { PickerMode } from './interface';
-import { getDefaultFormat, getInputSize } from './utils/uiUtil';
+import {
+  getDefaultFormat,
+  getInputSize,
+  elementsContains,
+} from './utils/uiUtil';
 import usePickerInput from './hooks/usePickerInput';
 import useTextValueMapping from './hooks/useTextValueMapping';
 import useMergedState from './hooks/useMergeState';
@@ -274,11 +278,9 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
     triggerOpen,
     forwardKeyDown,
     isClickOutside: target =>
-      !!(
-        panelDivRef.current &&
-        !panelDivRef.current.contains(target as Node) &&
-        inputDivRef.current &&
-        !inputDivRef.current.contains(target as Node)
+      !elementsContains(
+        [panelDivRef.current, inputDivRef.current],
+        target as HTMLElement,
       ),
     onSubmit: () => {
       triggerChange(selectedValue);

src/RangePicker.tsx

@@ -24,7 +24,11 @@ import getDataOrAriaProps, {
   getValue,
   updateValues,
 } from './utils/miscUtil';
-import { getDefaultFormat, getInputSize } from './utils/uiUtil';
+import {
+  getDefaultFormat,
+  getInputSize,
+  elementsContains,
+} from './utils/uiUtil';
 import PanelContext, { ContextOperationRefProps } from './PanelContext';
 import { isEqual, getClosingViewDate, isSameDate } from './utils/dateUtil';
 import useValueTexts from './hooks/useValueTexts';
@@ -520,13 +524,9 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
     forwardKeyDown,
     onBlur,
     isClickOutside: (target: EventTarget | null) =>
-      !!(
-        panelDivRef.current &&
-        !panelDivRef.current.contains(target as Node) &&
-        startInputDivRef.current &&
-        !startInputDivRef.current.contains(target as Node) &&
-        endInputDivRef.current &&
-        !endInputDivRef.current.contains(target as Node)
+      !elementsContains(
+        [panelDivRef.current, startInputDivRef.current, endInputDivRef.current],
+        target as HTMLElement,
       ),
     onFocus: (e: React.FocusEvent<HTMLInputElement>) => {
       setActivePickerIndex(index);

src/panels/YearPanel/YearBody.tsx

@@ -47,6 +47,12 @@ function YearBody<DateType>({
   );
 
   const rows: React.ReactNode[] = [];
+
+  const isInView = (date: DateType) => {
+    const currentYearNumber = generateConfig.getYear(date);
+    return startYear <= currentYearNumber && currentYearNumber <= endYear;
+  };
+
   const getCellClassName = useCellClassName<DateType>({
     cellPrefixCls: yearPrefixCls,
     value,
@@ -55,10 +61,7 @@ function YearBody<DateType>({
     hoverRangedValue,
     isSameCell: (current, target) =>
       isSameYear(generateConfig, current, target),
-    isInView: date => {
-      const currentYearNumber = generateConfig.getYear(date);
-      return startYear <= currentYearNumber && currentYearNumber <= endYear;
-    },
+    isInView,
     offsetCell: (date, offset) => generateConfig.addYear(date, offset),
   });
 

src/utils/uiUtil.ts

@@ -215,3 +215,10 @@ export const PickerModeMap: Record<
   time: null,
   date: null,
 };
+
+export function elementsContains(
+  elements: (HTMLElement | undefined | null)[],
+  target: HTMLElement,
+) {
+  return elements.some(ele => ele && ele.contains(target));
+}