Fix priority of Timeline initial scroll logic

Author: ethanshar

example/src/screens/timelineCalendar.tsx

@@ -213,6 +213,7 @@ export default class TimelineCalendarScreen extends Component {
           timelineProps={this.timelineProps}
           showNowIndicator
           scrollToNow
+          scrollToFirst
           initialTime={INITIAL_TIME}
         />
       </CalendarProvider>

src/timeline-list/index.tsx

@@ -18,7 +18,11 @@ export interface TimelineListProps {
   /**
    * General timeline props to pass to each timeline item
    */
-  timelineProps?: Omit<TimelineProps, 'events' | 'showNowIndicator' | 'scrollToNow' | 'initialTime'>;
+  timelineProps?: Omit<TimelineProps, 'events' | 'scrollToFirst' | 'showNowIndicator' | 'scrollToNow' | 'initialTime'>;
+  /**
+   * Should scroll to first event of the day
+   */
+  scrollToFirst?: boolean;
   /**
    * Should show now indicator (shown only on "today" timeline)
    */
@@ -34,7 +38,7 @@ export interface TimelineListProps {
 }
 
 const TimelineList = (props: TimelineListProps) => {
-  const {timelineProps, events, showNowIndicator, scrollToNow, initialTime} = props;
+  const {timelineProps, events, showNowIndicator, scrollToFirst, scrollToNow, initialTime} = props;
   const {date, updateSource, setDate} = useContext(Context);
   const listRef = useRef<any>();
   const prevDate = useRef(date);
@@ -103,9 +107,9 @@ const TimelineList = (props: TimelineListProps) => {
             key={item}
             date={item}
             events={timelineEvent}
-            scrollToFirst={false}
             scrollToNow={_isToday && isInitialPage && scrollToNow}
             initialTime={!_isToday && isInitialPage ? initialTime : undefined}
+            scrollToFirst={!_isToday && isInitialPage && scrollToFirst}
             scrollOffset={isCurrent ? undefined : timelineOffset}
             onChangeOffset={onTimelineOffsetChange}
             showNowIndicator={_isToday && showNowIndicator}

src/timeline/Timeline.tsx

@@ -119,10 +119,10 @@ const Timeline = (props: TimelineProps) => {
 
   useEffect(() => {
     let initialPosition = 0;
-    if (scrollToFirst) {
-      initialPosition = min(map(packedEvents, 'top')) ?? 0;
-    } else if (scrollToNow) {
+    if (scrollToNow) {
       initialPosition = calcNowOffset(HOUR_BLOCK_HEIGHT);
+    } else if (scrollToFirst && packedEvents.length > 0) {
+      initialPosition = min(map(packedEvents, 'top')) ?? 0;
     } else if (initialTime) {
       initialPosition = calcNowOffset(HOUR_BLOCK_HEIGHT, initialTime.hour, initialTime.minutes);
     }