[AppProvider] Consolidate se23 logic

Author: laurkim

polaris-react/.storybook/preview.js

@@ -32,13 +32,7 @@ function AppProviderDecorator(Story, context) {
   if (context.args.omitAppProvider) return <Story {...context} />;
 
   return (
-    <AppProvider
-      theme={context.globals.theme}
-      features={{
-        polarisSummerEditions2023: true,
-      }}
-      i18n={enTranslations}
-    >
+    <AppProvider theme={context.globals.theme} i18n={enTranslations}>
       <FrameContext.Provider value={{}}>
         <Story {...context} />
       </FrameContext.Provider>

polaris-react/src/components/AppProvider/AppProvider.stories.tsx

@@ -34,9 +34,6 @@ export function Default(_, context) {
           },
         },
       }}
-      features={{
-        polarisSummerEditions2023: true,
-      }}
     >
       <Page>
         <LegacyCard>
@@ -97,9 +94,6 @@ export function WithI18n(_, context) {
           },
         },
       }}
-      features={{
-        polarisSummerEditions2023: true,
-      }}
     >
       <Page>
         <LegacyCard>
@@ -155,13 +149,7 @@ export function WithLinkComponent(_, context) {
   };
 
   return (
-    <AppProvider
-      linkComponent={CustomLinkComponent}
-      i18n={{}}
-      features={{
-        polarisSummerEditions2023: true,
-      }}
-    >
+    <AppProvider linkComponent={CustomLinkComponent} i18n={{}}>
       <Page
         backAction={{content: 'Products', url: '#'}}
         title="Jar With Lock-Lid"

polaris-react/src/components/AppProvider/AppProvider.tsx

@@ -148,20 +148,10 @@ export class AppProvider extends Component<AppProviderProps, State> {
     document.documentElement.classList.add(classNamePolarisSummerEditions2023);
   };
 
-  getFeatures = () => {
-    const {features} = this.props;
-
-    return {
-      ...features,
-      polarisSummerEditions2023: features?.polarisSummerEditions2023 ?? true,
-    };
-  };
-
   getThemeName = (): ThemeName => this.props.theme ?? themeNameDefault;
 
   render() {
-    const {children} = this.props;
-    const features = this.getFeatures();
+    const {children, features} = this.props;
     const themeName = this.getThemeName();
 
     const {intl, link} = this.state;

polaris-react/src/components/Frame/Frame.stories.tsx

@@ -357,7 +357,6 @@ function InAnApplicationComponent() {
             },
           },
         }}
-        features={{polarisSummerEditions2023: true}}
       >
         <Frame
           logo={logo}
@@ -701,7 +700,6 @@ function WithAnOffsetComponent() {
             },
           },
         }}
-        features={{polarisSummerEditions2023: true}}
       >
         <Frame
           logo={logo}
@@ -1060,7 +1058,6 @@ function WithSidebarEnabled() {
             },
           },
         }}
-        features={{polarisSummerEditions2023: true}}
       >
         <Frame
           logo={logo}

polaris-react/src/components/Pagination/tests/Pagination.test.tsx

@@ -295,7 +295,6 @@ describe('<Pagination />', () => {
           label="Hello, world!"
           type="page"
         />,
-        {features: {polarisSummerEditions2023: false}},
       );
 
       expect(pagination).toContainReactComponent(ButtonGroup, {

polaris-react/src/components/PolarisTestProvider/PolarisTestProvider.tsx

@@ -65,21 +65,13 @@ export function PolarisTestProvider({
 
   const stickyManager = useMemo(() => new StickyManager(), []);
 
-  const featuresConfig = useMemo(
-    () => ({
-      polarisSummerEditions2023: true,
-      ...features,
-    }),
-    [features],
-  );
-
   const mergedFrame = createFrameContext(frame);
 
   const mergedMediaQuery = merge(defaultMediaQuery, mediaQuery);
 
   return (
     <Wrapper>
-      <FeaturesContext.Provider value={featuresConfig}>
+      <FeaturesContext.Provider value={features}>
         <I18nContext.Provider value={intl}>
           <ScrollLockManagerContext.Provider value={scrollLockManager}>
             <StickyManagerContext.Provider value={stickyManager}>

polaris-react/src/utilities/features/types.ts

@@ -1,5 +1,4 @@
 export interface FeaturesConfig {
-  polarisSummerEditions2023?: boolean;
   [key: string]: boolean | undefined;
 }
 

polaris-react/tests/utilities/react-testing.tsx

@@ -22,16 +22,9 @@ export const mountWithApp = createMount<
     return options;
   },
   render(element, context) {
-    const {features, ...rest} = context;
+    const {...rest} = context;
     return (
-      <PolarisTestProvider
-        i18n={translations}
-        features={{
-          polarisSummerEditions2023: true,
-          ...features,
-        }}
-        {...rest}
-      >
+      <PolarisTestProvider i18n={translations} {...rest}>
         {element}
       </PolarisTestProvider>
     );