diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
index 3de746e316..ed2986f81c 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
@@ -15,13 +15,13 @@ export abstract class ActionData<R = any> {
   get data(): ReadonlyActionData<R> {
     return {
       getInjected: this.getInjected,
+      // `record` / `index` may be signals; always use `data.record` / `data.index`.
       index: isSignal(this.index) ? this.index() : this.index,
       record: isSignal(this.record) ? this.record() : this.record,
     };
   }
 }
 
-
 export type ReadonlyActionData<R = any> = Readonly<{
   getInjected: <T>(
     token: Type<T> | InjectionToken<T>,
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
index 98f74d58aa..0b9a55209a 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
@@ -17,6 +17,7 @@ export abstract class PropData<R = any> {
   get data(): ReadonlyPropData<R> {
     return {
       getInjected: this.getInjected,
+      // `record` / `index` may be signals; always use `data.record` / `data.index`.
       index: isSignal(this.index) ? this.index() : this.index,
       record: isSignal(this.record) ? this.record() : this.record,
     };
@@ -55,7 +56,6 @@ export type PropCallback<T, R = any> = (data: ReadonlyPropData<T>, auxData?: any
 export type PropPredicate<T> = (data?: ReadonlyPropData<T>, auxData?: any) => boolean;
 export type PropDisplayTextResolver<T> = (data?: ReadonlyPropData<T>) => string;
 
-
 export abstract class PropsFactory<C extends Props<any>> {
   protected abstract _ctor: Type<C>;
   private contributorCallbacks: PropContributorCallbacks<InferredPropList<C>> = {};