fix: fix borderBottomRightRadius value casting error

microsoft · Apr 10, 2024 · 47b36e9 · 47b36e9
1 parent 1bbcb33
commit 47b36e9
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/apps/xplat-v9/stories/Button/ButtonStories.tsx b/apps/xplat-v9/stories/Button/ButtonStories.tsx
@@ -1,8 +1,7 @@
 /** @jsxRuntime automatic */
 /** @jsxImportSource @fluentui/react-jsx-runtime */
 
-import * as React from 'react';
-
+import 'react';
 import { Default } from './ButtonDefault';
 import { Shape } from './ButtonShape';
 import { Appearance } from './ButtonAppearance';
@@ -14,8 +13,8 @@ export const ButtonStories = () => (
   <div>
     <h1>Default</h1>
     <Default />
-    {/* <h1>Shape</h1>
-    <Shape /> */}
+    <h1>Shape</h1>
+    <Shape />
     <h1>Appearance</h1>
     <Appearance />
     <h1>Size</h1>

diff --git a/change/@fluentui-tokens-d29191c2-f70b-4ad6-98da-b2bb00c91007.json b/change/@fluentui-tokens-d29191c2-f70b-4ad6-98da-b2bb00c91007.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Use 0 instead of '0' to better support RSD",
+  "packageName": "@fluentui/tokens",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/...onents/react-platform-adapter-preview/etc/react-platform-adapter-preview.api.md b/...onents/react-platform-adapter-preview/etc/react-platform-adapter-preview.api.md
@@ -10,7 +10,7 @@ import { makeStyles as makeStylesCore } from '@griffel/core';
 import { mergeClasses } from '@griffel/react';
 import type { PartialTheme } from '@fluentui/react-theme';
 import * as React_2 from 'react';
-import { shorthands } from '@griffel/react';
+import { shorthands } from '@griffel/core';
 import { TextDirectionProvider } from '@griffel/react';
 import type { Theme } from '@fluentui/react-theme';
 import { useRenderer_unstable } from '@griffel/react';

diff --git a/packages/react-components/react-platform-adapter-preview/src/styling/shorthands.ts b/packages/react-components/react-platform-adapter-preview/src/styling/shorthands.ts
@@ -1 +1 @@
-export { shorthands } from '@griffel/react';
+export { shorthands } from '@griffel/core';
diff --git a/packages/tokens/etc/tokens.api.md b/packages/tokens/etc/tokens.api.md
@@ -6,7 +6,7 @@
 
 // @public (undocumented)
 export type BorderRadiusTokens = {
-    borderRadiusNone: string;
+    borderRadiusNone: string | 0;
     borderRadiusSmall: string;
     borderRadiusMedium: string;
     borderRadiusLarge: string;

diff --git a/packages/tokens/src/global/borderRadius.ts b/packages/tokens/src/global/borderRadius.ts
@@ -1,7 +1,7 @@
 import type { BorderRadiusTokens } from '../types';
 
 export const borderRadius: BorderRadiusTokens = {
-  borderRadiusNone: '0',
+  borderRadiusNone: 0,
   borderRadiusSmall: '2px',
   borderRadiusMedium: '4px',
   borderRadiusLarge: '6px',

diff --git a/packages/tokens/src/types.ts b/packages/tokens/src/types.ts
@@ -603,7 +603,7 @@ export type TypographyStyles = {
 };
 
 export type BorderRadiusTokens = {
-  borderRadiusNone: string;
+  borderRadiusNone: string | 0;
   borderRadiusSmall: string;
   borderRadiusMedium: string;
   borderRadiusLarge: string;