npm - @atlaskit/editor-plugin-selection-toolbar - Versions diffs - 19.0.9 → 19.0.11 - Mend

@atlaskit/editor-plugin-selection-toolbar 19.0.9 → 19.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/CHANGELOG.md +14 -0
package/dist/cjs/pm-plugins/commands.js +1 -48
package/dist/cjs/selectionToolbarPlugin.js +9 -59
package/dist/cjs/ui/PrimaryToolbarComponent.js +3 -4
package/dist/cjs/ui/overflow-toolbar-config.js +5 -14
package/dist/es2019/pm-plugins/commands.js +0 -47
package/dist/es2019/selectionToolbarPlugin.js +10 -58
package/dist/es2019/ui/PrimaryToolbarComponent.js +3 -4
package/dist/es2019/ui/overflow-toolbar-config.js +5 -14
package/dist/esm/pm-plugins/commands.js +0 -47
package/dist/esm/selectionToolbarPlugin.js +10 -60
package/dist/esm/ui/PrimaryToolbarComponent.js +3 -4
package/dist/esm/ui/overflow-toolbar-config.js +5 -14
package/dist/types/pm-plugins/commands.d.ts +1 -11
package/package.json +8 -8
package/dist/cjs/ui/PageVisibilityWatcher.js +0 -60
package/dist/es2019/ui/PageVisibilityWatcher.js +0 -31
package/dist/esm/ui/PageVisibilityWatcher.js +0 -53
package/dist/types/ui/PageVisibilityWatcher.d.ts +0 -6

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-selection-toolbar
+## 19.0.11
+### Patch Changes
+- [`0920715a6b9fc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0920715a6b9fc) -
+  Clean up feature gate `platform_editor_use_preferences_plugin`
+- Updated dependencies
+## 19.0.10
+### Patch Changes
+- Updated dependencies
 ## 19.0.9
 ### Patch Changes

package/dist/cjs/pm-plugins/commands.js CHANGED Viewed

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateToolbarDocking = exports.toggleToolbar = exports.setToolbarDocking = exports.forceToolbarDockingWithoutAnalytics = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _state = require("@atlaskit/editor-prosemirror/state");
+exports.updateToolbarDocking = exports.toggleToolbar = void 0;
 var _pluginKey = require("./plugin-key");
 var toggleToolbar = exports.toggleToolbar = function toggleToolbar(_ref) {
   var hide = _ref.hide;
@@ -26,49 +24,4 @@ var updateToolbarDocking = exports.updateToolbarDocking = function updateToolbar
     });
     return tr;
   };
-};
-var setToolbarDocking = exports.setToolbarDocking = function setToolbarDocking(_ref5) {
-  var toolbarDocking = _ref5.toolbarDocking,
-    userPreferencesProvider = _ref5.userPreferencesProvider,
-    editorAnalyticsApi = _ref5.editorAnalyticsApi;
-  return function (_ref6) {
-    var tr = _ref6.tr;
-    // We currently ignore any update failures, need to confirm this is the desired behaviour
-    userPreferencesProvider === null || userPreferencesProvider === void 0 || userPreferencesProvider.updatePreference('toolbarDockingInitialPosition', toolbarDocking);
-    tr.setMeta(_pluginKey.selectionToolbarPluginKey, {
-      toolbarDocking: toolbarDocking
-    });
-    if (toolbarDocking === 'top') {
-      // Remove the selection if the toolbar is docked to the top
-      tr.setSelection(_state.TextSelection.create(tr.doc, tr.selection.head));
-    }
-    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-      action: _analytics.ACTION.UPDATED,
-      actionSubject: _analytics.ACTION_SUBJECT.USER_PREFERENCES,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR_PREFERENCES,
-      attributes: {
-        toolbarDocking: toolbarDocking
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    })(tr);
-    return tr;
-  };
-};
-// Performs similarly to `setToolbarDocking` with a couple of differences.
-// 1) It does not fire any analytics.
-// 2) It does not make any changes to the selection.
-// This was required due to issues with the Confluence Legacy Content Extension which needs to manipulate the scrollbar position when editor controls are enabled
-// but relies on the selection remaining stable.
-var forceToolbarDockingWithoutAnalytics = exports.forceToolbarDockingWithoutAnalytics = function forceToolbarDockingWithoutAnalytics(_ref7) {
-  var toolbarDocking = _ref7.toolbarDocking,
-    userPreferencesProvider = _ref7.userPreferencesProvider;
-  return function (_ref8) {
-    var tr = _ref8.tr;
-    userPreferencesProvider === null || userPreferencesProvider === void 0 || userPreferencesProvider.updatePreference('toolbarDockingInitialPosition', toolbarDocking);
-    tr.setMeta(_pluginKey.selectionToolbarPluginKey, {
-      toolbarDocking: toolbarDocking
-    });
-    return tr;
-  };
 };

package/dist/cjs/selectionToolbarPlugin.js CHANGED Viewed

@@ -9,15 +9,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _bindEventListener = require("bind-event-listener");
-var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _commands = require("./pm-plugins/commands");
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _PageVisibilityWatcher = require("./ui/PageVisibilityWatcher");
 var _pinToolbarConfig = require("./ui/pin-toolbar-config");
 var _PrimaryToolbarComponent = require("./ui/PrimaryToolbarComponent");
 var _toolbarComponents = require("./ui/toolbar-components");
@@ -73,7 +70,6 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
     }
   }
   var previousToolbarDocking = (userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.getPreference('toolbarDockingInitialPosition')) || null;
-  var isPreferenceInitialized = false;
   return {
     name: 'selectionToolbar',
     actions: {
@@ -113,35 +109,20 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
         }))) !== null && _api$core$actions$exe4 !== void 0 ? _api$core$actions$exe4 : false;
       },
       setToolbarDocking: function setToolbarDocking(toolbarDocking) {
-        var _api$core$actions$exe6, _api$analytics;
-        if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe5, _api$userPreferences3;
-          return (_api$core$actions$exe5 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe5 !== void 0 ? _api$core$actions$exe5 : false;
-        }
-        return (_api$core$actions$exe6 = api === null || api === void 0 ? void 0 : api.core.actions.execute((0, _commands.setToolbarDocking)({
-          toolbarDocking: toolbarDocking,
-          userPreferencesProvider: userPreferencesProvider,
-          editorAnalyticsApi: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
-        }))) !== null && _api$core$actions$exe6 !== void 0 ? _api$core$actions$exe6 : false;
+        var _api$core$actions$exe5, _api$userPreferences3;
+        return (_api$core$actions$exe5 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe5 !== void 0 ? _api$core$actions$exe5 : false;
       },
       forceToolbarDockingWithoutAnalytics: function forceToolbarDockingWithoutAnalytics(toolbarDocking) {
-        var _api$core$actions$exe8;
-        if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe7, _api$userPreferences4;
-          return (_api$core$actions$exe7 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences4 = api.userPreferences) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe7 !== void 0 ? _api$core$actions$exe7 : false;
-        }
-        return (_api$core$actions$exe8 = api === null || api === void 0 ? void 0 : api.core.actions.execute((0, _commands.forceToolbarDockingWithoutAnalytics)({
-          toolbarDocking: toolbarDocking,
-          userPreferencesProvider: userPreferencesProvider
-        }))) !== null && _api$core$actions$exe8 !== void 0 ? _api$core$actions$exe8 : false;
+        var _api$core$actions$exe6, _api$userPreferences4;
+        return (_api$core$actions$exe6 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences4 = api.userPreferences) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe6 !== void 0 ? _api$core$actions$exe6 : false;
       },
       refreshToolbarDocking: function refreshToolbarDocking() {
         if (userPreferencesProvider) {
-          var _api$core$actions$exe9;
+          var _api$core$actions$exe7;
           var userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
-          return (_api$core$actions$exe9 = api === null || api === void 0 ? void 0 : api.core.actions.execute((0, _commands.updateToolbarDocking)({
+          return (_api$core$actions$exe7 = api === null || api === void 0 ? void 0 : api.core.actions.execute((0, _commands.updateToolbarDocking)({
             toolbarDocking: userToolbarDockingPref
-          }))) !== null && _api$core$actions$exe9 !== void 0 ? _api$core$actions$exe9 : false;
+          }))) !== null && _api$core$actions$exe7 !== void 0 ? _api$core$actions$exe7 : false;
         }
         return false;
       }
@@ -157,7 +138,7 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
       if (selectionToolbarHandlers) {
         __selectionToolbarHandlers.push.apply(__selectionToolbarHandlers, (0, _toConsumableArray2.default)(selectionToolbarHandlers));
       }
-      var initialToolbarDocking = (0, _fg.fg)('platform_editor_use_preferences_plugin') ? getToolbarDockingV2(contextualFormattingEnabled, api === null || api === void 0 || (_api$userPreferences5 = api.userPreferences) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.sharedState.currentState()) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.preferences) === null || _api$userPreferences5 === void 0 ? void 0 : _api$userPreferences5.toolbarDockingPosition) : getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
+      var initialToolbarDocking = getToolbarDockingV2(contextualFormattingEnabled, api === null || api === void 0 || (_api$userPreferences5 = api.userPreferences) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.sharedState.currentState()) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.preferences) === null || _api$userPreferences5 === void 0 ? void 0 : _api$userPreferences5.toolbarDockingPosition);
       return [{
         name: 'selection-tracker',
         plugin: function plugin() {
@@ -242,31 +223,6 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
                 }
               };
             },
-            appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
-              if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-                return null;
-              }
-              if (!isPreferenceInitialized && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
-                var toolbarDockingPreference = userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.getPreference('toolbarDockingInitialPosition');
-                if (toolbarDockingPreference !== undefined) {
-                  var _api$analytics2;
-                  isPreferenceInitialized = true;
-                  var userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
-                  var tr = newState.tr;
-                  api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-                    action: _analytics.ACTION.INITIALISED,
-                    actionSubject: _analytics.ACTION_SUBJECT.USER_PREFERENCES,
-                    actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR_PREFERENCES,
-                    attributes: {
-                      toolbarDocking: userToolbarDockingPref
-                    },
-                    eventType: _analytics.EVENT_TYPE.OPERATIONAL
-                  })(tr);
-                  return tr;
-                }
-              }
-              return null;
-            },
             props: {
               handleDOMEvents: {
                 mousedown: function mousedown(view) {
@@ -362,7 +318,7 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
         }
         if (items.length > 0 && contextualFormattingEnabled && isEditorControlsEnabled) {
           var _api$userPreferences6;
-          var toolbarDockingPref = api !== null && api !== void 0 && api.userPreferences && (0, _fg.fg)('platform_editor_use_preferences_plugin') ? api === null || api === void 0 || (_api$userPreferences6 = api.userPreferences) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.sharedState.currentState()) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.preferences) === null || _api$userPreferences6 === void 0 ? void 0 : _api$userPreferences6.toolbarDockingPosition : toolbarDocking;
+          var toolbarDockingPref = api !== null && api !== void 0 && api.userPreferences ? api === null || api === void 0 || (_api$userPreferences6 = api.userPreferences) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.sharedState.currentState()) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.preferences) === null || _api$userPreferences6 === void 0 ? void 0 : _api$userPreferences6.toolbarDockingPosition : toolbarDocking;
           items.push.apply(items, (0, _toConsumableArray2.default)((0, _pinToolbarConfig.getPinOptionToolbarConfig)({
             api: api,
             toolbarDocking: toolbarDockingPref,
@@ -389,12 +345,6 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
         });
       }
     },
-    contentComponent: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _fg.fg)('platform_editor_use_preferences_plugin') ? function () {
-      return /*#__PURE__*/_react.default.createElement(_PageVisibilityWatcher.PageVisibilityWatcher, {
-        api: api,
-        userPreferencesProvider: userPreferencesProvider
-      });
-    } : undefined,
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1', {
       exposure: true
     }) ? primaryToolbarComponent : undefined

package/dist/cjs/ui/PrimaryToolbarComponent.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* PrimaryToolbarComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* PrimaryToolbarComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
 "use strict";
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -17,7 +17,6 @@ var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _pin = _interopRequireDefault(require("@atlaskit/icon/core/pin"));
 var _pinFilled = _interopRequireDefault(require("@atlaskit/icon/core/pin-filled"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var buttonStyles = null;
 /**
@@ -25,13 +24,13 @@ var buttonStyles = null;
  * button to the toolbar to the or make it in-line.
  */
 var PrimaryToolbarComponent = exports.PrimaryToolbarComponent = function PrimaryToolbarComponent(_ref) {
-  var _api$userPreferences, _api$selectionToolbar;
+  var _api$userPreferences;
   var api = _ref.api,
     disabled = _ref.disabled;
   var intl = (0, _reactIntl.useIntl)();
   var mode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'connectivity.mode');
   var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(mode);
-  var isDockedToTop = (0, _fg.fg)('platform_editor_use_preferences_plugin') ? (api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition) === 'top' : (api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar.sharedState.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'top';
+  var isDockedToTop = (api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition) === 'top';
   if (isDockedToTop) {
     return /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
       "aria-label": intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionPinedAtTop)

package/dist/cjs/ui/overflow-toolbar-config.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.2 */
 "use strict";
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -14,7 +14,6 @@ var _dockToolbarTop = _interopRequireDefault(require("@atlaskit/icon-lab/core/do
 var _checkMark = _interopRequireDefault(require("@atlaskit/icon/core/check-mark"));
 var _minus = _interopRequireDefault(require("@atlaskit/icon/core/minus"));
 var _headingItem = _interopRequireDefault(require("@atlaskit/menu/heading-item"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var getOverflowPrimaryToolbarConfig = exports.getOverflowPrimaryToolbarConfig = function getOverflowPrimaryToolbarConfig(_ref) {
   var api = _ref.api,
@@ -32,12 +31,8 @@ var getOverflowPrimaryToolbarConfig = exports.getOverflowPrimaryToolbarConfig =
         name: 'contextual'
       },
       onClick: function onClick() {
-        var _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
-        if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe, _api$userPreferences, _api$userPreferences$;
-          return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.actions) === null || _api$userPreferences === void 0 || (_api$userPreferences$ = _api$userPreferences.updateUserPreference) === null || _api$userPreferences$ === void 0 ? void 0 : _api$userPreferences$.call(_api$userPreferences, 'toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
-        }
-        return (_api$selectionToolbar = api === null || api === void 0 || (_api$selectionToolbar2 = api.selectionToolbar.actions) === null || _api$selectionToolbar2 === void 0 || (_api$selectionToolbar3 = _api$selectionToolbar2.setToolbarDocking) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.call(_api$selectionToolbar2, 'none')) !== null && _api$selectionToolbar !== void 0 ? _api$selectionToolbar : false;
+        var _api$core$actions$exe, _api$userPreferences, _api$userPreferences$;
+        return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.actions) === null || _api$userPreferences === void 0 || (_api$userPreferences$ = _api$userPreferences.updateUserPreference) === null || _api$userPreferences$ === void 0 ? void 0 : _api$userPreferences$.call(_api$userPreferences, 'toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
       },
       elemBefore: (0, _minus.default)({
         label: ''
@@ -48,12 +43,8 @@ var getOverflowPrimaryToolbarConfig = exports.getOverflowPrimaryToolbarConfig =
         name: 'fixed'
       },
       onClick: function onClick() {
-        var _api$selectionToolbar4, _api$selectionToolbar5, _api$selectionToolbar6;
-        if ((0, _fg.fg)('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe2, _api$userPreferences2, _api$userPreferences3;
-          return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 || (_api$userPreferences2 = _api$userPreferences2.actions) === null || _api$userPreferences2 === void 0 || (_api$userPreferences3 = _api$userPreferences2.updateUserPreference) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.call(_api$userPreferences2, 'toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
-        }
-        return (_api$selectionToolbar4 = api === null || api === void 0 || (_api$selectionToolbar5 = api.selectionToolbar.actions) === null || _api$selectionToolbar5 === void 0 || (_api$selectionToolbar6 = _api$selectionToolbar5.setToolbarDocking) === null || _api$selectionToolbar6 === void 0 ? void 0 : _api$selectionToolbar6.call(_api$selectionToolbar5, 'top')) !== null && _api$selectionToolbar4 !== void 0 ? _api$selectionToolbar4 : false;
+        var _api$core$actions$exe2, _api$userPreferences2, _api$userPreferences3;
+        return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 || (_api$userPreferences2 = _api$userPreferences2.actions) === null || _api$userPreferences2 === void 0 || (_api$userPreferences3 = _api$userPreferences2.updateUserPreference) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.call(_api$userPreferences2, 'toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
       },
       isActive: true,
       elemBefore: (0, _dockToolbarTop.default)({

package/dist/es2019/pm-plugins/commands.js CHANGED Viewed

@@ -1,5 +1,3 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectionToolbarPluginKey } from './plugin-key';
 export const toggleToolbar = ({
   hide
@@ -20,49 +18,4 @@ export const updateToolbarDocking = ({
     toolbarDocking
   });
   return tr;
-};
-export const setToolbarDocking = ({
-  toolbarDocking,
-  userPreferencesProvider,
-  editorAnalyticsApi
-}) => ({
-  tr
-}) => {
-  // We currently ignore any update failures, need to confirm this is the desired behaviour
-  userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.updatePreference('toolbarDockingInitialPosition', toolbarDocking);
-  tr.setMeta(selectionToolbarPluginKey, {
-    toolbarDocking
-  });
-  if (toolbarDocking === 'top') {
-    // Remove the selection if the toolbar is docked to the top
-    tr.setSelection(TextSelection.create(tr.doc, tr.selection.head));
-  }
-  editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
-    action: ACTION.UPDATED,
-    actionSubject: ACTION_SUBJECT.USER_PREFERENCES,
-    actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR_PREFERENCES,
-    attributes: {
-      toolbarDocking
-    },
-    eventType: EVENT_TYPE.TRACK
-  })(tr);
-  return tr;
-};
-// Performs similarly to `setToolbarDocking` with a couple of differences.
-// 1) It does not fire any analytics.
-// 2) It does not make any changes to the selection.
-// This was required due to issues with the Confluence Legacy Content Extension which needs to manipulate the scrollbar position when editor controls are enabled
-// but relies on the selection remaining stable.
-export const forceToolbarDockingWithoutAnalytics = ({
-  toolbarDocking,
-  userPreferencesProvider
-}) => ({
-  tr
-}) => {
-  userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.updatePreference('toolbarDockingInitialPosition', toolbarDocking);
-  tr.setMeta(selectionToolbarPluginKey, {
-    toolbarDocking
-  });
-  return tr;
 };

package/dist/es2019/selectionToolbarPlugin.js CHANGED Viewed

@@ -1,14 +1,11 @@
 import React from 'react';
 import { bind } from 'bind-event-listener';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
-import { setToolbarDocking, toggleToolbar, updateToolbarDocking, forceToolbarDockingWithoutAnalytics } from './pm-plugins/commands';
+import { toggleToolbar, updateToolbarDocking } from './pm-plugins/commands';
 import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
-import { PageVisibilityWatcher } from './ui/PageVisibilityWatcher';
 import { getPinOptionToolbarConfig } from './ui/pin-toolbar-config';
 import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
 import { getToolbarComponents } from './ui/toolbar-components';
@@ -66,7 +63,6 @@ export const selectionToolbarPlugin = ({
     }
   }
   let previousToolbarDocking = (userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.getPreference('toolbarDockingInitialPosition')) || null;
-  let isPreferenceInitialized = false;
   return {
     name: 'selectionToolbar',
     actions: {
@@ -106,35 +102,20 @@ export const selectionToolbarPlugin = ({
         }))) !== null && _api$core$actions$exe4 !== void 0 ? _api$core$actions$exe4 : false;
       },
       setToolbarDocking: toolbarDocking => {
-        var _api$core$actions$exe6, _api$analytics;
-        if (fg('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe5, _api$userPreferences3;
-          return (_api$core$actions$exe5 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe5 !== void 0 ? _api$core$actions$exe5 : false;
-        }
-        return (_api$core$actions$exe6 = api === null || api === void 0 ? void 0 : api.core.actions.execute(setToolbarDocking({
-          toolbarDocking,
-          userPreferencesProvider,
-          editorAnalyticsApi: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
-        }))) !== null && _api$core$actions$exe6 !== void 0 ? _api$core$actions$exe6 : false;
+        var _api$core$actions$exe5, _api$userPreferences3;
+        return (_api$core$actions$exe5 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe5 !== void 0 ? _api$core$actions$exe5 : false;
       },
       forceToolbarDockingWithoutAnalytics: toolbarDocking => {
-        var _api$core$actions$exe8;
-        if (fg('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe7, _api$userPreferences4;
-          return (_api$core$actions$exe7 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences4 = api.userPreferences) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe7 !== void 0 ? _api$core$actions$exe7 : false;
-        }
-        return (_api$core$actions$exe8 = api === null || api === void 0 ? void 0 : api.core.actions.execute(forceToolbarDockingWithoutAnalytics({
-          toolbarDocking,
-          userPreferencesProvider
-        }))) !== null && _api$core$actions$exe8 !== void 0 ? _api$core$actions$exe8 : false;
+        var _api$core$actions$exe6, _api$userPreferences4;
+        return (_api$core$actions$exe6 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences4 = api.userPreferences) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe6 !== void 0 ? _api$core$actions$exe6 : false;
       },
       refreshToolbarDocking: () => {
         if (userPreferencesProvider) {
-          var _api$core$actions$exe9;
+          var _api$core$actions$exe7;
           const userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
-          return (_api$core$actions$exe9 = api === null || api === void 0 ? void 0 : api.core.actions.execute(updateToolbarDocking({
+          return (_api$core$actions$exe7 = api === null || api === void 0 ? void 0 : api.core.actions.execute(updateToolbarDocking({
             toolbarDocking: userToolbarDockingPref
-          }))) !== null && _api$core$actions$exe9 !== void 0 ? _api$core$actions$exe9 : false;
+          }))) !== null && _api$core$actions$exe7 !== void 0 ? _api$core$actions$exe7 : false;
         }
         return false;
       }
@@ -150,7 +131,7 @@ export const selectionToolbarPlugin = ({
       if (selectionToolbarHandlers) {
         __selectionToolbarHandlers.push(...selectionToolbarHandlers);
       }
-      const initialToolbarDocking = fg('platform_editor_use_preferences_plugin') ? getToolbarDockingV2(contextualFormattingEnabled, api === null || api === void 0 ? void 0 : (_api$userPreferences5 = api.userPreferences) === null || _api$userPreferences5 === void 0 ? void 0 : (_api$userPreferences6 = _api$userPreferences5.sharedState.currentState()) === null || _api$userPreferences6 === void 0 ? void 0 : (_api$userPreferences7 = _api$userPreferences6.preferences) === null || _api$userPreferences7 === void 0 ? void 0 : _api$userPreferences7.toolbarDockingPosition) : getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
+      const initialToolbarDocking = getToolbarDockingV2(contextualFormattingEnabled, api === null || api === void 0 ? void 0 : (_api$userPreferences5 = api.userPreferences) === null || _api$userPreferences5 === void 0 ? void 0 : (_api$userPreferences6 = _api$userPreferences5.sharedState.currentState()) === null || _api$userPreferences6 === void 0 ? void 0 : (_api$userPreferences7 = _api$userPreferences6.preferences) === null || _api$userPreferences7 === void 0 ? void 0 : _api$userPreferences7.toolbarDockingPosition);
       return [{
         name: 'selection-tracker',
         plugin: () => {
@@ -240,31 +221,6 @@ export const selectionToolbarPlugin = ({
                 }
               };
             },
-            appendTransaction(_transactions, _oldState, newState) {
-              if (fg('platform_editor_use_preferences_plugin')) {
-                return null;
-              }
-              if (!isPreferenceInitialized && editorExperiment('platform_editor_controls', 'variant1')) {
-                const toolbarDockingPreference = userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.getPreference('toolbarDockingInitialPosition');
-                if (toolbarDockingPreference !== undefined) {
-                  var _api$analytics2;
-                  isPreferenceInitialized = true;
-                  const userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
-                  const tr = newState.tr;
-                  api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
-                    action: ACTION.INITIALISED,
-                    actionSubject: ACTION_SUBJECT.USER_PREFERENCES,
-                    actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR_PREFERENCES,
-                    attributes: {
-                      toolbarDocking: userToolbarDockingPref
-                    },
-                    eventType: EVENT_TYPE.OPERATIONAL
-                  })(tr);
-                  return tr;
-                }
-              }
-              return null;
-            },
             props: {
               handleDOMEvents: {
                 mousedown: view => {
@@ -357,7 +313,7 @@ export const selectionToolbarPlugin = ({
         }
         if (items.length > 0 && contextualFormattingEnabled && isEditorControlsEnabled) {
           var _api$userPreferences8, _api$userPreferences9, _api$userPreferences0;
-          const toolbarDockingPref = api !== null && api !== void 0 && api.userPreferences && fg('platform_editor_use_preferences_plugin') ? api === null || api === void 0 ? void 0 : (_api$userPreferences8 = api.userPreferences) === null || _api$userPreferences8 === void 0 ? void 0 : (_api$userPreferences9 = _api$userPreferences8.sharedState.currentState()) === null || _api$userPreferences9 === void 0 ? void 0 : (_api$userPreferences0 = _api$userPreferences9.preferences) === null || _api$userPreferences0 === void 0 ? void 0 : _api$userPreferences0.toolbarDockingPosition : toolbarDocking;
+          const toolbarDockingPref = api !== null && api !== void 0 && api.userPreferences ? api === null || api === void 0 ? void 0 : (_api$userPreferences8 = api.userPreferences) === null || _api$userPreferences8 === void 0 ? void 0 : (_api$userPreferences9 = _api$userPreferences8.sharedState.currentState()) === null || _api$userPreferences9 === void 0 ? void 0 : (_api$userPreferences0 = _api$userPreferences9.preferences) === null || _api$userPreferences0 === void 0 ? void 0 : _api$userPreferences0.toolbarDockingPosition : toolbarDocking;
           items.push(...getPinOptionToolbarConfig({
             api,
             toolbarDocking: toolbarDockingPref,
@@ -384,10 +340,6 @@ export const selectionToolbarPlugin = ({
         };
       }
     },
-    contentComponent: editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_use_preferences_plugin') ? () => /*#__PURE__*/React.createElement(PageVisibilityWatcher, {
-      api: api,
-      userPreferencesProvider: userPreferencesProvider
-    }) : undefined,
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && editorExperiment('platform_editor_controls', 'variant1', {
       exposure: true
     }) ? primaryToolbarComponent : undefined

package/dist/es2019/ui/PrimaryToolbarComponent.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* PrimaryToolbarComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* PrimaryToolbarComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
 import "./PrimaryToolbarComponent.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
@@ -9,7 +9,6 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import PinIcon from '@atlaskit/icon/core/pin';
 import PinFilledIcon from '@atlaskit/icon/core/pin-filled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 const buttonStyles = null;
 /**
  * A component used to renderer a pin/unpin
@@ -19,11 +18,11 @@ export const PrimaryToolbarComponent = ({
   api,
   disabled
 }) => {
-  var _api$userPreferences, _api$userPreferences$, _api$userPreferences$2, _api$selectionToolbar;
+  var _api$userPreferences, _api$userPreferences$, _api$userPreferences$2;
   const intl = useIntl();
   const mode = useSharedPluginStateSelector(api, 'connectivity.mode');
   const isOffline = isOfflineMode(mode);
-  const isDockedToTop = fg('platform_editor_use_preferences_plugin') ? (api === null || api === void 0 ? void 0 : (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : (_api$userPreferences$ = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences$ === void 0 ? void 0 : (_api$userPreferences$2 = _api$userPreferences$.preferences) === null || _api$userPreferences$2 === void 0 ? void 0 : _api$userPreferences$2.toolbarDockingPosition) === 'top' : (api === null || api === void 0 ? void 0 : (_api$selectionToolbar = api.selectionToolbar.sharedState.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'top';
+  const isDockedToTop = (api === null || api === void 0 ? void 0 : (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : (_api$userPreferences$ = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences$ === void 0 ? void 0 : (_api$userPreferences$2 = _api$userPreferences$.preferences) === null || _api$userPreferences$2 === void 0 ? void 0 : _api$userPreferences$2.toolbarDockingPosition) === 'top';
   if (isDockedToTop) {
     return /*#__PURE__*/React.createElement(ToolbarButton, {
       "aria-label": intl.formatMessage(selectionToolbarMessages.toolbarPositionPinedAtTop)

package/dist/es2019/ui/overflow-toolbar-config.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.2 */
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
@@ -6,7 +6,6 @@ import DockToolbarTopIcon from '@atlaskit/icon-lab/core/dock-toolbar-top';
 import CheckMarkIcon from '@atlaskit/icon/core/check-mark';
 import MinusIcon from '@atlaskit/icon/core/minus';
 import HeadingItem from '@atlaskit/menu/heading-item';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 export const getOverflowPrimaryToolbarConfig = ({
   api,
   intl
@@ -23,12 +22,8 @@ export const getOverflowPrimaryToolbarConfig = ({
       name: 'contextual'
     },
     onClick: () => {
-      var _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
-      if (fg('platform_editor_use_preferences_plugin')) {
-        var _api$core$actions$exe, _api$userPreferences, _api$userPreferences$, _api$userPreferences$2;
-        return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : (_api$userPreferences$ = _api$userPreferences.actions) === null || _api$userPreferences$ === void 0 ? void 0 : (_api$userPreferences$2 = _api$userPreferences$.updateUserPreference) === null || _api$userPreferences$2 === void 0 ? void 0 : _api$userPreferences$2.call(_api$userPreferences$, 'toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
-      }
-      return (_api$selectionToolbar = api === null || api === void 0 ? void 0 : (_api$selectionToolbar2 = api.selectionToolbar.actions) === null || _api$selectionToolbar2 === void 0 ? void 0 : (_api$selectionToolbar3 = _api$selectionToolbar2.setToolbarDocking) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.call(_api$selectionToolbar2, 'none')) !== null && _api$selectionToolbar !== void 0 ? _api$selectionToolbar : false;
+      var _api$core$actions$exe, _api$userPreferences, _api$userPreferences$, _api$userPreferences$2;
+      return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : (_api$userPreferences$ = _api$userPreferences.actions) === null || _api$userPreferences$ === void 0 ? void 0 : (_api$userPreferences$2 = _api$userPreferences$.updateUserPreference) === null || _api$userPreferences$2 === void 0 ? void 0 : _api$userPreferences$2.call(_api$userPreferences$, 'toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
     },
     elemBefore: MinusIcon({
       label: ''
@@ -39,12 +34,8 @@ export const getOverflowPrimaryToolbarConfig = ({
       name: 'fixed'
     },
     onClick: () => {
-      var _api$selectionToolbar4, _api$selectionToolbar5, _api$selectionToolbar6;
-      if (fg('platform_editor_use_preferences_plugin')) {
-        var _api$core$actions$exe2, _api$userPreferences2, _api$userPreferences3, _api$userPreferences4;
-        return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 ? void 0 : (_api$userPreferences3 = _api$userPreferences2.actions) === null || _api$userPreferences3 === void 0 ? void 0 : (_api$userPreferences4 = _api$userPreferences3.updateUserPreference) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.call(_api$userPreferences3, 'toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
-      }
-      return (_api$selectionToolbar4 = api === null || api === void 0 ? void 0 : (_api$selectionToolbar5 = api.selectionToolbar.actions) === null || _api$selectionToolbar5 === void 0 ? void 0 : (_api$selectionToolbar6 = _api$selectionToolbar5.setToolbarDocking) === null || _api$selectionToolbar6 === void 0 ? void 0 : _api$selectionToolbar6.call(_api$selectionToolbar5, 'top')) !== null && _api$selectionToolbar4 !== void 0 ? _api$selectionToolbar4 : false;
+      var _api$core$actions$exe2, _api$userPreferences2, _api$userPreferences3, _api$userPreferences4;
+      return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 ? void 0 : (_api$userPreferences3 = _api$userPreferences2.actions) === null || _api$userPreferences3 === void 0 ? void 0 : (_api$userPreferences4 = _api$userPreferences3.updateUserPreference) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.call(_api$userPreferences3, 'toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
     },
     isActive: true,
     elemBefore: DockToolbarTopIcon({

package/dist/esm/pm-plugins/commands.js CHANGED Viewed

@@ -1,5 +1,3 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { selectionToolbarPluginKey } from './plugin-key';
 export var toggleToolbar = function toggleToolbar(_ref) {
   var hide = _ref.hide;
@@ -20,49 +18,4 @@ export var updateToolbarDocking = function updateToolbarDocking(_ref3) {
     });
     return tr;
   };
-};
-export var setToolbarDocking = function setToolbarDocking(_ref5) {
-  var toolbarDocking = _ref5.toolbarDocking,
-    userPreferencesProvider = _ref5.userPreferencesProvider,
-    editorAnalyticsApi = _ref5.editorAnalyticsApi;
-  return function (_ref6) {
-    var tr = _ref6.tr;
-    // We currently ignore any update failures, need to confirm this is the desired behaviour
-    userPreferencesProvider === null || userPreferencesProvider === void 0 || userPreferencesProvider.updatePreference('toolbarDockingInitialPosition', toolbarDocking);
-    tr.setMeta(selectionToolbarPluginKey, {
-      toolbarDocking: toolbarDocking
-    });
-    if (toolbarDocking === 'top') {
-      // Remove the selection if the toolbar is docked to the top
-      tr.setSelection(TextSelection.create(tr.doc, tr.selection.head));
-    }
-    editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-      action: ACTION.UPDATED,
-      actionSubject: ACTION_SUBJECT.USER_PREFERENCES,
-      actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR_PREFERENCES,
-      attributes: {
-        toolbarDocking: toolbarDocking
-      },
-      eventType: EVENT_TYPE.TRACK
-    })(tr);
-    return tr;
-  };
-};
-// Performs similarly to `setToolbarDocking` with a couple of differences.
-// 1) It does not fire any analytics.
-// 2) It does not make any changes to the selection.
-// This was required due to issues with the Confluence Legacy Content Extension which needs to manipulate the scrollbar position when editor controls are enabled
-// but relies on the selection remaining stable.
-export var forceToolbarDockingWithoutAnalytics = function forceToolbarDockingWithoutAnalytics(_ref7) {
-  var toolbarDocking = _ref7.toolbarDocking,
-    userPreferencesProvider = _ref7.userPreferencesProvider;
-  return function (_ref8) {
-    var tr = _ref8.tr;
-    userPreferencesProvider === null || userPreferencesProvider === void 0 || userPreferencesProvider.updatePreference('toolbarDockingInitialPosition', toolbarDocking);
-    tr.setMeta(selectionToolbarPluginKey, {
-      toolbarDocking: toolbarDocking
-    });
-    return tr;
-  };
 };

package/dist/esm/selectionToolbarPlugin.js CHANGED Viewed

@@ -4,15 +4,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { bind } from 'bind-event-listener';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
-import { setToolbarDocking as _setToolbarDocking, toggleToolbar, updateToolbarDocking, forceToolbarDockingWithoutAnalytics as _forceToolbarDockingWithoutAnalytics } from './pm-plugins/commands';
+import { toggleToolbar, updateToolbarDocking } from './pm-plugins/commands';
 import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
-import { PageVisibilityWatcher } from './ui/PageVisibilityWatcher';
 import { getPinOptionToolbarConfig } from './ui/pin-toolbar-config';
 import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
 import { getToolbarComponents } from './ui/toolbar-components';
@@ -66,7 +63,6 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
     }
   }
   var previousToolbarDocking = (userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.getPreference('toolbarDockingInitialPosition')) || null;
-  var isPreferenceInitialized = false;
   return {
     name: 'selectionToolbar',
     actions: {
@@ -106,35 +102,20 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
         }))) !== null && _api$core$actions$exe4 !== void 0 ? _api$core$actions$exe4 : false;
       },
       setToolbarDocking: function setToolbarDocking(toolbarDocking) {
-        var _api$core$actions$exe6, _api$analytics;
-        if (fg('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe5, _api$userPreferences3;
-          return (_api$core$actions$exe5 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe5 !== void 0 ? _api$core$actions$exe5 : false;
-        }
-        return (_api$core$actions$exe6 = api === null || api === void 0 ? void 0 : api.core.actions.execute(_setToolbarDocking({
-          toolbarDocking: toolbarDocking,
-          userPreferencesProvider: userPreferencesProvider,
-          editorAnalyticsApi: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
-        }))) !== null && _api$core$actions$exe6 !== void 0 ? _api$core$actions$exe6 : false;
+        var _api$core$actions$exe5, _api$userPreferences3;
+        return (_api$core$actions$exe5 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe5 !== void 0 ? _api$core$actions$exe5 : false;
       },
       forceToolbarDockingWithoutAnalytics: function forceToolbarDockingWithoutAnalytics(toolbarDocking) {
-        var _api$core$actions$exe8;
-        if (fg('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe7, _api$userPreferences4;
-          return (_api$core$actions$exe7 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences4 = api.userPreferences) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe7 !== void 0 ? _api$core$actions$exe7 : false;
-        }
-        return (_api$core$actions$exe8 = api === null || api === void 0 ? void 0 : api.core.actions.execute(_forceToolbarDockingWithoutAnalytics({
-          toolbarDocking: toolbarDocking,
-          userPreferencesProvider: userPreferencesProvider
-        }))) !== null && _api$core$actions$exe8 !== void 0 ? _api$core$actions$exe8 : false;
+        var _api$core$actions$exe6, _api$userPreferences4;
+        return (_api$core$actions$exe6 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences4 = api.userPreferences) === null || _api$userPreferences4 === void 0 ? void 0 : _api$userPreferences4.actions.updateUserPreference('toolbarDockingPosition', toolbarDocking))) !== null && _api$core$actions$exe6 !== void 0 ? _api$core$actions$exe6 : false;
       },
       refreshToolbarDocking: function refreshToolbarDocking() {
         if (userPreferencesProvider) {
-          var _api$core$actions$exe9;
+          var _api$core$actions$exe7;
           var userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
-          return (_api$core$actions$exe9 = api === null || api === void 0 ? void 0 : api.core.actions.execute(updateToolbarDocking({
+          return (_api$core$actions$exe7 = api === null || api === void 0 ? void 0 : api.core.actions.execute(updateToolbarDocking({
             toolbarDocking: userToolbarDockingPref
-          }))) !== null && _api$core$actions$exe9 !== void 0 ? _api$core$actions$exe9 : false;
+          }))) !== null && _api$core$actions$exe7 !== void 0 ? _api$core$actions$exe7 : false;
         }
         return false;
       }
@@ -150,7 +131,7 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
       if (selectionToolbarHandlers) {
         __selectionToolbarHandlers.push.apply(__selectionToolbarHandlers, _toConsumableArray(selectionToolbarHandlers));
       }
-      var initialToolbarDocking = fg('platform_editor_use_preferences_plugin') ? getToolbarDockingV2(contextualFormattingEnabled, api === null || api === void 0 || (_api$userPreferences5 = api.userPreferences) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.sharedState.currentState()) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.preferences) === null || _api$userPreferences5 === void 0 ? void 0 : _api$userPreferences5.toolbarDockingPosition) : getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
+      var initialToolbarDocking = getToolbarDockingV2(contextualFormattingEnabled, api === null || api === void 0 || (_api$userPreferences5 = api.userPreferences) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.sharedState.currentState()) === null || _api$userPreferences5 === void 0 || (_api$userPreferences5 = _api$userPreferences5.preferences) === null || _api$userPreferences5 === void 0 ? void 0 : _api$userPreferences5.toolbarDockingPosition);
       return [{
         name: 'selection-tracker',
         plugin: function plugin() {
@@ -235,31 +216,6 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
                 }
               };
             },
-            appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
-              if (fg('platform_editor_use_preferences_plugin')) {
-                return null;
-              }
-              if (!isPreferenceInitialized && editorExperiment('platform_editor_controls', 'variant1')) {
-                var toolbarDockingPreference = userPreferencesProvider === null || userPreferencesProvider === void 0 ? void 0 : userPreferencesProvider.getPreference('toolbarDockingInitialPosition');
-                if (toolbarDockingPreference !== undefined) {
-                  var _api$analytics2;
-                  isPreferenceInitialized = true;
-                  var userToolbarDockingPref = getToolbarDocking(contextualFormattingEnabled, userPreferencesProvider);
-                  var tr = newState.tr;
-                  api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-                    action: ACTION.INITIALISED,
-                    actionSubject: ACTION_SUBJECT.USER_PREFERENCES,
-                    actionSubjectId: ACTION_SUBJECT_ID.SELECTION_TOOLBAR_PREFERENCES,
-                    attributes: {
-                      toolbarDocking: userToolbarDockingPref
-                    },
-                    eventType: EVENT_TYPE.OPERATIONAL
-                  })(tr);
-                  return tr;
-                }
-              }
-              return null;
-            },
             props: {
               handleDOMEvents: {
                 mousedown: function mousedown(view) {
@@ -355,7 +311,7 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
         }
         if (items.length > 0 && contextualFormattingEnabled && isEditorControlsEnabled) {
           var _api$userPreferences6;
-          var toolbarDockingPref = api !== null && api !== void 0 && api.userPreferences && fg('platform_editor_use_preferences_plugin') ? api === null || api === void 0 || (_api$userPreferences6 = api.userPreferences) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.sharedState.currentState()) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.preferences) === null || _api$userPreferences6 === void 0 ? void 0 : _api$userPreferences6.toolbarDockingPosition : toolbarDocking;
+          var toolbarDockingPref = api !== null && api !== void 0 && api.userPreferences ? api === null || api === void 0 || (_api$userPreferences6 = api.userPreferences) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.sharedState.currentState()) === null || _api$userPreferences6 === void 0 || (_api$userPreferences6 = _api$userPreferences6.preferences) === null || _api$userPreferences6 === void 0 ? void 0 : _api$userPreferences6.toolbarDockingPosition : toolbarDocking;
           items.push.apply(items, _toConsumableArray(getPinOptionToolbarConfig({
             api: api,
             toolbarDocking: toolbarDockingPref,
@@ -382,12 +338,6 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
         });
       }
     },
-    contentComponent: editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_use_preferences_plugin') ? function () {
-      return /*#__PURE__*/React.createElement(PageVisibilityWatcher, {
-        api: api,
-        userPreferencesProvider: userPreferencesProvider
-      });
-    } : undefined,
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) && editorExperiment('platform_editor_controls', 'variant1', {
       exposure: true
     }) ? primaryToolbarComponent : undefined

package/dist/esm/ui/PrimaryToolbarComponent.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* PrimaryToolbarComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* PrimaryToolbarComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
 import "./PrimaryToolbarComponent.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
@@ -9,20 +9,19 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import PinIcon from '@atlaskit/icon/core/pin';
 import PinFilledIcon from '@atlaskit/icon/core/pin-filled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 var buttonStyles = null;
 /**
  * A component used to renderer a pin/unpin
  * button to the toolbar to the or make it in-line.
  */
 export var PrimaryToolbarComponent = function PrimaryToolbarComponent(_ref) {
-  var _api$userPreferences, _api$selectionToolbar;
+  var _api$userPreferences;
   var api = _ref.api,
     disabled = _ref.disabled;
   var intl = useIntl();
   var mode = useSharedPluginStateSelector(api, 'connectivity.mode');
   var isOffline = isOfflineMode(mode);
-  var isDockedToTop = fg('platform_editor_use_preferences_plugin') ? (api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition) === 'top' : (api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar.sharedState.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'top';
+  var isDockedToTop = (api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition) === 'top';
   if (isDockedToTop) {
     return /*#__PURE__*/React.createElement(ToolbarButton, {
       "aria-label": intl.formatMessage(selectionToolbarMessages.toolbarPositionPinedAtTop)

package/dist/esm/ui/overflow-toolbar-config.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.2 */
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
@@ -6,7 +6,6 @@ import DockToolbarTopIcon from '@atlaskit/icon-lab/core/dock-toolbar-top';
 import CheckMarkIcon from '@atlaskit/icon/core/check-mark';
 import MinusIcon from '@atlaskit/icon/core/minus';
 import HeadingItem from '@atlaskit/menu/heading-item';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 export var getOverflowPrimaryToolbarConfig = function getOverflowPrimaryToolbarConfig(_ref) {
   var api = _ref.api,
     intl = _ref.intl;
@@ -23,12 +22,8 @@ export var getOverflowPrimaryToolbarConfig = function getOverflowPrimaryToolbarC
         name: 'contextual'
       },
       onClick: function onClick() {
-        var _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
-        if (fg('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe, _api$userPreferences, _api$userPreferences$;
-          return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.actions) === null || _api$userPreferences === void 0 || (_api$userPreferences$ = _api$userPreferences.updateUserPreference) === null || _api$userPreferences$ === void 0 ? void 0 : _api$userPreferences$.call(_api$userPreferences, 'toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
-        }
-        return (_api$selectionToolbar = api === null || api === void 0 || (_api$selectionToolbar2 = api.selectionToolbar.actions) === null || _api$selectionToolbar2 === void 0 || (_api$selectionToolbar3 = _api$selectionToolbar2.setToolbarDocking) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.call(_api$selectionToolbar2, 'none')) !== null && _api$selectionToolbar !== void 0 ? _api$selectionToolbar : false;
+        var _api$core$actions$exe, _api$userPreferences, _api$userPreferences$;
+        return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.actions) === null || _api$userPreferences === void 0 || (_api$userPreferences$ = _api$userPreferences.updateUserPreference) === null || _api$userPreferences$ === void 0 ? void 0 : _api$userPreferences$.call(_api$userPreferences, 'toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
       },
       elemBefore: MinusIcon({
         label: ''
@@ -39,12 +34,8 @@ export var getOverflowPrimaryToolbarConfig = function getOverflowPrimaryToolbarC
         name: 'fixed'
       },
       onClick: function onClick() {
-        var _api$selectionToolbar4, _api$selectionToolbar5, _api$selectionToolbar6;
-        if (fg('platform_editor_use_preferences_plugin')) {
-          var _api$core$actions$exe2, _api$userPreferences2, _api$userPreferences3;
-          return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 || (_api$userPreferences2 = _api$userPreferences2.actions) === null || _api$userPreferences2 === void 0 || (_api$userPreferences3 = _api$userPreferences2.updateUserPreference) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.call(_api$userPreferences2, 'toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
-        }
-        return (_api$selectionToolbar4 = api === null || api === void 0 || (_api$selectionToolbar5 = api.selectionToolbar.actions) === null || _api$selectionToolbar5 === void 0 || (_api$selectionToolbar6 = _api$selectionToolbar5.setToolbarDocking) === null || _api$selectionToolbar6 === void 0 ? void 0 : _api$selectionToolbar6.call(_api$selectionToolbar5, 'top')) !== null && _api$selectionToolbar4 !== void 0 ? _api$selectionToolbar4 : false;
+        var _api$core$actions$exe2, _api$userPreferences2, _api$userPreferences3;
+        return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 || (_api$userPreferences2 = _api$userPreferences2.actions) === null || _api$userPreferences2 === void 0 || (_api$userPreferences3 = _api$userPreferences2.updateUserPreference) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.call(_api$userPreferences2, 'toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
       },
       isActive: true,
       elemBefore: DockToolbarTopIcon({

package/dist/types/pm-plugins/commands.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
-import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand, UserPreferencesProvider } from '@atlaskit/editor-common/types';
+import type { EditorCommand } from '@atlaskit/editor-common/types';
 import type { ToolbarDocking } from '../types';
 export declare const toggleToolbar: ({ hide }: {
     hide: boolean;
@@ -7,12 +6,3 @@ export declare const toggleToolbar: ({ hide }: {
 export declare const updateToolbarDocking: ({ toolbarDocking }: {
     toolbarDocking: ToolbarDocking;
 }) => EditorCommand;
-export declare const setToolbarDocking: ({ toolbarDocking, userPreferencesProvider, editorAnalyticsApi, }: {
-    editorAnalyticsApi?: EditorAnalyticsAPI | undefined;
-    toolbarDocking: ToolbarDocking;
-    userPreferencesProvider?: UserPreferencesProvider;
-}) => EditorCommand;
-export declare const forceToolbarDockingWithoutAnalytics: ({ toolbarDocking, userPreferencesProvider, }: {
-    toolbarDocking: ToolbarDocking;
-    userPreferencesProvider?: UserPreferencesProvider;
-}) => EditorCommand;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-toolbar",
-	"version": "19.0.9",
+	"version": "19.0.11",
 	"description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -8,6 +8,11 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"atlassian": {
+		"website": {
+			"tags": [
+				"platform-labs"
+			]
+		},
 		"team": "Editor: AI",
 		"singleton": true
 	},
@@ -37,13 +42,13 @@
 		"@atlaskit/icon-lab": "^7.9.0",
 		"@atlaskit/menu": "^10.2.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^197.0.0",
+		"@atlaskit/tmp-editor-statsig": "^198.0.0",
 		"@atlaskit/tokens": "^17.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.8.0",
+		"@atlaskit/editor-common": "^122.11.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -56,10 +61,5 @@
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0",
 		"wait-for-expect": "^1.2.0"
-	},
-	"platform-feature-flags": {
-		"platform_editor_use_preferences_plugin": {
-			"type": "boolean"
-		}
 	}
 }

package/dist/cjs/ui/PageVisibilityWatcher.js DELETED Viewed

@@ -1,60 +0,0 @@
-"use strict";
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PageVisibilityWatcher = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _react = require("react");
-var _bindEventListener = require("bind-event-listener");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
-var PageVisibilityWatcher = exports.PageVisibilityWatcher = function PageVisibilityWatcher(_ref) {
-  var api = _ref.api,
-    userPreferencesProvider = _ref.userPreferencesProvider;
-  (0, _react.useEffect)(function () {
-    if (!userPreferencesProvider || !api) {
-      return;
-    }
-    var refreshPrefrerence = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _api$selectionToolbar, _api$selectionToolbar2, _t;
-        return _regenerator.default.wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (!(document.visibilityState === 'visible')) {
-                _context.next = 5;
-                break;
-              }
-              _context.prev = 1;
-              _context.next = 2;
-              return userPreferencesProvider.loadPreferences();
-            case 2:
-              _context.next = 4;
-              break;
-            case 3:
-              _context.prev = 3;
-              _t = _context["catch"](1);
-              (0, _monitoring.logException)(_t, {
-                location: 'editor-plugin-selection-toolbar/PageVisibilityWatcher'
-              });
-            case 4:
-              api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.actions) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar2 = _api$selectionToolbar.refreshToolbarDocking) === null || _api$selectionToolbar2 === void 0 || _api$selectionToolbar2.call(_api$selectionToolbar);
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, null, [[1, 3]]);
-      }));
-      return function refreshPrefrerence() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    return (0, _bindEventListener.bind)(document, {
-      type: 'visibilitychange',
-      listener: refreshPrefrerence
-    });
-  }, [api, userPreferencesProvider]);
-  return null;
-};

package/dist/es2019/ui/PageVisibilityWatcher.js DELETED Viewed

@@ -1,31 +0,0 @@
-import { useEffect } from 'react';
-import { bind } from 'bind-event-listener';
-import { logException } from '@atlaskit/editor-common/monitoring';
-export const PageVisibilityWatcher = ({
-  api,
-  userPreferencesProvider
-}) => {
-  useEffect(() => {
-    if (!userPreferencesProvider || !api) {
-      return;
-    }
-    const refreshPrefrerence = async () => {
-      if (document.visibilityState === 'visible') {
-        var _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
-        try {
-          await userPreferencesProvider.loadPreferences();
-        } catch (error) {
-          logException(error, {
-            location: 'editor-plugin-selection-toolbar/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);
-      }
-    };
-    return bind(document, {
-      type: 'visibilitychange',
-      listener: refreshPrefrerence
-    });
-  }, [api, userPreferencesProvider]);
-  return null;
-};

package/dist/esm/ui/PageVisibilityWatcher.js DELETED Viewed

@@ -1,53 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useEffect } from 'react';
-import { bind } from 'bind-event-listener';
-import { logException } from '@atlaskit/editor-common/monitoring';
-export var PageVisibilityWatcher = function PageVisibilityWatcher(_ref) {
-  var api = _ref.api,
-    userPreferencesProvider = _ref.userPreferencesProvider;
-  useEffect(function () {
-    if (!userPreferencesProvider || !api) {
-      return;
-    }
-    var refreshPrefrerence = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _api$selectionToolbar, _api$selectionToolbar2, _t;
-        return _regeneratorRuntime.wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (!(document.visibilityState === 'visible')) {
-                _context.next = 5;
-                break;
-              }
-              _context.prev = 1;
-              _context.next = 2;
-              return userPreferencesProvider.loadPreferences();
-            case 2:
-              _context.next = 4;
-              break;
-            case 3:
-              _context.prev = 3;
-              _t = _context["catch"](1);
-              logException(_t, {
-                location: 'editor-plugin-selection-toolbar/PageVisibilityWatcher'
-              });
-            case 4:
-              api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.actions) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar2 = _api$selectionToolbar.refreshToolbarDocking) === null || _api$selectionToolbar2 === void 0 || _api$selectionToolbar2.call(_api$selectionToolbar);
-            case 5:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, null, [[1, 3]]);
-      }));
-      return function refreshPrefrerence() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    return bind(document, {
-      type: 'visibilitychange',
-      listener: refreshPrefrerence
-    });
-  }, [api, userPreferencesProvider]);
-  return null;
-};

package/dist/types/ui/PageVisibilityWatcher.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import type { ExtractInjectionAPI, UserPreferencesProvider } from '@atlaskit/editor-common/types';
-import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
-export declare const PageVisibilityWatcher: ({ api, userPreferencesProvider, }: {
-    api: ExtractInjectionAPI<SelectionToolbarPlugin> | undefined;
-    userPreferencesProvider?: UserPreferencesProvider;
-}) => null;