chore: Use rc-util hooks

Author: zombieJ

package.json

@@ -42,7 +42,7 @@
     "dayjs": "^1.8.18",
     "moment": "^2.24.0",
     "rc-trigger": "^4.0.0-alpha.6",
-    "rc-util": "^4.15.7"
+    "rc-util": "^4.17.0"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.9",

src/Picker.tsx

@@ -15,6 +15,7 @@ import * as React from 'react';
 import classNames from 'classnames';
 import { AlignType } from 'rc-trigger/lib/interface';
 import { warning } from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import PickerPanel, {
   PickerPanelBaseProps,
   PickerPanelDateProps,
@@ -32,7 +33,6 @@ import {
 } from './utils/uiUtil';
 import usePickerInput from './hooks/usePickerInput';
 import useTextValueMapping from './hooks/useTextValueMapping';
-import useMergedState from './hooks/useMergeState';
 import useValueTexts from './hooks/useValueTexts';
 
 export interface PickerRefConfig {
@@ -178,10 +178,9 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
   const inputDivRef = React.useRef<HTMLDivElement>(null);
 
   // Real value
-  const [mergedValue, setInnerValue] = useMergedState({
+  const [mergedValue, setInnerValue] = useMergedState(null, {
     value,
     defaultValue,
-    defaultStateValue: null,
   });
 
   // Selected value
@@ -195,10 +194,9 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
   >(null);
 
   // Open
-  const [mergedOpen, triggerInnerOpen] = useMergedState({
+  const [mergedOpen, triggerInnerOpen] = useMergedState(false, {
     value: open,
     defaultValue: defaultOpen,
-    defaultStateValue: false,
     postState: postOpen => (disabled ? false : postOpen),
     onChange: newOpen => {
       if (onOpenChange) {

src/PickerPanel.tsx

@@ -11,6 +11,7 @@ import * as React from 'react';
 import classNames from 'classnames';
 import KeyCode from 'rc-util/lib/KeyCode';
 import warning from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import TimePanel, { SharedTimeProps } from './panels/TimePanel';
 import DatetimePanel from './panels/DatetimePanel';
 import DatePanel from './panels/DatePanel';
@@ -34,7 +35,6 @@ import { DateRender } from './panels/DatePanel/DateBody';
 import { PickerModeMap } from './utils/uiUtil';
 import { MonthCellRender } from './panels/MonthPanel/MonthBody';
 import RangeContext from './RangeContext';
-import useMergedState from './hooks/useMergeState';
 import getExtraFooter from './utils/getExtraFooter';
 import getRanges from './utils/getRanges';
 
@@ -185,20 +185,18 @@ function PickerPanel<DateType>(props: PickerPanelProps<DateType>) {
   const initRef = React.useRef(true);
 
   // Value
-  const [mergedValue, setInnerValue] = useMergedState({
+  const [mergedValue, setInnerValue] = useMergedState(null, {
     value,
     defaultValue,
-    defaultStateValue: null,
   });
 
   // View date control
   const [viewDate, setInnerViewDate] = useMergedState<
     DateType | null,
     DateType
-  >({
+  >(null, {
     value: pickerValue,
     defaultValue: defaultPickerValue || mergedValue,
-    defaultStateValue: null,
     postState: date => date || generateConfig.getNow(),
   });
 

src/RangePicker.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import warning from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import {
   DisabledTimes,
   PanelMode,
@@ -15,7 +16,6 @@ import {
   PickerRefConfig,
 } from './Picker';
 import { SharedTimeProps } from './panels/TimePanel';
-import useMergedState from './hooks/useMergeState';
 import PickerTrigger from './PickerTrigger';
 import PickerPanel from './PickerPanel';
 import usePickerInput from './hooks/usePickerInput';
@@ -249,12 +249,14 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   }, [disabled]);
 
   // ============================= Value =============================
-  const [mergedValue, setInnerValue] = useMergedState<RangeValue<DateType>>({
-    value,
-    defaultValue,
-    defaultStateValue: null,
-    postState: values => reorderValues(values, generateConfig),
-  });
+  const [mergedValue, setInnerValue] = useMergedState<RangeValue<DateType>>(
+    null,
+    {
+      value,
+      defaultValue,
+      postState: values => reorderValues(values, generateConfig),
+    },
+  );
 
   // =========================== View Date ===========================
   // Config view panel
@@ -266,8 +268,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   });
 
   // ========================= Select Values =========================
-  const [selectedValue, setSelectedValue] = useMergedState({
-    defaultStateValue: mergedValue,
+  const [selectedValue, setSelectedValue] = useMergedState(mergedValue, {
     postState: values => {
       let postValues = values;
       for (let i = 0; i < 2; i += 1) {
@@ -300,10 +301,12 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   };
 
   // ============================= Modes =============================
-  const [mergedModes, setInnerModes] = useMergedState<[PanelMode, PanelMode]>({
-    value: mode,
-    defaultStateValue: [picker, picker],
-  });
+  const [mergedModes, setInnerModes] = useMergedState<[PanelMode, PanelMode]>(
+    [picker, picker],
+    {
+      value: mode,
+    },
+  );
 
   const triggerModesChange = (
     modes: [PanelMode, PanelMode],
@@ -327,10 +330,9 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
   });
 
   // ============================= Open ==============================
-  const [mergedOpen, triggerInnerOpen] = useMergedState({
+  const [mergedOpen, triggerInnerOpen] = useMergedState(false, {
     value: open,
     defaultValue: defaultOpen,
-    defaultStateValue: false,
     postState: postOpen =>
       mergedDisabled[activePickerIndex] ? false : postOpen,
     onChange: newOpen => {