Fix case when accesskey is not part of the label

public-ui · Oct 27, 2023 · d021f57 · d021f57
1 parent 6037f6e
commit d021f57
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 2 deletions.
diff --git a/packages/components/src/components/span/InternalUnderlinedAccessKey.tsx b/packages/components/src/components/span/InternalUnderlinedAccessKey.tsx
@@ -18,8 +18,8 @@ export const InternalUnderlinedAccessKey = ({ label, accessKey }: Props) => {
 	return (
 		<span>
 			{first}
-			<u>{accessKey}</u>
-			{rest.join(accessKey)}
+			{rest.length ? <u>{accessKey}</u> : null}
+			{rest.length ? rest.join(accessKey) : null}
 		</span>
 	);
 };
diff --git a/packages/samples/react/src/components/button/access-key.tsx b/packages/samples/react/src/components/button/access-key.tsx
@@ -5,6 +5,7 @@ export const ButtonAccessKey: FC = () => (
 	<div className="flex gap-4">
 		<KolButton _label="Mit S access key" _accessKey="S"></KolButton>
 		<KolButton _label="Sehr kleines s" _accessKey="s"></KolButton>
+		<KolButton _label="Access key kommt nicht in label vor" _accessKey="x"></KolButton>
 		<KolButton _label="access key ohne label" _hideLabel _accessKey="s" _icons="codicon codicon-dashboard"></KolButton>
 		<KolButton
 			_label="mit inline icons"

diff --git a/...hemes/bmf/snapshots/theme-bmf/snapshot-for-button-access-key-firefox-darwin.png b/...hemes/bmf/snapshots/theme-bmf/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...mes/bzst/snapshots/theme-bzst/snapshot-for-button-access-key-firefox-darwin.png b/...mes/bzst/snapshots/theme-bzst/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...fault/snapshots/theme-default/snapshot-for-button-access-key-firefox-darwin.png b/...fault/snapshots/theme-default/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...es/ecl/snapshots/theme-ecl_ec/snapshot-for-button-access-key-firefox-darwin.png b/...es/ecl/snapshots/theme-ecl_ec/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...es/ecl/snapshots/theme-ecl_eu/snapshot-for-button-access-key-firefox-darwin.png b/...es/ecl/snapshots/theme-ecl_eu/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...zbund/snapshots/theme-itzbund/snapshot-for-button-access-key-firefox-darwin.png b/...zbund/snapshots/theme-itzbund/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...hemes/mfm/snapshots/theme-mfm/snapshot-for-button-access-key-firefox-darwin.png b/...hemes/mfm/snapshots/theme-mfm/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...mes/zoll/snapshots/theme-mapz/snapshot-for-button-access-key-firefox-darwin.png b/...mes/zoll/snapshots/theme-mapz/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...s/zoll/snapshots/theme-zollv2/snapshot-for-button-access-key-firefox-darwin.png b/...s/zoll/snapshots/theme-zollv2/snapshot-for-button-access-key-firefox-darwin.png
diff --git a/...s/zoll/snapshots/theme-zollv3/snapshot-for-button-access-key-firefox-darwin.png b/...s/zoll/snapshots/theme-zollv3/snapshot-for-button-access-key-firefox-darwin.png