From 1b69a2db3496e6ac7fd0bb41bc0c0eb3f4e29b31 Mon Sep 17 00:00:00 2001
From: Mitch-At-Work <mifraser@microsoft.com>
Date: Thu, 15 May 2025 10:56:15 -0700
Subject: [PATCH] Fix regressions

---
 packages/semantic-tokens/etc/semantic-tokens.api.md     | 4 ++--
 packages/semantic-tokens/scripts/tokenGen.ts            | 6 +-----
 packages/semantic-tokens/src/components/focus/tokens.ts | 6 +++---
 packages/semantic-tokens/src/fluentOverrides.ts         | 3 ++-
 packages/semantic-tokens/src/legacy/tokens.ts           | 5 +++++
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/semantic-tokens/etc/semantic-tokens.api.md b/packages/semantic-tokens/etc/semantic-tokens.api.md
index eebced2d2b4c1..c6c07c98421c7 100644
--- a/packages/semantic-tokens/etc/semantic-tokens.api.md
+++ b/packages/semantic-tokens/etc/semantic-tokens.api.md
@@ -1553,7 +1553,7 @@ export const ctrlFabShadowRestKey = "var(--smtc-ctrl-fab-shadow-rest-key)";
 export const ctrlFabShadowRestKeyRaw = "--smtc-ctrl-fab-shadow-rest-key";
 
 // @public (undocumented)
-export const ctrlFocusInnerStroke = "var(--smtc-ctrl-focus-inner-stroke)";
+export const ctrlFocusInnerStroke = "var(--smtc-ctrl-focus-inner-stroke, var(--colorStrokeFocus2))";
 
 // @public (undocumented)
 export const ctrlFocusInnerStrokeRaw = "--smtc-ctrl-focus-inner-stroke";
@@ -1565,7 +1565,7 @@ export const ctrlFocusInnerStrokeWidth = "var(--smtc-ctrl-focus-inner-stroke-wid
 export const ctrlFocusInnerStrokeWidthRaw = "--smtc-ctrl-focus-inner-stroke-width";
 
 // @public (undocumented)
-export const ctrlFocusOuterStroke = "var(--smtc-ctrl-focus-outer-stroke, var(--smtc-background-ctrl-brand-rest, var(--colorStrokeFocus2)))";
+export const ctrlFocusOuterStroke = "var(--smtc-ctrl-focus-outer-stroke, var(--smtc-background-ctrl-brand-rest, var(--colorTransparentStroke)))";
 
 // @public (undocumented)
 export const ctrlFocusOuterStrokeRaw = "--smtc-ctrl-focus-outer-stroke";
diff --git a/packages/semantic-tokens/scripts/tokenGen.ts b/packages/semantic-tokens/scripts/tokenGen.ts
index 88cfa44f55490..4e9e402b641c0 100644
--- a/packages/semantic-tokens/scripts/tokenGen.ts
+++ b/packages/semantic-tokens/scripts/tokenGen.ts
@@ -47,7 +47,7 @@ const isInvalidToken = (token: string) => {
     return true;
   }
   // Blacklist for non-valid tokens
