incyclist-services 1.7.113 → 1.7.115

package/lib/cjs/activities/ride/service.js

@@ -617,49 +617,50 @@ let ActivityRideService = (() => {
                 const avatar = (0, avatars_1.useAvatars)().get(key);
                 return { position, avatar, ...a };
             });
-            if (props.length > maxEntries) {
-                const currentIdx = props.findIndex(a => a.title === 'current');
-                if (currentIdx < maxEntries - 1) {
-                    const deleted = props.splice(maxEntries - 1);
-                    props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                }
-                else if (currentIdx > maxEntries - 1) {
-                    if (currentIdx < props.length - 2) {
-                        const deleted = props.splice(currentIdx + 1);
-                        props.splice(maxEntries - 2, currentIdx - (maxEntries - 2));
-                        props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                    }
-                    else if (currentIdx === props.length - 2) {
-                        props.splice(maxEntries - 2, props.length - maxEntries);
-                    }
-                    else {
-                        const keep = maxEntries - 1;
-                        const cut = props.length - maxEntries;
-                        props.splice(keep, cut);
-                    }
-                }
-                else if (currentIdx === props.length - 2) {
-                    props.splice(maxEntries - 2, props.length - maxEntries);
-                }
-                else if (currentIdx === maxEntries - 1) {
-                    const deleted = props.splice(currentIdx + 1, props.length - currentIdx);
-                    props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                    props.splice(currentIdx - 1, 1);
-                }
-            }
+            const selected = this.selectPrevRidesRows(props, maxEntries);
             let logInfo = '';
             try {
                 const buildLog = (pr) => {
                     const distanceGap = typeof pr.distance === 'object' ? `${pr.distance?.value}${pr.distance?.unit}` : pr.distance;
                     return `${pr.position}:${pr.avatar?.shirt}-${pr.avatar?.helmet}:${pr.title}:${pr.timeGap}:${distanceGap}`;
                 };
-                logInfo = `(${props.length}/${prevRides.length})`
-                    + props.map(buildLog).join(',');
+                logInfo = `(${selected.length}/${prevRides.length})`
+                    + selected.map(buildLog).join(',');
             }
             catch {
             }
             this.logEvent({ message: 'PrevRides', prevRides: logInfo });
