@atlaskit/editor-plugin-selection-toolbar 7.0.9 → 7.0.11

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-selection-toolbar
 
+## 7.0.11
+
+### Patch Changes
+
+- [`14b9e966da4dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/14b9e966da4dd) -
+  [ux] ED-29517 Toolbar and offline banner is overlapping
+- [`ef001bf65d48f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ef001bf65d48f) -
+  Remove usage of `platform_editor_toolbar_aifc` inside editor packages - instead rely on checking
+  for new toolbar plugin option, make `enableNewToolbarExperience` mandatory for consumers to opt in
+  to new toolbar experience
+- Updated dependencies
+
+## 7.0.10
+
+### Patch Changes
+
+- [`0b4cd77e72217`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0b4cd77e72217) -
+  clean up references to platform_editor_controls_performance_fixes
+- Updated dependencies
+
 ## 7.0.9
 
 ### Patch Changes

package/dist/cjs/selectionToolbarPlugin.js

@@ -42,9 +42,7 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
     config = _ref.config;
   var __selectionToolbarHandlers = [];
   var primaryToolbarComponent;
-  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  });
+  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   var userPreferencesProvider = config.userPreferencesProvider,
     contextualFormattingEnabled = config.contextualFormattingEnabled;
   if (isToolbarAIFCEnabled) {

package/dist/cjs/ui/PageVisibilityWatcher.js

@@ -10,7 +10,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = require("react");
 var _bindEventListener = require("bind-event-listener");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var PageVisibilityWatcher = exports.PageVisibilityWatcher = function PageVisibilityWatcher(_ref) {
   var api = _ref.api,
     userPreferencesProvider = _ref.userPreferencesProvider;
@@ -52,9 +51,6 @@ var PageVisibilityWatcher = exports.PageVisibilityWatcher = function PageVisibil
         return _ref2.apply(this, arguments);
       };
     }();
-    if ((0, _experiments.editorExperiment)('platform_editor_controls_performance_fixes', false)) {
-      refreshPrefrerence();
-    }
     return (0, _bindEventListener.bind)(document, {
       type: 'visibilitychange',
       listener: refreshPrefrerence

package/dist/cjs/ui/PinButton.js

@@ -8,14 +8,19 @@ exports.PinButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
+var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var PinButton = exports.PinButton = function PinButton(_ref) {
   var api = _ref.api;
   var intl = (0, _reactIntlNext.useIntl)();
   var message = intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionPinedAtTop);
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    isOffline = _useEditorToolbar.isOffline;
+  var isDisabled = (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') ? isOffline : false;
   var onClick = function onClick() {
     var _api$selectionToolbar, _api$selectionToolbar2;
-    if (!api) {
+    if (!api || isDisabled) {
       return;
     }
     (_api$selectionToolbar = api.selectionToolbar.actions) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar2 = _api$selectionToolbar.setToolbarDocking) === null || _api$selectionToolbar2 === void 0 || _api$selectionToolbar2.call(_api$selectionToolbar, 'none');
@@ -28,6 +33,7 @@ var PinButton = exports.PinButton = function PinButton(_ref) {
       label: ""
     }),
     label: message,
-    onClick: onClick
+    onClick: onClick,
+    isDisabled: isDisabled
   }));
 };

package/dist/cjs/ui/PinMenuItem.js

@@ -11,6 +11,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var shouldShowPinMenuItem = function shouldShowPinMenuItem(editMode) {
@@ -21,17 +22,21 @@ var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(fun
 }, function (api) {
   var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
     editorViewMode = _useEditorToolbar.editorViewMode,
-    editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference;
+    editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference,
+    isOffline = _useEditorToolbar.isOffline;
   return {
     editorViewMode: editorViewMode,
-    editorToolbarDockingPreference: editorToolbarDockingPreference
+    editorToolbarDockingPreference: editorToolbarDockingPreference,
+    isOffline: isOffline
   };
 }, function (api) {
   var editorViewMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'editorViewMode.mode');
   var editorToolbarDockingPreference = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'userPreferences.preferences.toolbarDockingPosition');
