@atlaskit/editor-plugin-insert-block 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 1.1.0
+
+### Minor Changes
+
+- [#72122](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72122) [`c3186450404a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c3186450404a) - Breaking change:
+
+  ## WHAT?:
+
+  Removing feature flags:
+
+  - singleLayout
+  - newInsertionBehaviour
+  - interactiveExpand
+  - findReplace
+  - findReplaceMatchCase
+  - extendFloatingToolbar
+
+  ## WHY?:
+
+  Because the flags and props are unused/by default active. Removing them will reduce our maintenance burden
+
+  ## HOW to update your code:
+
+  - If you were using the feature flag - the behaviour is now default and you can remove the flags
+  - If you were not using the feature flag - the behaviour is now default.
+  - If you have opted out of using the feature flag - we have been careful to ensure no-one has opted out of the behaviours. If you do have an issue please reach out to #help-editor.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.0.1
+
+### Patch Changes
+
+- [#72440](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/72440) [`eee41a9f4bda`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eee41a9f4bda) - [ux] Ensures that when a table is inserted via popup, the table has a blinking cursor.
+
 ## 1.0.0
 
 ### Major Changes

package/dist/cjs/plugin.js

@@ -46,11 +46,9 @@ function handleInsertBlockType(insertCodeBlock, insertPanel, insertBlockQuote) {
   };
 }
 var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_ref) {
-  var _api$featureFlags;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'insertBlock',
     primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
@@ -79,7 +77,6 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
           disabled: disabled,
           isToolbarReducedSpacing: isToolbarReducedSpacing,
           isLastItem: isLastItem,
-          featureFlags: featureFlags,
           providers: providers,
           options: options
         });
@@ -106,8 +103,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     isLastItem = _ref3.isLastItem,
     providers = _ref3.providers,
     pluginInjectionApi = _ref3.pluginInjectionApi,
-    options = _ref3.options,
-    featureFlags = _ref3.featureFlags;
+    options = _ref3.options;
   var buttons = toolbarSizeToButtons(toolbarSize);
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText']),
     dateState = _useSharedPluginState.dateState,
@@ -159,7 +155,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
     showElementBrowserLink: options.showElementBrowserLink,
-    showSeparator: !isLastItem && toolbarSize <= _types.ToolbarSize.S,
-    featureFlags: featureFlags
+    showSeparator: !isLastItem && toolbarSize <= _types.ToolbarSize.S
   });
 }

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

@@ -541,13 +541,25 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       var _this$props13 = this.props,
         popupsMountPoint = _this$props13.popupsMountPoint,
         popupsBoundariesElement = _this$props13.popupsBoundariesElement,
-        popupsScrollableElement = _this$props13.popupsScrollableElement;
+        popupsScrollableElement = _this$props13.popupsScrollableElement,
+        pluginInjectionApi = _this$props13.pluginInjectionApi;
       var ref = (_this$tableButtonRef$ = this.tableButtonRef.current) !== null && _this$tableButtonRef$ !== void 0 ? _this$tableButtonRef$ : undefined;
       if (!isTableSelectorOpen) {
         return null;
       }
