@atlaskit/renderer 113.1.2 → 113.2.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/renderer
 
+## 113.2.1
+
+### Patch Changes
+
+- [#121139](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/121139)
+  [`3c8656ffcdb03`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3c8656ffcdb03) -
+  refactor emotion styles
+
+## 113.2.0
+
+### Minor Changes
+
+- [#112653](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/112653)
+  [`73371f1e55712`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73371f1e55712) -
+  Accepts extension viewport size list as a prop from confluence FE in order to render this size on
+  SSR.
+
+### Patch Changes
+
+- [#122260](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122260)
+  [`10eabde04f773`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/10eabde04f773) -
+  FD-80149: cleans up platform_editor_react18_phase2_v2 from with_editor_actions
+- Updated dependencies
+
 ## 113.1.2
 
 ### Patch Changes

package/dist/cjs/react/index.js

@@ -197,6 +197,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
     this.media = init.media;
     this.emojiResourceConfig = init.emojiResourceConfig;
     this.smartLinks = init.smartLinks;
+    this.extensionViewportSizes = init.extensionViewportSizes;
     this.allowSelectAllTrap = init.allowSelectAllTrap;
     this.nodeComponents = init.nodeComponents;
     this.allowWindowedCodeBlock = init.allowWindowedCodeBlock;
@@ -227,6 +228,9 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
           return this.getMediaProps(node, path);
         case 'emoji':
           return this.getEmojiProps(node);
+        case 'extension':
+        case 'bodiedExtension':
+          return this.getExtensionProps(node, path);
         case 'mediaGroup':
           return this.getMediaGroupProps(node);
         case 'mediaInline':
@@ -488,6 +492,14 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
         allowAnnotationsDraftMode: this.surroundTextNodesWithTextWrapper
       });
     }
+  }, {
+    key: "getExtensionProps",
+    value: function getExtensionProps(node) {
+      var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
+        extensionViewportSizes: this.extensionViewportSizes
+      });
+    }
   }, {
     key: "getEmojiProps",
     value: function getEmojiProps(node) {

package/dist/cjs/react/nodes/TableStickyScrollbar.js

@@ -91,10 +91,9 @@ var TableStickyScrollbar = exports.TableStickyScrollbar = /*#__PURE__*/function
         root: this.rendererScrollableElement
       });
       var bottomSentinels = (_this$wrapper = this.wrapper) === null || _this$wrapper === void 0 || (_this$wrapper = _this$wrapper.parentElement) === null || _this$wrapper === void 0 ? void 0 : _this$wrapper.getElementsByClassName(_styles.TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM);
-      this.sentinels.bottom = (0, _platformFeatureFlags.fg)('platform_editor_querySelector_fix_table_renderer')
-      // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      ? bottomSentinels === null || bottomSentinels === void 0 ? void 0 : bottomSentinels.item(bottomSentinels.length - 1) // eslint-disable-next-line @atlaskit/editor/no-as-casting
-      : (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.parentElement) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.getElementsByClassName(_styles.TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM)) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.item(0);
+      this.sentinels.bottom = (0, _platformFeatureFlags.fg)('platform_editor_querySelector_fix_table_renderer') ? // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      bottomSentinels === null || bottomSentinels === void 0 ? void 0 : bottomSentinels.item(bottomSentinels.length - 1) : // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      (_this$wrapper2 = this.wrapper) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.parentElement) === null || _this$wrapper2 === void 0 || (_this$wrapper2 = _this$wrapper2.getElementsByClassName(_styles.TableSharedCssClassName.TABLE_STICKY_SCROLLBAR_SENTINEL_BOTTOM)) === null || _this$wrapper2 === void 0 ? void 0 : _this$wrapper2.item(0);
 
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting

package/dist/cjs/react/nodes/bodiedExtension.js

@@ -21,7 +21,9 @@ var BodiedExtension = function BodiedExtension(props) {
     _props$path = props.path,
     path = _props$path === void 0 ? [] : _props$path,
     extensionKey = props.extensionKey,
-    extensionType = props.extensionType;
+    extensionType = props.extensionType,
+    parameters = props.parameters,
+    extensionViewportSizes = props.extensionViewportSizes;
   var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
     createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
   var removeOverflow = _react.default.Children.toArray(children)
@@ -51,7 +53,7 @@ var BodiedExtension = function BodiedExtension(props) {
         // Return the content directly if it's a valid JSX.Element
         return (0, _extension.renderExtension)(result, layout, {
           isTopLevel: path.length < 1
-        }, removeOverflow);
+        }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
       }
     } catch (e) {
       /** We don't want this error to block renderer */
@@ -61,7 +63,7 @@ var BodiedExtension = function BodiedExtension(props) {
     // Always return default content if anything goes wrong
     return (0, _extension.renderExtension)(children, layout, {
       isTopLevel: path.length < 1
-    }, removeOverflow);
+    }, removeOverflow, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
   })));
 };
 var _default = exports.default = BodiedExtension;

