Skip to content

Commit 3291349

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/multi-column-headers
2 parents 5552aa4 + dee063a commit 3291349

File tree

10 files changed

+366
-43
lines changed

10 files changed

+366
-43
lines changed

README.md

+30-26
Large diffs are not rendered by default.

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
249249
}
250250
}
251251

252-
public addScrollTop(addTop: number) {
252+
public addScrollTop(addTop: number): boolean {
253253
if (addTop === 0 && this.igxForScrollOrientation === 'horizontal') {
254-
return;
254+
return false;
255255
}
256-
256+
const originalVirtScrollTop = this._virtScrollTop;
257257
const containerSize = parseInt(this.igxForContainerSize, 10);
258258
const maxVirtScrollTop = this._virtHeight - containerSize;
259259

@@ -285,6 +285,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
285285
// Actual scroll position is not at the bottom, but virtual scroll is. Just update the acual scroll
286286
this.vh.instance.elementRef.nativeElement.scrollTop = maxRealScrollTop;
287287
}
288+
return this._virtScrollTop !== originalVirtScrollTop;
288289
}
289290

290291
public scrollTo(index) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# IgxTextHighlightDirective
2+
3+
#### Category
4+
_Directives_
5+
6+
## Description
7+
8+
Provides a way to highlight text elements.
9+
10+
## Usage
11+
12+
```html
13+
<div igxTextHighlight id="content" [cssClass]="highlightClass" [activeCssClass]="activeHighlightClass" [groupName]="groupName" [value]="html" [column]="0" [row]="0" [page]="0">
14+
{{html}}
15+
</div>
16+
```
17+
18+
## API
19+
20+
### Inputs
21+
| Name | Type | Description |
22+
| :--- |:--- | :--- |
23+
| cssClass| string | Determines the CSS class of the highlight elements, allowing the developer to provide custom CSS to customize the highlight. |
24+
| activeCssClass | string | Determines the CSS class of the active highlight element, allowing the developer to provide custom CSS to customize the active highlight.
25+
| groupName | string | Identifies the highlight within a unique group, allowing to have several different highlight groups each having their own active highlight.
26+
| value | any | The underlying value of the element that will be highlighted |
27+
| row | number | The index of the row on which the directive is currently on |
28+
| column | number | The index of the column on which the directive is currently on |
29+
| page | number | The index of the page on which the directive is currently on (used when the component containing the directive supports paging) |
30+
31+
### Methods
32+
| Name | Type | Arguments | Description |
33+
| :--- |:--- | :--- | :--- |
34+
| highlight | number | The text that should be highlighted and, optionally, if the search should be case sensitive or not (it defaults to false if it isn't specified). | Clears the existing highlight and highlight the searched text. Returns how many times the element contains the searched text. |
35+
| clearHighlight | void | N/A | Clears any existing highlight |
36+
| activateIfNecessary | void | N/A | Activates the highlight if it is on the currently active row, column and page |
37+
| setActiveHighlight (static)| void| The highlight group, the column, row and page of the directive and the index of the highlight | Activates the highlight at a given index (if such highlight exists) |
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# IgxTextSelection
2+
3+
#### Category
4+
5+
_Directives_
6+
7+
## Description
8+
9+
Provides a way to trigger selection of text inside input elements.
10+
11+
## Usage
12+
```html
13+
<input type="text" [IgxTextSelection]="true" />
14+
```
15+
16+
## API
17+
18+
### Inputs
19+
| Name | Type | Description |
20+
| :--- |:--- | :--- |
21+
| IgxTextSelection| boolean | Determines whether the input element should be selectable through the directive.
22+
23+
### Accessors
24+
| Name | Type | Description |
25+
| :--- |:--- | :--- |
26+
| selected | boolean | Returns whether the element is selected or not.
27+
| nativeElement | ElementRef | Returns the nativeElement of the element where the directive was applied.
28+
29+
### Methods
30+
| Name | Type | Description |
31+
| :--- |:--- | :--- |
32+
| trigger | void | Triggers the selection of the element.

0 commit comments

Comments
 (0)