merge

Author: Aleksandyr

.sassdocrc

@@ -9,14 +9,16 @@
     "theme": "./node_modules/igniteui-sassdoc-theme/sassdoc/",
     "autofill": ["throws", "content"],
     "groups": {
+        "global-themes": "Global Themes",
+        "component-themes": "Component Themes",
         "undefined": "general"
     },
     "no-update-notifier": false,
     "verbose": false,
     "strict": false,
     "display": {
         "alias": true,
-        "access": ["public", "private"]
+        "access": ["public"]
     },
     "privatePrefix": true,
     "resolvedValue": true

CHANGELOG.md

@@ -24,10 +24,36 @@ All notable changes for each version of this project will be documented in this
 - `igxDatePicker`
     -  Added new property - `editorTabIndex`, that allows setting tabindex for the default editor.
 
+### New Theme
+Ignite UI for Angular now has a new theme based on our own design system.
+You can use one of the following mixins to include a dark or light indigo theme:
+`igx-indigo-light-theme` and `igx-indigo-dark-theme`
+
+We also added two new palettes that go with the new theme, `$light-indigo-palette` and `$dark-indigo-palette`.
+
+The following example shows how you can use the Indigo theme:
+
+```scss
+// Light version
+.indigo-theme {
+    @include igx-indigo-light-theme($light-indigo-palette);
+}
+
+// Dark version
+.indigo-dark-theme {
+    @include igx-indigo-dark-theme($dark-indigo-palette);
+}
+```
+
 ### New Features
 - `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
     - Introduced `showSummaryOnCollapse` grid property which allows you to control whether the summary row stays visible when the groupBy / parent row is collapsed.
     - Added support for tooltips on data cells default template and summary cells.
+    - Added support for binding columns to properties in nested data objects.
+    Data operations (filtering/sorting/updating/etc) are supported for the nested properties.
+    ```html
+        <igx-column field="foo.bar.baz"></igx-column>
+    ```
 - `IgxGridState` directive
     - Added support for expansion states, column selection and row pinning.
     - Added support for `IgxTreeGrid` and `IgxHierarchicalGrid` (including child grids)
@@ -500,7 +526,7 @@ Ignite UI for angular now have a new theme that mimics Microsoft "Fluent" design
 Depending on your use case you can use one of the following mixins:
 `igx-fluent-theme` and `igx-fluent-dark-theme`
 
-We also added two new pallets that go with the new theme, `$fluent-word-palette` and `$fluent-excel-palette`.
+We also added two new palettes that go with the new theme, `$fluent-word-palette` and `$fluent-excel-palette`.
 
 Next example shows how you can use the Fluent theme.
 

angularDocsPostDeploy.ps1

@@ -64,7 +64,7 @@ if([System.IO.File]::Exists($filePath) -and [System.IO.Directory]::Exists($angul
     $folders = Get-ChildItem -Path $angularDocsRootFolder -Directory -Exclude $tagFolder,"sass","typescript" -Name | Sort-Object @{Expression = {[double]($_.Substring(0, $_.LastIndexOf('.'))) }};
     $textToUpdate = "";
     foreach($item in $folders) {
-        $textToUpdate += '"' + $item.Name + '"'; 
+        $textToUpdate += '"' + $item + '"'; 
     }
     $textToUpdate = "[" +  $textToUpdate.Replace("`"`"","`"`,`"") + "]" ;
     Write-Host $textToUpdate;

package-lock.json

@@ -53,14 +53,14 @@
     "@angular/platform-browser-dynamic": "^10.0.0",
     "@angular/router": "^10.0.0",
     "@types/hammerjs": "^2.0.36",
-    "@types/jszip": "^3.4.1",
     "@types/source-map": "0.5.2",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.6.11",
     "core-js-pure": "^3.6.5",
     "hammerjs": "^2.0.8",
     "igniteui-trial-watermark": "^1.0.3",
-    "jszip": "^3.4.0",
+    "jszip": "^3.5.0",
+    "lodash.merge": "^4.6.2",
     "resize-observer-polyfill": "^1.5.1",
     "rxjs": "^6.5.4",
     "tslib": "^2.0.0",

package.json

@@ -7,11 +7,11 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
-      "@types/jszip",
       "core-js-pure",
       "hammerjs",
       "jszip",
       "resize-observer-polyfill",
-      "igniteui-trial-watermark"
+      "igniteui-trial-watermark",
+      "lodash.merge"
     ]
 }

projects/igniteui-angular/ng-package.json

@@ -9,11 +9,11 @@
   },
   "whitelistedNonPeerDependencies": [
       "@types/hammerjs",
-      "@types/jszip",
       "core-js-pure",
       "hammerjs",
       "jszip",
       "resize-observer-polyfill",
-      "igniteui-trial-watermark"
+      "igniteui-trial-watermark",
+      "lodash.merge"
     ]
 }

projects/igniteui-angular/ng-package.prod.json

@@ -67,13 +67,13 @@
     ],
     "dependencies": {
         "@types/hammerjs": "^2.0.36",
-        "@types/jszip": "^3.1.7",
         "core-js-pure": "^3.6.5",
         "hammerjs": "^2.0.8",
-        "jszip": "^3.3.0",
+        "jszip": "^3.5.0",
         "tslib": "^2.0.0",
         "resize-observer-polyfill": "^1.5.1",
-        "igniteui-trial-watermark": "^1.0.3"
+        "igniteui-trial-watermark": "^1.0.3",
+        "lodash.merge": "^4.6.2"
     },
     "peerDependencies": {
         "@angular/common": "^10.0.0",

projects/igniteui-angular/package.json

@@ -28,9 +28,9 @@ export const DEPENDENCIES_MAP: PackageEntry[] = [
         { name: 'tslib', target: PackageTarget.NONE },
         { name: 'resize-observer-polyfill', target: PackageTarget.REGULAR },
         { name: '@types/hammerjs', target: PackageTarget.DEV },
-        { name: '@types/jszip', target: PackageTarget.DEV },
         { name: 'igniteui-trial-watermark', target: PackageTarget.NONE },
         { name: 'core-js-pure', target: PackageTarget.NONE },
+        { name: 'lodash.merge', target: PackageTarget.NONE },
         // peerDependencies
         { name: '@angular/forms', target: PackageTarget.NONE },
         { name: '@angular/common', target: PackageTarget.NONE },

projects/igniteui-angular/schematics/utils/dependency-handler.ts

@@ -150,3 +150,16 @@
 
     @return $result;
 }
+
+/// Default elevations.
+/// @type Map
+/// @prop {Color} $color-1 [rgba(0, 0, 0, .26)] - The color used for the umbra shadow.
+/// @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(
+    rgba(0, 0, 0, .26),
+    rgba(0, 0, 0, .12),
+    rgba(0, 0, 0, .08)
+) !default;
+