Merge branch 'master' into finjs-dev-demo-m

Author: kdinev

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '33 4 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.stylelintrc.json

@@ -2,7 +2,7 @@
     "plugins": ["stylelint-scss"],
     "ignoreFiles": ["projects/igniteui-angular/src/lib/core/styles/**/*.md"],
     "rules": {
-        "at-rule-blacklist": ["debug", {
+        "at-rule-disallowed-list": ["debug", {
             "severity": "warning"
         }],
         "block-closing-brace-empty-line-before": "never",

angular.json

@@ -29,7 +29,7 @@
               "src/web.config"
             ],
             "styles": [
-              "src/styles/igniteui-theme.scss"
+              "src/styles/styles.scss"
             ],
             "scripts": []
           },

projects/igniteui-angular/migrations/update-12_0_0/changes/theme-props.json

@@ -322,7 +322,7 @@
             "owner": "igx-button-theme"
         },
         {
-            "name": "$disabled-text-color",
+            "name": "$disabled-color",
             "replaceWith": "$disabled-foreground",
             "owner": "igx-button-theme"
         }

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.spec.ts

@@ -56,7 +56,7 @@ describe('igxGridEditingActions #grid ', () => {
             expect(editIcon.nativeElement.innerText).toBe('edit');
             editIcon.parent.triggerEventHandler('click', new Event('click'));
             fixture.detectChanges();
-            expect(grid.rowInEditMode).not.toBeNull();
+            expect(grid.gridAPI.crudService.rowInEditMode).not.toBeNull();
             expect(grid.rowList.first.inEditMode).toBe(true);
 
             expect(grid.rowList.first.rowData['ID']).toBe('ALFKI');
@@ -66,7 +66,7 @@ describe('igxGridEditingActions #grid ', () => {
             deleteIcon = fixture.debugElement.queryAll(By.css(`igx-grid-editing-actions igx-icon`))[1];
             // grid actions should not showing when the row is in edit mode #
             expect(deleteIcon).toBeUndefined();
-            grid.endEdit();
+            grid.gridAPI.crudService.endEdit();
             actionStrip.show(grid.rowList.first);
             fixture.detectChanges();
             deleteIcon = fixture.debugElement.queryAll(By.css(`igx-grid-editing-actions igx-icon`))[1];
@@ -102,7 +102,7 @@ describe('igxGridEditingActions #grid ', () => {
 
             expect(row.inEditMode).toBeTrue();
 
-            grid.endEdit();
+            grid.gridAPI.crudService.endEdit();
             fixture.detectChanges();
             actionStrip.menu.open();
             fixture.detectChanges();

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.ts

@@ -104,7 +104,7 @@ export class IgxGridEditingActionsComponent extends IgxGridActionsBaseDirective
         }
         // be sure row is in view
         if (grid.rowList.filter(r => r === row).length !== 0) {
-            grid.crudService.enterEditMode(firstEditable, event);
+            grid.gridAPI.crudService.enterEditMode(firstEditable, event);
         }
         this.strip.hide();
     }

projects/igniteui-angular/src/lib/core/styles/base/elevations/_index.scss

@@ -117,23 +117,6 @@
     );
 }
 
-/// Returns an igx elevation from an igx-elevations produced map.
-/// @access public
-/// @param {Map} $elevations - The igx-elevations map to extract the elevation from.
-/// @param {number} $elevation - The elevation level from 1 to 24.
-/// @returns {String} Returns a box-shadow value.
-@function igx-elevation($elevations, $elevation) {
-    @if type-of($elevation) != number or not unitless($elevation) {
-        @error '$elevation must be a number';
-    }
-
-    @if $elevation < 0 or $elevation > 24 {
-        @error '$elevation must be between 0 and 24';
-    }
-
-    @return map-get($elevations, #{$elevation});
-}
-
 /// Generates a map of 24 shadows.
 /// @access public
 /// @requires _elevation
@@ -157,9 +140,34 @@
 /// @prop {Color} $color-2 [rgba(0, 0, 0, .12)] - The color used for the penumbra shadow.
 /// @prop {Color} $color-3 [rgba(0, 0, 0, .08)] - The color used for the ambient shadow.
 /// @requires igx-elevations
-$elevations: igx-elevations(
+$igx-elevations: igx-elevations(
     rgba(0, 0, 0, .26),
     rgba(0, 0, 0, .12),
     rgba(0, 0, 0, .08)
 ) !default;
 
+/// Returns an igx elevation from an igx-elevations produced map.
+/// @access public
+/// @param {Map} $elevations [null] - The igx-elevations map to extract the elevation from.
+/// @param {number} $elevation [0] - The elevation level from 0 to 24.
+/// @returns {String} Returns a box-shadow value.
+@function igx-elevation($elevations: null, $elevation: 0) {
+    @if type-of($elevation) != number or not unitless($elevation) {
+        @error '$elevation must be a number';
+    }
+
+    @if $elevation < 0 or $elevation > 24 {
+        @error '$elevation must be between 0 and 24';
+    }
+
+    @if $elevations == null {
+        @return if(
+            legacy(),
+            igx-elevation($igx-elevations, $elevation),
+            #{var(--igx-elevation-#{$elevation})}
+        );
+    }
+
+    @return map-get($elevations, #{$elevation});
+}
+