Card remove se23 logic in Card.tsx

Shopify · Aug 10, 2023 · a6ca9e2 · a6ca9e2
1 parent cb3486a
commit a6ca9e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 59 deletions.
diff --git a/polaris-react/src/components/Card/Card.tsx b/polaris-react/src/components/Card/Card.tsx
@@ -10,7 +10,6 @@ import {useBreakpoints} from '../../utilities/breakpoints';
 import type {ResponsiveProp} from '../../utilities/css';
 import {Box} from '../Box';
 import {ShadowBevel} from '../ShadowBevel';
-import {useFeatures} from '../../utilities/features';
 import {WithinContentContext} from '../../utilities/within-content-context';
 
 type Spacing = ResponsiveProp<SpaceScale>;
@@ -35,25 +34,11 @@ export interface CardProps {
 export const Card = ({
   children,
   background = 'bg',
-  padding = {xs: '4', sm: '5'},
+  padding = {xs: '4'},
   roundedAbove,
 }: CardProps) => {
   const breakpoints = useBreakpoints();
-  const {polarisSummerEditions2023} = useFeatures();
-  const defaultBorderRadius: BorderRadiusScale = polarisSummerEditions2023
-    ? '3'
-    : '2';
-
-  const isDefaultPadding =
-    typeof padding !== 'string' &&
-    padding?.xs === '4' &&
-    padding?.sm === '5' &&
-    padding.md === undefined &&
-    padding.lg === undefined &&
-    padding.xl === undefined;
-
-  const finalPadding: CardProps['padding'] =
-    isDefaultPadding && polarisSummerEditions2023 ? {xs: '4'} : padding;
+  const defaultBorderRadius: BorderRadiusScale = '3';
 
   let hasBorderRadius = !roundedAbove;
 
@@ -63,34 +48,21 @@ export const Card = ({
 
   return (
     <WithinContentContext.Provider value>
-      {polarisSummerEditions2023 ? (
-        <ShadowBevel
-          boxShadow="xs"
-          borderRadius={hasBorderRadius ? '3' : '0-experimental'}
-          zIndex="32"
-        >
-          <Box
-            background={background}
-            padding={finalPadding}
-            overflowX="hidden"
-            overflowY="hidden"
-            minHeight="100%"
-          >
-            {children}
-          </Box>
-        </ShadowBevel>
-      ) : (
+      <ShadowBevel
+        boxShadow="xs"
+        borderRadius={hasBorderRadius ? defaultBorderRadius : '0-experimental'}
+        zIndex="32"
+      >
         <Box
           background={background}
-          padding={finalPadding}
-          shadow="md"
-          borderRadius={hasBorderRadius ? defaultBorderRadius : undefined}
+          padding={padding}
           overflowX="hidden"
           overflowY="hidden"
+          minHeight="100%"
         >
           {children}
         </Box>
-      )}
+      </ShadowBevel>
     </WithinContentContext.Provider>
   );
 };
diff --git a/polaris-react/src/components/Card/tests/Card.test.tsx b/polaris-react/src/components/Card/tests/Card.test.tsx
@@ -58,31 +58,10 @@ describe('Card', () => {
         {heading}
         {subheading}
       </Card>,
-      {features: {polarisSummerEditions2023: true}},
     );
 
     expect(card).toContainReactComponent(ShadowBevel, {
       borderRadius: '3',
     });
   });
-
-  // se23 -- default borderRadius changed from '2' to '3', border radius on ShadowBevel instead of Box
-  describe('polarisSummerEditions2023 false', () => {
-    it('sets default border radius when roundedAbove breakpoint passed in', () => {
-      setMediaWidth('breakpoints-sm');
-      const card = mountWithApp(
-        <Card roundedAbove="sm">
-          {heading}
-          {subheading}
-        </Card>,
-        {features: {polarisSummerEditions2023: false}},
-      );
-
-      expect(card).toContainReactComponent('div', {
-        style: expect.objectContaining({
-          '--pc-box-border-radius': 'var(--p-border-radius-2)',
-        }),
-      });
-    });
-  });
 });