@atlaskit/editor-synced-block-renderer 5.9.1 → 5.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/editor-synced-block-renderer
2
2
 
3
+ ## 5.9.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [`6998dc542380a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6998dc542380a) -
8
+ [EDITOR-5580] Pass media.ssr prop for reference sync block in view page for both client and ssr
9
+ environment
10
+ - Updated dependencies
11
+
3
12
  ## 5.9.1
4
13
 
5
14
  ### Patch Changes
@@ -45,13 +45,15 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
45
45
  ssrProviders = _useFetchSyncBlockDat.ssrProviders;
46
46
  var finalRendererOptions = (0, _react.useMemo)(function () {
47
47
  var _rendererOptions$medi, _ssrProviders$media;
48
- if (!(0, _coreUtils.isSSR)() || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
48
+ if (!(0, _coreUtils.isSSR)() && !(0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
49
49
  // already has ssr config
50
50
  !(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig)) {
51
51
  return rendererOptions;
52
52
  }
53
53
  var mediaSSR = {
54
- mode: 'server',
54
+ // Use synced block's media config so auth uses source contentId, not current page.
55
+ // Server: during SSR; client: after hydration (avoids using page's MediaClient).
56
+ mode: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? (0, _coreUtils.isSSR)() ? 'server' : 'client' : 'server',
55
57
  config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
56
58
  };
57
59
  return _objectSpread(_objectSpread({}, rendererOptions), {}, {
@@ -36,13 +36,15 @@ export const SyncedBlockNodeComponentRenderer = ({
36
36
  } = useFetchSyncBlockData(syncBlockStoreManager, resourceId, localId, fireAnalyticsEvent);
37
37
  const finalRendererOptions = useMemo(() => {
38
38
  var _rendererOptions$medi, _ssrProviders$media;
39
- if (!isSSR() || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
39
+ if (!isSSR() && !fg('platform_synced_block_patch_4') || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
40
40
  // already has ssr config
41
41
  !(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig)) {
42
42
  return rendererOptions;
43
43
  }
44
44
  const mediaSSR = {
45
- mode: 'server',
45
+ // Use synced block's media config so auth uses source contentId, not current page.
46
+ // Server: during SSR; client: after hydration (avoids using page's MediaClient).
47
+ mode: fg('platform_synced_block_patch_4') ? isSSR() ? 'server' : 'client' : 'server',
46
48
  config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
47
49
  };
48
50
  return {
@@ -36,13 +36,15 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
36
36
  ssrProviders = _useFetchSyncBlockDat.ssrProviders;
37
37
  var finalRendererOptions = useMemo(function () {
38
38
  var _rendererOptions$medi, _ssrProviders$media;
39
- if (!isSSR() || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
39
+ if (!isSSR() && !fg('platform_synced_block_patch_4') || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
40
40
  // already has ssr config
41
41
  !(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig)) {
42
42
  return rendererOptions;
43
43
  }
44
44
  var mediaSSR = {
45
- mode: 'server',
45
+ // Use synced block's media config so auth uses source contentId, not current page.
46
+ // Server: during SSR; client: after hydration (avoids using page's MediaClient).
47
+ mode: fg('platform_synced_block_patch_4') ? isSSR() ? 'server' : 'client' : 'server',
46
48
  config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
47
49
  };
48
50
  return _objectSpread(_objectSpread({}, rendererOptions), {}, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-synced-block-renderer",
3
- "version": "5.9.1",
3
+ "version": "5.9.2",
4
4
  "description": "SyncedBlockRenderer for @atlaskit/editor-plugin-synced-block",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -31,7 +31,7 @@
31
31
  "@atlaskit/button": "^23.9.0",
32
32
  "@atlaskit/css": "^0.19.0",
33
33
  "@atlaskit/editor-plugin-synced-block": "^5.3.0",
34
- "@atlaskit/editor-synced-block-provider": "^3.30.0",
34
+ "@atlaskit/editor-synced-block-provider": "^3.31.0",
35
35
  "@atlaskit/heading": "^5.3.0",
36
36
  "@atlaskit/icon": "^31.0.0",
37
37
  "@atlaskit/icon-lab": "^5.16.0",
@@ -48,7 +48,7 @@
48
48
  "relay-runtime": "npm:atl-relay-runtime@0.0.0-main-39e79f66"
49
49
  },
50
50
  "peerDependencies": {
51
- "@atlaskit/editor-common": "^111.19.0",
51
+ "@atlaskit/editor-common": "^111.20.0",
52
52
  "react": "^18.2.0",
53
53
  "react-intl-next": "npm:react-intl@^5.18.1"
54
54
  },