diff --git a/src/helpers/pivot/pivot_presentation.ts b/src/helpers/pivot/pivot_presentation.ts
index 5bd8344f00..a55b83b77d 100644
--- a/src/helpers/pivot/pivot_presentation.ts
+++ b/src/helpers/pivot/pivot_presentation.ts
@@ -48,7 +48,7 @@ type DomainGroups<T> = { [colDomain: string]: { [rowDomain: string]: T } };
  * to all pivots, regardless of the specific pivot implementation.
  * Examples of such features include calculated measures or "Show value as" options.
  */
-export function withPivotPresentationLayer(PivotClass: PivotUIConstructor) {
+export default function (PivotClass: PivotUIConstructor) {
   class PivotPresentationLayer extends PivotClass {
     private getters: Getters;
     private cache: Record<string, FunctionResultObject> = {};
diff --git a/src/plugins/ui_core_views/pivot_ui.ts b/src/plugins/ui_core_views/pivot_ui.ts
index 870468efb6..9b3551a267 100644
--- a/src/plugins/ui_core_views/pivot_ui.ts
+++ b/src/plugins/ui_core_views/pivot_ui.ts
@@ -4,7 +4,7 @@ import {
   getFirstPivotFunction,
   getNumberOfPivotFunctions,
 } from "../../helpers/pivot/pivot_composer_helpers";
-import { withPivotPresentationLayer } from "../../helpers/pivot/pivot_presentation";
+import withPivotPresentationLayer from "../../helpers/pivot/pivot_presentation";
 import { pivotRegistry } from "../../helpers/pivot/pivot_registry";
 import { resetMapValueDimensionDate } from "../../helpers/pivot/spreadsheet_pivot/date_spreadsheet_pivot";
 import { EMPTY_PIVOT_CELL } from "../../helpers/pivot/table_spreadsheet_pivot";
diff --git a/src/types/commands.ts b/src/types/commands.ts
index ab27223360..a0d90183c1 100644
--- a/src/types/commands.ts
+++ b/src/types/commands.ts
@@ -588,7 +588,7 @@ export interface SetDecimalCommand extends TargetDependentCommand {
   step: SetDecimalStep;
 }
 
-interface SetContextualFormatCommand extends TargetDependentCommand {
+export interface SetContextualFormatCommand extends TargetDependentCommand {
   type: "SET_FORMATTING_WITH_PIVOT";
   format: Format;
 }