-  if (token.includes('Figmaonly') || token.startsWith('null')) {
+  if (token.includes('Figmaonly') || token.toLocaleLowerCase().startsWith('null')) {
     // Superfluous tokens - SKIP
     return true;
   }
@@ -142,10 +142,6 @@ const getResolvedToken = (token: string, tokenData: Token, tokenNameRaw: string)
     )}, ${escapeMixedInlineToken(fluentFallback)}))`;
   }
 
-  if (fluentFallback && tokenData.nullable) {
-    return `var(${escapeInlineToken(tokenNameRaw)}, var(${escapeMixedInlineToken(fluentFallback)}}, unset))`;
-  }
-
   if (fluentFallback) {
     return `var(${escapeInlineToken(tokenNameRaw)}, ${escapeMixedInlineToken(fluentFallback)})`;
   }
diff --git a/packages/semantic-tokens/src/components/focus/tokens.ts b/packages/semantic-tokens/src/components/focus/tokens.ts
index 93475f34e7fbe..7598d8ad13674 100644
--- a/packages/semantic-tokens/src/components/focus/tokens.ts
+++ b/packages/semantic-tokens/src/components/focus/tokens.ts
@@ -1,6 +1,6 @@
 // THIS FILE IS GENERATED AS PART OF THE BUILD PROCESS. DO NOT MANUALLY MODIFY THIS FILE
 import { strokeWidthDefaultRaw, backgroundCtrlBrandRestRaw } from '../../control/variables';
-import { colorStrokeFocus2 } from '../../legacy/tokens';
+import { colorStrokeFocus2, colorTransparentStroke } from '../../legacy/tokens';
 import {
   ctrlFocusInnerStrokeWidthRaw,
   ctrlFocusInnerStrokeRaw,
@@ -9,6 +9,6 @@ import {
 } from './variables';
 
 export const ctrlFocusInnerStrokeWidth = `var(${ctrlFocusInnerStrokeWidthRaw}, var(${strokeWidthDefaultRaw}))`;
-export const ctrlFocusInnerStroke = `var(${ctrlFocusInnerStrokeRaw})`;
+export const ctrlFocusInnerStroke = `var(${ctrlFocusInnerStrokeRaw}, ${colorStrokeFocus2})`;
 export const ctrlFocusOuterStrokeWidth = `var(${ctrlFocusOuterStrokeWidthRaw})`;
-export const ctrlFocusOuterStroke = `var(${ctrlFocusOuterStrokeRaw}, var(${backgroundCtrlBrandRestRaw}, ${colorStrokeFocus2}))`;
+export const ctrlFocusOuterStroke = `var(${ctrlFocusOuterStrokeRaw}, var(${backgroundCtrlBrandRestRaw}, ${colorTransparentStroke}))`;
diff --git a/packages/semantic-tokens/src/fluentOverrides.ts b/packages/semantic-tokens/src/fluentOverrides.ts
index 271267472fb10..8202bf94a1c86 100644
--- a/packages/semantic-tokens/src/fluentOverrides.ts
+++ b/packages/semantic-tokens/src/fluentOverrides.ts
@@ -12,7 +12,8 @@ export type FluentOverrides = Record<string, FluentOverrideValue | null>;
 
 export const fluentOverrides: FluentOverrides = {
   cornerZero: { f2Token: 'borderRadiusNone' },
-  ctrlFocusOuterStroke: { f2Token: 'colorStrokeFocus2' },
+  ctrlFocusInnerStroke: { f2Token: 'colorStrokeFocus2' },
+  ctrlFocusOuterStroke: { f2Token: 'colorTransparentStroke' },
   ctrlLinkForegroundBrandHover: { f2Token: 'colorBrandForegroundLinkHover' },
   ctrlLinkForegroundBrandPressed: { f2Token: 'colorBrandForegroundLinkPressed' },
   ctrlLinkForegroundBrandRest: { f2Token: 'colorBrandForegroundLink' },
diff --git a/packages/semantic-tokens/src/legacy/tokens.ts b/packages/semantic-tokens/src/legacy/tokens.ts
index e07f8f67a34ba..ac932fcdc6546 100644
--- a/packages/semantic-tokens/src/legacy/tokens.ts
+++ b/packages/semantic-tokens/src/legacy/tokens.ts
@@ -9,6 +9,11 @@ export const borderRadiusNone = 'var(--borderRadiusNone)';
  * @public
  */
 export const colorStrokeFocus2 = 'var(--colorStrokeFocus2)';
+/**
+ * CSS custom property value for the {@link @fluentui/tokens#colorTransparentStroke | `colorTransparentStroke`} design token.
+ * @public
+ */
+export const colorTransparentStroke = 'var(--colorTransparentStroke)';
 /**
  * CSS custom property value for the {@link @fluentui/tokens#colorBrandForegroundLinkHover | `colorBrandForegroundLinkHover`} design token.
  * @public