@nordicsemiconductor/pc-nrfconnect-shared 109.0.0 → 111.0.0

package/Changelog.md

@@ -7,6 +7,26 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
+## 111 - 2023-09-22
+
+### Added
+
+-   Optional property `nrfConnectForDesktop.supportedDevices` in `package.json`.
+    Will for now only be used by the Quickstart app.
+-   Output link to where in Azure a release should be created.
+
+### Fixed
+
+-   List items in dialog bodies had the wrong size: They inherited the size from
+    the document body instead of using the same size as was used in the dialog
+    in paragraphs.
+
+## 110 - 2023-09-22
+
+### Fixed
+
+-   `MasonryLayout` dropdown component forced cards on different row to shift.
+
 ## 109 - 2023-09-21
 
 ### Changed
@@ -71,7 +91,8 @@ every new version is a new major version.
 
 ### Steps to upgrade
 
--   Update `nrfConnectForDesktop.nrfutil` to version 1.4.2 in `package.json`
+-   Update `nrfConnectForDesktop.nrfutil.device` to version 1.4.2 in
+    `package.json`
 
 ## 102 - 2023-09-05
 

package/coverage/cobertura-coverage.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage lines-valid="3207" lines-covered="1788" line-rate="0.5575" branches-valid="1532" branches-covered="448" branch-rate="0.2924" timestamp="1695307913420" complexity="0" version="0.1">
+<coverage lines-valid="3208" lines-covered="1788" line-rate="0.5573" branches-valid="1532" branches-covered="448" branch-rate="0.2924" timestamp="1695416714971" complexity="0" version="0.1">
   <sources>
     <source>/home/vsts/work/1/s</source>
   </sources>
@@ -1615,9 +1615,9 @@
         </class>
       </classes>
     </package>
-    <package name="scripts" line-rate="0.7118000000000001" branch-rate="0.36">
+    <package name="scripts" line-rate="0.7" branch-rate="0.36">
       <classes>
-        <class name="release-shared.ts" filename="scripts/release-shared.ts" line-rate="0.7118000000000001" branch-rate="0.36">
+        <class name="release-shared.ts" filename="scripts/release-shared.ts" line-rate="0.7" branch-rate="0.36">
           <methods>
             <method name="(anonymous_7)" hits="0" signature="()V">
               <lines>
@@ -1757,9 +1757,10 @@
             <line number="197" hits="0" branch="true" condition-coverage="0% (0/2)"/>
             <line number="200" hits="0" branch="true" condition-coverage="0% (0/1)"/>
             <line number="201" hits="0" branch="false"/>
-            <line number="205" hits="1" branch="false"/>
-            <line number="206" hits="1" branch="true" condition-coverage="0% (0/1)"/>
-            <line number="207" hits="0" branch="false"/>
+            <line number="202" hits="0" branch="false"/>
+            <line number="208" hits="1" branch="false"/>
+            <line number="209" hits="1" branch="true" condition-coverage="0% (0/1)"/>
+            <line number="210" hits="0" branch="false"/>
           </lines>
         </class>
       </classes>

