Merge pull request #3460 from IgniteUI/vnext

Updating master from vnext
IgniteUI · Apr 29, 2024 · d474ab4 · d474ab4
2 parents d38fb98 + d4b84ea
commit d474ab4
Show file tree

Hide file tree

Showing 37 changed files with 287 additions and 109 deletions.
diff --git a/.github/workflows/build-app-crm.yml b/.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

diff --git a/.github/workflows/build-app-lob.yml b/.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

diff --git a/azure-pipelines.yml b/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"

diff --git a/live-editing/configs/CalendarConfigGenerator.ts b/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({

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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"
   }
-}
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -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,

diff --git a/src/app/data-entries/buttons/buttons-sample-4/buttons-sample-4.component.html b/src/app/data-entries/buttons/buttons-sample-4/buttons-sample-4.component.html
@@ -1 +1 @@
-<span class="btn" igxButton="contained"  igxButtonColor="black" igxButtonBackground="#72da67" igxRipple="white">Span</span>
+<span class="btn" igxButton="contained" igxRipple="white">Span</span>
diff --git a/src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component.scss b/src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component.scss
@@ -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
 );
 

diff --git a/...id/grid-multi-row-layout-configuration/grid-multi-row-layout-configuration.component.html b/...id/grid-multi-row-layout-configuration/grid-multi-row-layout-configuration.component.html
@@ -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"

diff --git a/src/app/grid/grid-save-state/about.component.html b/src/app/grid/grid-save-state/about.component.html
@@ -3,5 +3,5 @@
     <span>Navigating to the previous page, components will reinitialize as per their initial configuration, therefore the igxGrid will lose its state.</span>
     <br />
     <span>What our GridSaveStateComponent does is reading the state from the window.localStorage object and applying the corresponding state in the AfterViewInit lifecycle.</span><br />
-    <span igxButton="contained" igxButtonColor="white" igxButtonBackground="#e41c77" [routerLink]="['../grid-state']">Go Back</span>
+    <span igxButton="contained" [routerLink]="['../grid-state']">Go Back</span>
 </div>
diff --git a/...hical-grid/hierarchical-grid-editing-style/hierarchical-grid-editing-style.component.scss b/...hical-grid/hierarchical-grid-editing-style/hierarchical-grid-editing-style.component.scss
@@ -30,7 +30,7 @@ $checkbox-theme: checkbox-theme(
 );
 
 $datepicker-theme: calendar-theme(
-    $date-selected-text-color: $white,
+    $date-selected-foreground: $white,
     $date-selected-background: $blue
 );
 

diff --git a/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html b/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html
@@ -3,5 +3,5 @@
     <span>Navigating to the previous page, components will reinitialize as per their initial configuration, therefore the igxHierarchicalGrid will lose its state.</span>
     <br />
     <span>What our GridSaveStateComponent does is reading the state from the window.localStorage object and applying the corresponding state in the AfterViewInit lifecycle.</span><br />
-    <span igxButton="contained" igxButtonColor="white" igxButtonBackground="#e41c77" [routerLink]="['../hGrid-state']">Go Back</span>
+    <span igxButton="contained" [routerLink]="['../hGrid-state']">Go Back</span>
 </div>
