@atlaskit/editor-plugin-floating-toolbar 3.1.1 → 3.1.3

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 3.1.3
+
+### Patch Changes
+
+- [#122186](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122186)
+  [`c629cdfe00a84`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c629cdfe00a84) -
+  migrated icons to new design systems library
+- Updated dependencies
+
+## 3.1.2
+
+### Patch Changes
+
+- [#122243](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122243)
+  [`cd1572955dd3b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cd1572955dd3b) -
+  FD-80149: cleans up platform_editor_react18_phase2_v2 in floating toolbar
+- Updated dependencies
+
 ## 3.1.1
 
 ### Patch Changes

package/dist/cjs/ui/DropdownMenu.js

@@ -10,7 +10,7 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
-var _done = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/done"));
+var _checkMarkEditorDone = _interopRequireDefault(require("@atlaskit/icon/core/migration/check-mark--editor-done"));
 var _menu = require("@atlaskit/menu");
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
@@ -223,10 +223,11 @@ var SelectedIconBefore = function SelectedIconBefore(_ref) {
   if (showSelected && itemSelected) {
     return (0, _react2.jsx)("span", {
       "aria-hidden": "true"
-    }, (0, _react2.jsx)(_done.default, {
-      primaryColor: "var(--ds-icon-selected, ".concat(_colors.B400, ")"),
-      size: "small",
-      label: intl.formatMessage(_floatingToolbar.messages.confirmModalOK)
+    }, (0, _react2.jsx)(_checkMarkEditorDone.default, {
+      LEGACY_primaryColor: "var(--ds-icon-selected, ".concat(_colors.B400, ")"),
+      LEGACY_size: "small",
+      label: intl.formatMessage(_floatingToolbar.messages.confirmModalOK),
+      spacing: "none"
     }));
   }
   return (0, _react2.jsx)("span", {

package/dist/cjs/ui/Input.js

@@ -5,83 +5,21 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.InputOld = exports.InputNew = void 0;
+exports.Input = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _ui = require("@atlaskit/editor-common/ui");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
+/**
  * @jsxRuntime classic
  * @jsx jsx
- */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-// eslint-disable-next-line @repo/internal/react/no-class-components
-var InputOld = exports.InputOld = /*#__PURE__*/function (_Component) {
-  function InputOld(props) {
-    var _this;
-    (0, _classCallCheck2.default)(this, InputOld);
-    _this = _callSuper(this, InputOld, [props]);
-    (0, _defineProperty2.default)(_this, "handleChange", function (e) {
-      _this.setState({
-        text: e.target.value
-      });
-    });
-    (0, _defineProperty2.default)(_this, "handleSubmit", function (e) {
-      e.preventDefault();
-      if (_this.props.onSubmit) {
-        _this.props.onSubmit(_this.state.text);
-      }
-    });
-    (0, _defineProperty2.default)(_this, "handleBlur", function (e) {
-      e.preventDefault();
-      if (_this.props.onBlur) {
-        _this.props.onBlur(_this.state.text);
-      }
-    });
-    _this.state = {
-      text: props.defaultValue || ''
-    };
-    return _this;
-  }
+ */
 
-  // Ignored via go/ees005
-  // eslint-disable-next-line react/no-unsafe
-  (0, _inherits2.default)(InputOld, _Component);
-  return (0, _createClass2.default)(InputOld, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (this.state.text !== nextProps.defaultValue) {
-        this.setState({
-          text: nextProps.defaultValue || ''
-        });
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var placeholder = this.props.placeholder;
-      return (0, _react2.jsx)("form", {
-        onSubmit: this.handleSubmit
-      }, (0, _react2.jsx)("input", {
-        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        css: _ui.panelTextInput,
-        value: this.state.text,
-        onChange: this.handleChange,
-        placeholder: placeholder,
-        onBlur: this.handleBlur
-      }));
-    }
-  }]);
-}(_react.Component);
-var InputNew = exports.InputNew = function InputNew(props) {
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+var Input = exports.Input = function Input(props) {
   var defaultValue = props.defaultValue,
     onBlur = props.onBlur,
     onSubmit = props.onSubmit,

package/dist/cjs/ui/ScrollButtons.js

@@ -12,8 +12,8 @@ var _react2 = require("@emotion/react");
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _ui = require("@atlaskit/editor-common/ui");
-var _chevronLeftLarge = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-left-large"));
-var _chevronRightLarge = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-right-large"));
+var _chevronLeftChevronLeftLarge = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-left--chevron-left-large"));
+var _chevronRightChevronRightLarge = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-right--chevron-right-large"));
 var _colors = require("@atlaskit/theme/colors");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -34,13 +34,8 @@ var toolbarScrollButtons = (0, _react2.css)({
   flexShrink: 0,
   alignItems: 'center'
 });
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-var LeftIcon = _chevronLeftLarge.default;
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-var RightIcon = _chevronRightLarge.default;
+var LeftIcon = _chevronLeftChevronLeftLarge.default;
+var RightIcon = _chevronRightChevronRightLarge.default;
 var ScrollButtons = exports.ScrollButtons = function ScrollButtons(_ref) {
   var intl = _ref.intl,
     scrollContainerRef = _ref.scrollContainerRef,

package/dist/cjs/ui/Toolbar.js

@@ -164,22 +164,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           spotlightConfig: item.spotlightConfig
         }, item.showTitle && item.title);
       case 'input':
-        if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2')) {
-          return (0, _react2.jsx)(_Input.InputNew, {
-            key: idx,
-            mountPoint: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            defaultValue: item.defaultValue,
-            placeholder: item.placeholder,
-            onSubmit: function onSubmit(value) {
-              return dispatchCommand(item.onSubmit(value));
-            },
-            onBlur: function onBlur(value) {
-              return dispatchCommand(item.onBlur(value));
-            }
-          });
-        }
-        return (0, _react2.jsx)(_Input.InputOld, {
+        return (0, _react2.jsx)(_Input.Input, {
           key: idx,
           mountPoint: popupsMountPoint,
           boundariesElement: popupsBoundariesElement,

package/dist/es2019/ui/DropdownMenu.js

@@ -10,7 +10,7 @@ import { css, jsx } from '@emotion/react';
 
 import { injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
-import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
+import EditorDoneIcon from '@atlaskit/icon/core/migration/check-mark--editor-done';
 import { ButtonItem, HeadingItem } from '@atlaskit/menu';
 import { B400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
@@ -216,9 +216,10 @@ const SelectedIconBefore = ({
     return jsx("span", {
       "aria-hidden": "true"
     }, jsx(EditorDoneIcon, {
-      primaryColor: `var(--ds-icon-selected, ${B400})`,
-      size: "small",
-      label: intl.formatMessage(messages.confirmModalOK)
+      LEGACY_primaryColor: `var(--ds-icon-selected, ${B400})`,
+      LEGACY_size: "small",
+      label: intl.formatMessage(messages.confirmModalOK),
+      spacing: "none"
     }));
   }
   return jsx("span", {

package/dist/es2019/ui/Input.js

@@ -1,65 +1,13 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React, { Component, useState } from 'react';
+import React, { useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { panelTextInput } from '@atlaskit/editor-common/ui';
-// eslint-disable-next-line @repo/internal/react/no-class-components
-export class InputOld extends Component {
-  constructor(props) {
-    super(props);
-    _defineProperty(this, "handleChange", e => {
-      this.setState({
-        text: e.target.value
-      });
-    });
-    _defineProperty(this, "handleSubmit", e => {
-      e.preventDefault();
-      if (this.props.onSubmit) {
-        this.props.onSubmit(this.state.text);
-      }
-    });
-    _defineProperty(this, "handleBlur", e => {
-      e.preventDefault();
-      if (this.props.onBlur) {
-        this.props.onBlur(this.state.text);
-      }
-    });
-    this.state = {
-      text: props.defaultValue || ''
-    };
-  }
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line react/no-unsafe
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.state.text !== nextProps.defaultValue) {
-      this.setState({
-        text: nextProps.defaultValue || ''
-      });
-    }
-  }
-  render() {
-    const {
-      placeholder
-    } = this.props;
-    return jsx("form", {
-      onSubmit: this.handleSubmit
-    }, jsx("input", {
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-      css: panelTextInput,
-      value: this.state.text,
-      onChange: this.handleChange,
-      placeholder: placeholder,
-      onBlur: this.handleBlur
-    }));
-  }
-}
-export const InputNew = props => {
+export const Input = props => {
   const {
     defaultValue,
     onBlur,

package/dist/es2019/ui/ScrollButtons.js

@@ -9,8 +9,8 @@ import { css, jsx } from '@emotion/react';
 import rafSchedule from 'raf-schd';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
-import ChevronLeftLargeIcon from '@atlaskit/icon/glyph/chevron-left-large';
-import ChevronRightLargeIcon from '@atlaskit/icon/glyph/chevron-right-large';
+import ChevronLeftLargeIcon from '@atlaskit/icon/utility/migration/chevron-left--chevron-left-large';
+import ChevronRightLargeIcon from '@atlaskit/icon/utility/migration/chevron-right--chevron-right-large';
 import { N30 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
 const toolbarScrollButtons = css({
@@ -22,12 +22,7 @@ const toolbarScrollButtons = css({
   flexShrink: 0,
   alignItems: 'center'
 });
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const LeftIcon = ChevronLeftLargeIcon;
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const RightIcon = ChevronRightLargeIcon;
 export const ScrollButtons = ({
   intl,

package/dist/es2019/ui/Toolbar.js

@@ -25,7 +25,7 @@ import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import Dropdown from './Dropdown';
 import { EmojiPickerButton } from './EmojiPickerButton';
 import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
-import { InputNew, InputOld } from './Input';
+import { Input } from './Input';
 import { ScrollButtons } from './ScrollButtons';
 import Select from './Select';
 export function groupItems(items) {
@@ -145,18 +145,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           spotlightConfig: item.spotlightConfig
         }, item.showTitle && item.title);
       case 'input':
-        if (fg('platform_editor_react18_phase2_v2')) {
-          return jsx(InputNew, {
-            key: idx,
-            mountPoint: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            defaultValue: item.defaultValue,
-            placeholder: item.placeholder,
-            onSubmit: value => dispatchCommand(item.onSubmit(value)),
-            onBlur: value => dispatchCommand(item.onBlur(value))
-          });
-        }
-        return jsx(InputOld, {
+        return jsx(Input, {
           key: idx,
           mountPoint: popupsMountPoint,
           boundariesElement: popupsBoundariesElement,

package/dist/esm/ui/DropdownMenu.js

@@ -11,7 +11,7 @@ import { css, jsx } from '@emotion/react';
 
 import { injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
-import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
+import EditorDoneIcon from '@atlaskit/icon/core/migration/check-mark--editor-done';
 import { ButtonItem, HeadingItem } from '@atlaskit/menu';
 import { B400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
@@ -215,9 +215,10 @@ var SelectedIconBefore = function SelectedIconBefore(_ref) {
     return jsx("span", {
       "aria-hidden": "true"
     }, jsx(EditorDoneIcon, {
-      primaryColor: "var(--ds-icon-selected, ".concat(B400, ")"),
-      size: "small",
-      label: intl.formatMessage(messages.confirmModalOK)
+      LEGACY_primaryColor: "var(--ds-icon-selected, ".concat(B400, ")"),
+      LEGACY_size: "small",
+      label: intl.formatMessage(messages.confirmModalOK),
+      spacing: "none"
     }));
   }
   return jsx("span", {

package/dist/esm/ui/Input.js

@@ -1,80 +1,14 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React, { Component, useState } from 'react';
+import React, { useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { panelTextInput } from '@atlaskit/editor-common/ui';
-// eslint-disable-next-line @repo/internal/react/no-class-components
-export var InputOld = /*#__PURE__*/function (_Component) {
-  function InputOld(props) {
-    var _this;
-    _classCallCheck(this, InputOld);
-    _this = _callSuper(this, InputOld, [props]);
-    _defineProperty(_this, "handleChange", function (e) {
-      _this.setState({
-        text: e.target.value
-      });
-    });
-    _defineProperty(_this, "handleSubmit", function (e) {
-      e.preventDefault();
-      if (_this.props.onSubmit) {
-        _this.props.onSubmit(_this.state.text);
-      }
-    });
-    _defineProperty(_this, "handleBlur", function (e) {
-      e.preventDefault();
-      if (_this.props.onBlur) {
-        _this.props.onBlur(_this.state.text);
-      }
-    });
-    _this.state = {
-      text: props.defaultValue || ''
-    };
-    return _this;
-  }
-
-  // Ignored via go/ees005
-  // eslint-disable-next-line react/no-unsafe
-  _inherits(InputOld, _Component);
-  return _createClass(InputOld, [{
-    key: "UNSAFE_componentWillReceiveProps",
-    value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      if (this.state.text !== nextProps.defaultValue) {
-        this.setState({
-          text: nextProps.defaultValue || ''
-        });
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var placeholder = this.props.placeholder;
-      return jsx("form", {
-        onSubmit: this.handleSubmit
-      }, jsx("input", {
-        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-        css: panelTextInput,
-        value: this.state.text,
-        onChange: this.handleChange,
-        placeholder: placeholder,
-        onBlur: this.handleBlur
-      }));
-    }
-  }]);
-}(Component);
-export var InputNew = function InputNew(props) {
+export var Input = function Input(props) {
   var defaultValue = props.defaultValue,
     onBlur = props.onBlur,
     onSubmit = props.onSubmit,

package/dist/esm/ui/ScrollButtons.js

@@ -10,8 +10,8 @@ import { css, jsx } from '@emotion/react';
 import rafSchedule from 'raf-schd';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
-import ChevronLeftLargeIcon from '@atlaskit/icon/glyph/chevron-left-large';
-import ChevronRightLargeIcon from '@atlaskit/icon/glyph/chevron-right-large';
+import ChevronLeftLargeIcon from '@atlaskit/icon/utility/migration/chevron-left--chevron-left-large';
+import ChevronRightLargeIcon from '@atlaskit/icon/utility/migration/chevron-right--chevron-right-large';
 import { N30 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
 var toolbarScrollButtons = css({
@@ -23,12 +23,7 @@ var toolbarScrollButtons = css({
   flexShrink: 0,
   alignItems: 'center'
 });
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 var LeftIcon = ChevronLeftLargeIcon;
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 var RightIcon = ChevronRightLargeIcon;
 export var ScrollButtons = function ScrollButtons(_ref) {
   var intl = _ref.intl,

package/dist/esm/ui/Toolbar.js

@@ -32,7 +32,7 @@ import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
 import Dropdown from './Dropdown';
 import { EmojiPickerButton } from './EmojiPickerButton';
 import { ExtensionsPlaceholder } from './ExtensionsPlaceholder';
-import { InputNew, InputOld } from './Input';
+import { Input } from './Input';
 import { ScrollButtons } from './ScrollButtons';
 import Select from './Select';
 export function groupItems(items) {
@@ -157,22 +157,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           spotlightConfig: item.spotlightConfig
         }, item.showTitle && item.title);
       case 'input':
-        if (fg('platform_editor_react18_phase2_v2')) {
-          return jsx(InputNew, {
-            key: idx,
-            mountPoint: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            defaultValue: item.defaultValue,
-            placeholder: item.placeholder,
-            onSubmit: function onSubmit(value) {
-              return dispatchCommand(item.onSubmit(value));
-            },
-            onBlur: function onBlur(value) {
-              return dispatchCommand(item.onBlur(value));
-            }
-          });
-        }
-        return jsx(InputOld, {
+        return jsx(Input, {
           key: idx,
           mountPoint: popupsMountPoint,
           boundariesElement: popupsBoundariesElement,

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

@@ -1,8 +1,3 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-import React, { Component } from 'react';
 import { jsx } from '@emotion/react';
 export interface Props {
     mountPoint?: HTMLElement;
@@ -15,12 +10,4 @@ export interface Props {
 export interface State {
     text: string;
 }
-export declare class InputOld extends Component<Props, State> {
-    constructor(props: Props);
-    UNSAFE_componentWillReceiveProps(nextProps: Props): void;
-    handleChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
-    handleSubmit: (e: React.FormEvent) => void;
-    handleBlur: (e: React.FocusEvent<Object>) => void;
-    render(): jsx.JSX.Element;
-}
-export declare const InputNew: (props: Props) => jsx.JSX.Element;
+export declare const Input: (props: Props) => jsx.JSX.Element;

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

@@ -1,8 +1,3 @@
-/**
- * @jsxRuntime classic
- * @jsx jsx
- */
-import React, { Component } from 'react';
 import { jsx } from '@emotion/react';
 export interface Props {
     mountPoint?: HTMLElement;
@@ -15,12 +10,4 @@ export interface Props {
 export interface State {
     text: string;
 }
-export declare class InputOld extends Component<Props, State> {
-    constructor(props: Props);
-    UNSAFE_componentWillReceiveProps(nextProps: Props): void;
-    handleChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
-    handleSubmit: (e: React.FormEvent) => void;
-    handleBlur: (e: React.FocusEvent<Object>) => void;
-    render(): jsx.JSX.Element;
-}
-export declare const InputNew: (props: Props) => jsx.JSX.Element;
+export declare const Input: (props: Props) => jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "3.1.1",
+	"version": "3.1.3",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,9 +28,9 @@
 		"@atlaskit/adf-utils": "^19.19.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/checkbox": "^17.0.0",
-		"@atlaskit/editor-common": "^101.0.0",
+		"@atlaskit/editor-common": "^101.1.0",
 		"@atlaskit/editor-palette": "2.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^3.2.0",
+		"@atlaskit/editor-plugin-block-controls": "^3.3.0",
 		"@atlaskit/editor-plugin-context-panel": "^3.0.0",
 		"@atlaskit/editor-plugin-copy-button": "^2.0.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
@@ -47,7 +47,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/select": "^20.0.0",
-		"@atlaskit/theme": "^17.0.0",
+		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^3.4.0",
 		"@atlaskit/tokens": "^4.3.0",
 		"@atlaskit/tooltip": "^20.0.0",
@@ -113,9 +113,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_react18_phase2_v2": {
-			"type": "boolean"
-		},
 		"platform_editor_floating_toolbar_padding_fix": {
 			"type": "boolean"
 		},