fix: fix bug sometimes scroll to selected item don't work

aliakbarazizi · Jul 17, 2023 · 8b9e21c · 8b9e21c
1 parent b461265
commit 8b9e21c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/components/datepicker/items/Items.tsx b/src/components/datepicker/items/Items.tsx
@@ -93,7 +93,7 @@ export const Items = forwardRef(
  useScrollIntoItemIfNeeded(
  disableAutoScroll !== true &&
  picker !== undefined &&
- picker.isOpen &&
+ (picker.alwaysOpen === true || picker.isOpen) &&
  ['year', 'hour', 'minute'].includes(type),
  type,
  type !== 'day' ? state[type] : undefined,

diff --git a/src/components/datepicker/picker/Picker.tsx b/src/components/datepicker/picker/Picker.tsx
@@ -125,7 +125,7 @@ export const Picker = forwardRef(
  const { state, slot, dispatch } = useDatepickerSlot();
 
  const defaultType = useRef(_defaultType);
- const defaultOpen = useRef(alwaysOpen || _defaultOpen);
+ const defaultOpen = useRef(_defaultOpen);
 
  useEffect(() => {
  dispatch({
@@ -135,10 +135,11 @@ export const Picker = forwardRef(
  nestedLevel: nestedLevel + 1,
  defaultType: defaultType.current,
  defaultOpen: defaultOpen.current,
+ alwaysOpen,
  },
  });
  return () => dispatch({ type: 'unregisterPicker', payload: pickerId });
- }, [dispatch, pickerId, nestedLevel]);
+ }, [dispatch, pickerId, nestedLevel, alwaysOpen]);
 
  const pickerState = state.pickers[pickerId];
 

diff --git a/src/context/context.ts b/src/context/context.ts
@@ -204,6 +204,7 @@ export type DatepickerContextActions =
  nestedLevel: number;
  defaultType?: ItemType['type'];
  defaultOpen: boolean;
+ alwaysOpen?: boolean;
  };
  }
  | {
@@ -217,6 +218,7 @@ export type DatepickerSlot = {
  nestedLevel: number;
  attach: MutableRefObject<HTMLElement | null> | undefined;
  isOpen: boolean;
+ alwaysOpen?: boolean;
  type?: ItemType['type'];
  defaultType?: ItemType['type'];
  };
@@ -430,6 +432,7 @@ export const datePickerReducer = (
  type: payload.defaultType,
  attach: undefined,
  isOpen: payload.defaultOpen,
+ alwaysOpen: payload.alwaysOpen,
  },
  },
  };