@ni/nimble-components 15.5.6 → 15.5.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/all-components-bundle.js +1126 -20
- package/dist/all-components-bundle.js.map +1 -1
- package/dist/all-components-bundle.min.js +234 -210
- package/dist/all-components-bundle.min.js.map +1 -1
- package/dist/esm/wafer-map/modules/prerendering.js +24 -16
- package/dist/esm/wafer-map/modules/prerendering.js.map +1 -1
- package/dist/esm/wafer-map/types.d.ts +0 -1
- package/package.json +4 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { scaleLinear, scaleOrdinal } from 'd3-scale';
|
|
2
|
+
import { ColorRGBA64, parseColor } from '@microsoft/fast-colors';
|
|
2
3
|
import { WaferMapColorScaleMode } from '../types';
|
|
3
4
|
/**
|
|
4
5
|
* Prerendering prepares render-ready dies data to be used by the rendering module
|
|
@@ -7,8 +8,8 @@ export class Prerendering {
|
|
|
7
8
|
constructor(dies, colorScale, highlightedValues, horizontalScale, verticalScale, colorScaleMode, dieLabelsHidden, dieLabelsSuffix, maxCharacters, dieDimensions, margin) {
|
|
8
9
|
this.fontSizeFactor = 0.8;
|
|
9
10
|
this.nonHighlightedOpacity = 0.3;
|
|
10
|
-
this.emptyDieColor = '
|
|
11
|
-
this.nanDieColor = '
|
|
11
|
+
this.emptyDieColor = 'rgba(218,223,236,1)';
|
|
12
|
+
this.nanDieColor = 'rgba(122,122,122,1)';
|
|
12
13
|
this.d3ColorScale = this.createD3ColorScale(colorScale, colorScaleMode);
|
|
13
14
|
this.labelsFontSize = this.calculateLabelsFontSize(dieDimensions, maxCharacters);
|
|
14
15
|
this.diesRenderInfo = [];
|
|
@@ -16,8 +17,7 @@ export class Prerendering {
|
|
|
16
17
|
this.diesRenderInfo.push({
|
|
17
18
|
x: horizontalScale(die.x) + margin.right,
|
|
18
19
|
y: verticalScale(die.y) + margin.top,
|
|
19
|
-
fillStyle: this.calculateFillStyle(die, colorScaleMode),
|
|
20
|
-
opacity: this.calculateOpacity(die.value, highlightedValues),
|
|
20
|
+
fillStyle: this.calculateFillStyle(die.value, colorScaleMode, highlightedValues),
|
|
21
21
|
text: this.buildLabel(die.value, maxCharacters, dieLabelsHidden, dieLabelsSuffix)
|
|
22
22
|
});
|
|
23
23
|
}
|
|
@@ -53,7 +53,7 @@ export class Prerendering {
|
|
|
53
53
|
return highlightedValues.length > 0
|
|
54
54
|
&& !highlightedValues.some(dieValue => dieValue === selectedValue)
|
|
55
55
|
? this.nonHighlightedOpacity
|
|
56
|
-
:
|
|
56
|
+
: 1;
|
|
57
57
|
}
|
|
58
58
|
isColorScaleLinear(colorScaleMode) {
|
|
59
59
|
return colorScaleMode === WaferMapColorScaleMode.linear;
|
|
@@ -61,20 +61,28 @@ export class Prerendering {
|
|
|
61
61
|
isColorScaleOrdinal(colorScaleMode) {
|
|
62
62
|
return colorScaleMode === WaferMapColorScaleMode.ordinal;
|
|
63
63
|
}
|
|
64
|
-
calculateFillStyle(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
64
|
+
calculateFillStyle(value, colorScaleMode, highlightedValues) {
|
|
65
|
+
let colorValue = this.emptyDieColor;
|
|
66
|
+
if (this.dieHasData(value)) {
|
|
67
|
+
if (isNaN(+value)) {
|
|
68
|
+
colorValue = this.nanDieColor;
|
|
69
|
+
}
|
|
70
|
+
else if (this.isColorScaleLinear(colorScaleMode)) {
|
|
71
|
+
colorValue = this.d3ColorScale(+value);
|
|
72
|
+
}
|
|
73
|
+
else if (this.isColorScaleOrdinal(colorScaleMode)) {
|
|
74
|
+
colorValue = this.d3ColorScale(value);
|
|
75
|
+
}
|
|
70
76
|
}
|
|
71
|
-
if (
|
|
72
|
-
return this.
|
|
77
|
+
if (colorValue === undefined) {
|
|
78
|
+
return this.emptyDieColor;
|
|
73
79
|
}
|
|
74
|
-
|
|
75
|
-
|
|
80
|
+
let rgbColor = parseColor(colorValue);
|
|
81
|
+
if (rgbColor === null) {
|
|
82
|
+
return this.emptyDieColor;
|
|
76
83
|
}
|
|
77
|
-
|
|
84
|
+
rgbColor = new ColorRGBA64(rgbColor.r, rgbColor.g, rgbColor.b, this.calculateOpacity(value, highlightedValues));
|
|
85
|
+
return rgbColor.toStringWebRGBA();
|
|
78
86
|
}
|
|
79
87
|
}
|
|
80
88
|
//# sourceMappingURL=prerendering.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prerendering.js","sourceRoot":"","sources":["../../../../src/wafer-map/modules/prerendering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAgB,YAAY,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AASlD;;GAEG;AACH,MAAM,OAAO,YAAY;IAcrB,YACI,IAAuC,EACvC,UAAwC,EACxC,iBAAqC,EACrC,eAA4C,EAC5C,aAA0C,EAC1C,cAAgD,EAChD,eAAkC,EAClC,eAAiC,EACjC,aAA+B,EAC/B,aAAmC,EACnC,MAAwB;QAhBX,mBAAc,GAAG,GAAG,CAAC;QACrB,0BAAqB,GAAG,GAAG,CAAC;QAC5B,kBAAa,GAAG,
|
|
1
|
+
{"version":3,"file":"prerendering.js","sourceRoot":"","sources":["../../../../src/wafer-map/modules/prerendering.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAgB,YAAY,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AASlD;;GAEG;AACH,MAAM,OAAO,YAAY;IAcrB,YACI,IAAuC,EACvC,UAAwC,EACxC,iBAAqC,EACrC,eAA4C,EAC5C,aAA0C,EAC1C,cAAgD,EAChD,eAAkC,EAClC,eAAiC,EACjC,aAA+B,EAC/B,aAAmC,EACnC,MAAwB;QAhBX,mBAAc,GAAG,GAAG,CAAC;QACrB,0BAAqB,GAAG,GAAG,CAAC;QAC5B,kBAAa,GAAG,qBAAqB,CAAC;QACtC,gBAAW,GAAG,qBAAqB,CAAC;QAejD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAExE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,uBAAuB,CAC9C,aAAa,EACb,aAAa,CAChB,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;gBACrB,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK;gBACxC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG;gBACpC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAC9B,GAAG,CAAC,KAAK,EACT,cAAc,EACd,iBAAiB,CACpB;gBACD,IAAI,EAAE,IAAI,CAAC,UAAU,CACjB,GAAG,CAAC,KAAK,EACT,aAAa,EACb,eAAe,EACf,eAAe,CAClB;aACJ,CAAC,CAAC;SACN;IACL,CAAC;IAEO,uBAAuB,CAC3B,aAAyB,EACzB,aAAqB;QAErB,OAAO,IAAI,CAAC,GAAG,CACX,aAAa,CAAC,MAAM,EACpB,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,aAAa,CAAC,GAAG,GAAG,CAAC,CAAC;cACpD,IAAI,CAAC,cAAc,CAC5B,CAAC;IACN,CAAC;IAEO,kBAAkB,CACtB,UAA8B,EAC9B,cAAsC;QAEtC,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;YACzC,OAAO,WAAW,EAAkB;iBAC/B,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;iBAC5C,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;SACjC;QACD,OAAO,YAAY,EAAkB;aAChC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;aACzB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAEO,UAAU,CAAC,OAAe;QAC9B,OAAO,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,EAAE,CAAC;IACvE,CAAC;IAEO,UAAU,CACd,KAAa,EACb,aAAqB,EACrB,eAAwB,EACxB,eAAuB;QAEvB,IAAI,eAAe,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC5C,OAAO,EAAE,CAAC;SACb;QACD,MAAM,KAAK,GAAG,GAAG,KAAK,GAAG,eAAe,EAAE,CAAC;QAC3C,IAAI,KAAK,CAAC,MAAM,GAAG,aAAa,EAAE;YAC9B,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC;SAClD;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,gBAAgB,CACpB,aAAqB,EACrB,iBAAqC;QAErC,OAAO,iBAAiB,CAAC,MAAM,GAAG,CAAC;eAC5B,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,KAAK,aAAa,CAAC;YAClE,CAAC,CAAC,IAAI,CAAC,qBAAqB;YAC5B,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC;IAEO,kBAAkB,CACtB,cAAsC;QAEtC,OAAO,cAAc,KAAK,sBAAsB,CAAC,MAAM,CAAC;IAC5D,CAAC;IAEO,mBAAmB,CACvB,cAAsC;QAEtC,OAAO,cAAc,KAAK,sBAAsB,CAAC,OAAO,CAAC;IAC7D,CAAC;IAEO,kBAAkB,CACtB,KAAa,EACb,cAAsC,EACtC,iBAAqC;QAErC,IAAI,UAAU,GAAW,IAAI,CAAC,aAAa,CAAC;QAC5C,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACxB,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE;gBACf,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;aACjC;iBAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;gBAChD,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC;aAC1C;iBAAM,IAAI,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE;gBACjD,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;aACzC;SACJ;QACD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,OAAO,IAAI,CAAC,aAAa,CAAC;SAC7B;QACD,IAAI,QAAQ,GAAuB,UAAU,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,QAAQ,KAAK,IAAI,EAAE;YACnB,OAAO,IAAI,CAAC,aAAa,CAAC;SAC7B;QACD,QAAQ,GAAG,IAAI,WAAW,CACtB,QAAQ,CAAC,CAAC,EACV,QAAQ,CAAC,CAAC,EACV,QAAQ,CAAC,CAAC,EACV,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAClD,CAAC;QACF,OAAO,QAAQ,CAAC,eAAe,EAAE,CAAC;IACtC,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ni/nimble-components",
|
|
3
|
-
"version": "15.5.
|
|
3
|
+
"version": "15.5.8",
|
|
4
4
|
"description": "Styled web components for the NI Nimble Design System",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "npm run generate-icons && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook",
|
|
@@ -46,12 +46,15 @@
|
|
|
46
46
|
},
|
|
47
47
|
"homepage": "https://github.com/ni/nimble#readme",
|
|
48
48
|
"dependencies": {
|
|
49
|
+
"@microsoft/fast-colors": "^5.3.1",
|
|
49
50
|
"@microsoft/fast-element": "^1.10.1",
|
|
50
51
|
"@microsoft/fast-foundation": "^2.46.11",
|
|
51
52
|
"@microsoft/fast-web-utilities": "^5.4.1",
|
|
52
53
|
"@ni/nimble-tokens": "^4.3.0",
|
|
53
54
|
"@tanstack/table-core": "^8.7.0",
|
|
55
|
+
"@types/d3": "^7.4.0",
|
|
54
56
|
"@types/d3-scale": "^4.0.2",
|
|
57
|
+
"d3-random": "^3.0.1",
|
|
55
58
|
"d3-scale": "^4.0.2",
|
|
56
59
|
"hex-rgb": "^5.0.0",
|
|
57
60
|
"tslib": "^2.2.0"
|