@atlaskit/editor-plugin-block-controls 1.3.2 → 1.3.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 1.3.4
+
+### Patch Changes
+
+-   [#99555](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99555)
+    [`703d23b83234`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/703d23b83234) -
+    [ux] Update drag handle style based on design
+-   Updated dependencies
+
+## 1.3.3
+
+### Patch Changes
+
+-   [#98101](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98101)
+    [`930a81c221d3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/930a81c221d3) -
+    Update example page to enable resizable table and media-single nodes
+
 ## 1.3.2
 
 ### Patch Changes

package/dist/cjs/ui/consts.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_HEIGHT = void 0;
-var DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_HEIGHT = 48;
-var DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_WIDTH = 24;
+exports.DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_BORDER_RADIUS = void 0;
+var DRAG_HANDLE_HEIGHT = exports.DRAG_HANDLE_HEIGHT = 24;
+var DRAG_HANDLE_WIDTH = exports.DRAG_HANDLE_WIDTH = 12;
+var DRAG_HANDLE_BORDER_RADIUS = exports.DRAG_HANDLE_BORDER_RADIUS = 4;

package/dist/cjs/ui/drag-handle.js

@@ -1,11 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DragHandle = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
+var _dragHandler = _interopRequireDefault(require("@atlaskit/icon/glyph/drag-handler"));
 var _adapter = require("@atlaskit/pragmatic-drag-and-drop/element/adapter");
 var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview");
 var _main = require("../pm-plugins/main");
@@ -13,14 +16,35 @@ var _consts = require("./consts");
 var _dragPreview = require("./drag-preview");
 /** @jsx jsx */
 
-var styles = (0, _react2.css)({
-  position: 'absolute',
-  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-  background: 'grey',
-  zIndex: 1,
+var dragHandleButtonStyles = (0, _react2.css)({
+  position: 'relative',
+  // TODO - we have ticket ED-23209 to correctly position the drag handle for each node
+  //https://product-fabric.atlassian.net/browse/ED-23209
+  top: 12,
+  left: -18,
+  padding: "var(--ds-space-025, 2px)".concat(" 0"),
+  boxSizing: 'border-box',
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'center',
+  alignItems: 'center',
   height: _consts.DRAG_HANDLE_HEIGHT,
   width: _consts.DRAG_HANDLE_WIDTH,
-  left: -_consts.DRAG_HANDLE_WIDTH
+  border: 'none',
+  background: 'transparent',
+  borderRadius: _consts.DRAG_HANDLE_BORDER_RADIUS,
+  color: "var(--ds-icon, #44546F)",
+  cursor: 'grab',
+  ':hover': {
+    backgroundColor: "var(--ds-background-neutral-subtle-hovered, #091E420F)"
+  },
+  ':active': {
+    backgroundColor: "var(--ds-background-neutral-subtle-pressed, #091E4224)"
+  }
+});
+var selectedStyles = (0, _react2.css)({
+  backgroundColor: "var(--ds-background-selected, #E9F2FF)",
+  color: "var(--ds-icon-selected, #0C66E4)"
 });
 var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   var dom = _ref.dom,
@@ -28,6 +52,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     start = _ref.start;
   var buttonRef = (0, _react.useRef)(null);
   var domRef = (0, _react.useRef)(dom);
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    dragHandleSelected = _useState2[0],
+    setDragHandleSelected = _useState2[1];
   (0, _react.useEffect)(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -74,20 +102,22 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       }
     });
   }, [api, start]);
-  return (0, _react2.jsx)("div", {
-    css: styles,
-    style: {
-      top: dom.clientHeight / 2 - _consts.DRAG_HANDLE_HEIGHT / 2
-    },
+  return (0, _react2.jsx)("button", {
+    type: "button",
+    css: [dragHandleButtonStyles, dragHandleSelected && selectedStyles],
     ref: buttonRef,
     onClick: function onClick() {
-      var _api$core3;
-      api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref6) {
-        var tr = _ref6.tr;
-        return tr.setMeta(_main.key, {
-          toggleMenu: true
-        });
-      });
+      setDragHandleSelected(!dragHandleSelected);
+
+      // TODO - add drag menu
+      // api?.core?.actions.execute(({ tr }) =>
+      //   tr.setMeta(key, {
+      //     toggleMenu: true,
+      //   }),
+      // );
     }
-  });
+  }, (0, _react2.jsx)(_dragHandler.default, {
+    label: "",
+    size: "medium"
+  }));
 };

package/dist/es2019/ui/consts.js

@@ -1,2 +1,3 @@
-export const DRAG_HANDLE_HEIGHT = 48;
-export const DRAG_HANDLE_WIDTH = 24;
+export const DRAG_HANDLE_HEIGHT = 24;
+export const DRAG_HANDLE_WIDTH = 12;
+export const DRAG_HANDLE_BORDER_RADIUS = 4;

package/dist/es2019/ui/drag-handle.js

@@ -1,19 +1,41 @@
 /** @jsx jsx */
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
+import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
 import { key } from '../pm-plugins/main';
-import { DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH } from './consts';
+import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH } from './consts';
 import { dragPreview } from './drag-preview';
-const styles = css({
-  position: 'absolute',
-  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-  background: 'grey',
-  zIndex: 1,
+const dragHandleButtonStyles = css({
+  position: 'relative',
+  // TODO - we have ticket ED-23209 to correctly position the drag handle for each node
+  //https://product-fabric.atlassian.net/browse/ED-23209
+  top: 12,
+  left: -18,
+  padding: `${"var(--ds-space-025, 2px)"} 0`,
+  boxSizing: 'border-box',
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'center',
+  alignItems: 'center',
   height: DRAG_HANDLE_HEIGHT,
   width: DRAG_HANDLE_WIDTH,
-  left: -DRAG_HANDLE_WIDTH
+  border: 'none',
+  background: 'transparent',
+  borderRadius: DRAG_HANDLE_BORDER_RADIUS,
+  color: "var(--ds-icon, #44546F)",
+  cursor: 'grab',
+  ':hover': {
+    backgroundColor: "var(--ds-background-neutral-subtle-hovered, #091E420F)"
+  },
+  ':active': {
+    backgroundColor: "var(--ds-background-neutral-subtle-pressed, #091E4224)"
+  }
+});
+const selectedStyles = css({
+  backgroundColor: "var(--ds-background-selected, #E9F2FF)",
+  color: "var(--ds-icon-selected, #0C66E4)"
 });
 export const DragHandle = ({
   dom,
@@ -22,6 +44,7 @@ export const DragHandle = ({
 }) => {
   const buttonRef = useRef(null);
   const domRef = useRef(dom);
+  const [dragHandleSelected, setDragHandleSelected] = useState(false);
   useEffect(() => {
     const element = buttonRef.current;
     if (!element) {
@@ -68,19 +91,22 @@ export const DragHandle = ({
       }
     });
   }, [api, start]);
-  return jsx("div", {
-    css: styles,
-    style: {
-      top: dom.clientHeight / 2 - DRAG_HANDLE_HEIGHT / 2
-    },
+  return jsx("button", {
+    type: "button",
+    css: [dragHandleButtonStyles, dragHandleSelected && selectedStyles],
     ref: buttonRef,
     onClick: () => {
-      var _api$core3;
-      api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
-        tr
-      }) => tr.setMeta(key, {
-        toggleMenu: true
-      }));
+      setDragHandleSelected(!dragHandleSelected);
+
+      // TODO - add drag menu
+      // api?.core?.actions.execute(({ tr }) =>
+      //   tr.setMeta(key, {
+      //     toggleMenu: true,
+      //   }),
+      // );
     }
-  });
+  }, jsx(DragHandlerIcon, {
+    label: "",
+    size: "medium"
+  }));
 };

package/dist/esm/ui/consts.js

@@ -1,2 +1,3 @@
-export var DRAG_HANDLE_HEIGHT = 48;
-export var DRAG_HANDLE_WIDTH = 24;
+export var DRAG_HANDLE_HEIGHT = 24;
+export var DRAG_HANDLE_WIDTH = 12;
+export var DRAG_HANDLE_BORDER_RADIUS = 4;

package/dist/esm/ui/drag-handle.js

@@ -1,19 +1,42 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
+import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
 import { key } from '../pm-plugins/main';
-import { DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH } from './consts';
+import { DRAG_HANDLE_BORDER_RADIUS, DRAG_HANDLE_HEIGHT, DRAG_HANDLE_WIDTH } from './consts';
 import { dragPreview } from './drag-preview';
-var styles = css({
-  position: 'absolute',
-  // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
-  background: 'grey',
-  zIndex: 1,
+var dragHandleButtonStyles = css({
+  position: 'relative',
+  // TODO - we have ticket ED-23209 to correctly position the drag handle for each node
+  //https://product-fabric.atlassian.net/browse/ED-23209
+  top: 12,
+  left: -18,
+  padding: "var(--ds-space-025, 2px)".concat(" 0"),
+  boxSizing: 'border-box',
+  display: 'flex',
+  flexDirection: 'column',
+  justifyContent: 'center',
+  alignItems: 'center',
   height: DRAG_HANDLE_HEIGHT,
   width: DRAG_HANDLE_WIDTH,
-  left: -DRAG_HANDLE_WIDTH
+  border: 'none',
+  background: 'transparent',
+  borderRadius: DRAG_HANDLE_BORDER_RADIUS,
+  color: "var(--ds-icon, #44546F)",
+  cursor: 'grab',
+  ':hover': {
+    backgroundColor: "var(--ds-background-neutral-subtle-hovered, #091E420F)"
+  },
+  ':active': {
+    backgroundColor: "var(--ds-background-neutral-subtle-pressed, #091E4224)"
+  }
+});
+var selectedStyles = css({
+  backgroundColor: "var(--ds-background-selected, #E9F2FF)",
+  color: "var(--ds-icon-selected, #0C66E4)"
 });
 export var DragHandle = function DragHandle(_ref) {
   var dom = _ref.dom,
@@ -21,6 +44,10 @@ export var DragHandle = function DragHandle(_ref) {
     start = _ref.start;
   var buttonRef = useRef(null);
   var domRef = useRef(dom);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    dragHandleSelected = _useState2[0],
+    setDragHandleSelected = _useState2[1];
   useEffect(function () {
     var element = buttonRef.current;
     if (!element) {
@@ -67,20 +94,22 @@ export var DragHandle = function DragHandle(_ref) {
       }
     });
   }, [api, start]);
-  return jsx("div", {
-    css: styles,
-    style: {
-      top: dom.clientHeight / 2 - DRAG_HANDLE_HEIGHT / 2
-    },
+  return jsx("button", {
+    type: "button",
+    css: [dragHandleButtonStyles, dragHandleSelected && selectedStyles],
     ref: buttonRef,
     onClick: function onClick() {
-      var _api$core3;
-      api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref6) {
-        var tr = _ref6.tr;
-        return tr.setMeta(key, {
-          toggleMenu: true
-        });
-      });
+      setDragHandleSelected(!dragHandleSelected);
+
+      // TODO - add drag menu
+      // api?.core?.actions.execute(({ tr }) =>
+      //   tr.setMeta(key, {
+      //     toggleMenu: true,
+      //   }),
+      // );
     }
-  });
+  }, jsx(DragHandlerIcon, {
+    label: "",
+    size: "medium"
+  }));
 };

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

@@ -1,2 +1,3 @@
-export declare const DRAG_HANDLE_HEIGHT = 48;
-export declare const DRAG_HANDLE_WIDTH = 24;
+export declare const DRAG_HANDLE_HEIGHT = 24;
+export declare const DRAG_HANDLE_WIDTH = 12;
+export declare const DRAG_HANDLE_BORDER_RADIUS = 4;

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

@@ -1,2 +1,3 @@
-export declare const DRAG_HANDLE_HEIGHT = 48;
-export declare const DRAG_HANDLE_WIDTH = 24;
+export declare const DRAG_HANDLE_HEIGHT = 24;
+export declare const DRAG_HANDLE_WIDTH = 12;
+export declare const DRAG_HANDLE_BORDER_RADIUS = 4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-block-controls",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Block controls plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -31,9 +31,11 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^79.1.0",
+    "@atlaskit/editor-common": "^79.6.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
+    "@atlaskit/icon": "^22.1.0",
     "@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
+    "@atlaskit/tokens": "^1.48.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1"
   },
@@ -79,5 +81,11 @@
       ]
     }
   },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
+  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
+  "platform-feature-flags": {
+    "platform.editor.media.extended-resize-experience": {
+      "type": "boolean",
+      "referenceOnly": true
+    }
+  }
 }