Skip to content

Commit 4b06a1a

Browse files
committed
fix(material/menu): remove deprecated factory functions
Removes factory functions that we had marked as deprecated for v21. These functions aren't necessary since we switched to standalone. BREAKING CHANGE: * `MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER` has been removed.
1 parent dd5abe3 commit 4b06a1a

File tree

5 files changed

+7
-50
lines changed

5 files changed

+7
-50
lines changed

goldens/material/menu/index.api.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ export const MAT_MENU_PANEL: InjectionToken<MatMenuPanel<any>>;
3939
// @public
4040
export const MAT_MENU_SCROLL_STRATEGY: InjectionToken<() => ScrollStrategy>;
4141

42-
// @public @deprecated
43-
export const MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER: {
44-
provide: InjectionToken<() => ScrollStrategy>;
45-
deps: any[];
46-
useFactory: typeof MAT_MENU_SCROLL_STRATEGY_FACTORY;
47-
};
48-
4942
// @public
5043
export class MatContextMenuTrigger extends MatMenuTriggerBase implements OnDestroy {
5144
constructor();

src/material/menu/menu-module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {MatMenu} from './menu';
1414
import {MatMenuItem} from './menu-item';
1515
import {MatMenuContent} from './menu-content';
1616
import {MatMenuTrigger} from './menu-trigger';
17-
import {MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER} from './menu-trigger-base';
1817
import {MatContextMenuTrigger} from './context-menu-trigger';
1918

2019
@NgModule({
@@ -37,6 +36,5 @@ import {MatContextMenuTrigger} from './context-menu-trigger';
3736
MatMenuTrigger,
3837
MatContextMenuTrigger,
3938
],
40-
providers: [MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER],
4139
})
4240
export class MatMenuModule {}

src/material/menu/menu-trigger-base.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,6 @@ export const MAT_MENU_SCROLL_STRATEGY = new InjectionToken<() => ScrollStrategy>
5454
},
5555
);
5656

57-
/**
58-
* @docs-private
59-
* @deprecated No longer used, will be removed.
60-
* @breaking-change 21.0.0
61-
*/
62-
export function MAT_MENU_SCROLL_STRATEGY_FACTORY(_overlay: unknown): () => ScrollStrategy {
63-
const injector = inject(Injector);
64-
return () => createRepositionScrollStrategy(injector);
65-
}
66-
67-
/**
68-
* @docs-private
69-
* @deprecated No longer used, will be removed.
70-
* @breaking-change 21.0.0
71-
*/
72-
export const MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER = {
73-
provide: MAT_MENU_SCROLL_STRATEGY,
74-
deps: [] as any[],
75-
useFactory: MAT_MENU_SCROLL_STRATEGY_FACTORY,
76-
};
77-
7857
/**
7958
* Default top padding of the menu panel.
8059
* @deprecated No longer being used. Will be removed.

src/material/menu/menu.ts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,15 @@ export const MAT_MENU_DEFAULT_OPTIONS = new InjectionToken<MatMenuDefaultOptions
7878
'mat-menu-default-options',
7979
{
8080
providedIn: 'root',
81-
factory: MAT_MENU_DEFAULT_OPTIONS_FACTORY,
81+
factory: () => ({
82+
overlapTrigger: false,
83+
xPosition: 'after',
84+
yPosition: 'below',
85+
backdropClass: 'cdk-overlay-transparent-backdrop',
86+
}),
8287
},
8388
);
8489

85-
/**
86-
* @docs-private
87-
* @deprecated No longer used, will be removed.
88-
* @breaking-change 21.0.0
89-
*/
90-
export function MAT_MENU_DEFAULT_OPTIONS_FACTORY(): MatMenuDefaultOptions {
91-
return {
92-
overlapTrigger: false,
93-
xPosition: 'after',
94-
yPosition: 'below',
95-
backdropClass: 'cdk-overlay-transparent-backdrop',
96-
};
97-
}
98-
9990
/** Name of the enter animation `@keyframes`. */
10091
const ENTER_ANIMATION = '_mat-menu-enter';
10192

src/material/menu/public-api.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ export {MatMenu, MAT_MENU_DEFAULT_OPTIONS, MatMenuDefaultOptions, MenuCloseReaso
1010
export * from './menu-item';
1111
export * from './menu-content';
1212
export {MatMenuTrigger} from './menu-trigger';
13-
export {
14-
MAT_MENU_SCROLL_STRATEGY,
15-
MAT_MENU_SCROLL_STRATEGY_FACTORY_PROVIDER,
16-
MENU_PANEL_TOP_PADDING,
17-
} from './menu-trigger-base';
13+
export {MAT_MENU_SCROLL_STRATEGY, MENU_PANEL_TOP_PADDING} from './menu-trigger-base';
1814
export * from './menu-module';
1915
export * from './menu-positions';
2016
export * from './menu-panel';

0 commit comments

Comments
 (0)