Merge branch 'main' into column-placeholder-hld

ni · Mar 7, 2024 · 6b4da55 · 6b4da55
2 parents e9cebdd + 581d528
commit 6b4da55
Show file tree

Hide file tree

Showing 20 changed files with 721 additions and 109 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -17,14 +17,14 @@
       "groupName": "npm dependencies lock update only",
       "matchManagers": ["npm"],
       "rangeStrategy": "in-range-only",
-      "matchDepTypes": ["dependencies", "devDependencies"],
+      "matchDepTypes": ["dependencies", "devDependencies", "peerDependencies"],
       "enabled": true
     },
     {
       "groupName": "npm dependencies update to latest",
       "matchManagers": ["npm"],
       "rangeStrategy": "update-lockfile",
-      "matchDepTypes": ["dependencies", "devDependencies"],
+      "matchDepTypes": ["dependencies", "devDependencies", "peerDependencies"],
       "excludePackagePatterns":[
         "^@angular",
         "@microsoft/fast-foundation",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Thu, 07 Mar 2024 21:20:52 GMT",
+      "version": "20.2.20",
+      "tag": "@ni/nimble-angular_v20.2.20",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v21.10.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 06 Mar 2024 17:56:10 GMT",
       "version": "20.2.19",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Wed, 06 Mar 2024 17:56:10 GMT and should not be manually modified.
+This log was last generated on Thu, 07 Mar 2024 21:20:52 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.2.20
+
+Thu, 07 Mar 2024 21:20:52 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v21.10.0
+
 ## 20.2.19
 
 Wed, 06 Mar 2024 17:56:10 GMT

diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.2.19",
+  "version": "20.2.20",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
@@ -31,7 +31,7 @@
     "@angular/forms": "^15.2.10",
     "@angular/localize": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@ni/nimble-components": "^21.9.1"
+    "@ni/nimble-components": "^21.10.0"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-blazor",
-  "version": "14.3.17",
+  "version": "14.3.18",
   "description": "Blazor components for the NI Nimble Design System",
   "scripts": {
     "postinstall": "node build/generate-playwright-version-properties/source/index.js",

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Thu, 07 Mar 2024 21:20:52 GMT",
+      "version": "21.10.0",
+      "tag": "@ni/nimble-components_v21.10.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-components",
+            "commit": "a9b5cede5ebbb79127bf36e91b31d17d4bf241b9",
+            "comment": "New Wafer Map Component API. Introduced `diesTable` and two rendering strategies switched by this input"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 06 Mar 2024 17:56:10 GMT",
       "version": "21.9.1",

diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-components
 
-This log was last generated on Wed, 06 Mar 2024 17:56:10 GMT and should not be manually modified.
+This log was last generated on Thu, 07 Mar 2024 21:20:52 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 21.10.0
+
+Thu, 07 Mar 2024 21:20:52 GMT
+
+### Minor changes
+
+- New Wafer Map Component API. Introduced `diesTable` and two rendering strategies switched by this input ([ni/nimble@a9b5ced](https://github.com/ni/nimble/commit/a9b5cede5ebbb79127bf36e91b31d17d4bf241b9))
+
 ## 21.9.1
 
 Wed, 06 Mar 2024 17:56:10 GMT

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "21.9.1",
+  "version": "21.10.0",
   "description": "Styled web components for the NI Nimble Design System",
   "scripts": {
     "build": "npm run generate-icons && npm run generate-workers && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook",
@@ -75,6 +75,7 @@
     "@tiptap/extension-bold": "^2.2.2",
     "@tiptap/extension-bullet-list": "^2.2.2",
     "@tiptap/extension-document": "^2.2.2",
+    "@tiptap/extension-hard-break": "^2.2.2",
     "@tiptap/extension-history": "^2.2.2",
     "@tiptap/extension-italic": "^2.2.2",
     "@tiptap/extension-link": "^2.2.2",
@@ -84,7 +85,6 @@
     "@tiptap/extension-paragraph": "^2.2.2",
     "@tiptap/extension-placeholder": "^2.2.2",
     "@tiptap/extension-text": "^2.2.2",
-    "@tiptap/extension-hard-break": "^2.2.2",
     "@types/d3-array": "^3.0.4",
     "@types/d3-random": "^3.0.1",
     "@types/d3-scale": "^4.0.2",
@@ -102,6 +102,9 @@
     "prosemirror-state": "^1.4.3",
     "tslib": "^2.2.0"
   },
+  "peerDependencies": {
+    "apache-arrow": "^15.0.0"
+  },
   "devDependencies": {
     "@babel/cli": "^7.13.16",
     "@babel/core": "^7.20.12",

diff --git a/packages/nimble-components/src/wafer-map/index.ts b/packages/nimble-components/src/wafer-map/index.ts
@@ -5,6 +5,7 @@ import {
 } from '@microsoft/fast-element';
 import { DesignSystem, FoundationElement } from '@microsoft/fast-foundation';
 import { zoomIdentity, ZoomTransform } from 'd3-zoom';
+import type { Table } from 'apache-arrow';
 import { template } from './template';
 import { styles } from './styles';
 import { DataManager } from './modules/data-manager';
@@ -21,6 +22,7 @@ import {
 } from './types';
 import { WaferMapUpdateTracker } from './modules/wafer-map-update-tracker';
 import { WaferMapValidator } from './modules/wafer-map-validator';
+import { WorkerRenderer } from './modules/worker-renderer';
 
 declare global {
     interface HTMLElementTagNameMap {
@@ -90,7 +92,14 @@ export class WaferMap extends FoundationElement {
     /**
      * @internal
      */
-    public readonly renderer = new RenderingModule(this);
+    public readonly mainRenderer = new RenderingModule(this);
+    /**
+     * @internal
+     */
+    public readonly workerRenderer = new WorkerRenderer(this);
+
+    @observable
+    public renderer: RenderingModule | WorkerRenderer = this.mainRenderer;
 
     /**
      * @internal
@@ -139,6 +148,8 @@ export class WaferMap extends FoundationElement {
 
     @observable public highlightedTags: string[] = [];
     @observable public dies: WaferMapDie[] = [];
+    @observable public diesTable: Table | undefined;
+
     @observable public colorScale: WaferMapColorScale = {
         colors: [],
         values: []
@@ -175,9 +186,12 @@ export class WaferMap extends FoundationElement {
      * The hover does not require an event update, but it's also the last update in the sequence.
      */
     public update(): void {
+        this.validate();
+        if (this.validity.invalidDiesTableSchema) {
+            return;
+        }
         if (this.waferMapUpdateTracker.requiresEventsUpdate) {
             this.eventCoordinator.detachEvents();
-            this.waferMapValidator.validateGridDimensions();
             if (this.waferMapUpdateTracker.requiresContainerDimensionsUpdate) {
                 this.dataManager.updateContainerDimensions();
                 this.renderer.updateSortedDiesAndDrawWafer();
@@ -203,6 +217,11 @@ export class WaferMap extends FoundationElement {
         }
     }
 
+    private validate(): void {
+        this.waferMapValidator.validateGridDimensions();
+        this.waferMapValidator.validateDiesTableSchema();
+    }
+
     private createResizeObserver(): ResizeObserver {
         const resizeObserver = new ResizeObserver(entries => {
             const entry = entries[0];
@@ -272,6 +291,17 @@ export class WaferMap extends FoundationElement {
 
     private diesChanged(): void {
         this.waferMapUpdateTracker.track('dies');
+        this.renderer = this.diesTable === undefined
+            ? this.mainRenderer
+            : this.workerRenderer;
+        this.waferMapUpdateTracker.queueUpdate();
+    }
+
+    private diesTableChanged(): void {
+        this.waferMapUpdateTracker.track('dies');
+        this.renderer = this.diesTable === undefined
+            ? this.mainRenderer
+            : this.workerRenderer;
         this.waferMapUpdateTracker.queueUpdate();
     }