Skip to content

Commit 056163f

Browse files
MKirovaMKirova
authored andcommitted
Merge branch 'mkirova/remove-deprecated-DropPosition' of https://github.com/IgniteUI/igniteui-angular.git
2 parents 873c336 + 31f1192 commit 056163f

15 files changed

+2442
-1068
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ All notable changes for each version of this project will be documented in this
44

55
## 10.1.0
66

7+
### General
8+
- `igxCombo`
9+
- **Behavioral Change** - Change default positioning strategy from `ConnectedPositioningStrategy` to `AutoPositionStrategy`. The [`Auto`](https://www.infragistics.com/products/ignite-ui-angular/angular/components/overlay_position.html#auto) strategy will initially try to show the element like the Connected strategy does. If the element goes out of the viewport Auto will flip the starting point and the direction, i.e. if the direction is 'bottom', it will switch it to 'top' and so on. If after flipping direction the content goes out of the view, auto strategy will revert to initial start point and direction and will push the content into the view. Note after pushing the content it may hide the combo's input.
10+
711
### New Features
12+
- `IgxGridState` directive
13+
- Added support for expansion states, column selection and row pinning.
14+
- Added support for `IgxTreeGrid` and `IgxHierarchicalGrid` (including child grids)
815
- `IgxColumn`
916
- Added `byHeader` parameter to the `autosize` method which specifies if the autosizing should be based only on the header content width.
1017
- `IgxToast`
@@ -47,6 +54,7 @@ All notable changes for each version of this project will be documented in this
4754
- `IgxHierarchicalGrid`
4855
- `onGridInitialized` - New output has been exposed. Emitted after a grid is being initialized for the corresponding row island.
4956
- **Behavioral Change** - When moving a column `DropPosition.None` is now acting like `DropPosition.AfterDropTarget`.
57+
5058
## 9.1.0
5159

5260
### General

angularDocsPostDeploy.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Write-Host "Check file exists: " ([System.IO.File]::Exists($filePath))
6161
Write-Host "Check dir exists:" ([System.IO.Directory]::Exists($angularDocsRootFolder));
6262

6363
if([System.IO.File]::Exists($filePath) -and [System.IO.Directory]::Exists($angularDocsRootFolder)) {
64-
$folders = Get-ChildItem -Path $angularDocsRootFolder -Directory -Exclude $tagFolder,"sass","typescript";
64+
$folders = Get-ChildItem -Path $angularDocsRootFolder -Directory -Exclude $tagFolder,"sass","typescript" -Name | Sort-Object @{Expression = {[double]($_.Substring(0, $_.LastIndexOf('.'))) }};
6565
$textToUpdate = "";
6666
foreach($item in $folders) {
6767
$textToUpdate += '"' + $item.Name + '"';
@@ -72,4 +72,4 @@ if([System.IO.File]::Exists($filePath) -and [System.IO.Directory]::Exists($angul
7272
$content = [System.IO.File]::ReadAllText($filePath);
7373
$newContent = $content -replace "\[.*\]", $textToUpdate;
7474
[System.IO.File]::WriteAllText($filePath,$newContent);
75-
}
75+
}

gulpfile.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ module.exports.copySchematics = (cb) => {
137137
const typedocBuildTheme = (cb) => {
138138
spawnSync(`typedoc`, [TYPEDOC.PROJECT_PATH,
139139
"--tsconfig",
140-
"tsconfig.base.json"], { stdio: 'inherit', shell: true });
140+
path.join(__dirname,"tsconfig.base.json")], { stdio: 'inherit', shell: true });
141141
cb();
142142
};
143143
typedocBuildTheme.displayName = 'typedoc-build:theme';
@@ -180,13 +180,26 @@ const TYPEDOC = {
180180
};
181181

182182
function typedocBuildExportFn(cb) {
183-
spawnSync('typedoc', [TYPEDOC.PROJECT_PATH, "--generate-json", TYPEDOC.EXPORT_JSON_PATH, "--tags", "--params"],
183+
spawnSync('typedoc', [
184+
TYPEDOC.PROJECT_PATH,
185+
"--generate-json",
186+
TYPEDOC.EXPORT_JSON_PATH,
187+
"--tags",
188+
"--params",
189+
"--tsconfig",
190+
path.join(__dirname,"tsconfig.base.json")],
184191
{ stdio: 'inherit', shell: true });
185192
cb();
186193
}
187194

188195
function typedocImportJsonFn(cb) {
189-
spawnSync('typedoc', [TYPEDOC.PROJECT_PATH, "--generate-from-json", TYPEDOC.EXPORT_JSON_PATH, "--warns"],
196+
spawnSync('typedoc', [
197+
TYPEDOC.PROJECT_PATH,
198+
"--generate-from-json",
199+
TYPEDOC.EXPORT_JSON_PATH,
200+
"--warns",
201+
"--tsconfig",
202+
path.join(__dirname,"tsconfig.base.json")],
190203
{ stdio: 'inherit', shell: true});
191204
cb();
192205
}
@@ -212,7 +225,7 @@ function typedocBuildDocsJA (cb) {
212225
'--localize',
213226
'jp',
214227
"--tsconfig",
215-
"tsconfig.base.json"], { stdio: 'inherit', shell: true });
228+
path.join(__dirname,"tsconfig.base.json")], { stdio: 'inherit', shell: true });
216229

217230
cb();
218231
}
@@ -223,7 +236,7 @@ function typedocBuildDocsEN (cb) {
223236
'--localize',
224237
'en',
225238
"--tsconfig",
226-
"tsconfig.base.json"], { stdio: 'inherit', shell: true});
239+
path.join(__dirname,"tsconfig.base.json")], { stdio: 'inherit', shell: true});
227240

228241
cb();
229242
}

projects/igniteui-angular/src/lib/combo/combo.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { ConnectedPositioningStrategy } from './../services/overlay/position/connected-positioning-strategy';
21
import { CommonModule } from '@angular/common';
32
import {
43
AfterViewInit, ChangeDetectorRef, Component, ContentChild, ElementRef, EventEmitter, HostBinding, HostListener,
@@ -30,7 +29,7 @@ import { IgxInputGroupModule, IgxInputGroupComponent } from '../input-group/inpu
3029
import { IgxComboItemComponent } from './combo-item.component';
3130
import { IgxComboDropDownComponent } from './combo-dropdown.component';
3231
import { IgxComboFilteringPipe, IgxComboGroupingPipe } from './combo.pipes';
33-
import { OverlaySettings, AbsoluteScrollStrategy } from '../services/public_api';
32+
import { OverlaySettings, AbsoluteScrollStrategy, AutoPositionStrategy } from '../services/public_api';
3433
import { Subject } from 'rxjs';
3534
import { takeUntil } from 'rxjs/operators';
3635
import { DisplayDensityBase, DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
@@ -156,7 +155,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
156155
private _onTouchedCallback: () => void = noop;
157156
private _overlaySettings: OverlaySettings = {
158157
scrollStrategy: new AbsoluteScrollStrategy(),
159-
positionStrategy: new ConnectedPositioningStrategy(),
158+
positionStrategy: new AutoPositionStrategy(),
160159
modal: false,
161160
closeOnOutsideClick: true,
162161
excludePositionTarget: true

0 commit comments

Comments
 (0)