Merge pull request #3460 from IgniteUI/vnext

Updating master from vnext

Author: ChronosSF

.github/workflows/build-app-crm.yml

@@ -49,7 +49,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Run lint
         run: npm run lint

.github/workflows/build-app-lob.yml

@@ -54,7 +54,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Run lint
         run: npm run lint

azure-pipelines.yml

@@ -17,7 +17,7 @@ steps:
 - task: Npm@1
   inputs:
     command: 'custom'
-    customCommand: 'install'
+    customCommand: 'install --legacy-peer-deps'
     customEndpoint: 'public proget'
   env:
     AZURE_PIPELINES: "true"

live-editing/configs/CalendarConfigGenerator.ts

@@ -1,4 +1,5 @@
 import {IgxButtonModule,
+IgxButtonGroupModule,
 IgxCalendarModule,
 IgxCardModule,
 IgxDialogModule,
@@ -102,6 +103,16 @@ export class CalendarConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/scheduling/calendar/"
         }));
 
+        configs.push(new Config({
+            component: 'CalendarSample9Component',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxButtonModule', 'IgxButtonGroupModule', 'IgxCalendarModule', 'CalendarSample9Component'],
+                ngDeclarations: ['CalendarSample9Component'],
+                ngImports: ['IgxButtonModule', 'IgxButtonGroupModule', 'IgxCalendarModule']
+            }),
+            shortenComponentPathBy: "/scheduling/calendar/"
+        }));
+
         configs.push(new Config({
             component: 'CalendarStylingSampleComponent',
             appModuleConfig: new AppModuleConfig({

package-lock.json

@@ -65,13 +65,13 @@
     "bootstrap": "5.3.2",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "^17.1.4",
+    "igniteui-angular": "^17.2.0",
     "igniteui-angular-charts": "^17.2.1",
     "igniteui-angular-core": "^17.2.1",
     "igniteui-angular-extras": "^17.1.5",
-    "igniteui-angular-i18n": "^17.1.0",
+    "igniteui-angular-i18n": "^17.2.0",
     "igniteui-dockmanager": "^1.14.2",
-    "igniteui-live-editing": "^2.1.0",
+    "igniteui-live-editing": "^2.2.0",
     "igniteui-webcomponents": "^4.7.0",
     "minireset.css": "0.0.6",
     "rxjs": "^7.8.1",
@@ -111,4 +111,4 @@
     "typescript": "5.3.3",
     "webpack-bundle-analyzer": "^4.10.0"
   }
-}
+}

package.json

@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { BrowserModule, HammerModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
-    IgxAutocompleteModule, IgxButtonModule, IgxDropDownModule,
+    IgxAutocompleteModule, IgxButtonModule, IgxButtonGroupModule, IgxDropDownModule,
     IgxIconModule, IgxInputGroupModule, IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule, IgxTreeModule
 } from 'igniteui-angular';
 import { AppRoutingModule } from './app-routing.module';
@@ -35,6 +35,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
         BrowserModule,
         BrowserAnimationsModule,
         IgxButtonModule,
+        IgxButtonGroupModule,
         FormsModule,
         HttpClientModule,
         HammerModule,

src/app/app.module.ts

@@ -1 +1 @@
-<span class="btn" igxButton="contained"  igxButtonColor="black" igxButtonBackground="#72da67" igxRipple="white">Span</span>
+<span class="btn" igxButton="contained" igxRipple="white">Span</span>

src/app/data-entries/buttons/buttons-sample-4/buttons-sample-4.component.html

@@ -19,7 +19,7 @@ $checkbox-theme: checkbox-theme(
 );
 
 $datepicker-theme: calendar-theme(
-    $date-selected-text-color: $white,
+    $date-selected-foreground: $white,
     $date-selected-background: $blue
 );
 

src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component.scss

@@ -115,9 +115,9 @@
             </igx-chips-area>
         </div>
         <div style="width: 100%; text-align: center; margin: 10px;">
-            <span igxButton="contained" class="bottomButton" (click)="resetCollections()" [igxButtonBackground]="'#ff134a'" [igxButtonColor]="'white'">Clear Layout</span>
-            <span igxButton="contained" class="bottomButton" (click)="getColumnLayoutTemplate()" [igxButtonBackground]="'#1377d5'" [igxButtonColor]="'white'">Template</span>
-            <span igxButton="contained" class="bottomButton" (click)="renderJson()" [igxButtonBackground]="'#1377d5'" [igxButtonColor]="'white'">JSON</span>
+            <span igxButton="contained" class="bottomButton" (click)="resetCollections()">Clear Layout</span>
+            <span igxButton="contained" class="bottomButton" (click)="getColumnLayoutTemplate()">Template</span>
+            <span igxButton="contained" class="bottomButton" (click)="renderJson()">JSON</span>
         </div>
 
         <igx-dialog #resultDialog title="Result"