@nordicsemiconductor/pc-nrfconnect-shared 235.0.0 → 236.0.0

package/Changelog.md

@@ -7,6 +7,13 @@ 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.
 
+## 236.0.0 - 2025-11-07
+
+### Changed
+
+- In a `ConfirmationDialog` a cancel button is only displayed if `onCancel` is
+  defined (before it was mandatory to define it).
+
 ## 235.0.0 - 2025-11-06
 
 ### Fixed

package/package.json

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

package/release_notes.md

@@ -1,3 +1,4 @@
-### Fixed
+### Changed
 
-- A text sizing problem with Dropdown's chevron.
+- In a `ConfirmationDialog` a cancel button is only displayed if `onCancel` is
+  defined (before it was mandatory to define it).

package/src/Dialog/Dialog.test.tsx

@@ -48,8 +48,8 @@ describe('Dialog', () => {
 });
 
 describe('InfoDialog creator', () => {
-    const dialog = (isVisible = true) => (
-        <InfoDialog isVisible={isVisible} onHide={noop}>
+    const dialog = () => (
+        <InfoDialog isVisible onHide={noop}>
             Test Body
         </InfoDialog>
     );
@@ -73,8 +73,8 @@ describe('InfoDialog creator', () => {
 });
 
 describe('ErrorDialog creator', () => {
-    const dialog = (isVisible = true) => (
-        <ErrorDialog isVisible={isVisible} onHide={noop}>
+    const dialog = () => (
+        <ErrorDialog isVisible onHide={noop}>
             Test Body
         </ErrorDialog>
     );
@@ -97,19 +97,27 @@ describe('ErrorDialog creator', () => {
     });
 });
 describe('ConfirmationDialog creator', () => {
-    const dialog = (isVisible = true) => (
+    const mockedConfirm = jest.fn();
+    const mockedCancel = jest.fn();
+    const mockedOptional = jest.fn();
+
+    const dialog = () => (
         <ConfirmationDialog
-            isVisible={isVisible}
+            isVisible
             confirmLabel="ConfButton"
-            onConfirm={() => noop(true)}
-            onCancel={() => noop(false)}
+            onConfirm={mockedConfirm}
+            onCancel={mockedCancel}
             optionalLabel="Optional"
-            onOptional={() => noop()}
+            onOptional={mockedOptional}
         >
             Test Body
         </ConfirmationDialog>
     );
 
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
     it('shows the expected content', () => {
         render(dialog());
 
@@ -123,11 +131,29 @@ describe('ConfirmationDialog creator', () => {
     it('invokes the expected action', () => {
         render(dialog());
 
+        jest.resetAllMocks();
         fireEvent.click(screen.getByText('Optional'));
-        expect(noop).toHaveBeenCalled();
+        expect(mockedOptional).toHaveBeenCalled();
         fireEvent.click(screen.getByText('ConfButton'));
-        expect(noop).toHaveBeenCalledWith(true);
+        expect(mockedConfirm).toHaveBeenCalled();
         fireEvent.click(screen.getByText('Cancel'));
-        expect(noop).toHaveBeenCalledWith(false);
+        expect(mockedCancel).toHaveBeenCalled();
+    });
+
+    it('invokes onCancel on pressing ESC', () => {
+        render(dialog());
+
+        fireEvent.keyDown(document, { key: 'Escape', keyCode: 27 });
+        expect(mockedCancel).toHaveBeenCalled();
+    });
+
+    it('hides the Cancel button if onCancel is not provided', () => {
+        render(
+            <ConfirmationDialog isVisible onConfirm={() => {}}>
+                Test Body
+            </ConfirmationDialog>,
+        );
+
+        expect(screen.queryByText('Cancel')).not.toBeInTheDocument();
     });
 });

package/src/Dialog/Dialog.tsx

@@ -207,7 +207,7 @@ interface ConfirmationDialogProps extends Omit<CoreProps, 'onHide'> {
     confirmLabel?: string;
     onConfirm: () => void;
     cancelLabel?: string;
-    onCancel: () => void;
+    onCancel?: () => void;
     optionalLabel?: string;
     onOptional?: () => void;
 }
@@ -223,12 +223,12 @@ export const ConfirmationDialog = ({
     cancelLabel = 'Cancel',
     onCancel,
     optionalLabel,
-    onOptional = () => {},
+    onOptional,
     size,
 }: ConfirmationDialogProps) => (
     <GenericDialog
         onHide={onCancel}
-        closeOnEsc
+        closeOnEsc={onCancel != null}
         isVisible={isVisible}
         headerIcon={headerIcon}
         title={title}
@@ -239,12 +239,16 @@ export const ConfirmationDialog = ({
                 <DialogButton variant="primary" onClick={onConfirm}>
                     {confirmLabel}
                 </DialogButton>
-                {optionalLabel && (
+                {onOptional && optionalLabel && (
                     <DialogButton onClick={onOptional}>
                         {optionalLabel}
                     </DialogButton>
                 )}
-                <DialogButton onClick={onCancel}>{cancelLabel}</DialogButton>
+                {onCancel && (
+                    <DialogButton onClick={onCancel}>
+                        {cancelLabel}
+                    </DialogButton>
+                )}
             </>
         }
     >

package/typings/generated/src/Dialog/Dialog.d.ts

@@ -60,7 +60,7 @@ interface ConfirmationDialogProps extends Omit<CoreProps, 'onHide'> {
     confirmLabel?: string;
     onConfirm: () => void;
     cancelLabel?: string;
-    onCancel: () => void;
+    onCancel?: () => void;
     optionalLabel?: string;
     onOptional?: () => void;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../../../../src/Dialog/Dialog.tsx"],"names":[],"mappings":"AAMA,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGzC,OAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG1D,OAAO,eAAe,CAAC;AAEvB,KAAK,SAAS,GAAG;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,KAAK,WAAW,GAAG,SAAS,GAAG;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,MAAM;oFAQhB,WAAW;gDA0BX;QACC,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,OAAO,CAAC;KACzB;uBAc4B;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;yBAIrB;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;CA5BrD,CAAC;AAkCF,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,SAAS,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,GAAI,sDAM1B,iBAAiB,gBAUnB,CAAC;AAEF,UAAU,kBAAmB,SAAQ,SAAS;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,aAAa,GAAI,uHAY3B,kBAAkB,gBAiBpB,CAAC;AAEF,UAAU,SAAU,SAAQ,SAAS;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,GAAI,8EASxB,SAAS,gBAcX,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,YAAY;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,gBAO1D,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,gBAK1D,CAAC;AAEP,UAAU,uBAAwB,SAAQ,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,eAAO,MAAM,kBAAkB,GAAI,yIAahC,uBAAuB,gBAyBzB,CAAC"}
+{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../../../../src/Dialog/Dialog.tsx"],"names":[],"mappings":"AAMA,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGzC,OAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG1D,OAAO,eAAe,CAAC;AAEvB,KAAK,SAAS,GAAG;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,KAAK,WAAW,GAAG,SAAS,GAAG;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,MAAM;oFAQhB,WAAW;gDA0BX;QACC,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,OAAO,CAAC;KACzB;uBAc4B;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;yBAIrB;QAAE,QAAQ,EAAE,SAAS,CAAA;KAAE;CA5BrD,CAAC;AAkCF,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,SAAS,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,GAAI,sDAM1B,iBAAiB,gBAUnB,CAAC;AAEF,UAAU,kBAAmB,SAAQ,SAAS;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,aAAa,GAAI,uHAY3B,kBAAkB,gBAiBpB,CAAC;AAEF,UAAU,SAAU,SAAQ,SAAS;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,GAAI,8EASxB,SAAS,gBAcX,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,YAAY;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,gBAO1D,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,gBAK1D,CAAC;AAEP,UAAU,uBAAwB,SAAQ,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,eAAO,MAAM,kBAAkB,GAAI,yIAahC,uBAAuB,gBA6BzB,CAAC"}