Merge remote-tracking branch 'origin/master' into rkaraivanov/wc-chat-wrapper

Author: rkaraivanov

package-lock.json

@@ -76,7 +76,7 @@
     "dompurify": "^3.3.0",
     "express": "^5.1.0",
     "fflate": "^0.8.1",
-    "igniteui-theming": "^20.0.0",
+    "igniteui-theming": "^22.0.0",
     "igniteui-trial-watermark": "^3.1.0",
     "lodash-es": "^4.17.21",
     "marked": "^16.4.0",
@@ -124,7 +124,7 @@
     "hammerjs": "^2.0.8",
     "ig-typedoc-theme": "^6.0.0",
     "igniteui-dockmanager": "^1.17.0",
-    "igniteui-sassdoc-theme": "^2.0.2",
+    "igniteui-sassdoc-theme": "^2.1.0",
     "igniteui-webcomponents": "^6.3.1",
     "jasmine": "^5.6.0",
     "jasmine-core": "^5.6.0",

package.json

@@ -49,14 +49,14 @@ describe('Elements: ', () => {
             gridEl.appendChild(columnEl);
 
             // TODO: Better way to wait - potentially expose the queue or observable for update on the strategy
-            await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 2));
+            await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 4));
 
             const gridComponent = (await gridEl.ngElementStrategy[ComponentRefKey]).instance as IgxGridComponent;
             const columnComponent = (await columnEl.ngElementStrategy[ComponentRefKey]).instance as IgxColumnComponent;
             expect(gridComponent.columnList.toArray()).toContain(columnComponent);
 
             columnEl.remove();
-            await firstValueFrom(timer(10 /* SCHEDULE_DELAY: DESTROY + QUERY */ * 3));
+            await firstValueFrom(timer(10 /* SCHEDULE_DELAY: DESTROY + QUERY */ * 4));
             expect(gridComponent.columnList.toArray()).toEqual([]);
         });
 

projects/igniteui-angular-elements/src/app/custom-strategy.spec.ts

@@ -12,7 +12,7 @@ import { IgxPivotDateDimension } from 'projects/igniteui-angular/src/lib/grids/p
 import { PivotDimensionType } from 'projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface';
 import { IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxSummaryOperand, IgxTimeSummaryOperand } from 'projects/igniteui-angular/src/lib/grids/summaries/grid-summary';
 import { HorizontalAlignment, VerticalAlignment } from 'projects/igniteui-angular/src/lib/services/overlay/utilities';
-import { ByLevelTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
+import { ByLevelTreeGridMergeStrategy, DefaultMergeStrategy, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
 
 /** Export Public API, TODO: reorganize, Generate all w/ renames? */
 export {
@@ -35,6 +35,8 @@ export {
 
     NoopSortingStrategy as IgcNoopSortingStrategy,
     NoopFilteringStrategy as IgcNoopFilteringStrategy,
+    DefaultMergeStrategy as IgcDefaultMergeStrategy,
+    DefaultTreeGridMergeStrategy as IgcDefaultTreeGridMergeStrategy,
     ByLevelTreeGridMergeStrategy as IgcByLevelTreeGridMergeStrategy,
 
     // Pivot API

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

@@ -72,9 +72,8 @@ $elements-selector-prefix: 'igc';
 /// @return {String} - Updated selector(s) with `igc-` prefixed equivalents
 @function updateSelectors($selector) {
     $result: ();
-    $selectors: string.split($selector, ", ");
 
-    @each $sel in $selectors {
+    @each $sel in $selector {
         $result: list.append($result, $sel, comma);
 
         @if string.index($sel, 'igx-') == 1 {

projects/igniteui-angular-elements/src/themes/_util.scss

@@ -73,7 +73,7 @@
         "tslib": "^2.3.0",
         "igniteui-trial-watermark": "^3.1.0",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^20.0.0",
+        "igniteui-theming": "^22.0.0",
         "@igniteui/material-icons-extended": "^3.1.0"
     },
     "peerDependencies": {

projects/igniteui-angular/package.json

@@ -2,64 +2,6 @@
 @use '../../base' as *;
 @use '../../themes/schemas' as *;
 
-////
-/// @group themes
-/// @access public
-/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
-/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
-////
-
-/// If only background color is specified, text/icon color will be assigned automatically to a contrasting color.
-/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
-///
-/// @param {Color} $icon-color [null] - The color used for the actions icons.
-/// @param {Color} $background [null] - The color used for the action strip component content background.
-/// @param {Color} $actions-background [null] - The color used for the actions background.
-/// @param {Color} $delete-action [null] - The color used for the delete icon in action strip component.
-/// @param {List} $actions-border-radius [null] - The border radius used for actions container inside action strip component.
-///
-/// @example scss Change the background and icon colors in action strip
-///   $my-action-strip-theme: action-strip-theme($background: black);
-///   // Pass the theme to the css-vars() mixin
-///   @include css-vars($my-action-strip-theme);
-@function action-strip-theme(
-    $schema: $light-material-schema,
-
-    $background: null,
-    $actions-background: null,
-    $icon-color: null,
-    $delete-action: null,
-    $actions-border-radius: null,
-) {
-    $name: 'igx-action-strip';
-    $action-strip-schema: ();
-
-    @if map.has-key($schema, 'action-strip') {
-        $action-strip-schema: map.get($schema, 'action-strip');
-    } @else {
-        $action-strip-schema: $schema;
-    }
-
-    $theme: digest-schema($action-strip-schema);
-
-    @if not($icon-color) and $actions-background {
-        $icon-color: adaptive-contrast(var(--actions-background));
-    }
-
-    @if not($actions-border-radius) {
-        $actions-border-radius: map.get($theme, 'actions-border-radius');
-    }
-
-    @return extend($theme, (
-        name: $name,
-        background: $background,
-        actions-background: $actions-background,
-        icon-color: $icon-color,
-        delete-action: $delete-action,
-        actions-border-radius: $actions-border-radius,
-    ));
-}
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.

projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss

@@ -6,7 +6,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin avatar($theme) {
-    @include css-vars($theme, 'igx-avatar');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
 

projects/igniteui-angular/src/lib/core/styles/components/avatar/_avatar-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin badge($theme) {
-    @include css-vars($theme, 'igx-badge');
+    @include css-vars($theme);
 
     $variant: map.get($theme, '_meta', 'theme');
 

projects/igniteui-angular/src/lib/core/styles/components/badge/_badge-theme.scss

@@ -5,7 +5,7 @@
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.
 @mixin banner($theme) {
-    @include css-vars($theme, 'igx-banner, .igx-banner');
+    @include css-vars($theme);
     $variant: map.get($theme, '_meta', 'theme');
 
     %igx-banner-host {