@atlaskit/editor-plugin-insert-block 2.4.16 → 2.4.17

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 2.4.17
+
+### Patch Changes
+
+- [#171281](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/171281)
+  [`10b213d7981fe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/10b213d7981fe) -
+  Prefer the plus menu button placement on the bottom where there is insufficient room on the top.
+- Updated dependencies
+
 ## 2.4.16
 
 ### Patch Changes

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.DEFAULT_HEIGHT = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -28,7 +28,7 @@ var _excluded = ["children"];
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 // AFP-2532 TODO: Fix automatic suppressions below
 // eslint-disable-next-line @atlassian/tangerine/import/entry-points
-var DEFAULT_HEIGHT = 560;
+var DEFAULT_HEIGHT = exports.DEFAULT_HEIGHT = 560;
 var InsertMenu = function InsertMenu(_ref) {
   var _pluginInjectionApi$q7, _pluginInjectionApi$q8;
   var editorView = _ref.editorView,

package/dist/cjs/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -1,18 +1,26 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BlockInsertElementBrowser = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ui = require("@atlaskit/editor-common/ui");
-var _InsertMenu = _interopRequireDefault(require("../ElementBrowser/InsertMenu"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _InsertMenu = _interopRequireWildcard(require("../ElementBrowser/InsertMenu"));
 var _dropdownButton = require("./dropdown-button");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// This determines how the popup should fit. We prefer the insert menu
+// opening on the bottom as we have a search bar and should only open on
+// top if there is more than sufficient room.
+var FIT_HEIGHT_BUFFER = 100;
 var BlockInsertElementBrowser = exports.BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.open && /*#__PURE__*/_react.default.createElement(_ui.Popup, {
     target: props.plusButtonRef,
-    fitHeight: 500,
+    fitHeight: (0, _platformFeatureFlags.fg)('platform_editor_consistent_insert_menu') ? _InsertMenu.DEFAULT_HEIGHT + FIT_HEIGHT_BUFFER : 500,
     fitWidth: 350,
     offset: [0, 3],
     mountTo: props.popupsMountPoint,

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

@@ -357,9 +357,8 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       var _pluginInjectionApi$l;
       var _this$props4 = _this.props,
         editorView = _this$props4.editorView,
-        pluginInjectionApi = _this$props4.pluginInjectionApi,
-        intl = _this$props4.intl;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 || _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod, intl.formatMessage)(editorView.state, editorView.dispatch);
+        pluginInjectionApi = _this$props4.pluginInjectionApi;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 || _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod)(editorView.state, editorView.dispatch);
       return true;
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "createStatus", function (inputMethod) {

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -19,7 +19,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { borderRadius } from '@atlaskit/theme';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-const DEFAULT_HEIGHT = 560;
+export const DEFAULT_HEIGHT = 560;
 const InsertMenu = ({
   editorView,
   dropdownItems,

package/dist/es2019/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -1,11 +1,16 @@
 import React from 'react';
 import { Popup } from '@atlaskit/editor-common/ui';
-import InsertMenu from '../ElementBrowser/InsertMenu';
+import { fg } from '@atlaskit/platform-feature-flags';
+import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
 import { DropDownButton } from './dropdown-button';
+// This determines how the popup should fit. We prefer the insert menu
+// opening on the bottom as we have a search bar and should only open on
+// top if there is more than sufficient room.
+const FIT_HEIGHT_BUFFER = 100;
 export const BlockInsertElementBrowser = props => {
   return /*#__PURE__*/React.createElement(React.Fragment, null, props.open && /*#__PURE__*/React.createElement(Popup, {
     target: props.plusButtonRef,
-    fitHeight: 500,
+    fitHeight: fg('platform_editor_consistent_insert_menu') ? DEFAULT_HEIGHT + FIT_HEIGHT_BUFFER : 500,
     fitWidth: 350,
     offset: [0, 3],
     mountTo: props.popupsMountPoint,

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

@@ -367,10 +367,9 @@ export class ToolbarInsertBlock extends React.PureComponent {
       var _pluginInjectionApi$l;
       const {
         editorView,
-        pluginInjectionApi,
-        intl
+        pluginInjectionApi
       } = this.props;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod, intl.formatMessage)(editorView.state, editorView.dispatch);
+      pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 ? void 0 : _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod)(editorView.state, editorView.dispatch);
       return true;
     });
     _defineProperty(this, "createStatus", inputMethod => {

package/dist/esm/ui/ElementBrowser/InsertMenu.js

@@ -23,7 +23,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { borderRadius } from '@atlaskit/theme';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-var DEFAULT_HEIGHT = 560;
+export var DEFAULT_HEIGHT = 560;
 var InsertMenu = function InsertMenu(_ref) {
   var _pluginInjectionApi$q7, _pluginInjectionApi$q8;
   var editorView = _ref.editorView,

package/dist/esm/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -1,11 +1,16 @@
 import React from 'react';
 import { Popup } from '@atlaskit/editor-common/ui';
-import InsertMenu from '../ElementBrowser/InsertMenu';
+import { fg } from '@atlaskit/platform-feature-flags';
+import InsertMenu, { DEFAULT_HEIGHT } from '../ElementBrowser/InsertMenu';
 import { DropDownButton } from './dropdown-button';
+// This determines how the popup should fit. We prefer the insert menu
+// opening on the bottom as we have a search bar and should only open on
+// top if there is more than sufficient room.
+var FIT_HEIGHT_BUFFER = 100;
 export var BlockInsertElementBrowser = function BlockInsertElementBrowser(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, props.open && /*#__PURE__*/React.createElement(Popup, {
     target: props.plusButtonRef,
-    fitHeight: 500,
+    fitHeight: fg('platform_editor_consistent_insert_menu') ? DEFAULT_HEIGHT + FIT_HEIGHT_BUFFER : 500,
     fitWidth: 350,
     offset: [0, 3],
     mountTo: props.popupsMountPoint,

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

@@ -348,9 +348,8 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       var _pluginInjectionApi$l;
       var _this$props4 = _this.props,
         editorView = _this$props4.editorView,
-        pluginInjectionApi = _this$props4.pluginInjectionApi,
-        intl = _this$props4.intl;
-      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 || _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod, intl.formatMessage)(editorView.state, editorView.dispatch);
+        pluginInjectionApi = _this$props4.pluginInjectionApi;
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$l = pluginInjectionApi.layout) === null || _pluginInjectionApi$l === void 0 || _pluginInjectionApi$l.actions.insertLayoutColumns(inputMethod)(editorView.state, editorView.dispatch);
       return true;
     });
     _defineProperty(_assertThisInitialized(_this), "createStatus", function (inputMethod) {

package/dist/types/ui/ElementBrowser/InsertMenu.d.ts

@@ -1,4 +1,5 @@
 import { jsx } from '@emotion/react';
 import type { InsertMenuProps } from './types';
+export declare const DEFAULT_HEIGHT = 560;
 declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, isFullPageAppearance, }: InsertMenuProps) => jsx.JSX.Element;
 export default InsertMenu;

package/dist/types-ts4.5/ui/ElementBrowser/InsertMenu.d.ts

@@ -1,4 +1,5 @@
 import { jsx } from '@emotion/react';
 import type { InsertMenuProps } from './types';
+export declare const DEFAULT_HEIGHT = 560;
 declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, isFullPageAppearance, }: InsertMenuProps) => jsx.JSX.Element;
 export default InsertMenu;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-insert-block",
-	"version": "2.4.16",
+	"version": "2.4.17",
 	"description": "Insert block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,7 +32,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/button": "^20.3.0",
-		"@atlaskit/editor-common": "^95.7.0",
+		"@atlaskit/editor-common": "^95.10.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-block-type": "^4.0.0",
 		"@atlaskit/editor-plugin-code-block": "^3.5.0",
@@ -54,20 +54,20 @@
 		"@atlaskit/editor-plugin-quick-insert": "^1.7.0",
 		"@atlaskit/editor-plugin-rule": "^1.9.0",
 		"@atlaskit/editor-plugin-status": "^2.5.0",
-		"@atlaskit/editor-plugin-table": "^8.1.0",
+		"@atlaskit/editor-plugin-table": "^8.2.0",
 		"@atlaskit/editor-plugin-tasks-and-decisions": "^2.12.0",
-		"@atlaskit/editor-plugin-type-ahead": "^1.10.0",
-		"@atlaskit/editor-prosemirror": "6.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^1.11.0",
+		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/emoji": "^67.11.0",
-		"@atlaskit/heading": "3.1.0",
-		"@atlaskit/icon": "^22.26.0",
+		"@atlaskit/heading": "4.0.0",
+		"@atlaskit/icon": "^22.28.0",
 		"@atlaskit/icon-lab": "^1.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.21.0",
-		"@atlaskit/tokens": "^2.3.0",
+		"@atlaskit/tokens": "^2.4.0",
 		"@atlaskit/tooltip": "18.9.3",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -127,6 +127,9 @@
 		"platform_editor_toolbar_responsive_fixes": {
 			"type": "boolean"
 		},
+		"platform_editor_consistent_insert_menu": {
+			"type": "boolean"
+		},
 		"platform_editor_reduce_element_browser_padding": {
 			"type": "boolean"
 		}