package/dist/cjs/react/nodes/extension.js

@@ -11,9 +11,32 @@ var _ExtensionRenderer = _interopRequireDefault(require("../../ui/ExtensionRende
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
 var _consts = require("../../consts");
+var viewportSizes = ['small', 'medium', 'default', 'large', 'xlarge'];
+// Mirrors sizes from https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/browse/platform/packages/forge/xen-editor-provider/src/render/renderers/ForgeUIExtension.tsx
+var macroHeights = {
+  small: '112px',
+  medium: '262px',
+  default: '262px',
+  large: '524px',
+  xlarge: '1048px'
+};
+var getViewportSize = function getViewportSize(extensionId, extensionViewportSizes) {
+  if (!Array.isArray(extensionViewportSizes) || !extensionId) {
+    return;
+  }
+  var extension = extensionViewportSizes.find(function (extension) {
+    return extension.extensionId === extensionId;
+  });
+  if (extension) {
+    var viewportSize = extension.viewportSize && viewportSizes.includes(extension.viewportSize) ? extension.viewportSize : 'default';
+    return macroHeights[viewportSize];
+  }
+};
 var renderExtension = exports.renderExtension = function renderExtension(content, layout) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var removeOverflow = arguments.length > 3 ? arguments[3] : undefined;
+  var extensionId = arguments.length > 4 ? arguments[4] : undefined;
+  var extensionViewportSizes = arguments.length > 5 ? arguments[5] : undefined;
   var overflowContainerClass = !removeOverflow ? _consts.RendererCssClassName.EXTENSION_OVERFLOW_CONTAINER : '';
 
   // by default, we assume the extension is at top level, (direct child of doc node)
@@ -21,6 +44,7 @@ var renderExtension = exports.renderExtension = function renderExtension(content
     _ref$isTopLevel = _ref.isTopLevel,
     isTopLevel = _ref$isTopLevel === void 0 ? true : _ref$isTopLevel;
   var centerAlignClass = isTopLevel && ['wide', 'full-width'].includes(layout) ? _consts.RendererCssClassName.EXTENSION_CENTER_ALIGN : '';
+  var viewportSize = getViewportSize(extensionId, extensionViewportSizes);
   return /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref2) {
     var width = _ref2.width;
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -30,7 +54,8 @@ var renderExtension = exports.renderExtension = function renderExtension(content
       className: "".concat(_consts.RendererCssClassName.EXTENSION, " ").concat(options.shadowClassNames, " ").concat(centerAlignClass),
       style: {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        width: isTopLevel ? (0, _utils.calcBreakoutWidth)(layout, width) : '100%'
+        width: isTopLevel ? (0, _utils.calcBreakoutWidth)(layout, width) : '100%',
+        minHeight: viewportSize
       },
       "data-layout": layout
     }, /*#__PURE__*/_react.default.createElement("div", {
@@ -45,7 +70,9 @@ var Extension = function Extension(props) {
     handleRef = props.handleRef,
     shadowClassNames = props.shadowClassNames,
     _props$path = props.path,
-    path = _props$path === void 0 ? [] : _props$path;
+    path = _props$path === void 0 ? [] : _props$path,
+    extensionViewportSizes = props.extensionViewportSizes,
+    parameters = props.parameters;
   return /*#__PURE__*/_react.default.createElement(_ExtensionRenderer.default
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
@@ -60,19 +87,18 @@ var Extension = function Extension(props) {
           isTopLevel: path.length < 1,
           handleRef: handleRef,
           shadowClassNames: shadowClassNames
-        });
+        }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
       }
     } catch (e) {
       /** We don't want this error to block renderer */
       /** We keep rendering the default content */
     }
-
     // Always return default content if anything goes wrong
     return renderExtension(text || 'extension', layout, {
       isTopLevel: path.length < 1,
       handleRef: handleRef,
       shadowClassNames: shadowClassNames
-    });
+    }, undefined, parameters === null || parameters === void 0 ? void 0 : parameters.extensionId, extensionViewportSizes);
   });
 };
 var _default = exports.default = (0, _ui.overflowShadow)(Extension, {