@atlaskit/renderer 128.10.6 → 128.11.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/renderer
 
+## 128.11.0
+
+### Minor Changes
+
+- [`65f1d80415ae8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/65f1d80415ae8) -
+  EDITOR-679 improve reliability of media provider
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 128.10.6
 
 ### Patch Changes

package/dist/cjs/react/utils/EditorMediaClientProvider.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _mediaClientReact = require("@atlaskit/media-client-react");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var EditorMediaClientProvider = exports.EditorMediaClientProvider = function EditorMediaClientProvider(_ref) {
   var children = _ref.children,
@@ -18,13 +19,24 @@ var EditorMediaClientProvider = exports.EditorMediaClientProvider = function Edi
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     mediaClientConfig = _useState2[0],
     setMediaClientConfig = _useState2[1];
+  var providerFactory = (0, _providerFactory.useProviderFactory)();
   var mediaProvider = (0, _providerFactory.useProviderLayout)('mediaProvider');
 
   /**
-   * If a mediaClientConfig is provided then we will force
-   * skip the mediaClient from context
+   * Whether this renderer has its own media provider and should never inherit
+   * the mediaClient from a parent renderer's context.
+   *
+   * We use providerFactory.hasProvider() rather and checking the mediaProvider
+   * state value, because useProviderLayout subscribes via useLayoutEffect —
+   * meaning mediaProvider state is always undefined on the first render, even
+   * if the ProviderFactory already has a provider registered. This would cause
+   * shouldSkipContext to be false on the first render, incorrectly allowing the
+   * inner renderer to inherit the outer renderer's MediaClientContext (which
+   * carries the wrong media token for this page).
+   *
+   * hasProvider() is synchronous and correct from render 1, closing that window.
    */
-  var shouldSkipContext = Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || mediaProvider);
+  var shouldSkipContext = (0, _expValEquals.expValEquals)('platform_editor_media_reliability_enhancements', 'isEnabled', true) ? Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || providerFactory.hasProvider('mediaProvider') || mediaProvider) : Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || mediaProvider);
   var contextMediaClient = (0, _react.useContext)(_mediaClientReact.MediaClientContext);
 
   // MediaClientProvider currently requires a mediaClientConfig

package/dist/cjs/ui/Renderer/index.js

@@ -71,7 +71,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "128.10.5";
+var packageVersion = "128.10.6";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/react/utils/EditorMediaClientProvider.js

@@ -1,18 +1,30 @@
 import React, { useContext, useLayoutEffect, useMemo, useState } from 'react';
 import { MediaClientContext, getMediaClient } from '@atlaskit/media-client-react';
-import { useProviderLayout } from '@atlaskit/editor-common/provider-factory';
+import { useProviderFactory, useProviderLayout } from '@atlaskit/editor-common/provider-factory';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const EditorMediaClientProvider = ({
   children,
   ssr
 }) => {
   const [mediaClientConfig, setMediaClientConfig] = useState();
+  const providerFactory = useProviderFactory();
   const mediaProvider = useProviderLayout('mediaProvider');
 
   /**
-   * If a mediaClientConfig is provided then we will force
-   * skip the mediaClient from context
+   * Whether this renderer has its own media provider and should never inherit
+   * the mediaClient from a parent renderer's context.
+   *
+   * We use providerFactory.hasProvider() rather and checking the mediaProvider
+   * state value, because useProviderLayout subscribes via useLayoutEffect —
+   * meaning mediaProvider state is always undefined on the first render, even
+   * if the ProviderFactory already has a provider registered. This would cause
+   * shouldSkipContext to be false on the first render, incorrectly allowing the
+   * inner renderer to inherit the outer renderer's MediaClientContext (which
+   * carries the wrong media token for this page).
+   *
+   * hasProvider() is synchronous and correct from render 1, closing that window.
    */
-  const shouldSkipContext = Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || mediaProvider);
+  const shouldSkipContext = expValEquals('platform_editor_media_reliability_enhancements', 'isEnabled', true) ? Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || providerFactory.hasProvider('mediaProvider') || mediaProvider) : Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || mediaProvider);
   const contextMediaClient = useContext(MediaClientContext);
 
   // MediaClientProvider currently requires a mediaClientConfig

package/dist/es2019/ui/Renderer/index.js

@@ -57,7 +57,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.2;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "128.10.5";
+const packageVersion = "128.10.6";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/react/utils/EditorMediaClientProvider.js

@@ -1,7 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useContext, useLayoutEffect, useMemo, useState } from 'react';
 import { MediaClientContext, getMediaClient } from '@atlaskit/media-client-react';
-import { useProviderLayout } from '@atlaskit/editor-common/provider-factory';
+import { useProviderFactory, useProviderLayout } from '@atlaskit/editor-common/provider-factory';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var EditorMediaClientProvider = function EditorMediaClientProvider(_ref) {
   var children = _ref.children,
     ssr = _ref.ssr;
@@ -9,13 +10,24 @@ export var EditorMediaClientProvider = function EditorMediaClientProvider(_ref)
     _useState2 = _slicedToArray(_useState, 2),
     mediaClientConfig = _useState2[0],
     setMediaClientConfig = _useState2[1];
+  var providerFactory = useProviderFactory();
   var mediaProvider = useProviderLayout('mediaProvider');
 
   /**
-   * If a mediaClientConfig is provided then we will force
-   * skip the mediaClient from context
+   * Whether this renderer has its own media provider and should never inherit
+   * the mediaClient from a parent renderer's context.
+   *
+   * We use providerFactory.hasProvider() rather and checking the mediaProvider
+   * state value, because useProviderLayout subscribes via useLayoutEffect —
+   * meaning mediaProvider state is always undefined on the first render, even
+   * if the ProviderFactory already has a provider registered. This would cause
+   * shouldSkipContext to be false on the first render, incorrectly allowing the
+   * inner renderer to inherit the outer renderer's MediaClientContext (which
+   * carries the wrong media token for this page).
+   *
+   * hasProvider() is synchronous and correct from render 1, closing that window.
    */
-  var shouldSkipContext = Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || mediaProvider);
+  var shouldSkipContext = expValEquals('platform_editor_media_reliability_enhancements', 'isEnabled', true) ? Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || providerFactory.hasProvider('mediaProvider') || mediaProvider) : Boolean((ssr === null || ssr === void 0 ? void 0 : ssr.config) || mediaProvider);
   var contextMediaClient = useContext(MediaClientContext);
 
   // MediaClientProvider currently requires a mediaClientConfig

package/dist/esm/ui/Renderer/index.js

@@ -62,7 +62,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "128.10.5";
+var packageVersion = "128.10.6";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "128.10.6",
+	"version": "128.11.0",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -59,7 +59,7 @@
 		"@atlaskit/status": "^3.2.0",
 		"@atlaskit/task-decision": "^19.3.0",
 		"@atlaskit/theme": "^23.0.0",
-		"@atlaskit/tmp-editor-statsig": "^62.1.0",
+		"@atlaskit/tmp-editor-statsig": "^62.2.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@atlaskit/tooltip": "^21.1.0",
 		"@atlaskit/visually-hidden": "^3.0.0",