+
+      // We use focusTrap in the Popup. When we insert a table via popup,
+      // the popup closes, focusTrap gets destroyed and the popup detaches.
+      // The focus gets set to the body element. onUnmount method sets focus on the editor right before the
+      // Popup will be unmounted to ensure that the new table has a selection with a blinking cursor.
+      // So we can start typing right away.
+      var onUnmount = function onUnmount() {
+        var _pluginInjectionApi$c7;
+        return pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c7 = pluginInjectionApi.core) === null || _pluginInjectionApi$c7 === void 0 || (_pluginInjectionApi$c7 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : _pluginInjectionApi$c7.focus();
+      };
       return (0, _react2.jsx)(_tableSelectorPopupWithListeners.default, {
         target: ref,
+        onUnmount: onUnmount,
         onSelection: this.handleSelectedTableSize,
         popupsMountPoint: popupsMountPoint,
         popupsBoundariesElement: popupsBoundariesElement,

package/dist/cjs/ui/ToolbarInsertBlock/table-selector-popup-with-listeners.js

@@ -232,6 +232,7 @@ var TableSelectorPopup = exports.TableSelectorPopup = function TableSelectorPopu
     boundariesElement: props.popupsBoundariesElement,
     scrollableElement: props.popupsScrollableElement,
     focusTrap: true,
+    onUnmount: props.onUnmount,
     zIndex: _editorSharedStyles.akEditorMenuZIndex
   }, (0, _react2.jsx)("div", {
     css: tableSelectorPopupWrapperStyles,

package/dist/es2019/plugin.js

@@ -40,8 +40,6 @@ export const insertBlockPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$featureFlags;
-  const featureFlags = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'insertBlock',
     primaryToolbarComponent({
@@ -71,7 +69,6 @@ export const insertBlockPlugin = ({
           disabled: disabled,
           isToolbarReducedSpacing: isToolbarReducedSpacing,
           isLastItem: isLastItem,
-          featureFlags: featureFlags,
           providers: providers,
           options: options
         });
@@ -97,8 +94,7 @@ function ToolbarInsertBlockWithInjectionApi({
   isLastItem,
   providers,
   pluginInjectionApi,
-  options,
-  featureFlags
+  options
 }) {
   var _ref, _ref2, _pluginInjectionApi$i, _pluginInjectionApi$c, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$e;
   const buttons = toolbarSizeToButtons(toolbarSize);
@@ -153,7 +149,6 @@ function ToolbarInsertBlockWithInjectionApi({
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
     showElementBrowserLink: options.showElementBrowserLink,
-    showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
-    featureFlags: featureFlags
+    showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S
   });
 }

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

@@ -597,14 +597,26 @@ export class ToolbarInsertBlock extends React.PureComponent {
     const {
       popupsMountPoint,
       popupsBoundariesElement,
-      popupsScrollableElement
+      popupsScrollableElement,
+      pluginInjectionApi
     } = this.props;
     const ref = (_this$tableButtonRef$ = this.tableButtonRef.current) !== null && _this$tableButtonRef$ !== void 0 ? _this$tableButtonRef$ : undefined;
     if (!isTableSelectorOpen) {
       return null;
     }
+
+    // We use focusTrap in the Popup. When we insert a table via popup,
+    // the popup closes, focusTrap gets destroyed and the popup detaches.
+    // The focus gets set to the body element. onUnmount method sets focus on the editor right before the
+    // Popup will be unmounted to ensure that the new table has a selection with a blinking cursor.
+    // So we can start typing right away.
+    const onUnmount = () => {
+      var _pluginInjectionApi$c7, _pluginInjectionApi$c8;
+      return pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$c7 = pluginInjectionApi.core) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : (_pluginInjectionApi$c8 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c8 === void 0 ? void 0 : _pluginInjectionApi$c8.focus();
+    };
     return jsx(TableSelectorPopup, {
       target: ref,
+      onUnmount: onUnmount,
       onSelection: this.handleSelectedTableSize,
       popupsMountPoint: popupsMountPoint,
       popupsBoundariesElement: popupsBoundariesElement,

package/dist/es2019/ui/ToolbarInsertBlock/table-selector-popup-with-listeners.js

@@ -222,6 +222,7 @@ export const TableSelectorPopup = props => {
     boundariesElement: props.popupsBoundariesElement,
     scrollableElement: props.popupsScrollableElement,
     focusTrap: true,
+    onUnmount: props.onUnmount,
     zIndex: akEditorMenuZIndex
   }, jsx("div", {
     css: tableSelectorPopupWrapperStyles,

package/dist/esm/plugin.js

@@ -39,11 +39,9 @@ function handleInsertBlockType(insertCodeBlock, insertPanel, insertBlockQuote) {
   };
 }
 export var insertBlockPlugin = function insertBlockPlugin(_ref) {
-  var _api$featureFlags;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
   return {
     name: 'insertBlock',
     primaryToolbarComponent: function primaryToolbarComponent(_ref2) {
@@ -72,7 +70,6 @@ export var insertBlockPlugin = function insertBlockPlugin(_ref) {
           disabled: disabled,
           isToolbarReducedSpacing: isToolbarReducedSpacing,
           isLastItem: isLastItem,
-          featureFlags: featureFlags,
           providers: providers,
           options: options
         });
@@ -99,8 +96,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     isLastItem = _ref3.isLastItem,
     providers = _ref3.providers,
     pluginInjectionApi = _ref3.pluginInjectionApi,
-    options = _ref3.options,
-    featureFlags = _ref3.featureFlags;
+    options = _ref3.options;
   var buttons = toolbarSizeToButtons(toolbarSize);
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText']),
     dateState = _useSharedPluginState.dateState,
@@ -152,7 +148,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
     showElementBrowserLink: options.showElementBrowserLink,
-    showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
-    featureFlags: featureFlags
+    showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S
   });
 }

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

@@ -531,13 +531,25 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       var _this$props13 = this.props,
         popupsMountPoint = _this$props13.popupsMountPoint,
         popupsBoundariesElement = _this$props13.popupsBoundariesElement,
-        popupsScrollableElement = _this$props13.popupsScrollableElement;
+        popupsScrollableElement = _this$props13.popupsScrollableElement,
+        pluginInjectionApi = _this$props13.pluginInjectionApi;
       var ref = (_this$tableButtonRef$ = this.tableButtonRef.current) !== null && _this$tableButtonRef$ !== void 0 ? _this$tableButtonRef$ : undefined;
       if (!isTableSelectorOpen) {
         return null;
       }
+
+      // We use focusTrap in the Popup. When we insert a table via popup,
+      // the popup closes, focusTrap gets destroyed and the popup detaches.
+      // The focus gets set to the body element. onUnmount method sets focus on the editor right before the
+      // Popup will be unmounted to ensure that the new table has a selection with a blinking cursor.
+      // So we can start typing right away.
+      var onUnmount = function onUnmount() {
+        var _pluginInjectionApi$c7;
+        return pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c7 = pluginInjectionApi.core) === null || _pluginInjectionApi$c7 === void 0 || (_pluginInjectionApi$c7 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : _pluginInjectionApi$c7.focus();
+      };
       return jsx(TableSelectorPopup, {
         target: ref,
+        onUnmount: onUnmount,
         onSelection: this.handleSelectedTableSize,
         popupsMountPoint: popupsMountPoint,
         popupsBoundariesElement: popupsBoundariesElement,

package/dist/esm/ui/ToolbarInsertBlock/table-selector-popup-with-listeners.js

@@ -224,6 +224,7 @@ export var TableSelectorPopup = function TableSelectorPopup(props) {
     boundariesElement: props.popupsBoundariesElement,
     scrollableElement: props.popupsScrollableElement,
     focusTrap: true,
+    onUnmount: props.onUnmount,
     zIndex: akEditorMenuZIndex
   }, jsx("div", {
     css: tableSelectorPopupWrapperStyles,

package/dist/types/types.d.ts

@@ -6,7 +6,6 @@ import type { DatePlugin } from '@atlaskit/editor-plugin-date';
 import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import type { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { HyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import type { ImageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
 import type { LayoutPlugin } from '@atlaskit/editor-plugin-layout';
@@ -21,7 +20,6 @@ import type { TablePlugin } from '@atlaskit/editor-plugin-table';
 import type { TasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 export type InsertBlockPluginDependencies = [
-    OptionalPlugin<FeatureFlagsPlugin>,
     TypeAheadPlugin,
     OptionalPlugin<TablePlugin>,
     OptionalPlugin<HyperlinkPlugin>,

package/dist/types/ui/ToolbarInsertBlock/table-selector-popup-with-listeners.d.ts

@@ -3,6 +3,7 @@ import { jsx } from '@emotion/react';
 import type { OnTableSizeSelection } from './table-selector-popup';
 type SimpleEventHandler<T> = (event: T) => void;
 export interface TableSelectorPopupProps {
+    onUnmount?: () => void;
     onSelection: OnTableSizeSelection;
     target?: HTMLElement;
     popupsMountPoint?: HTMLElement;

package/dist/types/ui/ToolbarInsertBlock/types.d.ts

@@ -1,6 +1,6 @@
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { MacroProvider } from '@atlaskit/editor-common/provider-factory';
-import type { Command, EditorActionsOptions as EditorActions, FeatureFlags, ImageUploadPluginReferenceEvent, PluginInjectionAPIWithDependencies } from '@atlaskit/editor-common/types';
+import type { Command, EditorActionsOptions as EditorActions, ImageUploadPluginReferenceEvent, PluginInjectionAPIWithDependencies } from '@atlaskit/editor-common/types';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { BlockType } from '@atlaskit/editor-plugin-block-type';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -47,7 +47,6 @@ export interface Props {
     onInsertBlockType?: (name: string) => Command;
     onInsertMacroFromMacroBrowser?: (macroProvider: MacroProvider, node?: PMNode, isEditing?: boolean) => (view: EditorView) => void;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
-    featureFlags: FeatureFlags;
     pluginInjectionApi?: PluginInjectionAPIWithDependencies<InsertBlockPluginDependencies>;
     mentionsDisabled?: boolean;
 }

package/dist/types-ts4.5/types.d.ts

@@ -6,7 +6,6 @@ import type { DatePlugin } from '@atlaskit/editor-plugin-date';
 import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import type { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { HyperlinkPlugin } from '@atlaskit/editor-plugin-hyperlink';
 import type { ImageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
 import type { LayoutPlugin } from '@atlaskit/editor-plugin-layout';
@@ -21,7 +20,6 @@ import type { TablePlugin } from '@atlaskit/editor-plugin-table';
 import type { TasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 export type InsertBlockPluginDependencies = [
-    OptionalPlugin<FeatureFlagsPlugin>,
     TypeAheadPlugin,
     OptionalPlugin<TablePlugin>,
     OptionalPlugin<HyperlinkPlugin>,

package/dist/types-ts4.5/ui/ToolbarInsertBlock/table-selector-popup-with-listeners.d.ts

@@ -3,6 +3,7 @@ import { jsx } from '@emotion/react';
 import type { OnTableSizeSelection } from './table-selector-popup';
 type SimpleEventHandler<T> = (event: T) => void;
 export interface TableSelectorPopupProps {
+    onUnmount?: () => void;
     onSelection: OnTableSizeSelection;
     target?: HTMLElement;
     popupsMountPoint?: HTMLElement;

package/dist/types-ts4.5/ui/ToolbarInsertBlock/types.d.ts

@@ -1,6 +1,6 @@
 import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { MacroProvider } from '@atlaskit/editor-common/provider-factory';
-import type { Command, EditorActionsOptions as EditorActions, FeatureFlags, ImageUploadPluginReferenceEvent, PluginInjectionAPIWithDependencies } from '@atlaskit/editor-common/types';
+import type { Command, EditorActionsOptions as EditorActions, ImageUploadPluginReferenceEvent, PluginInjectionAPIWithDependencies } from '@atlaskit/editor-common/types';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { BlockType } from '@atlaskit/editor-plugin-block-type';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -47,7 +47,6 @@ export interface Props {
     onInsertBlockType?: (name: string) => Command;
     onInsertMacroFromMacroBrowser?: (macroProvider: MacroProvider, node?: PMNode, isEditing?: boolean) => (view: EditorView) => void;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
-    featureFlags: FeatureFlags;
     pluginInjectionApi?: PluginInjectionAPIWithDependencies<InsertBlockPluginDependencies>;
     mentionsDisabled?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-insert-block",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Insert block plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^77.4.0",
+    "@atlaskit/editor-common": "^78.0.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-block-type": "^3.0.0",
     "@atlaskit/editor-plugin-code-block": "^1.0.0",
@@ -41,16 +41,15 @@
     "@atlaskit/editor-plugin-emoji": "^1.1.0",
     "@atlaskit/editor-plugin-expand": "^1.0.0",
     "@atlaskit/editor-plugin-extension": "^1.0.0",
-    "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-hyperlink": "^1.0.0",
     "@atlaskit/editor-plugin-image-upload": "^1.0.0",
     "@atlaskit/editor-plugin-layout": "^1.0.0",
-    "@atlaskit/editor-plugin-media": "^1.0.0",
+    "@atlaskit/editor-plugin-media": "^1.2.0",
     "@atlaskit/editor-plugin-mentions": "^1.0.0",
     "@atlaskit/editor-plugin-panel": "^1.0.0",
     "@atlaskit/editor-plugin-placeholder-text": "^1.0.0",
     "@atlaskit/editor-plugin-quick-insert": "^1.0.0",
-    "@atlaskit/editor-plugin-rule": "^1.0.0",
+    "@atlaskit/editor-plugin-rule": "^1.1.0",
     "@atlaskit/editor-plugin-status": "^1.0.0",
     "@atlaskit/editor-plugin-table": "^7.3.0",
     "@atlaskit/editor-plugin-tasks-and-decisions": "^1.0.0",
@@ -61,7 +60,7 @@
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/primitives": "^2.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.36.0",
+    "@atlaskit/tokens": "^1.37.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "bind-event-listener": "^2.1.1",