diff --git a/src/app/layouts/layouts-routes-data.ts b/src/app/layouts/layouts-routes-data.ts
@@ -29,6 +29,7 @@ export const layoutsRoutesData = {
     'layout-justify-content' : { displayName: 'Layout Justify Content', parentName: 'Layout' },
     'layout-wrap' : { displayName: 'Layout Wrap', parentName: 'Layout' },
     'layout-sample' : { displayName: 'Layouts Sample', parentName: 'Layout' },
+    'splitter-collapsible-sample': { displayName: 'Splitter Collapsible', parentName: 'Splitter' },
     'splitter-horizontal-sample': { displayName: 'Splitter Horizontal', parentName: 'Splitter' },
     'splitter-nested-sample': { displayName: 'Splitter Nested Panes', parentName: 'Splitter' },
     'splitter-styling-sample': { displayName: 'Splitter Styling', parentName: 'Splitter' },

diff --git a/src/app/layouts/layouts-routing.module.ts b/src/app/layouts/layouts-routing.module.ts
@@ -43,6 +43,7 @@ import { LayoutJustifyContentComponent } from './layout/layout-justify-content/l
 import { LayoutSampleComponent } from './layout/layout-sample/layout-sample.component';
 import { LayoutWrapComponent } from './layout/layout-wrap/layout-wrap.component';
 import { layoutsRoutesData } from './layouts-routes-data';
+import { SplitterCollapsibleSampleComponent } from './splitter/splitter-collapsible-sample/splitter-collapsible-sample.component';
 import {
     SplitterHorizontalSampleComponent
 } from './splitter/splitter-horizontal-sample/splitter-horizontal-sample.component';
@@ -237,6 +238,11 @@ export const layoutsRoutes: Routes = [
         data: layoutsRoutesData['layout-wrap'],
         path: 'layout-wrap'
     },
+    {
+        component: SplitterCollapsibleSampleComponent,
+        data: layoutsRoutesData['splitter-collapsible-sample'],
+        path: 'splitter-collapsible-sample'
+    },
     {
         component: SplitterHorizontalSampleComponent,
         data: layoutsRoutesData['splitter-horizontal-sample'],

diff --git a/src/app/layouts/layouts.module.ts b/src/app/layouts/layouts.module.ts
@@ -74,6 +74,7 @@ import { LayoutJustifyContentComponent } from './layout/layout-justify-content/l
 import { LayoutSampleComponent } from './layout/layout-sample/layout-sample.component';
 import { LayoutWrapComponent } from './layout/layout-wrap/layout-wrap.component';
 import { LayoutsRoutingModule } from './layouts-routing.module';
+import { SplitterCollapsibleSampleComponent } from './splitter/splitter-collapsible-sample/splitter-collapsible-sample.component';
 import {
     SplitterHorizontalSampleComponent
 } from './splitter/splitter-horizontal-sample/splitter-horizontal-sample.component';
@@ -140,6 +141,7 @@ import { StepperOverviewSampleComponent } from './stepper/stepper-overview-sampl
         LayoutContentSpaceComponent,
         LayoutSampleComponent,
         LayoutWrapComponent,
+        SplitterCollapsibleSampleComponent,
         SplitterHorizontalSampleComponent,
         SplitterNestedSampleComponent,
         SplitterStylingSampleComponent,

diff --git a/...p/layouts/splitter/splitter-collapsible-sample/splitter-collapsible-sample.component.html b/...p/layouts/splitter/splitter-collapsible-sample/splitter-collapsible-sample.component.html
@@ -0,0 +1,14 @@
+<igx-splitter #splitter [nonCollapsible]='true' style='height: 100vh;' [style.width]='"100%"'>
+    <igx-splitter-pane>
+        <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris in lacus eget turpis congue fermentum. Aliquam sollicitudin massa vel ullamcorper bibendum. Donec sit amet augue in justo fermentum facilisis vel quis quam. Vivamus eget iaculis nisi, vitae dignissim leo. Donec eget consectetur lacus. In viverra vehicula libero, quis dictum odio varius in.
+            <br>
+            <button igxButton='contained' (click)="toggleCollapsible()">Toggle Collapsible</button>
+        </p>
+    </igx-splitter-pane>
+    <igx-splitter-pane>
+        <p>
+            Duis auctor, diam id vehicula consequat, lacus tellus molestie magna, sed varius nisi quam eget nisl. Donec dignissim mi et elementum laoreet. Nam dignissim quis justo eu fermentum. Proin vestibulum, neque quis elementum tincidunt, nibh mi gravida purus, eget volutpat ipsum magna in orci. Donec id mauris vitae lectus molestie blandit. Praesent non quam interdum, efficitur lacus nec, gravida mauris. Ut ac ante maximus, ultrices turpis a, aliquam magna. Praesent blandit ante ut nulla malesuada lobortis. Praesent a lobortis justo. Morbi congue, dui sed ornare faucibus, turpis felis vulputate arcu, lobortis posuere sem leo eget risus. Duis risus augue, dignissim ac tincidunt a, ullamcorper rutrum nisl. Ut ut ipsum vel purus viverra dapibus.
+        </p>
+    </igx-splitter-pane>
+</igx-splitter>
diff --git a/...p/layouts/splitter/splitter-collapsible-sample/splitter-collapsible-sample.component.scss b/...p/layouts/splitter/splitter-collapsible-sample/splitter-collapsible-sample.component.scss
@@ -0,0 +1,7 @@
+p {
+    padding: 0 16px;
+}
+
+[igxButton] {
+    margin-top: 16px;
+}
diff --git a/...app/layouts/splitter/splitter-collapsible-sample/splitter-collapsible-sample.component.ts b/...app/layouts/splitter/splitter-collapsible-sample/splitter-collapsible-sample.component.ts
@@ -0,0 +1,15 @@
+import { Component, ViewChild } from '@angular/core';
+import { IgxSplitterComponent } from 'igniteui-angular';
+
+@Component({
+    selector: 'app-splitter-collapsible-sample',
+    styleUrls: ['splitter-collapsible-sample.component.scss'],
+    templateUrl: 'splitter-collapsible-sample.component.html'
+})
+export class SplitterCollapsibleSampleComponent {
+    @ViewChild('splitter') public splitterComponent: IgxSplitterComponent;
+
+    public toggleCollapsible() {
+        this.splitterComponent.nonCollapsible = !this.splitterComponent.nonCollapsible;
+    }
+}
diff --git a/src/app/lists/list/list-chat-sample/list-chat-sample.component.html b/src/app/lists/list/list-chat-sample/list-chat-sample.component.html
@@ -44,7 +44,7 @@
                 <input class="input-round-box" placeholder="Send message" autocomplete="off" igxInput #newMessage name="newMessage"
                     [(ngModel)]="message" (keypress)="onMessageKeypress($event)" />
             </igx-input-group>
-            <button class="send-message-button" igxIconButton="flat" igxButtonColor="#09f" igxButtonBackground="#fff"
+            <button class="send-message-button" igxIconButton="flat"
                 igxRipple="#09f" [igxRippleCentered]="true" (click)="onSendButtonClick()">
                 <igx-icon family="material">send</igx-icon>
             </button>

diff --git a/src/app/notifications/snackbar/snackbar-sample-2/snackbar-sample-2.component.html b/src/app/notifications/snackbar/snackbar-sample-2/snackbar-sample-2.component.html
@@ -7,8 +7,8 @@ <h6>Snackbar Component that uses Content projection</h6>
 
     <span>
         <h6>Snackbar Component which dynamically changes the message text</h6>
-        <button igxButton="outlined" igxButtonColor="blue" (click)="snackbar1.open('Hi! This is info message.')">Info Message</button>
-        <button igxButton="outlined" igxButtonColor="green" (click)="snackbar1.open('Hi! This is success message.')">Success Message</button>
+        <button igxButton="outlined" (click)="snackbar1.open('Hi! This is info message.')">Info Message</button>
+        <button igxButton="outlined" (click)="snackbar1.open('Hi! This is success message.')">Success Message</button>
         <igx-snackbar #snackbar1 [autoHide]="true" actionText="CLOSE" (clicked)="close(snackbar1)"></igx-snackbar>
     </span>
     <span>

diff --git a/src/app/notifications/toast/toast-sample-3/toast-sample-3.component.html b/src/app/notifications/toast/toast-sample-3/toast-sample-3.component.html
@@ -7,10 +7,10 @@ <h6>Toast that uses content projection</h6>
     </span>
     <span>
         <h6>Toast which dynamically changes the message text</h6>
-        <button igxButton="outlined" igxButtonColor="blue" (click)="toast1.open('Hi! This is info message.')">Info Message</button>
-        <button igxButton="outlined" igxButtonColor="green" (click)="toast1.open('Hi! This is success message.')">Success Message</button>
-        <button igxButton="outlined" igxButtonColor="orange" (click)="toast1.open('Hi! This is warning message.')">Warning Message</button>
-        <button igxButton="outlined" igxButtonColor="red" (click)="toast1.open('Hi! This is error message.')">Error Message</button>
+        <button igxButton="outlined" (click)="toast1.open('Hi! This is info message.')">Info Message</button>
+        <button igxButton="outlined" (click)="toast1.open('Hi! This is success message.')">Success Message</button>
+        <button igxButton="outlined" (click)="toast1.open('Hi! This is warning message.')">Warning Message</button>
+        <button igxButton="outlined" (click)="toast1.open('Hi! This is error message.')">Error Message</button>
         <igx-toast #toast1 [autoHide]="true"></igx-toast>
     </span>
     <span>