@atlaskit/editor-plugin-table 2.10.2 → 2.10.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-table
 
+## 2.10.3
+
+### Patch Changes
+
+- [`d6e4badd8c4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d6e4badd8c4) - Add explicit height to table when resizing width to increase performance
+
 ## 2.10.2
 
 ### Patch Changes

package/dist/cjs/plugins/table/nodeviews/TableContainer.js

@@ -55,6 +55,23 @@ var ResizableTableContainer = function ResizableTableContainer(_ref2) {
   var containerRef = (0, _react.useRef)(null);
   var marginLeftRef = (0, _react.useRef)(0);
   var tableWidthRef = (0, _react.useRef)(_editorSharedStyles.akEditorDefaultLayoutWidth);
+  var updateContainerHeight = (0, _react.useCallback)(function (height) {
+    var _containerRef$current;
+    (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.style.setProperty('height', typeof height === 'number' ? "".concat(height + 29, "px") : 'auto');
+  }, []);
+  var resizeObserverRef = (0, _react.useRef)(new ResizeObserver(function (entries) {
+    updateContainerHeight(entries[entries.length - 1].contentRect.height);
+  }));
+  var onResizeStart = (0, _react.useCallback)(function () {
+    updateContainerHeight(tableRef === null || tableRef === void 0 ? void 0 : tableRef.clientHeight);
+    if (tableRef) {
+      resizeObserverRef.current.observe(tableRef);
+    }
+  }, [tableRef, updateContainerHeight]);
+  var onResizeStop = (0, _react.useCallback)(function () {
+    updateContainerHeight('auto');
+    resizeObserverRef.current.disconnect();
+  }, [updateContainerHeight]);
   var updateWidth = (0, _react.useCallback)(function (width) {
     if (!containerRef.current) {
       return;
@@ -102,6 +119,8 @@ var ResizableTableContainer = function ResizableTableContainer(_ref2) {
     className: _types.TableCssClassName.TABLE_RESIZER_CONTAINER,
     ref: containerRef
   }, /*#__PURE__*/_react.default.createElement(_TableResizer.TableResizer, {
+    onResizeStart: onResizeStart,
+    onResizeStop: onResizeStop,
     width: width,
     maxWidth: maxResizerWidth,
     containerWidth: containerWidth,

package/dist/cjs/plugins/table/nodeviews/TableResizer.js

@@ -33,6 +33,10 @@ var tableHandlePosition = 14;
 var getResizerHandleHeight = function getResizerHandleHeight(tableRef) {
   var tableHeight = tableRef === null || tableRef === void 0 ? void 0 : tableRef.clientHeight;
   var handleHeightSize = 'small';
+  if (!tableHeight) {
+    return handleHeightSize;
+  }
+
   /*
     - One row table height (minimum possible table height) ~ 45px
     - Two row table height ~ 90px
@@ -41,9 +45,9 @@ var getResizerHandleHeight = function getResizerHandleHeight(tableRef) {
     - > 46 because the height of the table can be a float number like 45.44.
     - < 96 is the height of large resize handle.
   */
-  if (tableHeight && tableHeight > 46 && tableHeight < 96) {
+  if (tableHeight > 46 && tableHeight < 96) {
     handleHeightSize = 'medium';
-  } else if (tableHeight && tableHeight >= 96) {
+  } else if (tableHeight >= 96) {
     handleHeightSize = 'large';
   }
   return handleHeightSize;
@@ -74,6 +78,8 @@ var TableResizer = function TableResizer(_ref) {
     maxWidth = _ref.maxWidth,
     containerWidth = _ref.containerWidth,
     updateWidth = _ref.updateWidth,
+    onResizeStop = _ref.onResizeStop,
+    onResizeStart = _ref.onResizeStart,
     editorView = _ref.editorView,
     getPos = _ref.getPos,
     node = _ref.node,
@@ -116,7 +122,8 @@ var TableResizer = function TableResizer(_ref) {
     }));
     var visibleGuidelines = getVisibleGuidelines(_guidelines.defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, containerWidth, editorView, startMeasure]);
+    onResizeStart();
+  }, [displayGuideline, editorView, startMeasure, onResizeStart, containerWidth]);
   var handleResize = (0, _react.useCallback)(function (originalState, delta) {
     countFrames();
     var newWidth = originalState.width + delta.width;
@@ -181,8 +188,9 @@ var TableResizer = function TableResizer(_ref) {
     displayGuideline([]);
     updateWidth(newWidth);
     scheduleResize.cancel();
+    onResizeStop();
     return newWidth;
-  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
+  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop]);
   var handleComponent = (0, _react.useMemo)(function () {
     return {
       left: /*#__PURE__*/_react.default.createElement("div", {

package/dist/es2019/plugins/table/nodeviews/TableContainer.js

@@ -46,6 +46,23 @@ export const ResizableTableContainer = ({
   const containerRef = useRef(null);
   const marginLeftRef = useRef(0);
   const tableWidthRef = useRef(akEditorDefaultLayoutWidth);
+  const updateContainerHeight = useCallback(height => {
+    var _containerRef$current;
+    (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.style.setProperty('height', typeof height === 'number' ? `${height + 29}px` : 'auto');
+  }, []);
+  const resizeObserverRef = useRef(new ResizeObserver(entries => {
+    updateContainerHeight(entries[entries.length - 1].contentRect.height);
+  }));
+  const onResizeStart = useCallback(() => {
+    updateContainerHeight(tableRef === null || tableRef === void 0 ? void 0 : tableRef.clientHeight);
+    if (tableRef) {
+      resizeObserverRef.current.observe(tableRef);
+    }
+  }, [tableRef, updateContainerHeight]);
+  const onResizeStop = useCallback(() => {
+    updateContainerHeight('auto');
+    resizeObserverRef.current.disconnect();
+  }, [updateContainerHeight]);
   const updateWidth = useCallback(width => {
     if (!containerRef.current) {
       return;
@@ -93,6 +110,8 @@ export const ResizableTableContainer = ({
     className: ClassName.TABLE_RESIZER_CONTAINER,
     ref: containerRef
   }, /*#__PURE__*/React.createElement(TableResizer, {
+    onResizeStart: onResizeStart,
+    onResizeStop: onResizeStop,
     width: width,
     maxWidth: maxResizerWidth,
     containerWidth: containerWidth,

package/dist/es2019/plugins/table/nodeviews/TableResizer.js

@@ -19,6 +19,10 @@ const tableHandlePosition = 14;
 const getResizerHandleHeight = tableRef => {
   const tableHeight = tableRef === null || tableRef === void 0 ? void 0 : tableRef.clientHeight;
   let handleHeightSize = 'small';
+  if (!tableHeight) {
+    return handleHeightSize;
+  }
+
   /*
     - One row table height (minimum possible table height) ~ 45px
     - Two row table height ~ 90px
@@ -27,9 +31,9 @@ const getResizerHandleHeight = tableRef => {
     - > 46 because the height of the table can be a float number like 45.44.
     - < 96 is the height of large resize handle.
   */
-  if (tableHeight && tableHeight > 46 && tableHeight < 96) {
+  if (tableHeight > 46 && tableHeight < 96) {
     handleHeightSize = 'medium';
-  } else if (tableHeight && tableHeight >= 96) {
+  } else if (tableHeight >= 96) {
     handleHeightSize = 'large';
   }
   return handleHeightSize;
@@ -59,6 +63,8 @@ export const TableResizer = ({
   maxWidth,
   containerWidth,
   updateWidth,
+  onResizeStop,
+  onResizeStart,
   editorView,
   getPos,
   node,
@@ -105,7 +111,8 @@ export const TableResizer = ({
     }));
     const visibleGuidelines = getVisibleGuidelines(defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, containerWidth, editorView, startMeasure]);
+    onResizeStart();
+  }, [displayGuideline, editorView, startMeasure, onResizeStart, containerWidth]);
   const handleResize = useCallback((originalState, delta) => {
     countFrames();
     const newWidth = originalState.width + delta.width;
@@ -171,8 +178,9 @@ export const TableResizer = ({
     displayGuideline([]);
     updateWidth(newWidth);
     scheduleResize.cancel();
+    onResizeStop();
     return newWidth;
-  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
+  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop]);
   const handleComponent = useMemo(() => ({
     left: /*#__PURE__*/React.createElement("div", {
       className: resizerHandleShadowClassName,

package/dist/esm/plugins/table/nodeviews/TableContainer.js

@@ -44,6 +44,23 @@ export var ResizableTableContainer = function ResizableTableContainer(_ref2) {
   var containerRef = useRef(null);
   var marginLeftRef = useRef(0);
   var tableWidthRef = useRef(akEditorDefaultLayoutWidth);
+  var updateContainerHeight = useCallback(function (height) {
+    var _containerRef$current;
+    (_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.style.setProperty('height', typeof height === 'number' ? "".concat(height + 29, "px") : 'auto');
+  }, []);
+  var resizeObserverRef = useRef(new ResizeObserver(function (entries) {
+    updateContainerHeight(entries[entries.length - 1].contentRect.height);
+  }));
+  var onResizeStart = useCallback(function () {
+    updateContainerHeight(tableRef === null || tableRef === void 0 ? void 0 : tableRef.clientHeight);
+    if (tableRef) {
+      resizeObserverRef.current.observe(tableRef);
+    }
+  }, [tableRef, updateContainerHeight]);
+  var onResizeStop = useCallback(function () {
+    updateContainerHeight('auto');
+    resizeObserverRef.current.disconnect();
+  }, [updateContainerHeight]);
   var updateWidth = useCallback(function (width) {
     if (!containerRef.current) {
       return;
@@ -91,6 +108,8 @@ export var ResizableTableContainer = function ResizableTableContainer(_ref2) {
     className: ClassName.TABLE_RESIZER_CONTAINER,
     ref: containerRef
   }, /*#__PURE__*/React.createElement(TableResizer, {
+    onResizeStart: onResizeStart,
+    onResizeStop: onResizeStop,
     width: width,
     maxWidth: maxResizerWidth,
     containerWidth: containerWidth,

package/dist/esm/plugins/table/nodeviews/TableResizer.js

@@ -23,6 +23,10 @@ var tableHandlePosition = 14;
 var getResizerHandleHeight = function getResizerHandleHeight(tableRef) {
   var tableHeight = tableRef === null || tableRef === void 0 ? void 0 : tableRef.clientHeight;
   var handleHeightSize = 'small';
+  if (!tableHeight) {
+    return handleHeightSize;
+  }
+
   /*
     - One row table height (minimum possible table height) ~ 45px
     - Two row table height ~ 90px
@@ -31,9 +35,9 @@ var getResizerHandleHeight = function getResizerHandleHeight(tableRef) {
     - > 46 because the height of the table can be a float number like 45.44.
     - < 96 is the height of large resize handle.
   */
-  if (tableHeight && tableHeight > 46 && tableHeight < 96) {
+  if (tableHeight > 46 && tableHeight < 96) {
     handleHeightSize = 'medium';
-  } else if (tableHeight && tableHeight >= 96) {
+  } else if (tableHeight >= 96) {
     handleHeightSize = 'large';
   }
   return handleHeightSize;
@@ -64,6 +68,8 @@ export var TableResizer = function TableResizer(_ref) {
     maxWidth = _ref.maxWidth,
     containerWidth = _ref.containerWidth,
     updateWidth = _ref.updateWidth,
+    onResizeStop = _ref.onResizeStop,
+    onResizeStart = _ref.onResizeStart,
     editorView = _ref.editorView,
     getPos = _ref.getPos,
     node = _ref.node,
@@ -106,7 +112,8 @@ export var TableResizer = function TableResizer(_ref) {
     }));
     var visibleGuidelines = getVisibleGuidelines(defaultGuidelines, containerWidth);
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, containerWidth, editorView, startMeasure]);
+    onResizeStart();
+  }, [displayGuideline, editorView, startMeasure, onResizeStart, containerWidth]);
   var handleResize = useCallback(function (originalState, delta) {
     countFrames();
     var newWidth = originalState.width + delta.width;
@@ -171,8 +178,9 @@ export var TableResizer = function TableResizer(_ref) {
     displayGuideline([]);
     updateWidth(newWidth);
     scheduleResize.cancel();
+    onResizeStop();
     return newWidth;
-  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure]);
+  }, [updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop]);
   var handleComponent = useMemo(function () {
     return {
       left: /*#__PURE__*/React.createElement("div", {

package/dist/types/plugins/table/nodeviews/TableResizer.d.ts

@@ -9,6 +9,8 @@ interface TableResizerProps {
     maxWidth: number;
     containerWidth: number;
     updateWidth: (width: number) => void;
+    onResizeStop: () => void;
+    onResizeStart: () => void;
     editorView: EditorView;
     getPos: () => number | undefined;
     node: PMNode;
@@ -16,5 +18,5 @@ interface TableResizerProps {
     displayGuideline: (guideline: GuidelineConfig[]) => boolean;
     attachAnalyticsEvent: (payload: TableEventPayload) => ((tr: Transaction) => boolean) | undefined;
 }
-export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
+export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, onResizeStop, onResizeStart, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
 export {};

package/dist/types-ts4.5/plugins/table/nodeviews/TableResizer.d.ts

@@ -9,6 +9,8 @@ interface TableResizerProps {
     maxWidth: number;
     containerWidth: number;
     updateWidth: (width: number) => void;
+    onResizeStop: () => void;
+    onResizeStart: () => void;
     editorView: EditorView;
     getPos: () => number | undefined;
     node: PMNode;
@@ -16,5 +18,5 @@ interface TableResizerProps {
     displayGuideline: (guideline: GuidelineConfig[]) => boolean;
     attachAnalyticsEvent: (payload: TableEventPayload) => ((tr: Transaction) => boolean) | undefined;
 }
-export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
+export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, onResizeStop, onResizeStart, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, }: PropsWithChildren<TableResizerProps>) => JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "2.10.2",
+  "version": "2.10.3",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/plugins/table/nodeviews/TableContainer.tsx

@@ -89,6 +89,33 @@ export const ResizableTableContainer = ({
   const marginLeftRef = useRef<number | undefined>(0);
   const tableWidthRef = useRef<number>(akEditorDefaultLayoutWidth);
 
+  const updateContainerHeight = useCallback((height: number | 'auto') => {
+    containerRef.current?.style.setProperty(
+      'height',
+      typeof height === 'number' ? `${height + 29}px` : 'auto',
+    );
+  }, []);
+
+  const resizeObserverRef = useRef(
+    new ResizeObserver((entries) => {
+      updateContainerHeight(entries[entries.length - 1].contentRect.height);
+    }),
+  );
+
+  const onResizeStart = useCallback(() => {
+    updateContainerHeight(tableRef?.clientHeight);
+
+    if (tableRef) {
+      resizeObserverRef.current.observe(tableRef);
+    }
+  }, [tableRef, updateContainerHeight]);
+
+  const onResizeStop = useCallback(() => {
+    updateContainerHeight('auto');
+
+    resizeObserverRef.current.disconnect();
+  }, [updateContainerHeight]);
+
   const updateWidth = useCallback(
     (width: number) => {
       if (!containerRef.current) {
@@ -157,6 +184,8 @@ export const ResizableTableContainer = ({
       ref={containerRef}
     >
       <TableResizer
+        onResizeStart={onResizeStart}
+        onResizeStop={onResizeStop}
         width={width}
         maxWidth={maxResizerWidth}
         containerWidth={containerWidth}

package/src/plugins/table/nodeviews/TableResizer.tsx

@@ -43,6 +43,8 @@ interface TableResizerProps {
   maxWidth: number;
   containerWidth: number;
   updateWidth: (width: number) => void;
+  onResizeStop: () => void;
+  onResizeStart: () => void;
   editorView: EditorView;
   getPos: () => number | undefined;
   node: PMNode;
@@ -57,9 +59,14 @@ const handles = { right: true };
 const tableHandleMarginTop = 12;
 const tableHandlePosition = 14;
 
-const getResizerHandleHeight = (tableRef: HTMLTableElement) => {
+const getResizerHandleHeight = (tableRef: HTMLTableElement | undefined) => {
   const tableHeight = tableRef?.clientHeight;
   let handleHeightSize: HandleHeightSizeType | undefined = 'small';
+
+  if (!tableHeight) {
+    return handleHeightSize;
+  }
+
   /*
     - One row table height (minimum possible table height) ~ 45px
     - Two row table height ~ 90px
@@ -69,9 +76,9 @@ const getResizerHandleHeight = (tableRef: HTMLTableElement) => {
     - > 46 because the height of the table can be a float number like 45.44.
     - < 96 is the height of large resize handle.
   */
-  if (tableHeight && tableHeight > 46 && tableHeight < 96) {
+  if (tableHeight > 46 && tableHeight < 96) {
     handleHeightSize = 'medium';
-  } else if (tableHeight && tableHeight >= 96) {
+  } else if (tableHeight >= 96) {
     handleHeightSize = 'large';
   }
 
@@ -115,6 +122,8 @@ export const TableResizer = ({
   maxWidth,
   containerWidth,
   updateWidth,
+  onResizeStop,
+  onResizeStart,
   editorView,
   getPos,
   node,
@@ -177,7 +186,15 @@ export const TableResizer = ({
       containerWidth,
     );
     setSnappingEnabled(displayGuideline(visibleGuidelines));
-  }, [displayGuideline, containerWidth, editorView, startMeasure]);
+
+    onResizeStart();
+  }, [
+    displayGuideline,
+    editorView,
+    startMeasure,
+    onResizeStart,
+    containerWidth,
+  ]);
 
   const handleResize = useCallback(
     (originalState, delta) => {
@@ -281,6 +298,8 @@ export const TableResizer = ({
       updateWidth(newWidth);
       scheduleResize.cancel();
 
+      onResizeStop();
+
       return newWidth;
     },
     [
@@ -293,6 +312,7 @@ export const TableResizer = ({
       displayGuideline,
       attachAnalyticsEvent,
       endMeasure,
+      onResizeStop,
     ],
   );