Skip to content

Commit 7953d78

Browse files
committed
Merge branch 'copilot/support-multiple-entry-points' of https://github.com/IgniteUI/igniteui-angular into copilot/support-multiple-entry-points
2 parents bd05d02 + b136aba commit 7953d78

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+87
-131
lines changed

projects/igniteui-angular/action-strip/src/action-strip/action-strip.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818

1919

2020
import { ActionStripResourceStringsEN, CloseScrollStrategy, getCurrentResourceStrings, IActionStripResourceStrings, OverlaySettings } from 'igniteui-angular/core';
21-
import { IgxGridActionsBaseDirective } from './grid-actions/grid-actions-base.directive';
21+
import { IgxGridActionsBaseDirective } from '../../../grids/src/grids/grid-actions/grid-actions-base.directive';
2222
import { IgxIconComponent } from 'igniteui-angular/icon';
2323
import { IgxToggleActionDirective } from 'igniteui-angular/directives';
2424
import { IgxRippleDirective } from 'igniteui-angular/directives';
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { NgModule } from '@angular/core';
2-
import { IGX_GRID_ACTION_STRIP_DIRECTIVES } from './public_api';
2+
import { IGX_ACTION_STRIP_DIRECTIVES } from './public_api';
33

44
/**
55
* @hidden
66
* IMPORTANT: The following is NgModule exported for backwards-compatibility before standalone components
77
*/
88
@NgModule({
99
imports: [
10-
...IGX_GRID_ACTION_STRIP_DIRECTIVES
10+
...IGX_ACTION_STRIP_DIRECTIVES
1111
],
1212
exports: [
13-
...IGX_GRID_ACTION_STRIP_DIRECTIVES
13+
...IGX_ACTION_STRIP_DIRECTIVES
1414
],
1515
})
1616
export class IgxActionStripModule { }
Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,10 @@
11
import { IgxActionStripComponent, IgxActionStripMenuItemDirective } from './action-strip.component';
2-
import { IgxGridActionButtonComponent } from './grid-actions/grid-action-button.component';
3-
import { IgxGridActionsBaseDirective } from './grid-actions/grid-actions-base.directive';
4-
import { IgxGridEditingActionsComponent } from './grid-actions/grid-editing-actions.component';
5-
import { IgxGridPinningActionsComponent } from './grid-actions/grid-pinning-actions.component';
62

7-
export { IgxGridActionsBaseDirective } from './grid-actions/grid-actions-base.directive';
8-
export { IgxGridEditingActionsComponent } from './grid-actions/grid-editing-actions.component';
9-
export { IgxGridPinningActionsComponent } from './grid-actions/grid-pinning-actions.component';
103
export { IgxActionStripComponent, IgxActionStripMenuItemDirective } from './action-strip.component';
11-
export { IgxGridActionButtonComponent } from './grid-actions/grid-action-button.component';
4+
export { IgxActionStripToken } from './token';
125

136
/* Action-strip outside of grid directives collection for ease-of-use import in standalone components scenario */
147
export const IGX_ACTION_STRIP_DIRECTIVES = [
158
IgxActionStripComponent,
169
IgxActionStripMenuItemDirective
1710
] as const;
18-
19-
/* Action-strip in grid directives collection for ease-of-use import in standalone components scenario */
20-
export const IGX_GRID_ACTION_STRIP_DIRECTIVES = [
21-
IgxActionStripComponent,
22-
IgxActionStripMenuItemDirective,
23-
IgxGridPinningActionsComponent,
24-
IgxGridEditingActionsComponent,
25-
IgxGridActionsBaseDirective,
26-
IgxGridActionButtonComponent
27-
] as const;

projects/igniteui-angular/chips/src/chips/chip.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ import {
1717
DOCUMENT
1818
} from '@angular/core';
1919
import { IgxDragDirective, IDragBaseEventArgs, IDragStartEventArgs, IDropBaseEventArgs, IDropDroppedEventArgs, IgxDropDirective } from 'igniteui-angular/directives';
20-
import { IBaseEventArgs } from 'igniteui-angular/core';
20+
import { IBaseEventArgs, Size } from 'igniteui-angular/core';
2121
import { ChipResourceStringsEN, IChipResourceStrings } from 'igniteui-angular/core';
2222
import { Subject } from 'rxjs';
2323
import { IgxIconComponent } from 'igniteui-angular/icon';
2424
import { NgClass, NgTemplateOutlet } from '@angular/common';
2525
import { getCurrentResourceStrings } from 'igniteui-angular/core';
26-
import { Size } from '../grids/common/enums';
2726