package/ipc/MetaFiles.ts

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
+import { DevicePCA } from '../src/Device/deviceInfo/deviceInfo';
+
 export type UrlString = string;
 
 export interface SourceJson {
@@ -43,6 +45,7 @@ interface ObjectContainingOptionalStrings {
 }
 
 interface NrfConnectForDesktop {
+    supportedDevices?: DevicePCA[];
     nrfutil?: NrfutilModules;
     html?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "109.0.0",
+    "version": "111.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",

package/scripts/release-shared.ts

@@ -199,6 +199,9 @@ const main = () => {
 
     if (noErrors) {
         doRelease(nextReleaseNumber);
+        console.log(
+            'All done on GitHub. Now go to Azure and create a release there:\nhttps://dev.azure.com/NordicSemiconductor/Wayland/_release?definitionId=33'
+        );
     }
 };
 

package/src/Device/deviceInfo/deviceInfo.ts

@@ -43,7 +43,7 @@ import unknownNordicLogo from '!!@svgr!./unknown-nordic-logo.svg';
 
 type Device = NrfutilDevice | WrappedDevice;
 
-type DevicePCA =
+export type DevicePCA =
     | 'PCA10028'
     | 'PCA10031'
     | 'PCA10040'

package/src/Dialog/dialog.scss

@@ -36,7 +36,8 @@
         overflow-wrap: anywhere;
         padding: 32px 16px 16px 16px;
         margin: 0;
-        p {
+        p,
+        li {
             font-size: 14px;
         }
     }

package/src/MasonryLayout/MasonryLayout.tsx

@@ -102,7 +102,8 @@ export default ({
 
         const generateMetaData = (col: number) => {
             let child = masonryLayoutRef.current?.firstElementChild;
-            const heightMatrix: number[][] = [];
+            const offsetHeightMatrix: number[][] = [];
+            const scrollHeightMatrix: number[][] = [];
             const zeroHeightChildren: boolean[] = [];
 
             let i = 0;
@@ -111,11 +112,14 @@ export default ({
                     if (!child.hasAttribute('data-filler')) {
                         const rowIndex = Math.floor(i / col);
 
-                        if (heightMatrix[rowIndex] === undefined) {
-                            heightMatrix[rowIndex] = [];
+                        if (offsetHeightMatrix[rowIndex] === undefined) {
+                            offsetHeightMatrix[rowIndex] = [];
+                            scrollHeightMatrix[rowIndex] = [];
                         }
 
-                        const row = heightMatrix[rowIndex];
+                        const offsetHeightRow = offsetHeightMatrix[rowIndex];
+                        const scrollHeightRow = scrollHeightMatrix[rowIndex];
+                        let scrollHeightRowDiff = 0;
                         const columnIndex = i % col;
 
                         i += 1;
@@ -123,19 +127,34 @@ export default ({
                             child.offsetHeight <=
                             Number.parseInt(styles.margin, 10)
                         ) {
-                            row[columnIndex] = 0;
+                            offsetHeightRow[columnIndex] = 0;
                             zeroHeightChildren.push(true);
                         } else {
-                            row[columnIndex] = child.scrollHeight + 9; // 8 border bottom + 1px to round as value might be decimal
+                            offsetHeightRow[columnIndex] =
+                                child.offsetHeight + 1; // 1px to round as value might be decimal
+                            scrollHeightRowDiff =
+                                child.scrollHeight +
+                                9 -
+                                offsetHeightRow[columnIndex]; // 8 border bottom + 1px to round as value might be decimal
                             zeroHeightChildren.push(false);
                         }
+
+                        scrollHeightRow[columnIndex] =
+                            offsetHeightMatrix.reduce(
+                                (p, c) => p + c[columnIndex],
+                                0
+                            ) + scrollHeightRowDiff;
                     }
 
                     child = child.nextElementSibling;
                 }
             }
 
-            return { heightMatrix, hiddenChildren: zeroHeightChildren };
+            return {
+                offsetHeightMatrix,
+                scrollHeightMatrix,
+                hiddenChildren: zeroHeightChildren,
+            };
         };
 
         const calcData = (col: number) => {
@@ -143,7 +162,7 @@ export default ({
             const heights: number[] = Array(col).fill(0);
             const newOrder: number[] = [];
 
-            metaData.heightMatrix.forEach(row => {
+            metaData.offsetHeightMatrix.forEach(row => {
                 row.forEach(itemHeight => {
                     const smallest =
                         heights.findIndex(h => h === Math.min(...heights)) ?? 0;
@@ -153,7 +172,10 @@ export default ({
             });
 
             return {
-                maxHeight: Math.max(...heights, 0),
+                maxHeight: Math.max(
+                    ...heights,
+                    ...metaData.scrollHeightMatrix.flat()
+                ),
                 order: newOrder,
                 columnHeights: heights,
                 columns: Math.min(

package/typings/generated/ipc/MetaFiles.d.ts

@@ -1,3 +1,4 @@
+import { DevicePCA } from '../src/Device/deviceInfo/deviceInfo';
 export type UrlString = string;
 export interface SourceJson {
     name: string;
@@ -30,6 +31,7 @@ interface ObjectContainingOptionalStrings {
     [index: string]: string | undefined;
 }
 interface NrfConnectForDesktop {
+    supportedDevices?: DevicePCA[];
     nrfutil?: NrfutilModules;
     html?: string;
 }

package/typings/generated/ipc/MetaFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetaFiles.d.ts","sourceRoot":"","sources":["../../../ipc/MetaFiles.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED,UAAU,+BAA+B;IACrC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,UAAU,oBAAoB;IAC1B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACvC,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC3B,CAAC,IAAI,EAAE,iBAAiB,GAAG;QACvB,oBAAoB;QACpB,GAAG,oBAAoB,EAAE;KAC5B,CAAC;CACL;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,+BAA+B,GAAG,MAAM,CAAC;IAC/C,YAAY,CAAC,EAAE,+BAA+B,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,eAAe,CAAC,EAAE,+BAA+B,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,+BAA+B,CAAC;IAC1C,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,+BAA+B,CAAC;IACnD,UAAU,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,SAAS,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,+BAA+B,CAAC;CAC7C"}
+{"version":3,"file":"MetaFiles.d.ts","sourceRoot":"","sources":["../../../ipc/MetaFiles.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AAEhE,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAE/B,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,EAAE,CAAC;CACrB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,EAAE,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,SAAS,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,OAAO;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACL;AAED,UAAU,+BAA+B;IACrC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,UAAU,oBAAoB;IAC1B,gBAAgB,CAAC,EAAE,SAAS,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,YAAY,GAAG,MAAM,CAAC;AAE3B,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AACvC,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAEhD,MAAM,WAAW,cAAc;IAC3B,CAAC,IAAI,EAAE,iBAAiB,GAAG;QACvB,oBAAoB;QACpB,GAAG,oBAAoB,EAAE;KAC5B,CAAC;CACL;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;IAGtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,+BAA+B,GAAG,MAAM,CAAC;IAC/C,YAAY,CAAC,EAAE,+BAA+B,CAAC;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,eAAe,CAAC,EAAE,+BAA+B,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,+BAA+B,CAAC;IAC1C,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,+BAA+B,CAAC;IACnD,UAAU,CAAC,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,SAAS,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,+BAA+B,CAAC;CAC7C"}

package/typings/generated/src/Device/deviceInfo/deviceInfo.d.ts

@@ -2,6 +2,7 @@
 import { NrfutilDevice } from '../../../nrfutil';
 import type { Device as WrappedDevice } from '../deviceSlice';
 type Device = NrfutilDevice | WrappedDevice;
+export type DevicePCA = 'PCA10028' | 'PCA10031' | 'PCA10040' | 'PCA10056' | 'PCA10059' | 'PCA10090' | 'PCA10095' | 'PCA10100' | 'PCA10121' | 'PCA20020' | 'PCA20035' | 'PCA10143' | 'PCA10152' | 'PCA10153' | 'PCA20049';
 interface DeviceInfo {
     name?: string | null;
     cores?: number;

package/typings/generated/src/Device/deviceInfo/deviceInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceInfo.d.ts","sourceRoot":"","sources":["../../../../../src/Device/deviceInfo/deviceInfo.ts"],"names":[],"mappings":";AA8BA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAY9D,KAAK,MAAM,GAAG,aAAa,GAAG,aAAa,CAAC;AAmB5C,UAAU,UAAU;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC;IACxB,OAAO,EAAE;QACL,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;CACL;AAoLD,eAAO,MAAM,UAAU,WAAY,MAAM,KAAG,UAC2B,CAAC;AASxE,eAAO,MAAM,mBAAmB,WACpB,MAAM;;YAQjB,CAAC;AAEF,eAAO,MAAM,cAAc,WAAY,MAAM,uBAEiC,CAAC;AAE/E,eAAO,MAAM,YAAY,WAAY,MAAM,uBAIrC,CAAC"}
+{"version":3,"file":"deviceInfo.d.ts","sourceRoot":"","sources":["../../../../../src/Device/deviceInfo/deviceInfo.ts"],"names":[],"mappings":";AA8BA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAY9D,KAAK,MAAM,GAAG,aAAa,GAAG,aAAa,CAAC;AAE5C,MAAM,MAAM,SAAS,GACf,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,GACV,UAAU,CAAC;AAEjB,UAAU,UAAU;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC;IACxB,OAAO,EAAE;QACL,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;CACL;AAoLD,eAAO,MAAM,UAAU,WAAY,MAAM,KAAG,UAC2B,CAAC;AASxE,eAAO,MAAM,mBAAmB,WACpB,MAAM;;YAQjB,CAAC;AAEF,eAAO,MAAM,cAAc,WAAY,MAAM,uBAEiC,CAAC;AAE/E,eAAO,MAAM,YAAY,WAAY,MAAM,uBAIrC,CAAC"}

package/typings/generated/src/MasonryLayout/MasonryLayout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MasonryLayout.d.ts","sourceRoot":"","sources":["../../../../src/MasonryLayout/MasonryLayout.tsx"],"names":[],"mappings":"AAKA,OAAc,EAAE,iBAAiB,EAA+B,MAAM,OAAO,CAAC;AAM9E,UAAU,uBAAuB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAiED;;;;;;GAMG;6DAKA,kBAAkB,uBAAuB,CAAC;AAJ7C,wBA2IE"}
+{"version":3,"file":"MasonryLayout.d.ts","sourceRoot":"","sources":["../../../../src/MasonryLayout/MasonryLayout.tsx"],"names":[],"mappings":"AAKA,OAAc,EAAE,iBAAiB,EAA+B,MAAM,OAAO,CAAC;AAM9E,UAAU,uBAAuB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAiED;;;;;;GAMG;6DAKA,kBAAkB,uBAAuB,CAAC;AAJ7C,wBAiKE"}