@atlaskit/editor-toolbar 0.17.13 → 0.18.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-toolbar
 
+## 0.18.1
+
+### Patch Changes
+
+- [`15d7f87e470d5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/15d7f87e470d5) -
+  [ux] EDITOR-3749 Fix keep selection after applying text color or highlight
+
+## 0.18.0
+
+### Minor Changes
+
+- [`6d7eaf7a84ff3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6d7eaf7a84ff3) -
+  ToolbarTooltip now supports displaying shortcuts in the tooltip, through the new shortcut prop. It
+  is passed through to the Tooltip's shortcut prop.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 0.17.13
 
 ### Patch Changes

package/dist/cjs/ui/ColorPalette/Color.js

@@ -39,7 +39,7 @@ var Color = exports.Color = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, []);
   var handleClick = (0, _react.useCallback)(function (e) {
     e.preventDefault();
-    onClick(value, label);
+    onClick(value, label, e);
   }, [onClick, value, label]);
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     if (!onKeyDown) {

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

@@ -239,7 +239,7 @@ var ColorPalette = function ColorPalette(_ref) {
       case ' ':
         {
           event.preventDefault();
-          onClick(value, label);
+          onClick(value, label, event);
           break;
         }
       default:

package/dist/cjs/ui/ToolbarDropdownItem.js

@@ -81,7 +81,7 @@ var ToolbarDropdownItem = exports.ToolbarDropdownItem = function ToolbarDropdown
   return /*#__PURE__*/_react.default.createElement(_dropdownMenu.DropdownItem, {
     onClick: function onClick(e) {
       if (!hasNestedDropdownMenu) {
-        parentContext === null || parentContext === void 0 || parentContext.closeMenu();
+        parentContext === null || parentContext === void 0 || parentContext.closeMenu(e);
       }
       _onClick === null || _onClick === void 0 || _onClick(e);
     },

package/dist/cjs/ui/ToolbarDropdownMenu.js

@@ -36,14 +36,14 @@ var ToolbarDropdownMenuContent = function ToolbarDropdownMenuContent(_ref) {
   var handleOpenChange = (0, _react.useCallback)(function (args) {
     onDropdownOpenChanged(args);
     if (!args.isOpen) {
-      menuContext === null || menuContext === void 0 || menuContext.closeMenu();
+      menuContext === null || menuContext === void 0 || menuContext.closeMenu(args.event);
     }
   }, [menuContext, onDropdownOpenChanged]);
-  var handleClick = (0, _react.useCallback)(function () {
+  var handleClick = (0, _react.useCallback)(function (e) {
     if (!(menuContext !== null && menuContext !== void 0 && menuContext.isOpen)) {
-      menuContext === null || menuContext === void 0 || menuContext.openMenu();
+      menuContext === null || menuContext === void 0 || menuContext.openMenu(e);
     } else {
-      menuContext === null || menuContext === void 0 || menuContext.closeMenu();
+      menuContext === null || menuContext === void 0 || menuContext.closeMenu(e);
     }
   }, [menuContext]);
   return /*#__PURE__*/_react.default.createElement(_dropdownMenu.default, {
@@ -57,7 +57,7 @@ var ToolbarDropdownMenuContent = function ToolbarDropdownMenuContent(_ref) {
         onBlur: triggerProps.onBlur,
         onClick: function onClick(e) {
           _onClick && _onClick(e, !(menuContext !== null && menuContext !== void 0 && menuContext.isOpen));
-          handleClick();
+          handleClick(e);
           triggerProps.onClick && triggerProps.onClick(e);
         },
         onFocus: triggerProps.onFocus,

package/dist/cjs/ui/ToolbarDropdownMenuContext.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useToolbarDropdownMenu = exports.ToolbarDropdownMenuProvider = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _uiContext = require("../hooks/ui-context");
 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 ToolbarDropdownMenuContext = /*#__PURE__*/(0, _react.createContext)(undefined);
 var useToolbarDropdownMenu = exports.useToolbarDropdownMenu = function useToolbarDropdownMenu() {
@@ -21,19 +23,33 @@ var ToolbarDropdownMenuProvider = exports.ToolbarDropdownMenuProvider = function
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     isOpenInternal = _useState2[0],
     setIsOpenInternal = _useState2[1];
-  var openMenu = function openMenu() {
+  var _useToolbarUI = (0, _uiContext.useToolbarUI)(),
+    onDropdownOpenChanged = _useToolbarUI.onDropdownOpenChanged;
+  var openMenu = function openMenu(event) {
     if (setIsOpen !== undefined) {
       setIsOpen(true);
     } else {
       setIsOpenInternal(true);
     }
+    if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_highlight_bug_fix')) {
+      onDropdownOpenChanged({
+        isOpen: true,
+        event: event
+      });
+    }
   };
-  var closeMenu = function closeMenu() {
+  var closeMenu = function closeMenu(event) {
     if (setIsOpen !== undefined) {
       setIsOpen(false);
     } else {
       setIsOpenInternal(false);
     }
+    if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_highlight_bug_fix')) {
+      onDropdownOpenChanged({
+        isOpen: false,
+        event: event
+      });
+    }
   };
   var contextValue = {
     openMenu: openMenu,

package/dist/cjs/ui/ToolbarTooltip.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var ToolbarTooltip = exports.ToolbarTooltip = function ToolbarTooltip(_ref) {
   var content = _ref.content,
+    shortcut = _ref.shortcut,
     children = _ref.children,
     _ref$position = _ref.position,
     position = _ref$position === void 0 ? 'top' : _ref$position,
@@ -16,6 +17,7 @@ var ToolbarTooltip = exports.ToolbarTooltip = function ToolbarTooltip(_ref) {
   return /*#__PURE__*/_react.default.createElement(_tooltip.default, {
     content: content,
     position: position,
-    delay: delay
+    delay: delay,
+    shortcut: shortcut
   }, children);
 };

package/dist/es2019/ui/ColorPalette/Color.js

@@ -30,7 +30,7 @@ export const Color = /*#__PURE__*/memo(({
   }, []);
   const handleClick = useCallback(e => {
     e.preventDefault();
-    onClick(value, label);
+    onClick(value, label, e);
   }, [onClick, value, label]);
   const handleKeyDown = useCallback(e => {
     if (!onKeyDown) {

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

@@ -235,7 +235,7 @@ const ColorPalette = ({
       case ' ':
         {
           event.preventDefault();
-          onClick(value, label);
+          onClick(value, label, event);
           break;
         }
       default:

package/dist/es2019/ui/ToolbarDropdownItem.js

@@ -69,7 +69,7 @@ export const ToolbarDropdownItem = ({
   return /*#__PURE__*/React.createElement(DropdownItem, {
     onClick: e => {
       if (!hasNestedDropdownMenu) {
-        parentContext === null || parentContext === void 0 ? void 0 : parentContext.closeMenu();
+        parentContext === null || parentContext === void 0 ? void 0 : parentContext.closeMenu(e);
       }
       onClick === null || onClick === void 0 ? void 0 : onClick(e);
     },

package/dist/es2019/ui/ToolbarDropdownMenu.js

@@ -29,14 +29,14 @@ const ToolbarDropdownMenuContent = ({
   const handleOpenChange = useCallback(args => {
     onDropdownOpenChanged(args);
     if (!args.isOpen) {
-      menuContext === null || menuContext === void 0 ? void 0 : menuContext.closeMenu();
+      menuContext === null || menuContext === void 0 ? void 0 : menuContext.closeMenu(args.event);
     }
   }, [menuContext, onDropdownOpenChanged]);
-  const handleClick = useCallback(() => {
+  const handleClick = useCallback(e => {
     if (!(menuContext !== null && menuContext !== void 0 && menuContext.isOpen)) {
-      menuContext === null || menuContext === void 0 ? void 0 : menuContext.openMenu();
+      menuContext === null || menuContext === void 0 ? void 0 : menuContext.openMenu(e);
     } else {
-      menuContext === null || menuContext === void 0 ? void 0 : menuContext.closeMenu();
+      menuContext === null || menuContext === void 0 ? void 0 : menuContext.closeMenu(e);
     }
   }, [menuContext]);
   return /*#__PURE__*/React.createElement(DropdownMenu, {
@@ -49,7 +49,7 @@ const ToolbarDropdownMenuContent = ({
       onBlur: triggerProps.onBlur,
       onClick: e => {
         onClick && onClick(e, !(menuContext !== null && menuContext !== void 0 && menuContext.isOpen));
-        handleClick();
+        handleClick(e);
         triggerProps.onClick && triggerProps.onClick(e);
       },
       onFocus: triggerProps.onFocus,

package/dist/es2019/ui/ToolbarDropdownMenuContext.js

@@ -1,4 +1,6 @@
 import React, { createContext, useContext, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { useToolbarUI } from '../hooks/ui-context';
 const ToolbarDropdownMenuContext = /*#__PURE__*/createContext(undefined);
 export const useToolbarDropdownMenu = () => {
   return useContext(ToolbarDropdownMenuContext);
@@ -9,19 +11,34 @@ export const ToolbarDropdownMenuProvider = ({
   setIsOpen
 }) => {
   const [isOpenInternal, setIsOpenInternal] = useState(false);
-  const openMenu = () => {
+  const {
+    onDropdownOpenChanged
+  } = useToolbarUI();
+  const openMenu = event => {
     if (setIsOpen !== undefined) {
       setIsOpen(true);
     } else {
       setIsOpenInternal(true);
     }
+    if (fg('platform_editor_toolbar_highlight_bug_fix')) {
+      onDropdownOpenChanged({
+        isOpen: true,
+        event: event
+      });
+    }
   };
-  const closeMenu = () => {
+  const closeMenu = event => {
     if (setIsOpen !== undefined) {
       setIsOpen(false);
     } else {
       setIsOpenInternal(false);
     }
+    if (fg('platform_editor_toolbar_highlight_bug_fix')) {
+      onDropdownOpenChanged({
+        isOpen: false,
+        event: event
+      });
+    }
   };
   const contextValue = {
     openMenu,

package/dist/es2019/ui/ToolbarTooltip.js

@@ -2,6 +2,7 @@ import React from 'react';
 import Tooltip from '@atlaskit/tooltip';
 export const ToolbarTooltip = ({
   content,
+  shortcut,
   children,
   position = 'top',
   delay
@@ -9,6 +10,7 @@ export const ToolbarTooltip = ({
   return /*#__PURE__*/React.createElement(Tooltip, {
     content: content,
     position: position,
-    delay: delay
+    delay: delay,
+    shortcut: shortcut
   }, children);
 };

package/dist/esm/ui/ColorPalette/Color.js

@@ -30,7 +30,7 @@ export var Color = /*#__PURE__*/memo(function (_ref) {
   }, []);
   var handleClick = useCallback(function (e) {
     e.preventDefault();
-    onClick(value, label);
+    onClick(value, label, e);
   }, [onClick, value, label]);
   var handleKeyDown = useCallback(function (e) {
     if (!onKeyDown) {

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

@@ -231,7 +231,7 @@ var ColorPalette = function ColorPalette(_ref) {
       case ' ':
         {
           event.preventDefault();
-          onClick(value, label);
+          onClick(value, label, event);
           break;
         }
       default:

package/dist/esm/ui/ToolbarDropdownItem.js

@@ -72,7 +72,7 @@ export var ToolbarDropdownItem = function ToolbarDropdownItem(_ref2) {
   return /*#__PURE__*/React.createElement(DropdownItem, {
     onClick: function onClick(e) {
       if (!hasNestedDropdownMenu) {
-        parentContext === null || parentContext === void 0 || parentContext.closeMenu();
+        parentContext === null || parentContext === void 0 || parentContext.closeMenu(e);
       }
       _onClick === null || _onClick === void 0 || _onClick(e);
     },

package/dist/esm/ui/ToolbarDropdownMenu.js

@@ -27,14 +27,14 @@ var ToolbarDropdownMenuContent = function ToolbarDropdownMenuContent(_ref) {
   var handleOpenChange = useCallback(function (args) {
     onDropdownOpenChanged(args);
     if (!args.isOpen) {
-      menuContext === null || menuContext === void 0 || menuContext.closeMenu();
+      menuContext === null || menuContext === void 0 || menuContext.closeMenu(args.event);
     }
   }, [menuContext, onDropdownOpenChanged]);
-  var handleClick = useCallback(function () {
+  var handleClick = useCallback(function (e) {
     if (!(menuContext !== null && menuContext !== void 0 && menuContext.isOpen)) {
-      menuContext === null || menuContext === void 0 || menuContext.openMenu();
+      menuContext === null || menuContext === void 0 || menuContext.openMenu(e);
     } else {
-      menuContext === null || menuContext === void 0 || menuContext.closeMenu();
+      menuContext === null || menuContext === void 0 || menuContext.closeMenu(e);
     }
   }, [menuContext]);
   return /*#__PURE__*/React.createElement(DropdownMenu, {
@@ -48,7 +48,7 @@ var ToolbarDropdownMenuContent = function ToolbarDropdownMenuContent(_ref) {
         onBlur: triggerProps.onBlur,
         onClick: function onClick(e) {
           _onClick && _onClick(e, !(menuContext !== null && menuContext !== void 0 && menuContext.isOpen));
-          handleClick();
+          handleClick(e);
           triggerProps.onClick && triggerProps.onClick(e);
         },
         onFocus: triggerProps.onFocus,

package/dist/esm/ui/ToolbarDropdownMenuContext.js

@@ -1,5 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { createContext, useContext, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { useToolbarUI } from '../hooks/ui-context';
 var ToolbarDropdownMenuContext = /*#__PURE__*/createContext(undefined);
 export var useToolbarDropdownMenu = function useToolbarDropdownMenu() {
   return useContext(ToolbarDropdownMenuContext);
@@ -12,19 +14,33 @@ export var ToolbarDropdownMenuProvider = function ToolbarDropdownMenuProvider(_r
     _useState2 = _slicedToArray(_useState, 2),
     isOpenInternal = _useState2[0],
     setIsOpenInternal = _useState2[1];
-  var openMenu = function openMenu() {
+  var _useToolbarUI = useToolbarUI(),
+    onDropdownOpenChanged = _useToolbarUI.onDropdownOpenChanged;
+  var openMenu = function openMenu(event) {
     if (setIsOpen !== undefined) {
       setIsOpen(true);
     } else {
       setIsOpenInternal(true);
     }
+    if (fg('platform_editor_toolbar_highlight_bug_fix')) {
+      onDropdownOpenChanged({
+        isOpen: true,
+        event: event
+      });
+    }
   };
-  var closeMenu = function closeMenu() {
+  var closeMenu = function closeMenu(event) {
     if (setIsOpen !== undefined) {
       setIsOpen(false);
     } else {
       setIsOpenInternal(false);
     }
+    if (fg('platform_editor_toolbar_highlight_bug_fix')) {
+      onDropdownOpenChanged({
+        isOpen: false,
+        event: event
+      });
+    }
   };
   var contextValue = {
     openMenu: openMenu,

package/dist/esm/ui/ToolbarTooltip.js

@@ -2,6 +2,7 @@ import React from 'react';
 import Tooltip from '@atlaskit/tooltip';
 export var ToolbarTooltip = function ToolbarTooltip(_ref) {
   var content = _ref.content,
+    shortcut = _ref.shortcut,
     children = _ref.children,
     _ref$position = _ref.position,
     position = _ref$position === void 0 ? 'top' : _ref$position,
@@ -9,6 +10,7 @@ export var ToolbarTooltip = function ToolbarTooltip(_ref) {
   return /*#__PURE__*/React.createElement(Tooltip, {
     content: content,
     position: position,
-    delay: delay
+    delay: delay,
+    shortcut: shortcut
   }, children);
 };

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

@@ -52,7 +52,7 @@ export interface ColorPaletteProps {
     /** Number of columns in the palette grid */
     cols?: number;
     /** Callback when a color is clicked */
-    onClick: (value: string, label: string) => void;
+    onClick: (value: string, label: string, event: React.MouseEvent | React.KeyboardEvent) => void;
     /** Optional callback for keyboard navigation */
     onKeyDown?: (value: string, label: string, event: React.KeyboardEvent) => void;
     /** Palette configuration options */
@@ -79,7 +79,7 @@ export interface ColorProps {
     /** Display label for accessibility */
     label: string;
     /** Click handler */
-    onClick: (value: string, label: string) => void;
+    onClick: (value: string, label: string, event: React.MouseEvent) => void;
     /** Keyboard event handler */
     onKeyDown?: (value: string, label: string, event: React.KeyboardEvent) => void;
     /** Tab index for keyboard navigation */

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

@@ -1,8 +1,8 @@
-import React from 'react';
+import React, { type KeyboardEvent, type MouseEvent } from 'react';
 interface ToolbarDropdownMenuContextValue {
-    closeMenu: () => void;
+    closeMenu: (event: Event | MouseEvent | KeyboardEvent | null) => void;
     isOpen: boolean;
-    openMenu: () => void;
+    openMenu: (event: Event | MouseEvent | KeyboardEvent | null) => void;
 }
 export declare const useToolbarDropdownMenu: () => ToolbarDropdownMenuContextValue | undefined;
 interface ToolbarDropdownMenuProviderProps {

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

@@ -5,6 +5,7 @@ type ToolbarTooltipProps = {
     content: React.ReactNode;
     delay?: number;
     position?: PositionType;
+    shortcut?: string[];
 };
-export declare const ToolbarTooltip: ({ content, children, position, delay, }: ToolbarTooltipProps) => React.JSX.Element;
+export declare const ToolbarTooltip: ({ content, shortcut, children, position, delay, }: ToolbarTooltipProps) => React.JSX.Element;
 export {};

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

@@ -52,7 +52,7 @@ export interface ColorPaletteProps {
     /** Number of columns in the palette grid */
     cols?: number;
     /** Callback when a color is clicked */
-    onClick: (value: string, label: string) => void;
+    onClick: (value: string, label: string, event: React.MouseEvent | React.KeyboardEvent) => void;
     /** Optional callback for keyboard navigation */
     onKeyDown?: (value: string, label: string, event: React.KeyboardEvent) => void;
     /** Palette configuration options */
@@ -79,7 +79,7 @@ export interface ColorProps {
     /** Display label for accessibility */
     label: string;
     /** Click handler */
-    onClick: (value: string, label: string) => void;
+    onClick: (value: string, label: string, event: React.MouseEvent) => void;
     /** Keyboard event handler */
     onKeyDown?: (value: string, label: string, event: React.KeyboardEvent) => void;
     /** Tab index for keyboard navigation */

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

@@ -1,8 +1,8 @@
-import React from 'react';
+import React, { type KeyboardEvent, type MouseEvent } from 'react';
 interface ToolbarDropdownMenuContextValue {
-    closeMenu: () => void;
+    closeMenu: (event: Event | MouseEvent | KeyboardEvent | null) => void;
     isOpen: boolean;
-    openMenu: () => void;
+    openMenu: (event: Event | MouseEvent | KeyboardEvent | null) => void;
 }
 export declare const useToolbarDropdownMenu: () => ToolbarDropdownMenuContextValue | undefined;
 interface ToolbarDropdownMenuProviderProps {

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

@@ -5,6 +5,7 @@ type ToolbarTooltipProps = {
     content: React.ReactNode;
     delay?: number;
     position?: PositionType;
+    shortcut?: string[];
 };
-export declare const ToolbarTooltip: ({ content, children, position, delay, }: ToolbarTooltipProps) => React.JSX.Element;
+export declare const ToolbarTooltip: ({ content, shortcut, children, position, delay, }: ToolbarTooltipProps) => React.JSX.Element;
 export {};

package/package.json

@@ -3,7 +3,7 @@
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
 	},
-	"version": "0.17.13",
+	"version": "0.18.1",
 	"description": "Common UI for Toolbars across the platform",
 	"atlassian": {
 		"team": "Editor: Jenga",
@@ -30,7 +30,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popup": "^4.6.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^14.1.0",
+		"@atlaskit/tmp-editor-statsig": "^14.6.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",
@@ -89,6 +89,9 @@
 		},
 		"platform_editor_toolbar_aifc_undo_redo_confluence": {
 			"type": "boolean"
+		},
+		"platform_editor_toolbar_highlight_bug_fix": {
+			"type": "boolean"
 		}
 	}
 }