+  var isOffline = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'connectivity.mode') === 'offline';
   return {
     editorViewMode: editorViewMode,
-    editorToolbarDockingPreference: editorToolbarDockingPreference
+    editorToolbarDockingPreference: editorToolbarDockingPreference,
+    isOffline: isOffline
   };
 });
 
@@ -43,13 +48,15 @@ var PinMenuItem = exports.PinMenuItem = function PinMenuItem(_ref) {
   var intl = (0, _reactIntlNext.useIntl)();
   var _usePluginState = usePluginState(api),
     editorViewMode = _usePluginState.editorViewMode,
-    editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference;
+    editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
+    isOffline = _usePluginState.isOffline;
   var isToolbarDocked = editorToolbarDockingPreference === 'top';
+  var isDisabled = (0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_patch_7') ? isOffline : false;
   if (!shouldShowPinMenuItem(editorViewMode)) {
     return null;
   }
   var onClick = function onClick() {
-    if (!api) {
+    if (!api || isDisabled) {
       return;
     }
     if (isToolbarDocked) {
@@ -63,6 +70,7 @@ var PinMenuItem = exports.PinMenuItem = function PinMenuItem(_ref) {
   var message = intl.formatMessage(isToolbarDocked ? _messages.selectionToolbarMessages.toolbarPositionPinedAtTop : _messages.selectionToolbarMessages.toolbarPositionUnpinnedConcise);
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: onClick,
+    isDisabled: isDisabled,
     elemBefore: isToolbarDocked ? /*#__PURE__*/_react.default.createElement(_editorToolbar.PinnedIcon, {
       size: "small",
       label: ""

package/dist/es2019/selectionToolbarPlugin.js

@@ -32,9 +32,7 @@ export const selectionToolbarPlugin = ({
 }) => {
   const __selectionToolbarHandlers = [];
   let primaryToolbarComponent;
-  const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  });
+  const isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   const {
     userPreferencesProvider,
     contextualFormattingEnabled

package/dist/es2019/ui/PageVisibilityWatcher.js

@@ -1,7 +1,6 @@
 import { useEffect } from 'react';
 import { bind } from 'bind-event-listener';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const PageVisibilityWatcher = ({
   api,
   userPreferencesProvider
@@ -23,9 +22,6 @@ export const PageVisibilityWatcher = ({
         api === null || api === void 0 ? void 0 : (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 ? void 0 : (_api$selectionToolbar2 = _api$selectionToolbar.actions) === null || _api$selectionToolbar2 === void 0 ? void 0 : (_api$selectionToolbar3 = _api$selectionToolbar2.refreshToolbarDocking) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.call(_api$selectionToolbar2);
       }
     };
-    if (editorExperiment('platform_editor_controls_performance_fixes', false)) {
-      refreshPrefrerence();
-    }
     return bind(document, {
       type: 'visibilitychange',
       listener: refreshPrefrerence

package/dist/es2019/ui/PinButton.js

@@ -1,15 +1,21 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { PinnedIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const PinButton = ({
   api
 }) => {
   const intl = useIntl();
   const message = intl.formatMessage(selectionToolbarMessages.toolbarPositionPinedAtTop);
+  const {
+    isOffline
+  } = useEditorToolbar();
+  const isDisabled = fg('platform_editor_toolbar_aifc_patch_7') ? isOffline : false;
   const onClick = () => {
     var _api$selectionToolbar, _api$selectionToolbar2;
-    if (!api) {
+    if (!api || isDisabled) {
       return;
     }
     (_api$selectionToolbar = api.selectionToolbar.actions) === null || _api$selectionToolbar === void 0 ? void 0 : (_api$selectionToolbar2 = _api$selectionToolbar.setToolbarDocking) === null || _api$selectionToolbar2 === void 0 ? void 0 : _api$selectionToolbar2.call(_api$selectionToolbar, 'none');
@@ -22,6 +28,7 @@ export const PinButton = ({
       label: ""
     }),
     label: message,
-    onClick: onClick
+    onClick: onClick,
+    isDisabled: isDisabled
   }));
 };

package/dist/es2019/ui/PinMenuItem.js

@@ -4,6 +4,7 @@ import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { PinIcon, PinnedIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const shouldShowPinMenuItem = editMode => {
@@ -12,18 +13,22 @@ const shouldShowPinMenuItem = editMode => {
 const usePluginState = conditionalHooksFactory(() => expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true), api => {
   const {
     editorViewMode,
-    editorToolbarDockingPreference
+    editorToolbarDockingPreference,
+    isOffline
   } = useEditorToolbar();
   return {
     editorViewMode,
-    editorToolbarDockingPreference
+    editorToolbarDockingPreference,
+    isOffline
   };
 }, api => {
   const editorViewMode = useSharedPluginStateSelector(api, 'editorViewMode.mode');
   const editorToolbarDockingPreference = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
+  const isOffline = useSharedPluginStateSelector(api, 'connectivity.mode') === 'offline';
   return {
     editorViewMode,
-    editorToolbarDockingPreference
+    editorToolbarDockingPreference,
+    isOffline
   };
 });
 
@@ -36,14 +41,16 @@ export const PinMenuItem = ({
   const intl = useIntl();
   const {
     editorViewMode,
-    editorToolbarDockingPreference
+    editorToolbarDockingPreference,
+    isOffline
   } = usePluginState(api);
   const isToolbarDocked = editorToolbarDockingPreference === 'top';
+  const isDisabled = fg('platform_editor_toolbar_aifc_patch_7') ? isOffline : false;
   if (!shouldShowPinMenuItem(editorViewMode)) {
     return null;
   }
   const onClick = () => {
-    if (!api) {
+    if (!api || isDisabled) {
       return;
     }
     if (isToolbarDocked) {
@@ -57,6 +64,7 @@ export const PinMenuItem = ({
   const message = intl.formatMessage(isToolbarDocked ? selectionToolbarMessages.toolbarPositionPinedAtTop : selectionToolbarMessages.toolbarPositionUnpinnedConcise);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: onClick,
+    isDisabled: isDisabled,
     elemBefore: isToolbarDocked ? /*#__PURE__*/React.createElement(PinnedIcon, {
       size: "small",
       label: ""

package/dist/esm/selectionToolbarPlugin.js

@@ -35,9 +35,7 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
     config = _ref.config;
   var __selectionToolbarHandlers = [];
   var primaryToolbarComponent;
-  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar) && editorExperiment('platform_editor_toolbar_aifc', true, {
-    exposure: true
-  });
+  var isToolbarAIFCEnabled = Boolean(api === null || api === void 0 ? void 0 : api.toolbar);
   var userPreferencesProvider = config.userPreferencesProvider,
     contextualFormattingEnabled = config.contextualFormattingEnabled;
   if (isToolbarAIFCEnabled) {

package/dist/esm/ui/PageVisibilityWatcher.js

@@ -3,7 +3,6 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect } from 'react';
 import { bind } from 'bind-event-listener';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var PageVisibilityWatcher = function PageVisibilityWatcher(_ref) {
   var api = _ref.api,
     userPreferencesProvider = _ref.userPreferencesProvider;
@@ -45,9 +44,6 @@ export var PageVisibilityWatcher = function PageVisibilityWatcher(_ref) {
         return _ref2.apply(this, arguments);
       };
     }();
-    if (editorExperiment('platform_editor_controls_performance_fixes', false)) {
-      refreshPrefrerence();
-    }
     return bind(document, {
       type: 'visibilitychange',
       listener: refreshPrefrerence

package/dist/esm/ui/PinButton.js

@@ -1,14 +1,19 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { PinnedIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var PinButton = function PinButton(_ref) {
   var api = _ref.api;
   var intl = useIntl();
   var message = intl.formatMessage(selectionToolbarMessages.toolbarPositionPinedAtTop);
+  var _useEditorToolbar = useEditorToolbar(),
+    isOffline = _useEditorToolbar.isOffline;
+  var isDisabled = fg('platform_editor_toolbar_aifc_patch_7') ? isOffline : false;
   var onClick = function onClick() {
     var _api$selectionToolbar, _api$selectionToolbar2;
-    if (!api) {
+    if (!api || isDisabled) {
       return;
     }
     (_api$selectionToolbar = api.selectionToolbar.actions) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar2 = _api$selectionToolbar.setToolbarDocking) === null || _api$selectionToolbar2 === void 0 || _api$selectionToolbar2.call(_api$selectionToolbar, 'none');
@@ -21,6 +26,7 @@ export var PinButton = function PinButton(_ref) {
       label: ""
     }),
     label: message,
-    onClick: onClick
+    onClick: onClick,
+    isDisabled: isDisabled
   }));
 };

package/dist/esm/ui/PinMenuItem.js

@@ -4,6 +4,7 @@ import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
 import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { PinIcon, PinnedIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var shouldShowPinMenuItem = function shouldShowPinMenuItem(editMode) {
@@ -14,17 +15,21 @@ var usePluginState = conditionalHooksFactory(function () {
 }, function (api) {
   var _useEditorToolbar = useEditorToolbar(),
     editorViewMode = _useEditorToolbar.editorViewMode,
-    editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference;
+    editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference,
+    isOffline = _useEditorToolbar.isOffline;
   return {
     editorViewMode: editorViewMode,
-    editorToolbarDockingPreference: editorToolbarDockingPreference
+    editorToolbarDockingPreference: editorToolbarDockingPreference,
+    isOffline: isOffline
   };
 }, function (api) {
   var editorViewMode = useSharedPluginStateSelector(api, 'editorViewMode.mode');
   var editorToolbarDockingPreference = useSharedPluginStateSelector(api, 'userPreferences.preferences.toolbarDockingPosition');
+  var isOffline = useSharedPluginStateSelector(api, 'connectivity.mode') === 'offline';
   return {
     editorViewMode: editorViewMode,
-    editorToolbarDockingPreference: editorToolbarDockingPreference
+    editorToolbarDockingPreference: editorToolbarDockingPreference,
+    isOffline: isOffline
   };
 });
 
@@ -36,13 +41,15 @@ export var PinMenuItem = function PinMenuItem(_ref) {
   var intl = useIntl();
   var _usePluginState = usePluginState(api),
     editorViewMode = _usePluginState.editorViewMode,
-    editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference;
+    editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
+    isOffline = _usePluginState.isOffline;
   var isToolbarDocked = editorToolbarDockingPreference === 'top';
+  var isDisabled = fg('platform_editor_toolbar_aifc_patch_7') ? isOffline : false;
   if (!shouldShowPinMenuItem(editorViewMode)) {
     return null;
   }
   var onClick = function onClick() {
-    if (!api) {
+    if (!api || isDisabled) {
       return;
     }
     if (isToolbarDocked) {
@@ -56,6 +63,7 @@ export var PinMenuItem = function PinMenuItem(_ref) {
   var message = intl.formatMessage(isToolbarDocked ? selectionToolbarMessages.toolbarPositionPinedAtTop : selectionToolbarMessages.toolbarPositionUnpinnedConcise);
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: onClick,
+    isDisabled: isDisabled,
     elemBefore: isToolbarDocked ? /*#__PURE__*/React.createElement(PinnedIcon, {
       size: "small",
       label: ""

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-toolbar",
-	"version": "7.0.9",
+	"version": "7.0.11",
 	"description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/menu": "^8.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^13.8.0",
+		"@atlaskit/tmp-editor-statsig": "^13.10.0",
 		"@atlaskit/tokens": "^6.4.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
@@ -105,6 +105,9 @@
 		"aifc_create_enabled": {
 			"type": "boolean"
 		},
+		"platform_editor_toolbar_aifc_patch_7": {
+			"type": "boolean"
+		},
 		"platform_editor_lcm_toolbar_docking_fix": {
 			"type": "boolean"
 		}