-            return props;
+            return selected;
+        }
+        selectPrevRidesRows(props, maxEntries) {
+            if (props.length <= maxEntries)
+                return props;
+            const currentIdx = props.findIndex(a => a.title === 'current');
+            const selectedIdx = new Set();
+            if (maxEntries >= 3) {
+                selectedIdx.add(0);
+                selectedIdx.add(props.length - 1);
+            }
+            if (currentIdx >= 0)
+                selectedIdx.add(currentIdx);
+            let above = currentIdx - 1;
+            let below = currentIdx + 1;
+            let takeAbove = true;
+            while (selectedIdx.size < maxEntries && (above >= 0 || below < props.length)) {
+                const canAbove = above >= 0;
+                const canBelow = below < props.length;
+                const useAbove = canAbove && (takeAbove || !canBelow);
+                if (useAbove) {
+                    selectedIdx.add(above);
+                    above--;
+                }
+                else {
+                    selectedIdx.add(below);
+                    below++;
+                }
+                takeAbove = !takeAbove;
+            }
+            return Array.from(selectedIdx).sort((a, b) => a - b).map(i => props[i]);
         }
         getPrevActivityLog(ai, current) {
             try {

package/lib/cjs/ride/page/service.js

@@ -51,6 +51,7 @@ const DEFAULT_LOAD_INCREMENT = 1;
 const HINTS_WORKOUT_GESTURES_KEY = 'hints.workoutRideGestures';
 const LOAD_INCREMENT_SETTING_KEY = 'preferences.workouts.loadIncrement';
 const CORNER_WIDGET_SETTING_KEY = 'preferences.workouts.rideCornerWidget';
+const DEFAULT_PREV_RIDES_VISIBLE_ROWS = 1;
 let RidePageService = (() => {
     let _classDecorators = [decorators_1.Singleton];
     let _classDescriptor;
@@ -91,6 +92,8 @@ let RidePageService = (() => {
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
+        prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
+        prevRidesMode = 'list';
         gestureHintDismissed = false;
         viewTransition = false;
         constructor() {
@@ -344,7 +347,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props),
+                ...this.buildWorkoutOverlayProps(props, base.prevRides),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -356,7 +359,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props),
+                ...this.buildWorkoutOverlayProps(props, base.prevRides),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver,
@@ -365,8 +368,8 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
-        buildWorkoutOverlayProps(props) {
-            const cornerWidget = this.getCornerWidget();
+        buildWorkoutOverlayProps(props, prevRides) {
+            const cornerWidget = this.getCornerWidget(prevRides);
             if (!this.isWorkoutAttached() || !props?.showWorkout)
                 return { workoutAttached: false, cornerWidget };
             try {
@@ -385,21 +388,32 @@ let RidePageService = (() => {
                 return { workoutAttached: false, cornerWidget };
             }
         }
-        getCornerWidget() {
+        getCornerWidget(prevRides) {
             try {
-                if (!this.isWorkoutAttached())
+                const available = this.getCornerWidgetStates(prevRides);
+                if (available.length <= 1)
                     return undefined;
-                return this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                return available.includes(current) ? current : available[0];
             }
             catch (err) {
                 this.logError(err, 'getCornerWidget');
                 return undefined;
             }
         }
+        getCornerWidgetStates(prevRides) {
+            const states = ['elevation'];
+            if (this.isWorkoutAttached())
+                states.push('workout');
+            if (!!prevRides && prevRides.mode !== 'hidden')
+                states.push('prevRides');
+            return states;
+        }
         onToggleCornerWidget() {
             try {
+                const available = this.getCornerWidgetStates(this.buildPrevRides());
                 const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
-                const next = current === 'elevation' ? 'workout' : 'elevation';
+                const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
                 this.updatePageDisplay();
             }
@@ -407,6 +421,30 @@ let RidePageService = (() => {
                 this.logError(err, 'onToggleCornerWidget');
             }
         }
+        onExpandPrevRides() {
+            this.setPrevRidesMode('list');
+        }
+        onCollapsePrevRides() {
+            this.setPrevRidesMode('condensed');
+        }
+        setPrevRidesVisibleRows(n) {
+            try {
+                this.prevRidesVisibleRows = n;
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'setPrevRidesVisibleRows');
+            }
+        }
+        setPrevRidesMode(mode) {
+            try {
+                this.prevRidesMode = mode;
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'setPrevRidesMode');
+            }
+        }
         async checkSecretValidity() {
             if (this.getBindings().appInfo?.getChannel() === 'mobile') {
                 const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
@@ -794,7 +832,46 @@ let RidePageService = (() => {
                 startGateProps: this.startGateProps,
                 gestureHint: this.buildGestureHint(startOverlayProps === null),
                 loadIncrement: this.getLoadIncrement(),
-                loadButtonMode: this.getLoadButtonMode()
+                loadButtonMode: this.getLoadButtonMode(),
+                prevRides: this.buildPrevRides()
+            };
+        }
+        buildPrevRides() {
+            try {
+                const rows = this.getActivityRide().getPrevRidesListDisplay(this.prevRidesVisibleRows) ?? [];
+                if (rows.length === 0)
+                    return { mode: 'hidden', rows: [], hasMore: false };
+                const hasMore = (rows.at(-1)?.position ?? rows.length) > rows.length;
+                return {
+                    mode: this.prevRidesMode,
+                    rows: rows.map(row => this.mapPrevRidesRow(row)),
+                    hasMore
+                };
+            }
+            catch (err) {
+                this.logError(err, 'buildPrevRides');
+                return { mode: 'hidden', rows: [], hasMore: false };
+            }
+        }
+        mapPrevRidesRow(row) {
+            const isCurrent = row.title === 'current';
+            const speed = typeof row.speed === 'object' ? row.speed?.value : row.speed;
+            const distanceGap = typeof row.distanceGap === 'object'
+                ? `${row.distanceGap.value}${row.distanceGap.unit}`
+                : row.distanceGap;
+            return {
+                position: row.position ?? 0,
+                label: isCurrent ? 'You' : row.title,
+                timeGap: row.timeGap,
+                distanceGap,
+                isCurrent,
+                avatar: row.avatar,
+                speed,
+                power: row.power,
+                heartrate: row.heartrate,
+                lat: row.lat,
+                lng: row.lng,
+                tsStart: row.tsStart
             };
         }
         onDisplayStateUpdate(state) {

package/lib/esm/activities/ride/service.js

@@ -611,49 +611,50 @@ let ActivityRideService = (() => {
                 const avatar = useAvatars().get(key);
                 return { position, avatar, ...a };
             });
-            if (props.length > maxEntries) {
-                const currentIdx = props.findIndex(a => a.title === 'current');
-                if (currentIdx < maxEntries - 1) {
-                    const deleted = props.splice(maxEntries - 1);
-                    props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                }
-                else if (currentIdx > maxEntries - 1) {
-                    if (currentIdx < props.length - 2) {
-                        const deleted = props.splice(currentIdx + 1);
-                        props.splice(maxEntries - 2, currentIdx - (maxEntries - 2));
-                        props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                    }
-                    else if (currentIdx === props.length - 2) {
-                        props.splice(maxEntries - 2, props.length - maxEntries);
-                    }
-                    else {
-                        const keep = maxEntries - 1;
-                        const cut = props.length - maxEntries;
-                        props.splice(keep, cut);
-                    }
-                }
-                else if (currentIdx === props.length - 2) {
-                    props.splice(maxEntries - 2, props.length - maxEntries);
-                }
-                else if (currentIdx === maxEntries - 1) {
-                    const deleted = props.splice(currentIdx + 1, props.length - currentIdx);
-                    props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                    props.splice(currentIdx - 1, 1);
-                }
-            }
+            const selected = this.selectPrevRidesRows(props, maxEntries);
             let logInfo = '';
             try {
                 const buildLog = (pr) => {
                     const distanceGap = typeof pr.distance === 'object' ? `${pr.distance?.value}${pr.distance?.unit}` : pr.distance;
                     return `${pr.position}:${pr.avatar?.shirt}-${pr.avatar?.helmet}:${pr.title}:${pr.timeGap}:${distanceGap}`;
                 };
-                logInfo = `(${props.length}/${prevRides.length})`
-                    + props.map(buildLog).join(',');
+                logInfo = `(${selected.length}/${prevRides.length})`
+                    + selected.map(buildLog).join(',');
             }
             catch {
             }
             this.logEvent({ message: 'PrevRides', prevRides: logInfo });
-            return props;
+            return selected;
+        }
+        selectPrevRidesRows(props, maxEntries) {
+            if (props.length <= maxEntries)
+                return props;
+            const currentIdx = props.findIndex(a => a.title === 'current');
+            const selectedIdx = new Set();
+            if (maxEntries >= 3) {
+                selectedIdx.add(0);
+                selectedIdx.add(props.length - 1);
+            }
+            if (currentIdx >= 0)
+                selectedIdx.add(currentIdx);
+            let above = currentIdx - 1;
+            let below = currentIdx + 1;
+            let takeAbove = true;
+            while (selectedIdx.size < maxEntries && (above >= 0 || below < props.length)) {
+                const canAbove = above >= 0;
+                const canBelow = below < props.length;
+                const useAbove = canAbove && (takeAbove || !canBelow);
+                if (useAbove) {
+                    selectedIdx.add(above);
+                    above--;
+                }
+                else {
+                    selectedIdx.add(below);
+                    below++;
+                }
+                takeAbove = !takeAbove;
+            }
+            return Array.from(selectedIdx).sort((a, b) => a - b).map(i => props[i]);
         }
         getPrevActivityLog(ai, current) {
             try {

package/lib/esm/ride/page/service.js

@@ -48,6 +48,7 @@ const DEFAULT_LOAD_INCREMENT = 1;
 const HINTS_WORKOUT_GESTURES_KEY = 'hints.workoutRideGestures';
 const LOAD_INCREMENT_SETTING_KEY = 'preferences.workouts.loadIncrement';
 const CORNER_WIDGET_SETTING_KEY = 'preferences.workouts.rideCornerWidget';
+const DEFAULT_PREV_RIDES_VISIBLE_ROWS = 1;
 let RidePageService = (() => {
     let _classDecorators = [Singleton];
     let _classDescriptor;
@@ -88,6 +89,8 @@ let RidePageService = (() => {
         menuProps = null;
         isInitialized = false;
         startGateProps = null;
+        prevRidesVisibleRows = DEFAULT_PREV_RIDES_VISIBLE_ROWS;
+        prevRidesMode = 'list';
         gestureHintDismissed = false;
         viewTransition = false;
         constructor() {
@@ -341,7 +344,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props),
+                ...this.buildWorkoutOverlayProps(props, base.prevRides),
                 video: props.video,
                 videos: props.videos,
                 route: props.route
@@ -353,7 +356,7 @@ let RidePageService = (() => {
             const base = this.buildBaseDisplayProps();
             const displayProps = {
                 ...base,
-                ...this.buildWorkoutOverlayProps(props),
+                ...this.buildWorkoutOverlayProps(props, base.prevRides),
                 rideView: props.rideView,
                 route: props.route,
                 displayObserver: props.displayObserver,
@@ -362,8 +365,8 @@ let RidePageService = (() => {
             };
             return displayProps;
         }
-        buildWorkoutOverlayProps(props) {
-            const cornerWidget = this.getCornerWidget();
+        buildWorkoutOverlayProps(props, prevRides) {
+            const cornerWidget = this.getCornerWidget(prevRides);
             if (!this.isWorkoutAttached() || !props?.showWorkout)
                 return { workoutAttached: false, cornerWidget };
             try {
@@ -382,21 +385,32 @@ let RidePageService = (() => {
                 return { workoutAttached: false, cornerWidget };
             }
         }
-        getCornerWidget() {
+        getCornerWidget(prevRides) {
             try {
-                if (!this.isWorkoutAttached())
+                const available = this.getCornerWidgetStates(prevRides);
+                if (available.length <= 1)
                     return undefined;
-                return this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
+                return available.includes(current) ? current : available[0];
             }
             catch (err) {
                 this.logError(err, 'getCornerWidget');
                 return undefined;
             }
         }
+        getCornerWidgetStates(prevRides) {
+            const states = ['elevation'];
+            if (this.isWorkoutAttached())
+                states.push('workout');
+            if (!!prevRides && prevRides.mode !== 'hidden')
+                states.push('prevRides');
+            return states;
+        }
         onToggleCornerWidget() {
             try {
+                const available = this.getCornerWidgetStates(this.buildPrevRides());
                 const current = this.getUserSettings().get(CORNER_WIDGET_SETTING_KEY, 'elevation');
-                const next = current === 'elevation' ? 'workout' : 'elevation';
+                const next = available[(available.indexOf(current) + 1) % available.length];
                 this.getUserSettings().set(CORNER_WIDGET_SETTING_KEY, next);
                 this.updatePageDisplay();
             }
@@ -404,6 +418,30 @@ let RidePageService = (() => {
                 this.logError(err, 'onToggleCornerWidget');
             }
         }
+        onExpandPrevRides() {
+            this.setPrevRidesMode('list');
+        }
+        onCollapsePrevRides() {
+            this.setPrevRidesMode('condensed');
+        }
+        setPrevRidesVisibleRows(n) {
+            try {
+                this.prevRidesVisibleRows = n;
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'setPrevRidesVisibleRows');
+            }
+        }
+        setPrevRidesMode(mode) {
+            try {
+                this.prevRidesMode = mode;
+                this.updatePageDisplay();
+            }
+            catch (err) {
+                this.logError(err, 'setPrevRidesMode');
+            }
+        }
         async checkSecretValidity() {
             if (this.getBindings().appInfo?.getChannel() === 'mobile') {
                 const secretsStatus = this.getSecretBinding()?.getSecretsStatus?.();
@@ -791,7 +829,46 @@ let RidePageService = (() => {
                 startGateProps: this.startGateProps,
                 gestureHint: this.buildGestureHint(startOverlayProps === null),
                 loadIncrement: this.getLoadIncrement(),
-                loadButtonMode: this.getLoadButtonMode()
+                loadButtonMode: this.getLoadButtonMode(),
+                prevRides: this.buildPrevRides()
+            };
+        }
+        buildPrevRides() {
+            try {
+                const rows = this.getActivityRide().getPrevRidesListDisplay(this.prevRidesVisibleRows) ?? [];
+                if (rows.length === 0)
+                    return { mode: 'hidden', rows: [], hasMore: false };
+                const hasMore = (rows.at(-1)?.position ?? rows.length) > rows.length;
+                return {
+                    mode: this.prevRidesMode,
+                    rows: rows.map(row => this.mapPrevRidesRow(row)),
+                    hasMore
+                };
+            }
+            catch (err) {
+                this.logError(err, 'buildPrevRides');
+                return { mode: 'hidden', rows: [], hasMore: false };
+            }
+        }
+        mapPrevRidesRow(row) {
+            const isCurrent = row.title === 'current';
+            const speed = typeof row.speed === 'object' ? row.speed?.value : row.speed;
+            const distanceGap = typeof row.distanceGap === 'object'
+                ? `${row.distanceGap.value}${row.distanceGap.unit}`
+                : row.distanceGap;
+            return {
+                position: row.position ?? 0,
+                label: isCurrent ? 'You' : row.title,
+                timeGap: row.timeGap,
+                distanceGap,
+                isCurrent,
+                avatar: row.avatar,
+                speed,
+                power: row.power,
+                heartrate: row.heartrate,
+                lat: row.lat,
+                lng: row.lng,
+                tsStart: row.tsStart
             };
         }
         onDisplayStateUpdate(state) {

package/lib/types/activities/ride/service.d.ts

@@ -158,6 +158,7 @@ export declare class ActivityRideService extends IncyclistService {
     onRouteUpdate(points: Array<RoutePoint>): void;
     getPrevRideStats(current: ActivityLogRecord): PastActivityInfo;
     getPrevRidesListDisplay(maxEntries?: number): Array<PrevRidesListDisplayProps>;
+    protected selectPrevRidesRows(props: Array<PrevRidesListDisplayProps>, maxEntries: number): Array<PrevRidesListDisplayProps>;
     protected getPrevActivityLog(ai: ActivityInfo, current: ActivityLogRecord): PastActivityLogEntry | null;
     protected getRecordWithSameOrBiggerTime(logs: any, current: any): any;
     protected calculateDistanceGap(ai: ActivityInfo, res: any, current: any): {

package/lib/types/ride/page/service.d.ts

@@ -1,7 +1,8 @@
 import { IncyclistPageService } from "../../base/pages";
 import { CurrentRideDisplayProps, CurrentRideState, IObserver, RideType } from "../../types";
-import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
+import { AnyRidePageDisplayProps, GPXRidePageDisplayProps, IRidePageService, PrevRidesRowProps, RideMenuProps, RidePageDisplayProps, StartGateProps, VideoRidePageDisplayProps, WorkoutDashboardLine, WorkoutGestureHint, WorkoutGraphActuals, WorkoutGraphPlan, WorkoutRideMenuProps, WorkoutRidePageDisplayProps, WorkoutUpcomingSteps } from "./types";
 import { ISecretBinding } from "../../api/secret";
+import { PrevRidesListDisplayProps } from "../../activities";
 import type { LoadButtonMode, PowerAdjustmentResult, WorkoutDisplayProperties } from "../../workouts/ride/types";
 import type { Workout } from "../../workouts/base/model";
 import type { StepDefinition } from "../../workouts/base/model/types";
@@ -15,6 +16,8 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected menuProps: RideMenuProps | null;
     protected isInitialized: boolean;
     protected startGateProps: StartGateProps | null;
+    protected prevRidesVisibleRows: number;
+    protected prevRidesMode: 'condensed' | 'list';
     protected gestureHintDismissed: boolean;
     protected viewTransition: boolean;
     constructor();
@@ -40,9 +43,14 @@ export declare class RidePageService extends IncyclistPageService implements IRi
     protected getGPXRideDisplayProps(): GPXRidePageDisplayProps;
     protected buildWorkoutOverlayProps(props: CurrentRideDisplayProps & {
         showWorkout?: boolean;
-    }): Partial<RidePageDisplayProps>;
-    protected getCornerWidget(): 'elevation' | 'workout' | undefined;
+    }, prevRides: RidePageDisplayProps['prevRides']): Partial<RidePageDisplayProps>;
+    protected getCornerWidget(prevRides: RidePageDisplayProps['prevRides']): 'elevation' | 'workout' | 'prevRides' | undefined;
+    protected getCornerWidgetStates(prevRides: RidePageDisplayProps['prevRides']): Array<'elevation' | 'workout' | 'prevRides'>;
     onToggleCornerWidget(): void;
+    onExpandPrevRides(): void;
+    onCollapsePrevRides(): void;
+    setPrevRidesVisibleRows(n: number): void;
+    setPrevRidesMode(mode: 'condensed' | 'list'): void;
     protected checkSecretValidity(): Promise<void>;
     protected showStartGate(): void;
     protected hideStartgate(): void;
@@ -99,7 +107,14 @@ export declare class RidePageService extends IncyclistPageService implements IRi
         gestureHint: WorkoutGestureHint;
         loadIncrement: number;
         loadButtonMode: LoadButtonMode;
+        prevRides: {
+            mode: "hidden" | "condensed" | "list";
+            rows: PrevRidesRowProps[];
+            hasMore: boolean;
+        };
     };
+    protected buildPrevRides(): RidePageDisplayProps['prevRides'];
+    protected mapPrevRidesRow(row: PrevRidesListDisplayProps): PrevRidesRowProps;
     protected onDisplayStateUpdate(state: CurrentRideState): void;
     protected updatePageDisplay(): void;
     protected registerHandlers(observer: IObserver | null | undefined, map: Record<string, any>): void;

package/lib/types/ride/page/types.d.ts

@@ -4,6 +4,7 @@ import { IObserver, RideType } from "../../types";
 import { CurrentPosition, CurrentRideState, GPXStartOverlayProps, RideViewType, StartOverlayProps, StreetViewEvent, VideoDisplayProps, VideoStartOverlayProps } from "../types";
 import type { LoadButtonMode, PowerAdjustmentResult } from "../../workouts/ride/types";
 import type { WorkoutGraphPlanBar } from "../../workouts/base/graph/types";
+import type { Avatar } from "../../avatars";
 export interface StartGateProps {
     title: string;
     body: string;
@@ -29,7 +30,26 @@ export interface RidePageDisplayProps {
     loadIncrement?: number;
     workoutAttached?: boolean;
     loadButtonMode?: LoadButtonMode;
-    cornerWidget?: 'elevation' | 'workout';
+    cornerWidget?: 'elevation' | 'workout' | 'prevRides';
+    prevRides?: {
+        mode: 'hidden' | 'condensed' | 'list';
+        rows: PrevRidesRowProps[];
+        hasMore: boolean;
+    };
+}
+export interface PrevRidesRowProps {
+    position: number;
+    label: string;
+    timeGap: string;
+    distanceGap?: string;
+    isCurrent: boolean;
+    avatar?: Avatar;
+    speed?: number;
+    power?: number;
+    heartrate?: number;
+    lat?: number;
+    lng?: number;
+    tsStart?: number;
 }
 export interface VideoRidePageDisplayProps extends RidePageDisplayProps {
     video?: VideoDisplayProps;
@@ -64,6 +84,8 @@ interface RidePageCallbacks {
         dontShowAgain: boolean;
     }): void;
     onToggleCornerWidget(): void;
+    onExpandPrevRides?(): void;
+    onCollapsePrevRides?(): void;
 }
 export interface IRidePageService extends RidePageCallbacks, IPageService {
     initPage(): Promise<RideType | undefined>;
@@ -75,6 +97,8 @@ export interface IRidePageService extends RidePageCallbacks, IPageService {
     adjustLoad(deltaPct: number): PowerAdjustmentResult | undefined;
     getLoadButtonMode(): LoadButtonMode;
     isWorkoutAttached(): boolean;
+    setPrevRidesVisibleRows(n: number): void;
+    setPrevRidesMode(mode: 'condensed' | 'list'): void;
 }
 export interface WorkoutGraphPoint {
     x: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.113",
+  "version": "1.7.115",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },