Provide React Context composition; new Kibana Context, consolidate/de…

…precate.
elastic · Jun 1, 2023 · cd5d125 · cd5d125
1 parent 0e6b153
commit cd5d125
Show file tree

Hide file tree

Showing 62 changed files with 539 additions and 497 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -510,6 +510,8 @@ src/plugins/presentation_util @elastic/kibana-presentation
 x-pack/plugins/profiling @elastic/profiling-ui
 x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations
 packages/kbn-react-field @elastic/kibana-data-discovery
+packages/react/kibana_context @elastic/appex-sharedux
+packages/react/kibana_mount @elastic/appex-sharedux
 x-pack/plugins/remote_clusters @elastic/platform-deployment-management
 test/plugin_functional/plugins/rendering_plugin @elastic/kibana-core
 packages/kbn-repo-file-maps @elastic/kibana-operations

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -76,6 +76,7 @@
     "newsfeed": "src/plugins/newsfeed",
     "presentationUtil": "src/plugins/presentation_util",
     "randomSampling": "x-pack/packages/kbn-random-sampling",
+    "reactPackages": "packages/react",
     "textBasedEditor": "packages/kbn-text-based-editor",
     "reporting": "packages/kbn-reporting/common",
     "savedObjects": "src/plugins/saved_objects",

diff --git a/package.json b/package.json
@@ -518,6 +518,8 @@
     "@kbn/profiling-plugin": "link:x-pack/plugins/profiling",
     "@kbn/random-sampling": "link:x-pack/packages/kbn-random-sampling",
     "@kbn/react-field": "link:packages/kbn-react-field",
+    "@kbn/react-kibana-context": "link:packages/react/kibana_context",
+    "@kbn/react-kibana-mount": "link:packages/react/kibana_mount",
     "@kbn/remote-clusters-plugin": "link:x-pack/plugins/remote_clusters",
     "@kbn/rendering-plugin": "link:test/plugin_functional/plugins/rendering_plugin",
     "@kbn/repo-info": "link:packages/kbn-repo-info",

diff --git a/...lays/core-overlays-browser-internal/src/flyout/__snapshots__/flyout_service.test.tsx.snap b/...lays/core-overlays-browser-internal/src/flyout/__snapshots__/flyout_service.test.tsx.snap
diff --git a/...erlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap b/...erlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap
diff --git a/packages/core/theme/core-theme-browser-internal/src/convert_core_theme.test.ts b/packages/core/theme/core-theme-browser-internal/src/convert_core_theme.test.ts
diff --git a/packages/core/theme/core-theme-browser-internal/src/convert_core_theme.ts b/packages/core/theme/core-theme-browser-internal/src/convert_core_theme.ts
diff --git a/packages/core/theme/core-theme-browser-internal/src/core_context_provider.tsx b/packages/core/theme/core-theme-browser-internal/src/core_context_provider.tsx
@@ -6,35 +6,31 @@
  * Side Public License, v 1.
  */
 
-import React, { FC } from 'react';
-import type { ThemeServiceStart } from '@kbn/core-theme-browser';
+import React, { FC, useMemo } from 'react';
 import type { I18nStart } from '@kbn/core-i18n-browser';
-import { CoreThemeProvider } from './core_theme_provider';
+import { composeProviders, KibanaThemeProvider } from '@kbn/react-kibana-context';
+import { ThemeServiceStart } from '@kbn/core-theme-browser/src/types';
 
 interface CoreContextProviderProps {
-  theme: ThemeServiceStart;
   i18n: I18nStart;
+  theme: ThemeServiceStart;
   globalStyles?: boolean;
 }
 
 /**
- * utility component exposing all the context providers required by core when integrating with react
+ * Utility component exposing all the context providers required by core when integrating with React.
  **/
 export const CoreContextProvider: FC<CoreContextProviderProps> = ({
   i18n,
-  theme,
   children,
+  theme,
   globalStyles = false,
 }) => {
-  // `globalStyles` and `utilityClasses` default values are inverted from that of `EuiProvider`.
-  // Default to `false` (does not add EUI global styles) because more instances use that value.
-  // A value of `true` (does add EUI global styles) will have `EuiProvider` use its default value.
-  const includeGlobalStyles = globalStyles === false ? false : undefined;
+  const Provider = useMemo(() => composeProviders([i18n.Context, KibanaThemeProvider]), [i18n]);
+
   return (
-    <i18n.Context>
-      <CoreThemeProvider theme$={theme.theme$} globalStyles={includeGlobalStyles}>
-        {children}
-      </CoreThemeProvider>
-    </i18n.Context>
+    <Provider theme$={theme.theme$} {...{ globalStyles }}>
+      {children}
+    </Provider>
   );
 };