Skip to content

Commit

Permalink
Merge branch 'thristodorova/stepper-implementaton' of https://github.…
Browse files Browse the repository at this point in the history
…com/IgniteUI/igniteui-angular into thristodorova/stepper-implementaton

� Conflicts:
�	projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-component.scss
�	projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss
�	projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_stepper.scss
�	projects/igniteui-angular/src/lib/stepper/igx-stepper.directive.ts
�	projects/igniteui-angular/src/lib/stepper/step/igx-step.component.html
�	projects/igniteui-angular/src/lib/stepper/step/igx-step.component.ts
  • Loading branch information
MPopov committed Sep 16, 2021
2 parents 52c9a0a + d9e4a8c commit 30f4de0
Show file tree
Hide file tree
Showing 44 changed files with 922 additions and 89 deletions.
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,28 @@

All notable changes for each version of this project will be documented in this file.

## 12.1.6
## 12.2.0

### General
- `igxGrid`, `igxHierarchicalGrid`, `igxTreeGrid`
- 'oddRowCSS' and 'evenRowCSS' properties has been deprecated

### New Features
- `igxGrid`, `igxHierarchicalGrid`, `igxTreeGrid`
- Added two public methods that spawn the add row UI for an arbitrary record in the current data view. One that accepts a rowID to use as the row the UI spawns under and the other accepting an index that has a distinct implementation for `IgxTreeGrid`. Please, refer to the official documentation for more information:[Grid Row Adding](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/row-adding) and [Tree Grid Row Adding](https://www.infragistics.com/products/ignite-ui-angular/angular/components/treegrid/row-adding).

_Note:_ That the new record is still added at the end of the data view, after the end-user submits it.
```typescript
this.grid.beginAddRowById('ALFKI'); // spawns the add row UI under the row with PK 'ALFKI'
this.grid.beginAddRowById(null); // spawns the add row UI as the first record
this.grid.beginAddRowByIndex(10); // spawns the add row UI at index 10
this.grid.beginAddRowByIndex(0); // spawns the add row UI as the first record
this.treeGrid.beginAddRowById('ALFKI', true); // spawns the add row UI to add a child for the row with PK 'ALFKI'
this.treeGrid.beginAddRowByIndex(10, true); // spawns the add row UI to add a child for the row at index 10
this.treeGrid.beginAddRowByIndex(null); // spawns the add row UI as the first record
```
- Added capability to restore the state of multi column headers with `IgxGridStateDirective`.
- Introduced new 'rowStyles' and 'rowClasses' grid properties which allows to define a custom styling on each grid row

## 12.1.3

Expand Down Expand Up @@ -69,7 +86,7 @@ All notable changes for each version of this project will be documented in this
- `IgxGridCellComponent`, `IgxTreeGridCellComponent`, `IgxHierarchicalGridCellComponent` are no longer exposed in the public API. Instead, a new class `IgxGridCell` replaces all of these. It is a facade class which exposes only the public API of the above mentioned. Automatic migration will change these imports with `CellType`, which is the interface implemented by `IgxGridCell`
- **Behavioral changes**
- `getCellByKey`, `getCellByColumn`, `getCellByColumnVisibleIndex`, `row.cells`, `column.cells`, `grid.selectedCells` now return an `IgxGridCell` the `CellType` interface.
- `cell` in `IGridCellEventArgs` is now `CellType`. `IGridCellEventArgs` are emitetd in `cellClick`, `selected`, `contextMenu` and `doubleClick` events.
- `cell` in `IGridCellEventArgs` is now `CellType`. `IGridCellEventArgs` are emitted in `cellClick`, `selected`, `contextMenu` and `doubleClick` events.
- `let-cell` property in cell template is now `CellType`.
- `getCellByColumnVisibleIndex` is now deprecated and will be removed in next major version. Use `getCellByKey`, `getCellByColumn` instead.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const GridResourceStringsDA_: ExpandRequire<IGridResourceStrings> = {
igx_grid_groupByArea_select_message: 'Vælg alle rækker i gruppen med navnet {0} og værdi {1}.',
igx_grid_groupByArea_deselect_message: 'Fravælg alle rækker i gruppen med navnet {0} og værdi {1}.',
igx_grid_emptyFilteredGrid_message: 'Ingen poster fundet',
igx_grid_emptyGrid_message: 'Gitter har ingen data',
igx_grid_emptyGrid_message: 'Tabel har ingen data',
igx_grid_filter: 'Filter',
igx_grid_filter_row_close: 'Luk',
igx_grid_filter_row_reset: 'Nulstil',
Expand Down
24 changes: 24 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/calendar-resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { ICalendarResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const CalendarResourceStringsNB_: ExpandRequire<ICalendarResourceStrings> = {
igx_calendar_previous_month: 'Forrige måned',
igx_calendar_next_month: 'Neste måned',
igx_calendar_select_month: 'Velg måned',
igx_calendar_select_year: 'Velg år',
igx_calendar_range_start: 'Rekkevidde start',
igx_calendar_range_end: 'Rekkevidde slutt',
igx_calendar_selected_month_is: 'Valgt måned er ',
igx_calendar_first_picker_of: 'Den første plukkeren på {0} starter fra',
igx_calendar_multi_selection: 'Flervalgskalender med {0} datovelgere',
igx_calendar_range_selection: 'Områdevalgskalender med {0} datovelgere',
igx_calendar_single_selection: 'Kalender med {0} datovelgere',
igx_calendar_singular_multi_selection: 'Kalender med flere valg',
igx_calendar_singular_range_selection: 'Områdevalgskalender',
igx_calendar_singular_single_selection: 'Kalender'
};

/**
* Norwegian resource strings for IgxCalendar
*/
export const CalendarResourceStringsNB = CalendarResourceStringsNB_ as ExpandRequire<ICalendarResourceStrings>;
14 changes: 14 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/carousel-resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { ICarouselResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const CarouselResourceStringsNB_: ExpandRequire<ICarouselResourceStrings> = {
igx_carousel_of: 'av',
igx_carousel_slide: 'lysbilde',
igx_carousel_previous_slide: 'forrige lysbilde',
igx_carousel_next_slide: 'neste lysbilde'
};

/**
* Norwegian resource strings for IgxCarousel
*/
export const CarouselResourceStringsNB = CarouselResourceStringsNB_ as ExpandRequire<ICarouselResourceStrings>;
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { IDatePickerResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const DatePickerResourceStringsNB_: ExpandRequire<IDatePickerResourceStrings> = {
igx_date_picker_change_date: 'Endre dato',
igx_date_picker_choose_date: 'Velg dato'
};

/**
* Portuguese resource strings for IgxDatePicker
*/
export const DatePickerResourceStringsNB = DatePickerResourceStringsNB_ as ExpandRequire<IDatePickerResourceStrings>;
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { IDateRangePickerResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const DateRangePickerResourceStringsNB_: ExpandRequire<IDateRangePickerResourceStrings> = {
igx_date_range_picker_date_separator: 'til',
igx_date_range_picker_done_button: 'Ferdig'
};

/**
* Norwegian resource strings for IgxDateRangePicker
*/
export const DateRangePickerResourceStringsNB = DateRangePickerResourceStringsNB_ as ExpandRequire<IDateRangePickerResourceStrings>;
141 changes: 141 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/grid-resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
import { IGridResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const GridResourceStringsNB_: ExpandRequire<IGridResourceStrings> = {
igx_grid_groupByArea_message: 'Dra en kolonneoverskrift og slipp den her for å gruppere etter den kolonnen.',
igx_grid_groupByArea_select_message: 'Velg alle radene i gruppen med feltnavn {0} og verdi {1}.',
igx_grid_groupByArea_deselect_message: 'Opphev valg av alle radene i gruppen med feltnavn {0} og verdi {1}.',
igx_grid_emptyFilteredGrid_message: 'Ingen opptak funnet.',
igx_grid_emptyGrid_message: 'Rutenettet har ingen data.',
igx_grid_filter: 'Filter',
igx_grid_filter_row_close: 'Lukk',
igx_grid_filter_row_reset: 'Nullstille',
igx_grid_filter_row_placeholder: 'Legg til filterverdi',
igx_grid_filter_row_boolean_placeholder: 'Alle',
igx_grid_filter_row_date_placeholder: 'Hentedato',
igx_grid_filter_row_time_placeholder: 'Hentetid',
igx_grid_filter_operator_and: 'Og',
igx_grid_filter_operator_or: 'Eller',
igx_grid_complex_filter: 'Kompleks filter',
igx_grid_filter_contains: 'Inneholder',
igx_grid_filter_doesNotContain: 'Inneholder ikke',
igx_grid_filter_startsWith: 'Begynner med',
igx_grid_filter_endsWith: 'Slutter med',
igx_grid_filter_equals: 'Er lik',
igx_grid_filter_doesNotEqual: 'Er ikke lik',
igx_grid_filter_empty: 'Tømme',
igx_grid_filter_notEmpty: 'Ikke tom',
igx_grid_filter_null: 'Null',
igx_grid_filter_notNull: 'Ikke null',
igx_grid_filter_before: 'Før',
igx_grid_filter_after: 'Etter',
igx_grid_filter_at: 'På',
igx_grid_filter_not_at: 'Ikke på',
igx_grid_filter_at_before: 'Kl. eller før',
igx_grid_filter_at_after: 'Kl. eller etter',
igx_grid_filter_today: 'I dag',
igx_grid_filter_yesterday: 'I går',
igx_grid_filter_thisMonth: 'Denne måneden',
igx_grid_filter_lastMonth: 'Forrige måned',
igx_grid_filter_nextMonth: 'Neste måned',
igx_grid_filter_thisYear: 'I år',
igx_grid_filter_lastYear: 'I fjor',
igx_grid_filter_nextYear: 'Neste år',
igx_grid_filter_greaterThan: 'Større enn',
igx_grid_filter_lessThan: 'Mindre enn',
igx_grid_filter_greaterThanOrEqualTo: 'Større enn eller lik',
igx_grid_filter_lessThanOrEqualTo: 'Mindre enn eller lik',
igx_grid_filter_true: 'True',
igx_grid_filter_false: 'False',
igx_grid_filter_all: 'Alle',
igx_grid_filter_condition_placeholder: 'Velg filter',
igx_grid_summary_count: 'Telle',
igx_grid_summary_min: 'Min',
igx_grid_summary_max: 'Maks',
igx_grid_summary_sum: 'Sum',
igx_grid_summary_average: 'Gj.sn',
igx_grid_summary_earliest: 'Tidligst',
igx_grid_summary_latest: 'Siste',
igx_grid_excel_filter_moving_left: 'gå til venstre',
igx_grid_excel_filter_moving_left_short: 'venstre',
igx_grid_excel_filter_moving_right: 'Flytt til høyre',
igx_grid_excel_filter_moving_right_short: 'Ikke sant',
igx_grid_excel_filter_moving_header: 'bevege seg',
igx_grid_excel_filter_sorting_asc: 'stigende',
igx_grid_excel_filter_sorting_asc_short: 'stige',
igx_grid_excel_filter_sorting_desc: 'synkende',
igx_grid_excel_filter_sorting_desc_short: 'synk',
igx_grid_excel_filter_sorting_header: 'sortere',
igx_grid_excel_filter_clear: 'Fjern kolonnefiltre',
igx_grid_excel_custom_dialog_add: 'legg til filter',
igx_grid_excel_custom_dialog_clear: 'Tøm filteret',
igx_grid_excel_custom_dialog_header: 'Egendefinert automatisk filtrering i kolonnen: ',
igx_grid_excel_cancel: 'avbryt',
igx_grid_excel_apply: 'søke om',
igx_grid_excel_search_placeholder: 'Søk',
igx_grid_excel_select_all: 'Velg alle',
igx_grid_excel_select_all_search_results: 'Velg alle søkeresultatene',
igx_grid_excel_add_to_filter: 'Legg til gjeldende valg for å filtrere',
igx_grid_excel_blanks: '(Tomme)',
igx_grid_excel_hide: 'Skjul kolonne',
igx_grid_excel_show: 'Vis kolonne',
igx_grid_excel_pin: 'Fest kolonne',
igx_grid_excel_unpin: 'Løsne kolonnen',
igx_grid_excel_select: 'Velg kolonne',
igx_grid_excel_deselect: 'Opphev valg av kolonne',
igx_grid_excel_text_filter: 'Tekstfilter',
igx_grid_excel_number_filter: 'Nummerfilter',
igx_grid_excel_date_filter: 'Datofilter',
igx_grid_excel_boolean_filter: 'Boolsk filter',
igx_grid_excel_currency_filter: 'Valutafilter',
igx_grid_excel_custom_filter: 'Tilpasset filter...',
igx_grid_advanced_filter_title: 'Avansert filtrering',
igx_grid_advanced_filter_and_group: '"Og"-gruppe',
igx_grid_advanced_filter_or_group: '"Eller"-gruppe',
igx_grid_advanced_filter_end_group: 'Sluttgruppe',
igx_grid_advanced_filter_create_and_group: 'Opprett "Og"-gruppe',
igx_grid_advanced_filter_create_or_group: 'Opprett "Eller"-gruppe',
igx_grid_advanced_filter_and_label: 'og',
igx_grid_advanced_filter_or_label: 'eller',
igx_grid_advanced_filter_add_condition: 'Tilstand',
igx_grid_advanced_filter_ungroup: 'Opphev gruppering',
igx_grid_advanced_filter_delete: 'Slett',
igx_grid_advanced_filter_delete_filters: 'Slett filtre',
igx_grid_advanced_filter_initial_text: 'Start med å opprette en gruppe forhold knyttet til "Og" eller "Eller"',
igx_grid_advanced_filter_column_placeholder: 'Velg kolonne',
igx_grid_advanced_filter_value_placeholder: 'Verdi',
igx_grid_pinned_row_indicator: 'Festet',
igx_grid_hiding_check_all_label: 'Gjem alle',
igx_grid_hiding_uncheck_all_label: 'Vis alt',
igx_grid_pinning_check_all_label: 'Fest alle',
igx_grid_pinning_uncheck_all_label: 'Løsne alle',
igx_grid_row_edit_btn_done: 'Ferdig',
igx_grid_row_edit_btn_cancel: 'Avbryt',
igx_grid_toolbar_actions_filter_prompt: 'Filtrer kolonneliste...',
igx_grid_toolbar_pinning_button_tooltip: 'Åpne rullegardinmenyen for kolonnefester',
igx_grid_toolbar_hiding_button_tooltip: 'Åpne kolonne som skjuler rullegardinmenyen',
igx_grid_toolbar_pinning_title: 'Festede kolonner',
igx_grid_toolbar_hiding_title: 'Synlige kolonner',
igx_grid_toolbar_advanced_filtering_button_tooltip: 'Åpne avansert filtreringsdialogboks',
igx_grid_toolbar_advanced_filtering_button_label: 'Avansert filtrering',
igx_grid_toolbar_exporter_button_tooltip: 'Åpne rullegardinmenyen for eksportør',
igx_grid_toolbar_exporter_button_label: 'Eksporter',
igx_grid_toolbar_exporter_excel_entry_text: 'Eksporter til Excel',
igx_grid_toolbar_exporter_csv_entry_text: 'Eksporter til CSV',
igx_grid_snackbar_addrow_label: 'Rad lagt til',
igx_grid_snackbar_addrow_actiontext: 'FORESTILLING',
igx_grid_actions_edit_label: 'Redigere',
igx_grid_actions_add_label: 'Legge til',
igx_grid_add_row_label: 'LEGG TIL RAD',
igx_grid_actions_add_child_label: 'Legg til barn',
igx_grid_actions_delete_label: 'Slett',
igx_grid_actions_pin_label: 'Fest',
igx_grid_actions_unpin_label: 'Løsne',
igx_grid_actions_jumpUp_label: 'Hoppe opp',
igx_grid_actions_jumpDown_label: 'Hopp ned'
};

/**
* Norwegian resource strings for IgxGrid
*/
export const GridResourceStringsNB = GridResourceStringsNB_ as ExpandRequire<IGridResourceStrings>;
12 changes: 12 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/list-resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { IListResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const ListResourceStringsNB_: ExpandRequire<IListResourceStrings> = {
igx_list_no_items: 'Det er ingen elementer på listen.',
igx_list_loading: 'Laster inn data fra serveren...'
};

/**
* Norwegian resource strings for IgxList
*/
export const ListResourceStringsNB = ListResourceStringsNB_ as ExpandRequire<IListResourceStrings>;
16 changes: 16 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/paginator-resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { IPaginatorResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const PaginatorResourceStringsNB_: ExpandRequire<IPaginatorResourceStrings> = {
igx_paginator_label: 'Elementer per side',
igx_paginator_pager_text: 'av',
igx_paginator_first_page_button_text: 'Gå til første side',
igx_paginator_previous_page_button_text: 'Forrige side',
igx_paginator_last_page_button_text: 'Gå til siste side',
igx_paginator_next_page_button_text: 'Neste side'
};

/**
* Norwegian resource strings for IgxPaginator
*/
export const PaginatorResourceStringsNB = PaginatorResourceStringsNB_ as ExpandRequire<IPaginatorResourceStrings>;
24 changes: 24 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { GridResourceStringsNB } from './grid-resources';
import { PaginatorResourceStringsNB } from './paginator-resources';
import { TimePickerResourceStringsNB } from './time-picker-resources';
import { DatePickerResourceStringsNB } from './date-picker-resources';
import { DateRangePickerResourceStringsNB } from './date-range-picker-resources';
import { CarouselResourceStringsNB } from './carousel-resources';
import { ListResourceStringsNB } from './list-resources';
import { CalendarResourceStringsNB } from './calendar-resources';
import { TreeResourceStringsNB } from './tree-resources';

/**
* Norwegian resource strings for all components
*/
export const IgxResourceStringsNB = {
...GridResourceStringsNB,
...PaginatorResourceStringsNB,
...TimePickerResourceStringsNB,
...DatePickerResourceStringsNB,
...DateRangePickerResourceStringsNB,
...CarouselResourceStringsNB,
...ListResourceStringsNB,
...CalendarResourceStringsNB,
...TreeResourceStringsNB
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { ITimePickerResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const TimePickerResourceStringsNB_: ExpandRequire<ITimePickerResourceStrings> = {
igx_time_picker_ok: 'OK',
igx_time_picker_cancel: 'Avbryt',
igx_time_picker_change_time: 'Endre tid',
igx_time_picker_choose_time: 'Velg tid'
};

/**
* Norwegian resource strings for IgxTimePicker
*/
export const TimePickerResourceStringsNB = TimePickerResourceStringsNB_ as ExpandRequire<ITimePickerResourceStrings>;
12 changes: 12 additions & 0 deletions projects/igniteui-angular-i18n/src/i18n/NB/tree-resources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ITreeResourceStrings } from 'igniteui-angular';

// exported below as re-cast to create declaration type with expanded properties
const TreeResourceStringsNB_: ExpandRequire<ITreeResourceStrings> = {
igx_expand: 'Vis',
igx_collapse: 'Skjul'
};

/**
* Norwegian resource strings for IgxTree
*/
export const TreeResourceStringsNB = TreeResourceStringsNB_ as ExpandRequire<ITreeResourceStrings>;
11 changes: 11 additions & 0 deletions projects/igniteui-angular-i18n/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,14 @@ export * from './i18n/TR/carousel-resources';
export * from './i18n/TR/list-resources';
export * from './i18n/TR/tree-resources';
export * from './i18n/TR/resources';
// Norwegian (NB)
export * from './i18n/NB/calendar-resources';
export * from './i18n/NB/grid-resources';
export * from './i18n/NB/paginator-resources';
export * from './i18n/NB/time-picker-resources';
export * from './i18n/NB/date-picker-resources';
export * from './i18n/NB/date-range-picker-resources';
export * from './i18n/NB/carousel-resources';
export * from './i18n/NB/list-resources';
export * from './i18n/NB/tree-resources';
export * from './i18n/NB/resources';
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,9 @@
@include igx-type-style($type-scale, $content) {
margin: 0;
}

> * {
letter-spacing: normal;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1211,10 +1211,18 @@ export class IgxDragDirective implements AfterContentInit, OnDestroy {
originalEvent
};

const elementsFromPoint = this.getElementsAtPoint(pageX, pageY);
let elementsFromPoint = this.getElementsAtPoint(pageX, pageY);

// Check for shadowRoot instance and use it if present
for (const elFromPoint of elementsFromPoint) {
if (elFromPoint?.shadowRoot !== null) {
elementsFromPoint = elFromPoint.shadowRoot.elementsFromPoint(pageX, pageY);
}
}

for (const element of elementsFromPoint) {
if (element.getAttribute('droppable') === 'true' &&
element !== this.ghostElement && element !== this.element.nativeElement) {
element !== this.ghostElement && element !== this.element.nativeElement) {
topDropArea = element;
break;
}
Expand Down
Loading

0 comments on commit 30f4de0

Please sign in to comment.