2827
export const IgxChipTypeVariant = {
2928
PRIMARY: 'primary',
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* @hidden @internal
3+
*
4+
* Enumeration representing the possible predefined size options of the grid.
5+
* - Small: This is the smallest size with 32px row height. Left and Right paddings are 12px. Minimal column width is 56px.
6+
* - Medium: This is the middle size with 40px row height. Left and Right paddings are 16px. Minimal column width is 64px.
7+
* - Large: this is the default Grid size with the lowest intense and row height equal to 50px. Left and Right paddings are 24px. Minimal column width is 80px.
8+
*/
9+
export const Size = {
10+
Small: '1',
11+
Medium: '2',
12+
Large: '3'
13+
} as const;
14+
export type Size = (typeof Size)[keyof typeof Size];

projects/igniteui-angular/core/src/public_api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Core utilities
22
export * from './core/navigation';
33
export * from './core/dates';
4+
export * from './core/enums';
45
export * from './core/utils';
56
export * from './core/types';
67
export * from './core/selection';
@@ -16,7 +17,7 @@ export * from './data-operations/filtering-state.interface';
1617
export * from './data-operations/filtering-strategy';
1718
export { TreeGridFilteringStrategy } from './data-operations/tree-grid-filtering-strategy';
1819
export * from './data-operations/merge-strategy';
19-
export { ExpressionsTreeUtil } from './data-operations/expressions-tree-util';
20+
export * from './data-operations/expressions-tree-util';
2021
export * from './data-operations/groupby-expand-state.interface';
2122
export * from './data-operations/groupby-record.interface';
2223
export * from './data-operations/groupby-state.interface';

projects/igniteui-angular/core/src/services/overlay/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ this.overlay.show(component, overlaySettings);
8282
|verticalStartPoint | VerticalAlignment | Target's starting point |
8383
|openAnimation | AnimationMetadata | AnimationMetadata[] | Animation applied while overlay opens |
8484
|closeAnimation | AnimationMetadata | AnimationMetadata[] | Animation applied while overlay closes |
85-
|minSize | Size | The size up to which element may shrink when shown in elastic position strategy |
85+
|minSize | ElementDimensions | The size up to which element may shrink when shown in elastic position strategy |
8686

8787
###### OverlayCreateSettings extends OverlaySettings
8888

projects/igniteui-angular/core/src/services/overlay/position/IPositionStrategy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PositionSettings, Size, Point } from './../utilities';
1+
import { ElementDimensions, PositionSettings, Point } from './../utilities';
22

33
/**
44
* [Documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/overlay-position)
@@ -23,7 +23,7 @@ export interface IPositionStrategy {
2323
* settings.positionStrategy.position(content, size, document, true);
2424
* ```
2525
*/
26-
position(contentElement: HTMLElement, size?: Size, document?: Document, initialCall?: boolean, target?: Point | HTMLElement): void;
26+
position(contentElement: HTMLElement, size?: ElementDimensions, document?: Document, initialCall?: boolean, target?: Point | HTMLElement): void;
2727

2828
/**
2929
* Clone the strategy instance.

projects/igniteui-angular/core/src/services/overlay/position/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ import {AutoPositionStrategy, GlobalPositionStrategy, ConnectedPositioningStrate
7979
|verticalStartPoint | VerticalAlignment | Target's starting point |
8080
|openAnimation | AnimationReferenceMetadata | Animation applied while overlay opens |
8181
|closeAnimation | AnimationReferenceMetadata | Animation applied while overlay closes |
82-
|minSize | Size | The size up to which element could be reduced |
82+
|minSize | ElementDimensions | The size up to which element could be reduced |

projects/igniteui-angular/core/src/services/overlay/position/base-fit-position-strategy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { ConnectedFit, HorizontalAlignment, Point, PositionSettings, Size, Util, VerticalAlignment } from '../utilities';
1+
import { ConnectedFit, ElementDimensions, HorizontalAlignment, Point, PositionSettings, Util, VerticalAlignment } from '../utilities';
22
import { ConnectedPositioningStrategy } from './connected-positioning-strategy';
33

44
export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrategy {
5-
protected _initialSize: Size;
5+
protected _initialSize: ElementDimensions;
66
protected _initialSettings: PositionSettings;
77

88
/**
@@ -18,7 +18,7 @@ export abstract class BaseFitPositionStrategy extends ConnectedPositioningStrate
1818
* ```
1919
*/
2020
public override position(
21-
contentElement: HTMLElement, size: Size, document?: Document, initialCall?: boolean, target?: Point | HTMLElement): void {
21+
contentElement: HTMLElement, size: ElementDimensions, document?: Document, initialCall?: boolean, target?: Point | HTMLElement): void {
2222
const rects = super.calculateElementRectangles(contentElement, target);
2323
const connectedFit: ConnectedFit = {};
2424
if (initialCall) {

0 commit comments

Comments
 (0)