@atlaskit/editor-plugin-insert-block 8.3.2 → 8.4.0

package/dist/es2019/ui/toolbar-components.js

@@ -254,159 +254,126 @@ export const getToolbarComponents = ({
         numberOfButtons: 0
       });
     };
-    if (fg('platform_editor_toolbar_aifc_ga_blockers')) {
-      components.push({
+    components.push({
+      type: INSERT_GROUP.type,
+      key: `${INSERT_GROUP.key}-none`,
+      parents: [{
+        type: INSERT_BLOCK_SECTION.type,
+        key: INSERT_BLOCK_SECTION.key,
+        rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
+      }],
+      component: ({
+        children
+      }) => /*#__PURE__*/React.createElement(Show, {
+        below: "sm"
+      }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
+    });
+    components.push({
+      type: INSERT_BUTTON.type,
+      key: INSERT_BUTTON.key,
+      parents: [{
         type: INSERT_GROUP.type,
         key: `${INSERT_GROUP.key}-none`,
-        parents: [{
-          type: INSERT_BLOCK_SECTION.type,
-          key: INSERT_BLOCK_SECTION.key,
-          rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
-        }],
-        component: ({
-          children
-        }) => /*#__PURE__*/React.createElement(Show, {
-          below: "sm"
-        }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
-      });
-      components.push({
-        type: INSERT_BUTTON.type,
-        key: INSERT_BUTTON.key,
-        parents: [{
-          type: INSERT_GROUP.type,
-          key: `${INSERT_GROUP.key}-none`,
-          rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent(null)
-      });
-      components.push({
+        rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent(null)
+    });
+    components.push({
+      type: INSERT_GROUP.type,
+      key: `${INSERT_GROUP.key}-sm`,
+      parents: [{
+        type: INSERT_BLOCK_SECTION.type,
+        key: INSERT_BLOCK_SECTION.key,
+        rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
+      }],
+      component: ({
+        children
+      }) => /*#__PURE__*/React.createElement(Show, {
+        only: "sm"
+      }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
+    });
+    components.push({
+      type: INSERT_BUTTON.type,
+      key: INSERT_BUTTON.key,
+      parents: [{
         type: INSERT_GROUP.type,
         key: `${INSERT_GROUP.key}-sm`,
-        parents: [{
-          type: INSERT_BLOCK_SECTION.type,
-          key: INSERT_BLOCK_SECTION.key,
-          rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
-        }],
-        component: ({
-          children
-        }) => /*#__PURE__*/React.createElement(Show, {
-          only: "sm"
-        }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
-      });
-      components.push({
-        type: INSERT_BUTTON.type,
-        key: INSERT_BUTTON.key,
-        parents: [{
-          type: INSERT_GROUP.type,
-          key: `${INSERT_GROUP.key}-sm`,
-          rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('sm')
-      });
-      components.push({
+        rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('sm')
+    });
+    components.push({
+      type: INSERT_GROUP.type,
+      key: `${INSERT_GROUP.key}-md`,
+      parents: [{
+        type: INSERT_BLOCK_SECTION.type,
+        key: INSERT_BLOCK_SECTION.key,
+        rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
+      }],
+      component: ({
+        children
+      }) => /*#__PURE__*/React.createElement(Show, {
+        only: "md"
+      }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
+    });
+    components.push({
+      type: INSERT_BUTTON.type,
+      key: INSERT_BUTTON.key,
+      parents: [{
         type: INSERT_GROUP.type,
         key: `${INSERT_GROUP.key}-md`,
-        parents: [{
-          type: INSERT_BLOCK_SECTION.type,
-          key: INSERT_BLOCK_SECTION.key,
-          rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
-        }],
-        component: ({
-          children
-        }) => /*#__PURE__*/React.createElement(Show, {
-          only: "md"
-        }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
-      });
-      components.push({
-        type: INSERT_BUTTON.type,
-        key: INSERT_BUTTON.key,
-        parents: [{
-          type: INSERT_GROUP.type,
-          key: `${INSERT_GROUP.key}-md`,
-          rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('md')
-      });
-      components.push({
+        rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('md')
+    });
+    components.push({
+      type: INSERT_GROUP.type,
+      key: `${INSERT_GROUP.key}-lg`,
+      parents: [{
+        type: INSERT_BLOCK_SECTION.type,
+        key: INSERT_BLOCK_SECTION.key,
+        rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
+      }],
+      component: ({
+        children
+      }) => /*#__PURE__*/React.createElement(Show, {
+        only: "lg"
+      }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
+    });
+    components.push({
+      type: INSERT_BUTTON.type,
+      key: INSERT_BUTTON.key,
+      parents: [{
         type: INSERT_GROUP.type,
         key: `${INSERT_GROUP.key}-lg`,
-        parents: [{
-          type: INSERT_BLOCK_SECTION.type,
-          key: INSERT_BLOCK_SECTION.key,
-          rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
-        }],
-        component: ({
-          children
-        }) => /*#__PURE__*/React.createElement(Show, {
-          only: "lg"
-        }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
-      });
-      components.push({
-        type: INSERT_BUTTON.type,
-        key: INSERT_BUTTON.key,
-        parents: [{
-          type: INSERT_GROUP.type,
-          key: `${INSERT_GROUP.key}-lg`,
-          rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('lg')
-      });
-      components.push({
+        rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('lg')
+    });
+    components.push({
+      type: INSERT_GROUP.type,
+      key: `${INSERT_GROUP.key}-xl`,
+      parents: [{
+        type: INSERT_BLOCK_SECTION.type,
+        key: INSERT_BLOCK_SECTION.key,
+        rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
+      }],
+      component: ({
+        children
+      }) => /*#__PURE__*/React.createElement(Show, {
+        only: "xl"
+      }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
+    });
+    components.push({
+      type: INSERT_BUTTON.type,
+      key: INSERT_BUTTON.key,
+      parents: [{
         type: INSERT_GROUP.type,
         key: `${INSERT_GROUP.key}-xl`,
-        parents: [{
-          type: INSERT_BLOCK_SECTION.type,
-          key: INSERT_BLOCK_SECTION.key,
-          rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
-        }],
-        component: ({
-          children
-        }) => /*#__PURE__*/React.createElement(Show, {
-          only: "xl"
-        }, /*#__PURE__*/React.createElement(ToolbarButtonGroup, null, children))
-      });
-      components.push({
-        type: INSERT_BUTTON.type,
-        key: INSERT_BUTTON.key,
-        parents: [{
-          type: INSERT_GROUP.type,
-          key: `${INSERT_GROUP.key}-xl`,
-          rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('xl')
-      });
-    } else {
-      components.push({
-        type: INSERT_GROUP.type,
-        key: INSERT_GROUP.key,
-        parents: [{
-          type: INSERT_BLOCK_SECTION.type,
-          key: INSERT_BLOCK_SECTION.key,
-          rank: INSERT_BLOCK_SECTION_RANK[INSERT_GROUP.key]
-        }]
-      });
-      components.push({
-        type: INSERT_BUTTON.type,
-        key: INSERT_BUTTON.key,
-        parents: [{
-          type: INSERT_GROUP.type,
-          key: INSERT_GROUP.key,
-          rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
-        }],
-        component: () => /*#__PURE__*/React.createElement(InsertButton, {
-          api: api,
-          toolbarConfig: config,
-          showElementBrowserLink: options.showElementBrowserLink,
-          tableSelectorSupported: options.tableSelectorSupported,
-          onInsertBlockType: onInsertBlockType,
-          nativeStatusSupported: options.nativeStatusSupported,
-          horizontalRuleEnabled: options.horizontalRuleEnabled,
-          expandEnabled: options.allowExpand,
-          insertMenuItems: options.insertMenuItems,
-          numberOfButtons: 7 // TODO: ED-28759 - Default to 7 buttons - Remove this once we have a proper way to do toolbar responsiveness
-        })
-      });
-    }
+        rank: INSERT_GROUP_RANK[INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('xl')
+    });
   }
   return components;
 };

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

@@ -23,10 +23,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { messages, IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 export var DEFAULT_HEIGHT = 560;
 
 /**
@@ -35,98 +32,29 @@ export var DEFAULT_HEIGHT = 560;
    method that can be used to get suggestions -> once all experiments are cleaned up,
    they should be unified through `pluginInjectionApi?.quickInsert?.actions.getSuggestions`
  */
-export var filterForPinWhiteboardsExperiment = function filterForPinWhiteboardsExperiment(featuredItems, formatMessage) {
-  // Legacy path fallback -- prior comments as follows:
-  /**
-   * // Part of ATLAS-95399 to pin whiteboards to the top of the InsertMenu
-  	// Need to check if whiteboard options are available, and filter for the cohort
-  	// Takes the original featuredItems list and returns one with the right whiteboard option at the top
-   */
-  if (fg('confluence-whiteboards-quick-insert-eligible')) {
-    var DIAGRAM_TITLE = 'Create diagram',
-      BLANK_TITLE = 'Create whiteboard';
-    var featuredWhiteboardsPresent = featuredItems.filter(function (item) {
-      return [DIAGRAM_TITLE, BLANK_TITLE].includes(item.title);
-    }).length === 2;
-    if (featuredWhiteboardsPresent) {
-      var pinWhiteboardActionToTop = function pinWhiteboardActionToTop(items, title) {
-        // find the requested item by title, give it the appropriate description, and bring it to the top of the list
-        var index = items.findIndex(function (item) {
-          return item.title === title;
-        });
-        var filteredList = items.filter(function (item) {
-          return ![DIAGRAM_TITLE, BLANK_TITLE].includes(item.title);
-        });
-        if (index === -1) {
-          return filteredList;
-        }
-        var featuredItem = _objectSpread({}, items[index]);
-        featuredItem.description = formatMessage(messages.featuredWhiteboardDescription);
-        return [featuredItem].concat(_toConsumableArray(filteredList));
-      };
-      return pinWhiteboardActionToTop(featuredItems, DIAGRAM_TITLE);
-    } else {
-      if (fg('confluence-whiteboards-quick-insert-l10n-eligible')) {
-        // Fire exposure for confluence_whiteboards_quick_insert_localised_aa
-        // https://switcheroo.atlassian.com/ui/gates/ccd80d32-28a1-4dcf-b3f9-dbdc02a046ff/key/confluence_whiteboards_quick_insert_localised_aa
-        expVal('confluence_whiteboards_quick_insert_localised_aa', 'cohort', 'test_diagram');
-
-        /** BEGIN locale agnostic path */
-
-        /**
-         * EXTREMELY IMPORTANT: we must not drop diagram for those who already receive
-         * the 'insert diagram to the top' treatment.
-         *
-         * Our heuristic to check that this is only targeting users where they haven't
-         * gotten the experience, is if we _cannot_ find the blank board experience in
-         * the list, matching purely on title.
-         *
-         * e.g. `featuredWhiteboardsPresent` = false, given it matches on title.
-         *
-         * The side-effect of this, is that there's a small chance/edge case of users
-         * who toggle between locales, and receive different experiences.
-         *
-         * Hopefully we can make a call early on this experiment, and eliminate this
-         * code path.
-         */
-        var WHITEBOARD_KEY = 'whiteboard-extension:create-whiteboard';
-        var DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
-        var isBlank = function isBlank(item) {
-          return item.key === WHITEBOARD_KEY;
-        };
-        var isDiagram = function isDiagram(item) {
-          return item.key === DIAGRAM_KEY;
-        };
-        var hasBoth = featuredItems.some(isBlank) && featuredItems.some(isDiagram);
-        if (hasBoth) {
-          var pin = function pin(key) {
-            var idx = featuredItems.findIndex(function (item) {
-              return item.key === key;
-            });
-            var filtered = featuredItems.filter(function (item) {
-              return !isBlank(item) && !isDiagram(item);
-            });
-            if (idx === -1) {
-              return filtered;
-            }
-            var picked = _objectSpread(_objectSpread({}, featuredItems[idx]), {}, {
-              description: formatMessage(messages.featuredWhiteboardDescription)
-            });
-            return [picked].concat(_toConsumableArray(filtered));
-          };
-          if (expValEquals('confluence_whiteboards_quick_insert_localised', 'cohort', 'test_blank')) {
-            return pin(WHITEBOARD_KEY);
-          }
-          if (expValEquals('confluence_whiteboards_quick_insert_localised', 'cohort', 'test_diagram')) {
-            return pin(DIAGRAM_KEY);
-          }
-          if (expValEquals('confluence_whiteboards_quick_insert_localised', 'cohort', 'control')) {
-            return featuredItems;
-          }
-        }
+export var filterForPinWhiteboards = function filterForPinWhiteboards(featuredItems, formatMessage) {
+  var DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
+  var isDiagram = function isDiagram(item) {
+    return item.key === DIAGRAM_KEY;
+  };
+  var featuredWhiteboardsPresent = featuredItems.some(isDiagram);
+  if (featuredWhiteboardsPresent) {
+    var pin = function pin(key) {
+      var idx = featuredItems.findIndex(function (item) {
+        return item.key === key;
+      });
+      var filtered = featuredItems.filter(function (item) {
+        return !isDiagram(item);
+      });
+      if (idx === -1) {
+        return filtered;
       }
-      /** END locale agnostic path */
-    }
+      var picked = _objectSpread(_objectSpread({}, featuredItems[idx]), {}, {
+        description: formatMessage(messages.featuredWhiteboardDescription)
+      });
+      return [picked].concat(_toConsumableArray(filtered));
+    };
+    return pin(DIAGRAM_KEY);
   }
   return featuredItems;
 };
@@ -240,7 +168,7 @@ var InsertMenu = function InsertMenu(_ref) {
       })) !== null && _pluginInjectionApi$q4 !== void 0 ? _pluginInjectionApi$q4 : [];
       var unfilteredResult = quickInsertDropdownItems.concat(featuredQuickInsertSuggestions);
       // need to filter on the concatenated list so whiteboards are at the top
-      result = filterForPinWhiteboardsExperiment(unfilteredResult, formatMessage);
+      result = filterForPinWhiteboards(unfilteredResult, formatMessage);
     }
     setItemCount(result.length);
     return result;