more

pinterest · Nov 12, 2024 · d4a6687 · d4a6687
1 parent 28b5371
commit d4a6687
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 74 deletions.
diff --git a/docs/docs-components/App.tsx b/docs/docs-components/App.tsx
@@ -75,13 +75,15 @@ export default function App({ children, files }: Props) {
         <AppContextConsumer>
           {({ colorScheme }) => (
             <ColorSchemeProvider colorScheme={colorScheme}>
-              <GlobalEventsHandlerProvider linkHandlers={{ onNavigation: useOnNavigation }}>
-                <NavigationContextProvider>
-                  <LocalFilesProvider files={files}>
-                    <AppLayout colorScheme={colorScheme}>{children}</AppLayout>
-                  </LocalFilesProvider>
-                </NavigationContextProvider>
-              </GlobalEventsHandlerProvider>
+              <ColorSchemeProvider _conditionallyInactive colorScheme={colorScheme} >
+                <GlobalEventsHandlerProvider linkHandlers={{ onNavigation: useOnNavigation }}>
+                  <NavigationContextProvider>
+                    <LocalFilesProvider files={files}>
+                      <AppLayout colorScheme={colorScheme}>{children}</AppLayout>
+                    </LocalFilesProvider>
+                  </NavigationContextProvider>
+                </GlobalEventsHandlerProvider>
+              </ColorSchemeProvider>
             </ColorSchemeProvider>
           )}
         </AppContextConsumer>

diff --git a/docs/docs-components/Header.tsx b/docs/docs-components/Header.tsx
@@ -40,17 +40,26 @@ function getTabs(componentPlatform: 'web' | 'android' | 'ios') {
 }
 
 function Header() {
+  const searchAnchorRef = useRef<null | HTMLButtonElement | HTMLAnchorElement>(null);
+
   const router = useRouter();
   const { isSidebarOpen, setIsSidebarOpen, componentPlatformFilteredBy } = useNavigationContext();
   const [isMobileSearchExpandedOpen, setMobileSearchExpanded] = useState(false);
-  const [showVRToggle, setShowVRToggle] = useState(false);
 
-  const searchAnchorRef = useRef<null | HTMLButtonElement | HTMLAnchorElement>(null);
+  const [showVRToggle, setShowVRToggle] = useState(false);
 
   const isInVRExperiment = useDangerouslyInGestaltExperiment({
     webExperimentName: 'web_gestalt_visualRefresh',
     mwebExperimentName: 'web_gestalt_visualRefresh',
   });
+
+  const [showVR1Toggle, setShowVR1Toggle] = useState(false);
+
+  const isInVR1Experiment = useDangerouslyInGestaltExperiment({
+    webExperimentName: 'web_gestalt_visualRefresh1',
+    mwebExperimentName: 'web_gestalt_visualRefresh1',
+  });
+
   const { setExperiments } = useAppContext();
 
   const mainNavigationTabs = useMemo(
@@ -85,8 +94,16 @@ function Header() {
   );
 
   useEffect(() => {
-    if (isInVRExperiment) setShowVRToggle(true);
-  }, [isInVRExperiment]);
+    if (isInVRExperiment) {
+      setShowVRToggle(true);
+      setShowVR1Toggle(false);
+    }
+
+    if (isInVR1Experiment) {
+      setShowVRToggle(false);
+      setShowVR1Toggle(true);
+    }
+  }, [isInVRExperiment, isInVR1Experiment]);
 
   useEffect(() => {
     const isDeployPreviewEnvironment =
@@ -205,6 +222,16 @@ function Header() {
               />
             )}
 
+            {showVR1Toggle && (
+              <ButtonToggle
+                iconStart="sparkle"
+                onClick={() => setExperiments(isInVR1Experiment ? '' : 'VR1')}
+                selected={isInVR1Experiment}
+                size="sm"
+                text={isInVR1Experiment ? 'VR1 on' : 'VR1 off'}
+              />
+            )}
+
             {devExampleMode === 'development' ? (
               <Badge
                 position="middle"

diff --git a/docs/docs-components/contexts/DocsExperimentProvider.tsx b/docs/docs-components/contexts/DocsExperimentProvider.tsx
@@ -10,6 +10,7 @@ import { useAppContext } from '../appContext';
 
 const enabledExperiments = {
   Tokens: ['web_gestalt_visualRefresh', 'web_gestalt_visualRefresh'],
+  VR1: ['web_gestalt_visualRefresh1', 'web_gestalt_visualRefresh1'],
 } as const;
 
 type ExperimentKey = keyof typeof enabledExperiments;

diff --git a/docs/pages/visualrefreshactivation.tsx b/docs/pages/visualrefreshactivation.tsx
@@ -1,3 +1,4 @@
+import { Fragment } from 'react';
 import { BannerSlimExperiment } from '../docs-components/BannerSlimExperiment';
 import Page from '../docs-components/Page';
 import PageHeader from '../docs-components/PageHeader';
@@ -7,11 +8,18 @@ export default function DesignTokensPage() {
     <Page hideEditLink hideSideNav title="Visual refresh experimentation">
       <PageHeader
         bannerSlimExperiment={
-          <BannerSlimExperiment
-            componentName="Tokens"
-            description="enable a visual refresh in Gestalt. Typography and icons are also under the experiment"
-            pullRequest={3616}
-          />
+          <Fragment>
+            <BannerSlimExperiment
+              componentName="VR1"
+              description="enable a visual refresh in Gestalt. Typography and icons are also under the experiment"
+              pullRequest={3616}
+            />
+            <BannerSlimExperiment
+              componentName="Tokens"
+              description="enable a visual refresh in Gestalt. Typography and icons are also under the experiment"
+              pullRequest={3616}
+            />
+          </Fragment>
         }
         name="Visual refresh experimentation"
         type="guidelines"

diff --git a/packages/gestalt/src/Button.tsx b/packages/gestalt/src/Button.tsx
@@ -3,6 +3,7 @@ import classnames from 'classnames';
 import NewTabAccessibilityLabel from './accessibility/NewTabAccessibilityLabel';
 import styles from './Button.css';
 import { useColorScheme } from './contexts/ColorSchemeProvider';
+import ExperimentProvider from './contexts/ExperimentProvider';
 import Flex from './Flex';
 import focusStyles from './Focus.css';
 import Icon, { IconColor } from './Icon';
@@ -140,13 +141,16 @@ function InternalButtonContent({
     mwebExperimentName: 'web_gestalt_visualRefresh',
   });
 
+  const isInVR1 = useInExperiment({
+    webExperimentName: 'web_gestalt_visualRefresh1',
+    mwebExperimentName: 'web_gestalt_visualRefresh1',
+  });
+
+  const isInVR = isInVR1 || isInVRExperiment;
+
   return (
     <Fragment>
-      <Flex
-        alignItems="center"
-        gap={{ row: isInVRExperiment ? 1.5 : 2, column: 0 }}
-        justifyContent="center"
-      >
+      <Flex alignItems="center" gap={{ row: isInVR ? 1.5 : 2, column: 0 }} justifyContent="center">
         {iconStart && (
           <Icon
             accessibilityLabel=""
@@ -208,6 +212,13 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
     mwebExperimentName: 'web_gestalt_visualRefresh',
   });
 
+  const isInVR1 = useInExperiment({
+    webExperimentName: 'web_gestalt_visualRefresh1',
+    mwebExperimentName: 'web_gestalt_visualRefresh1',
+  });
+
+  const isInVR = isInVR1 || isInVRExperiment;
+
   const textSizes: {
     [key: string]: '100' | '200' | '300' | '400' | '500' | '600';
   } = {
@@ -250,12 +261,12 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
   const isDarkMode = colorSchemeName === 'darkMode';
   const isDarkModeRed = isDarkMode && color === 'red';
 
-  const colorClass = color === 'transparentWhiteText' && !isInVRExperiment ? 'transparent' : color;
+  const colorClass = color === 'transparentWhiteText' && !isInVR ? 'transparent' : color;
 
   const { isFocusVisible } = useFocusVisible();
 
-  const sharedTypeClasses = isInVRExperiment
-    ? classnames(styles.buttonVr, {
+  const sharedTypeClasses = isInVR
+    ? classnames('visualRefreshA', styles.buttonVr, {
         [styles.smVr]: size === 'sm',
         [styles.mdVr]: size === 'md',
         [styles.lgVr]: size === 'lg',
@@ -273,7 +284,7 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
         [focusStyles.accessibilityOutline]: !disabled && isFocusVisible,
       });
 
-  const baseTypeClasses = isInVRExperiment
+  const baseTypeClasses = isInVR
     ? classnames(sharedTypeClasses, touchableStyles.tapTransition, {
         [styles.selected]: !disabled && selected,
         [styles.disabled]: disabled,
@@ -294,7 +305,7 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
   const parentButtonClasses = classnames(
     sharedTypeClasses,
     styles.parentButton,
-    isInVRExperiment && {
+    isInVR && {
       [styles[colorClass]]: !disabled && !selected,
     },
   );
@@ -305,10 +316,10 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
     (disabled && 'disabled') ||
     (selected && 'inverse') ||
     (isDarkModeRed && 'default') ||
-    (isInVRExperiment && isDarkMode && color === 'blue' && 'default') ||
+    (isInVR && isDarkMode && color === 'blue' && 'default') ||
     DEFAULT_TEXT_COLORS[color];
 
-  const buttonText = isInVRExperiment ? (
+  const buttonText = isInVR ? (
     <TextUI align="center" color={textColor} overflow="normal" size={textSizesVR[size]}>
       {text}
     </TextUI>
@@ -342,12 +353,27 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
         tabIndex={disabled ? null : tabIndex}
         type="submit"
       >
-        <InternalButtonContent
-          iconEnd={iconEnd}
-          size={size}
-          text={buttonText}
-          textColor={textColor}
-        />
+        {isInVR1 ? (
+          <ExperimentProvider
+            value={{
+              'web_gestalt_visualRefresh': { anyEnabled: true, group: 'enabled' },
+            }}
+          >
+            <InternalButtonContent
+              iconEnd={iconEnd}
+              size={size}
+              text={buttonText}
+              textColor={textColor}
+            />
+          </ExperimentProvider>
+        ) : (
+          <InternalButtonContent
+            iconEnd={iconEnd}
+            size={size}
+            text={buttonText}
+            textColor={textColor}
+          />
+        )}
       </button>
     );
   }
@@ -373,24 +399,46 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
       onTouchMove={handleTouchMove}
       // @ts-expect-error - TS2322 - Type '(arg1: TouchEvent<HTMLDivElement>) => void' is not assignable to type 'TouchEventHandler<HTMLButtonElement>'.
       onTouchStart={handleTouchStart}
-      style={isInVRExperiment ? compressStyle || undefined : undefined}
+      style={isInVR ? compressStyle || undefined : undefined}
       // @ts-expect-error - TS2322 - Type '0 | -1 | null' is not assignable to type 'number | undefined'.
       tabIndex={disabled ? null : tabIndex}
       type="button"
     >
-      <div className={childrenDivClasses} style={compressStyle || undefined}>
-        {iconEnd || iconStart ? (
-          <InternalButtonContent
-            iconEnd={iconEnd}
-            iconStart={iconStart}
-            size={size}
-            text={buttonText}
-            textColor={textColor}
-          />
-        ) : (
-          buttonText
-        )}
-      </div>
+      {isInVR1 ? (
+        <ExperimentProvider
+          value={{
+            'web_gestalt_visualRefresh': { anyEnabled: true, group: 'enabled' },
+          }}
+        >
+          <div className={childrenDivClasses} style={compressStyle || undefined}>
+            {iconEnd || iconStart ? (
+              <InternalButtonContent
+                iconEnd={iconEnd}
+                iconStart={iconStart}
+                size={size}
+                text={buttonText}
+                textColor={textColor}
+              />
+            ) : (
+              buttonText
+            )}
+          </div>
+        </ExperimentProvider>
+      ) : (
+        <div className={childrenDivClasses} style={compressStyle || undefined}>
+          {iconEnd || iconStart ? (
+            <InternalButtonContent
+              iconEnd={iconEnd}
+              iconStart={iconStart}
+              size={size}
+              text={buttonText}
+              textColor={textColor}
+            />
+          ) : (
+            buttonText
+          )}
+        </div>
+      )}
     </button>
   );
 });