From bd6399242e127f18ba002d4ac94f2d9720850d1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 17:35:45 +0000 Subject: [PATCH 1/2] fix(deps): update dependency classnames to v2.3.2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3b0da861cf..dfe405a61c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21662,9 +21662,9 @@ __metadata: linkType: hard "classnames@npm:*, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1": - version: 2.3.1 - resolution: "classnames@npm:2.3.1" - checksum: 14db8889d56c267a591f08b0834989fe542d47fac659af5a539e110cc4266694e8de86e4e3bbd271157dbd831361310a8293e0167141e80b0f03a0f175c80960 + version: 2.3.2 + resolution: "classnames@npm:2.3.2" + checksum: 2c62199789618d95545c872787137262e741f9db13328e216b093eea91c85ef2bfb152c1f9e63027204e2559a006a92eb74147d46c800a9f96297ae1d9f96f4e languageName: node linkType: hard From 117027636b1045f6267e3f94c950752a2fd0d5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 14 Sep 2023 13:57:03 +0200 Subject: [PATCH 2/2] fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/nine-taxis-study.md | 5 +++++ packages/core-components/src/layout/Sidebar/Items.tsx | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/nine-taxis-study.md diff --git a/.changeset/nine-taxis-study.md b/.changeset/nine-taxis-study.md new file mode 100644 index 0000000000..693534c2be --- /dev/null +++ b/.changeset/nine-taxis-study.md @@ -0,0 +1,5 @@ +--- +'@backstage/core-components': patch +--- + +Minor internal tweak to handle `classnames` update diff --git a/packages/core-components/src/layout/Sidebar/Items.tsx b/packages/core-components/src/layout/Sidebar/Items.tsx index 715e0d4af7..c40d45f8b4 100644 --- a/packages/core-components/src/layout/Sidebar/Items.tsx +++ b/packages/core-components/src/layout/Sidebar/Items.tsx @@ -351,7 +351,7 @@ export const WorkaroundNavLink = React.forwardRef< aria-current={ariaCurrent} style={{ ...style, ...(isActive ? activeStyle : undefined) }} className={classnames([ - className, + typeof className !== 'function' ? className : undefined, isActive ? activeClassName : undefined, ])} />