@atlaskit/editor-plugin-insert-block 1.14.4 → 1.14.6

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 1.14.6
+
+### Patch Changes
+
+- [#141109](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141109)
+  [`466f39066bd56`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/466f39066bd56) -
+  Enforce appearance check for all experiment code
+
+## 1.14.5
+
+### Patch Changes
+
+- [`8c1e1dea50327`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8c1e1dea50327) -
+  [ED-24967] Add in code English locale targeting for `platform_editor_element_level_templates`
+  experiment
+- Updated dependencies
+
 ## 1.14.4
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -60,7 +60,7 @@ function handleInsertBlockType(insertCodeBlock, insertPanel, insertBlockQuote) {
   };
 }
 var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_ref) {
-  var _api$primaryToolbar;
+  var _api$primaryToolbar, _options$UNSAFE_edito3;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -129,7 +129,10 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
       }
     },
     pmPlugins: function pmPlugins() {
-      if (!(0, _experiments.editorExperiment)('insert-menu-in-right-rail', true)) {
+      var _options$UNSAFE_edito;
+      if (
+      // @ts-ignore
+      !['full-page', 'full-width'].includes((_options$UNSAFE_edito = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito !== void 0 ? _options$UNSAFE_edito : '') || !(0, _experiments.editorExperiment)('insert-menu-in-right-rail', true)) {
         [];
       }
       return [{
@@ -212,11 +215,13 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
       // This is not the most ideal plugin to add this to, but it is suitable for experiment purpose
       // If we decide to ship the feature, we will consider a separate plugin if needed.
       // Experiment one-pager: https://hello.atlassian.net/wiki/spaces/ETM/pages/3983684902/Experiment+Drive+element+usage+via+element+templates
-      quickInsert: function quickInsert() {
-        var _options$UNSAFE_edito;
-        if (
+      quickInsert: function quickInsert(intl) {
+        var _options$UNSAFE_edito2;
+        var locale = intl.locale;
+        var isEligible = locale.startsWith('en') &&
         // @ts-ignore
-        ['full-page', 'full-width'].includes((_options$UNSAFE_edito = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito !== void 0 ? _options$UNSAFE_edito : '') && (0, _experiments.editorExperiment)('element-level-templates', true, {
+        ['full-page', 'full-width'].includes((_options$UNSAFE_edito2 = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito2 !== void 0 ? _options$UNSAFE_edito2 : '');
+        if (isEligible && (0, _experiments.editorExperiment)('element-level-templates', true, {
           exposure: true
         })) {
           return (0, _templateOptions.templateOptions)(api);
@@ -233,7 +238,9 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
     },
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
-  if ((0, _experiments.editorExperiment)('insert-menu-in-right-rail', true)) {
+  if (
+  // @ts-ignore
+  ['full-page', 'full-width'].includes((_options$UNSAFE_edito3 = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito3 !== void 0 ? _options$UNSAFE_edito3 : '') && (0, _experiments.editorExperiment)('insert-menu-in-right-rail', true)) {
     plugin.pluginsOptions.contextPanel = function (state) {
       // api.getSharedState() will have an outdated reference to editorState on first mount of this component
       // so instead just rely on plugin key as we don't need to be reactive to changes here

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

@@ -112,14 +112,14 @@ var InsertMenuRail = exports.InsertMenuRail = function InsertMenuRail(_ref) {
         (_api$emoji = api.emoji) === null || _api$emoji === void 0 || _api$emoji.actions.openTypeAhead(inputMethod);
         break;
       case 'codeblock':
-        (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 || _api$codeBlock.actions.insertCodeBlock(inputMethod);
+        (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 || _api$codeBlock.actions.insertCodeBlock(inputMethod)(state, dispatch);
         break;
       case 'blockquote':
         // @ts-expect-error
-        (_api$blockType = api.blockType) === null || _api$blockType === void 0 || _api$blockType.actions.insertBlockQuote(inputMethod);
+        (_api$blockType = api.blockType) === null || _api$blockType === void 0 || _api$blockType.actions.insertBlockQuote(inputMethod)(state, dispatch);
         break;
       case 'panel':
-        (_api$panel = api.panel) === null || _api$panel === void 0 || _api$panel.actions.insertPanel(inputMethod);
+        (_api$panel = api.panel) === null || _api$panel === void 0 || _api$panel.actions.insertPanel(inputMethod)(state, dispatch);
         break;
       case 'action':
         // @ts-expect-error

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

@@ -213,11 +213,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       (_this$unregisterToggl = (_this2 = _this).unregisterToggleDropdownMenuOptions) === null || _this$unregisterToggl === void 0 || _this$unregisterToggl.call(_this2);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleClick", function () {
+      var _this$props$editorApp;
       /**
        * For insert menu in right rail experiment
        * - Clean up ticket ED-24801
        */
-      if ((0, _experiments.editorExperiment)('insert-menu-in-right-rail', true, {
+      if (['full-page', 'full-width'].includes((_this$props$editorApp = _this.props.editorAppearance) !== null && _this$props$editorApp !== void 0 ? _this$props$editorApp : '') && (0, _experiments.editorExperiment)('insert-menu-in-right-rail', true, {
         exposure: true
       })) {
         var pluginInjectionApi = _this.props.pluginInjectionApi;
@@ -245,11 +246,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleOpenByKeyboard", function (event) {
       if (event.key === 'Enter' || event.key === ' ') {
+        var _this$props$editorApp2;
         /**
          * For insert menu in right rail experiment
          * - Clean up ticket ED-24801
          */
-        if ((0, _experiments.editorExperiment)('insert-menu-in-right-rail', true, {
+        if (['full-page', 'full-width'].includes((_this$props$editorApp2 = _this.props.editorAppearance) !== null && _this$props$editorApp2 !== void 0 ? _this$props$editorApp2 : '') && (0, _experiments.editorExperiment)('insert-menu-in-right-rail', true, {
           exposure: true
         })) {
           var _this$props$pluginInj;

package/dist/es2019/plugin.js

@@ -51,7 +51,7 @@ export const insertBlockPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$primaryToolbar;
+  var _api$primaryToolbar, _options$UNSAFE_edito3;
   const toggleDropdownMenuOptionsRef = {
     current: null
   };
@@ -118,7 +118,10 @@ export const insertBlockPlugin = ({
       }
     },
     pmPlugins: () => {
-      if (!editorExperiment('insert-menu-in-right-rail', true)) {
+      var _options$UNSAFE_edito;
+      if (
+      // @ts-ignore
+      !['full-page', 'full-width'].includes((_options$UNSAFE_edito = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito !== void 0 ? _options$UNSAFE_edito : '') || !editorExperiment('insert-menu-in-right-rail', true)) {
         [];
       }
       return [{
@@ -203,11 +206,15 @@ export const insertBlockPlugin = ({
       // This is not the most ideal plugin to add this to, but it is suitable for experiment purpose
       // If we decide to ship the feature, we will consider a separate plugin if needed.
       // Experiment one-pager: https://hello.atlassian.net/wiki/spaces/ETM/pages/3983684902/Experiment+Drive+element+usage+via+element+templates
-      quickInsert: () => {
-        var _options$UNSAFE_edito;
-        if (
+      quickInsert: intl => {
+        var _options$UNSAFE_edito2;
+        const {
+          locale
+        } = intl;
+        const isEligible = locale.startsWith('en') &&
         // @ts-ignore
-        ['full-page', 'full-width'].includes((_options$UNSAFE_edito = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito !== void 0 ? _options$UNSAFE_edito : '') && editorExperiment('element-level-templates', true, {
+        ['full-page', 'full-width'].includes((_options$UNSAFE_edito2 = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito2 !== void 0 ? _options$UNSAFE_edito2 : '');
+        if (isEligible && editorExperiment('element-level-templates', true, {
           exposure: true
         })) {
           return templateOptions(api);
@@ -224,7 +231,9 @@ export const insertBlockPlugin = ({
     },
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
-  if (editorExperiment('insert-menu-in-right-rail', true)) {
+  if (
+  // @ts-ignore
+  ['full-page', 'full-width'].includes((_options$UNSAFE_edito3 = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito3 !== void 0 ? _options$UNSAFE_edito3 : '') && editorExperiment('insert-menu-in-right-rail', true)) {
     plugin.pluginsOptions.contextPanel = state => {
       // api.getSharedState() will have an outdated reference to editorState on first mount of this component
       // so instead just rely on plugin key as we don't need to be reactive to changes here

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

@@ -106,14 +106,14 @@ export const InsertMenuRail = ({
         (_api$emoji = api.emoji) === null || _api$emoji === void 0 ? void 0 : _api$emoji.actions.openTypeAhead(inputMethod);
         break;
       case 'codeblock':
-        (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 ? void 0 : _api$codeBlock.actions.insertCodeBlock(inputMethod);
+        (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 ? void 0 : _api$codeBlock.actions.insertCodeBlock(inputMethod)(state, dispatch);
         break;
       case 'blockquote':
         // @ts-expect-error
-        (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : _api$blockType.actions.insertBlockQuote(inputMethod);
+        (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : _api$blockType.actions.insertBlockQuote(inputMethod)(state, dispatch);
         break;
       case 'panel':
-        (_api$panel = api.panel) === null || _api$panel === void 0 ? void 0 : _api$panel.actions.insertPanel(inputMethod);
+        (_api$panel = api.panel) === null || _api$panel === void 0 ? void 0 : _api$panel.actions.insertPanel(inputMethod)(state, dispatch);
         break;
       case 'action':
         // @ts-expect-error

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

@@ -211,11 +211,12 @@ export class ToolbarInsertBlock extends React.PureComponent {
       (_this$unregisterToggl = this.unregisterToggleDropdownMenuOptions) === null || _this$unregisterToggl === void 0 ? void 0 : _this$unregisterToggl.call(this);
     });
     _defineProperty(this, "handleClick", () => {
+      var _this$props$editorApp;
       /**
        * For insert menu in right rail experiment
        * - Clean up ticket ED-24801
        */
-      if (editorExperiment('insert-menu-in-right-rail', true, {
+      if (['full-page', 'full-width'].includes((_this$props$editorApp = this.props.editorAppearance) !== null && _this$props$editorApp !== void 0 ? _this$props$editorApp : '') && editorExperiment('insert-menu-in-right-rail', true, {
         exposure: true
       })) {
         const {
@@ -246,11 +247,12 @@ export class ToolbarInsertBlock extends React.PureComponent {
     });
     _defineProperty(this, "handleOpenByKeyboard", event => {
       if (event.key === 'Enter' || event.key === ' ') {
+        var _this$props$editorApp2;
         /**
          * For insert menu in right rail experiment
          * - Clean up ticket ED-24801
          */
-        if (editorExperiment('insert-menu-in-right-rail', true, {
+        if (['full-page', 'full-width'].includes((_this$props$editorApp2 = this.props.editorAppearance) !== null && _this$props$editorApp2 !== void 0 ? _this$props$editorApp2 : '') && editorExperiment('insert-menu-in-right-rail', true, {
           exposure: true
         })) {
           var _this$props$pluginInj;

package/dist/esm/plugin.js

@@ -50,7 +50,7 @@ function handleInsertBlockType(insertCodeBlock, insertPanel, insertBlockQuote) {
   };
 }
 export var insertBlockPlugin = function insertBlockPlugin(_ref) {
-  var _api$primaryToolbar;
+  var _api$primaryToolbar, _options$UNSAFE_edito3;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -119,7 +119,10 @@ export var insertBlockPlugin = function insertBlockPlugin(_ref) {
       }
     },
     pmPlugins: function pmPlugins() {
-      if (!editorExperiment('insert-menu-in-right-rail', true)) {
+      var _options$UNSAFE_edito;
+      if (
+      // @ts-ignore
+      !['full-page', 'full-width'].includes((_options$UNSAFE_edito = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito !== void 0 ? _options$UNSAFE_edito : '') || !editorExperiment('insert-menu-in-right-rail', true)) {
         [];
       }
       return [{
@@ -202,11 +205,13 @@ export var insertBlockPlugin = function insertBlockPlugin(_ref) {
       // This is not the most ideal plugin to add this to, but it is suitable for experiment purpose
       // If we decide to ship the feature, we will consider a separate plugin if needed.
       // Experiment one-pager: https://hello.atlassian.net/wiki/spaces/ETM/pages/3983684902/Experiment+Drive+element+usage+via+element+templates
-      quickInsert: function quickInsert() {
-        var _options$UNSAFE_edito;
-        if (
+      quickInsert: function quickInsert(intl) {
+        var _options$UNSAFE_edito2;
+        var locale = intl.locale;
+        var isEligible = locale.startsWith('en') &&
         // @ts-ignore
-        ['full-page', 'full-width'].includes((_options$UNSAFE_edito = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito !== void 0 ? _options$UNSAFE_edito : '') && editorExperiment('element-level-templates', true, {
+        ['full-page', 'full-width'].includes((_options$UNSAFE_edito2 = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito2 !== void 0 ? _options$UNSAFE_edito2 : '');
+        if (isEligible && editorExperiment('element-level-templates', true, {
           exposure: true
         })) {
           return templateOptions(api);
@@ -223,7 +228,9 @@ export var insertBlockPlugin = function insertBlockPlugin(_ref) {
     },
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined
   };
-  if (editorExperiment('insert-menu-in-right-rail', true)) {
+  if (
+  // @ts-ignore
+  ['full-page', 'full-width'].includes((_options$UNSAFE_edito3 = options.UNSAFE_editorAppearance) !== null && _options$UNSAFE_edito3 !== void 0 ? _options$UNSAFE_edito3 : '') && editorExperiment('insert-menu-in-right-rail', true)) {
     plugin.pluginsOptions.contextPanel = function (state) {
       // api.getSharedState() will have an outdated reference to editorState on first mount of this component
       // so instead just rely on plugin key as we don't need to be reactive to changes here

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

@@ -101,14 +101,14 @@ export var InsertMenuRail = function InsertMenuRail(_ref) {
         (_api$emoji = api.emoji) === null || _api$emoji === void 0 || _api$emoji.actions.openTypeAhead(inputMethod);
         break;
       case 'codeblock':
-        (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 || _api$codeBlock.actions.insertCodeBlock(inputMethod);
+        (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 || _api$codeBlock.actions.insertCodeBlock(inputMethod)(state, dispatch);
         break;
       case 'blockquote':
         // @ts-expect-error
-        (_api$blockType = api.blockType) === null || _api$blockType === void 0 || _api$blockType.actions.insertBlockQuote(inputMethod);
+        (_api$blockType = api.blockType) === null || _api$blockType === void 0 || _api$blockType.actions.insertBlockQuote(inputMethod)(state, dispatch);
         break;
       case 'panel':
-        (_api$panel = api.panel) === null || _api$panel === void 0 || _api$panel.actions.insertPanel(inputMethod);
+        (_api$panel = api.panel) === null || _api$panel === void 0 || _api$panel.actions.insertPanel(inputMethod)(state, dispatch);
         break;
       case 'action':
         // @ts-expect-error

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

@@ -204,11 +204,12 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       (_this$unregisterToggl = (_this2 = _this).unregisterToggleDropdownMenuOptions) === null || _this$unregisterToggl === void 0 || _this$unregisterToggl.call(_this2);
     });
     _defineProperty(_assertThisInitialized(_this), "handleClick", function () {
+      var _this$props$editorApp;
       /**
        * For insert menu in right rail experiment
        * - Clean up ticket ED-24801
        */
-      if (editorExperiment('insert-menu-in-right-rail', true, {
+      if (['full-page', 'full-width'].includes((_this$props$editorApp = _this.props.editorAppearance) !== null && _this$props$editorApp !== void 0 ? _this$props$editorApp : '') && editorExperiment('insert-menu-in-right-rail', true, {
         exposure: true
       })) {
         var pluginInjectionApi = _this.props.pluginInjectionApi;
@@ -236,11 +237,12 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     });
     _defineProperty(_assertThisInitialized(_this), "handleOpenByKeyboard", function (event) {
       if (event.key === 'Enter' || event.key === ' ') {
+        var _this$props$editorApp2;
         /**
          * For insert menu in right rail experiment
          * - Clean up ticket ED-24801
          */
-        if (editorExperiment('insert-menu-in-right-rail', true, {
+        if (['full-page', 'full-width'].includes((_this$props$editorApp2 = _this.props.editorAppearance) !== null && _this$props$editorApp2 !== void 0 ? _this$props$editorApp2 : '') && editorExperiment('insert-menu-in-right-rail', true, {
           exposure: true
         })) {
           var _this$props$pluginInj;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-insert-block",
-	"version": "1.14.4",
+	"version": "1.14.6",
 	"description": "Insert block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -64,7 +64,7 @@
 		"@atlaskit/primitives": "^12.1.0",
 		"@atlaskit/theme": "^13.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.1.0",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@atlaskit/tooltip": "18.7.2",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",