@atlaskit/editor-synced-block-renderer 5.4.1 → 5.5.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-synced-block-renderer
 
+## 5.5.0
+
+### Minor Changes
+
+- [`10cc4958a1511`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/10cc4958a1511) -
+  EDITOR-2849 add media ssr options to renderer
+
 ## 5.4.1
 
 ### Patch Changes

package/dist/cjs/ui/SyncedBlockNodeComponentRenderer.js

@@ -1,19 +1,24 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SyncedBlockNodeComponentRenderer = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _AKRendererWrapper = require("./AKRendererWrapper");
 var _SyncedBlockErrorComponent = require("./SyncedBlockErrorComponent");
 var _SyncedBlockLoadingState = require("./SyncedBlockLoadingState");
+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); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentRenderer(_ref) {
   var nodeProps = _ref.nodeProps,
     syncBlockStoreManager = _ref.syncBlockStoreManager,
@@ -26,7 +31,25 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
     syncBlockInstance = _useFetchSyncBlockDat.syncBlockInstance,
     isLoading = _useFetchSyncBlockDat.isLoading,
     reloadData = _useFetchSyncBlockDat.reloadData,
-    providerFactory = _useFetchSyncBlockDat.providerFactory;
+    providerFactory = _useFetchSyncBlockDat.providerFactory,
+    ssrProviders = _useFetchSyncBlockDat.ssrProviders;
+  var finalRendererOptions = (0, _react.useMemo)(function () {
+    var _rendererOptions$medi, _ssrProviders$media;
+    if (!(0, _coreUtils.isSSR)() || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
+    // already has ssr config
+    !(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig) || !(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
+      return rendererOptions;
+    }
+    var mediaSSR = {
+      mode: 'server',
+      config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
+    };
+    return _objectSpread(_objectSpread({}, rendererOptions), {}, {
+      media: _objectSpread(_objectSpread({}, (rendererOptions === null || rendererOptions === void 0 ? void 0 : rendererOptions.media) || {}), {}, {
+        ssr: mediaSSR
+      })
+    });
+  }, [rendererOptions, ssrProviders]);
   if (isLoading && !syncBlockInstance) {
     return /*#__PURE__*/_react.default.createElement(_SyncedBlockLoadingState.SyncedBlockLoadingState, null);
   }
@@ -52,6 +75,6 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
   }, (0, _defineProperty2.default)({}, _syncBlock.SyncBlockRendererDataAttributeName, true)), /*#__PURE__*/_react.default.createElement(_AKRendererWrapper.AKRendererWrapper, {
     doc: syncBlockDoc,
     dataProviders: providerFactory,
-    options: rendererOptions
+    options: finalRendererOptions
   }));
 };

package/dist/es2019/ui/SyncedBlockNodeComponentRenderer.js

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useMemo } from 'react';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { SyncBlockSharedCssClassName, SyncBlockRendererDataAttributeName } from '@atlaskit/editor-common/sync-block';
 import { SyncBlockError, useFetchSyncBlockData } from '@atlaskit/editor-synced-block-provider';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -20,8 +21,28 @@ export const SyncedBlockNodeComponentRenderer = ({
     syncBlockInstance,
     isLoading,
     reloadData,
-    providerFactory
+    providerFactory,
+    ssrProviders
   } = useFetchSyncBlockData(syncBlockStoreManager, resourceId, localId, fireAnalyticsEvent);
+  const finalRendererOptions = useMemo(() => {
+    var _rendererOptions$medi, _ssrProviders$media;
+    if (!isSSR() || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
+    // already has ssr config
+    !(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig) || !fg('platform_synced_block_dogfooding')) {
+      return rendererOptions;
+    }
+    const mediaSSR = {
+      mode: 'server',
+      config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
+    };
+    return {
+      ...rendererOptions,
+      media: {
+        ...((rendererOptions === null || rendererOptions === void 0 ? void 0 : rendererOptions.media) || {}),
+        ssr: mediaSSR
+      }
+    };
+  }, [rendererOptions, ssrProviders]);
   if (isLoading && !syncBlockInstance) {
     return /*#__PURE__*/React.createElement(SyncedBlockLoadingState, null);
   }
@@ -49,6 +70,6 @@ export const SyncedBlockNodeComponentRenderer = ({
   }, /*#__PURE__*/React.createElement(AKRendererWrapper, {
     doc: syncBlockDoc,
     dataProviders: providerFactory,
-    options: rendererOptions
+    options: finalRendererOptions
   }));
 };

package/dist/esm/ui/SyncedBlockNodeComponentRenderer.js

@@ -1,6 +1,9 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import React from 'react';
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import React, { useMemo } from 'react';
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { SyncBlockSharedCssClassName, SyncBlockRendererDataAttributeName } from '@atlaskit/editor-common/sync-block';
 import { SyncBlockError, useFetchSyncBlockData } from '@atlaskit/editor-synced-block-provider';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -19,7 +22,25 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
     syncBlockInstance = _useFetchSyncBlockDat.syncBlockInstance,
     isLoading = _useFetchSyncBlockDat.isLoading,
     reloadData = _useFetchSyncBlockDat.reloadData,
-    providerFactory = _useFetchSyncBlockDat.providerFactory;
+    providerFactory = _useFetchSyncBlockDat.providerFactory,
+    ssrProviders = _useFetchSyncBlockDat.ssrProviders;
+  var finalRendererOptions = useMemo(function () {
+    var _rendererOptions$medi, _ssrProviders$media;
+    if (!isSSR() || rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
+    // already has ssr config
+    !(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig) || !fg('platform_synced_block_dogfooding')) {
+      return rendererOptions;
+    }
+    var mediaSSR = {
+      mode: 'server',
+      config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
+    };
+    return _objectSpread(_objectSpread({}, rendererOptions), {}, {
+      media: _objectSpread(_objectSpread({}, (rendererOptions === null || rendererOptions === void 0 ? void 0 : rendererOptions.media) || {}), {}, {
+        ssr: mediaSSR
+      })
+    });
+  }, [rendererOptions, ssrProviders]);
   if (isLoading && !syncBlockInstance) {
     return /*#__PURE__*/React.createElement(SyncedBlockLoadingState, null);
   }
@@ -45,6 +66,6 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
   }, _defineProperty({}, SyncBlockRendererDataAttributeName, true)), /*#__PURE__*/React.createElement(AKRendererWrapper, {
     doc: syncBlockDoc,
     dataProviders: providerFactory,
-    options: rendererOptions
+    options: finalRendererOptions
   }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-synced-block-renderer",
-	"version": "5.4.1",
+	"version": "5.5.0",
 	"description": "SyncedBlockRenderer for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",