@atlaskit/editor-core 187.32.1 → 187.32.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 187.32.2
+
+### Patch Changes
+
+- [`eab48233583`](https://bitbucket.org/atlassian/atlassian-frontend/commits/eab48233583) - Calculate parent content width properly when inserting a nested media single node
+
 ## 187.32.1
 
 ### Patch Changes

package/dist/cjs/plugins/media/toolbar/index.js

@@ -304,19 +304,12 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             mediaHeight: mediaHeight || _mediaSingle2.DEFAULT_IMAGE_HEIGHT,
             minWidth: minWidth,
             maxWidth: maxWidth,
-            validate: function validate(value) {
-              if (value && (value < minWidth || value > maxWidth)) {
+            onChange: function onChange(valid) {
+              if (valid) {
                 hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true, 'warning')(editorView.state, dispatch, editorView);
               } else {
-                // remove decoration when:
-                // input is within min-max range or
-                // input is empty
                 hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false)(editorView.state, dispatch, editorView);
               }
-              if (value === '') {
-                return false;
-              }
-              return true;
             },
             onSubmit: function onSubmit(_ref2) {
               var width = _ref2.width;

package/dist/cjs/plugins/media/ui/PixelEntry/index.js

@@ -26,9 +26,9 @@ var PixelEntry = function PixelEntry(_ref) {
     mediaWidth = _ref.mediaWidth,
     mediaHeight = _ref.mediaHeight,
     onSubmit = _ref.onSubmit,
-    validate = _ref.validate,
     minWidth = _ref.minWidth,
     maxWidth = _ref.maxWidth,
+    onChange = _ref.onChange,
     formatMessage = _ref.intl.formatMessage,
     showMigration = _ref.showMigration,
     onMigrate = _ref.onMigrate;
@@ -55,6 +55,9 @@ var PixelEntry = function PixelEntry(_ref) {
 
   // Handle submit when user presses enter in form
   var handleOnSubmit = function handleOnSubmit(data) {
+    if (data.inputWidth === '' || data.inputHeight === '') {
+      return;
+    }
     if (onSubmit) {
       var widthToBeSumitted = data.inputWidth;
       var isInvalidInput = false;
@@ -80,46 +83,33 @@ var PixelEntry = function PixelEntry(_ref) {
     }
   };
 
-  // Syncronous validation returning undefined for valid and string for invalid
-  var handleValidateWidth = (0, _react2.useCallback)(function (value) {
-    if (!validate || value === undefined) {
-      return;
-    }
-    if (validate) {
-      return validate(value) === true ? undefined : formatMessage(_messages.messages.validationFailedMessage);
-    }
-    return;
-  }, [validate, formatMessage]);
-
   // Handle updating computed fields based on
   var handleOnChange = (0, _react2.useCallback)(function (type) {
     return function (event) {
       var value = parseInt(event.currentTarget.value);
-      var newInputValue = isNaN(value) ? '' : parseInt(event.currentTarget.value);
+      var newInputValue = isNaN(value) ? '' : value;
+      var newWidth = '';
       switch (type) {
         case 'inputWidth':
           {
+            newWidth = newInputValue;
             setComputedWidth(newInputValue);
-            if (newInputValue) {
-              setComputedHeight(Math.round(ratioWidth * value));
-            } else {
-              setComputedHeight('');
-            }
+            var newHeight = newInputValue !== '' ? Math.round(ratioWidth * newInputValue) : '';
+            setComputedHeight(newHeight);
             break;
           }
         case 'inputHeight':
           {
             setComputedHeight(newInputValue);
-            if (newInputValue) {
-              setComputedWidth(Math.round(ratioHeight * value));
-            } else {
-              setComputedWidth('');
-            }
+            newWidth = newInputValue !== '' ? Math.round(ratioHeight * newInputValue) : '';
+            setComputedWidth(newWidth);
             break;
           }
       }
+      var isInvalidInputValid = newWidth !== '' && (newWidth < minWidth || newWidth > maxWidth);
+      onChange && onChange(isInvalidInputValid);
     };
-  }, [ratioHeight, ratioWidth]);
+  }, [minWidth, maxWidth, onChange, ratioWidth, ratioHeight]);
   if (showMigration) {
     return (0, _react.jsx)(_tooltip.default, {
       content: formatMessage(_messages.messages.migrationButtonTooltip)
@@ -141,7 +131,6 @@ var PixelEntry = function PixelEntry(_ref) {
     }, (0, _react.jsx)(_form.Field, {
       key: "inputWidth",
       name: "inputWidth",
-      validate: handleValidateWidth,
       defaultValue: computedWidth
     }, function (_ref3) {
       var fieldProps = _ref3.fieldProps;

package/dist/cjs/plugins/media/utils/media-single.js

@@ -103,7 +103,7 @@ var insertMediaSingleNode = function insertMediaSingleNode(view, mediaState, inp
 
   // add undefined as fallback as we don't want media single width to have upper limit as 0
   // if widthPluginState.width is 0, default 760 will be used
-  var contentWidth = (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
+  var contentWidth = (0, _mediaSingle.getMaxWidthForNestedNodeNext)(view, state.selection.$from.pos, true) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
   var node = createMediaSingleNode(state.schema, collection, contentWidth, mediaState.status !== 'error' && isVideo(mediaState.fileMimeType) ? _mediaSingle.MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : _mediaSingle.MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, alignLeftOnInsert)(mediaState);
   var fileExtension;
   if (mediaState.fileName) {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.32.1";
+var version = "187.32.2";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/plugins/media/toolbar/index.js

@@ -310,19 +310,12 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             mediaHeight: mediaHeight || DEFAULT_IMAGE_HEIGHT,
             minWidth: minWidth,
             maxWidth: maxWidth,
-            validate: value => {
-              if (value && (value < minWidth || value > maxWidth)) {
+            onChange: valid => {
+              if (valid) {
                 hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true, 'warning')(editorView.state, dispatch, editorView);
               } else {
-                // remove decoration when:
-                // input is within min-max range or
-                // input is empty
                 hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false)(editorView.state, dispatch, editorView);
               }
-              if (value === '') {
-                return false;
-              }
-              return true;
             },
             onSubmit: ({
               width

package/dist/es2019/plugins/media/ui/PixelEntry/index.js

@@ -14,9 +14,9 @@ export const PixelEntry = ({
   mediaWidth,
   mediaHeight,
   onSubmit,
-  validate,
   minWidth,
   maxWidth,
+  onChange,
   intl: {
     formatMessage
   },
@@ -40,6 +40,9 @@ export const PixelEntry = ({
 
   // Handle submit when user presses enter in form
   const handleOnSubmit = data => {
+    if (data.inputWidth === '' || data.inputHeight === '') {
+      return;
+    }
     if (onSubmit) {
       let widthToBeSumitted = data.inputWidth;
       let isInvalidInput = false;
@@ -65,44 +68,31 @@ export const PixelEntry = ({
     }
   };
 
-  // Syncronous validation returning undefined for valid and string for invalid
-  const handleValidateWidth = useCallback(value => {
-    if (!validate || value === undefined) {
-      return;
-    }
-    if (validate) {
-      return validate(value) === true ? undefined : formatMessage(messages.validationFailedMessage);
-    }
-    return;
-  }, [validate, formatMessage]);
-
   // Handle updating computed fields based on
   const handleOnChange = useCallback(type => event => {
     const value = parseInt(event.currentTarget.value);
-    const newInputValue = isNaN(value) ? '' : parseInt(event.currentTarget.value);
+    const newInputValue = isNaN(value) ? '' : value;
+    let newWidth = '';
     switch (type) {
       case 'inputWidth':
         {
+          newWidth = newInputValue;
           setComputedWidth(newInputValue);
-          if (newInputValue) {
-            setComputedHeight(Math.round(ratioWidth * value));
-          } else {
-            setComputedHeight('');
-          }
+          const newHeight = newInputValue !== '' ? Math.round(ratioWidth * newInputValue) : '';
+          setComputedHeight(newHeight);
           break;
         }
       case 'inputHeight':
         {
           setComputedHeight(newInputValue);
-          if (newInputValue) {
-            setComputedWidth(Math.round(ratioHeight * value));
-          } else {
-            setComputedWidth('');
-          }
+          newWidth = newInputValue !== '' ? Math.round(ratioHeight * newInputValue) : '';
+          setComputedWidth(newWidth);
           break;
         }
     }
-  }, [ratioHeight, ratioWidth]);
+    const isInvalidInputValid = newWidth !== '' && (newWidth < minWidth || newWidth > maxWidth);
+    onChange && onChange(isInvalidInputValid);
+  }, [minWidth, maxWidth, onChange, ratioWidth, ratioHeight]);
   if (showMigration) {
     return jsx(Tooltip, {
       content: formatMessage(messages.migrationButtonTooltip)
@@ -125,7 +115,6 @@ export const PixelEntry = ({
     }, jsx(Field, {
       key: "inputWidth",
       name: "inputWidth",
-      validate: handleValidateWidth,
       defaultValue: computedWidth
     }, ({
       fieldProps

package/dist/es2019/plugins/media/utils/media-single.js

@@ -1,7 +1,7 @@
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { checkNodeDown } from '../../../utils';
-import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
+import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { mapSlice } from '../../../utils/slice';
@@ -93,7 +93,7 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
 
   // add undefined as fallback as we don't want media single width to have upper limit as 0
   // if widthPluginState.width is 0, default 760 will be used
-  const contentWidth = (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
+  const contentWidth = getMaxWidthForNestedNodeNext(view, state.selection.$from.pos, true) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
   const node = createMediaSingleNode(state.schema, collection, contentWidth, mediaState.status !== 'error' && isVideo(mediaState.fileMimeType) ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, alignLeftOnInsert)(mediaState);
   let fileExtension;
   if (mediaState.fileName) {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.32.1";
+export const version = "187.32.2";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/plugins/media/toolbar/index.js

@@ -297,19 +297,12 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             mediaHeight: mediaHeight || DEFAULT_IMAGE_HEIGHT,
             minWidth: minWidth,
             maxWidth: maxWidth,
-            validate: function validate(value) {
-              if (value && (value < minWidth || value > maxWidth)) {
+            onChange: function onChange(valid) {
+              if (valid) {
                 hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, true, 'warning')(editorView.state, dispatch, editorView);
               } else {
-                // remove decoration when:
-                // input is within min-max range or
-                // input is empty
                 hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(mediaSingle, false)(editorView.state, dispatch, editorView);
               }
-              if (value === '') {
-                return false;
-              }
-              return true;
             },
             onSubmit: function onSubmit(_ref2) {
               var width = _ref2.width;

package/dist/esm/plugins/media/ui/PixelEntry/index.js

@@ -15,9 +15,9 @@ export var PixelEntry = function PixelEntry(_ref) {
     mediaWidth = _ref.mediaWidth,
     mediaHeight = _ref.mediaHeight,
     onSubmit = _ref.onSubmit,
-    validate = _ref.validate,
     minWidth = _ref.minWidth,
     maxWidth = _ref.maxWidth,
+    onChange = _ref.onChange,
     formatMessage = _ref.intl.formatMessage,
     showMigration = _ref.showMigration,
     onMigrate = _ref.onMigrate;
@@ -44,6 +44,9 @@ export var PixelEntry = function PixelEntry(_ref) {
 
   // Handle submit when user presses enter in form
   var handleOnSubmit = function handleOnSubmit(data) {
+    if (data.inputWidth === '' || data.inputHeight === '') {
+      return;
+    }
     if (onSubmit) {
       var widthToBeSumitted = data.inputWidth;
       var isInvalidInput = false;
@@ -69,46 +72,33 @@ export var PixelEntry = function PixelEntry(_ref) {
     }
   };
 
-  // Syncronous validation returning undefined for valid and string for invalid
-  var handleValidateWidth = useCallback(function (value) {
-    if (!validate || value === undefined) {
-      return;
-    }
-    if (validate) {
-      return validate(value) === true ? undefined : formatMessage(messages.validationFailedMessage);
-    }
-    return;
-  }, [validate, formatMessage]);
-
   // Handle updating computed fields based on
   var handleOnChange = useCallback(function (type) {
     return function (event) {
       var value = parseInt(event.currentTarget.value);
-      var newInputValue = isNaN(value) ? '' : parseInt(event.currentTarget.value);
+      var newInputValue = isNaN(value) ? '' : value;
+      var newWidth = '';
       switch (type) {
         case 'inputWidth':
           {
+            newWidth = newInputValue;
             setComputedWidth(newInputValue);
-            if (newInputValue) {
-              setComputedHeight(Math.round(ratioWidth * value));
-            } else {
-              setComputedHeight('');
-            }
+            var newHeight = newInputValue !== '' ? Math.round(ratioWidth * newInputValue) : '';
+            setComputedHeight(newHeight);
             break;
           }
         case 'inputHeight':
           {
             setComputedHeight(newInputValue);
-            if (newInputValue) {
-              setComputedWidth(Math.round(ratioHeight * value));
-            } else {
-              setComputedWidth('');
-            }
+            newWidth = newInputValue !== '' ? Math.round(ratioHeight * newInputValue) : '';
+            setComputedWidth(newWidth);
             break;
           }
       }
+      var isInvalidInputValid = newWidth !== '' && (newWidth < minWidth || newWidth > maxWidth);
+      onChange && onChange(isInvalidInputValid);
     };
-  }, [ratioHeight, ratioWidth]);
+  }, [minWidth, maxWidth, onChange, ratioWidth, ratioHeight]);
   if (showMigration) {
     return jsx(Tooltip, {
       content: formatMessage(messages.migrationButtonTooltip)
@@ -130,7 +120,6 @@ export var PixelEntry = function PixelEntry(_ref) {
     }, jsx(Field, {
       key: "inputWidth",
       name: "inputWidth",
-      validate: handleValidateWidth,
       defaultValue: computedWidth
     }, function (_ref3) {
       var fieldProps = _ref3.fieldProps;

package/dist/esm/plugins/media/utils/media-single.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { checkNodeDown } from '../../../utils';
-import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
+import { getMediaSingleInitialWidth, MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH, getMaxWidthForNestedNodeNext } from '@atlaskit/editor-common/media-single';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { mapSlice } from '../../../utils/slice';
@@ -91,7 +91,7 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
 
   // add undefined as fallback as we don't want media single width to have upper limit as 0
   // if widthPluginState.width is 0, default 760 will be used
-  var contentWidth = (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
+  var contentWidth = getMaxWidthForNestedNodeNext(view, state.selection.$from.pos, true) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
   var node = createMediaSingleNode(state.schema, collection, contentWidth, mediaState.status !== 'error' && isVideo(mediaState.fileMimeType) ? MEDIA_SINGLE_VIDEO_MIN_PIXEL_WIDTH : MEDIA_SINGLE_DEFAULT_MIN_PIXEL_WIDTH, alignLeftOnInsert)(mediaState);
   var fileExtension;
   if (mediaState.fileName) {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.32.1";
+export var version = "187.32.2";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/plugins/media/ui/PixelEntry/index.d.ts

@@ -3,7 +3,7 @@
 import { jsx } from '@emotion/react';
 import type { IntlShape } from 'react-intl-next';
 import type { PixelEntryProps } from './types';
-export declare const PixelEntry: ({ width, mediaWidth, mediaHeight, onSubmit, validate, minWidth, maxWidth, intl: { formatMessage }, showMigration, onMigrate, }: PixelEntryProps) => jsx.JSX.Element;
+export declare const PixelEntry: ({ width, mediaWidth, mediaHeight, onSubmit, minWidth, maxWidth, onChange, intl: { formatMessage }, showMigration, onMigrate, }: PixelEntryProps) => jsx.JSX.Element;
 export declare const FullWidthDisplay: React.FC<{
     intl: IntlShape;
 }>;

package/dist/types/plugins/media/ui/PixelEntry/types.d.ts

@@ -24,6 +24,11 @@ export type PixelEntryProps = {
      * The maximum acceptable width input
      */
     maxWidth: number;
+    /**
+     *
+     * Handler for valid input
+     */
+    onChange?: (valid: boolean) => void;
     /**
      * show migration button to convert to pixels for legacy image resize experience
      */
@@ -43,8 +48,8 @@ export type PixelEntryProps = {
     onMigrate?: () => void;
 };
 export type PixelEntryFormValues = {
-    inputWidth: number;
-    inputHeight: number;
+    inputWidth: number | '';
+    inputHeight: number | '';
 };
 export type PixelEntryFormData = {
     width: number;

package/dist/types-ts4.5/plugins/media/ui/PixelEntry/index.d.ts

@@ -3,7 +3,7 @@
 import { jsx } from '@emotion/react';
 import type { IntlShape } from 'react-intl-next';
 import type { PixelEntryProps } from './types';
-export declare const PixelEntry: ({ width, mediaWidth, mediaHeight, onSubmit, validate, minWidth, maxWidth, intl: { formatMessage }, showMigration, onMigrate, }: PixelEntryProps) => jsx.JSX.Element;
+export declare const PixelEntry: ({ width, mediaWidth, mediaHeight, onSubmit, minWidth, maxWidth, onChange, intl: { formatMessage }, showMigration, onMigrate, }: PixelEntryProps) => jsx.JSX.Element;
 export declare const FullWidthDisplay: React.FC<{
     intl: IntlShape;
 }>;

package/dist/types-ts4.5/plugins/media/ui/PixelEntry/types.d.ts

@@ -24,6 +24,11 @@ export type PixelEntryProps = {
      * The maximum acceptable width input
      */
     maxWidth: number;
+    /**
+     *
+     * Handler for valid input
+     */
+    onChange?: (valid: boolean) => void;
     /**
      * show migration button to convert to pixels for legacy image resize experience
      */
@@ -43,8 +48,8 @@ export type PixelEntryProps = {
     onMigrate?: () => void;
 };
 export type PixelEntryFormValues = {
-    inputWidth: number;
-    inputHeight: number;
+    inputWidth: number | '';
+    inputHeight: number | '';
 };
 export type PixelEntryFormData = {
     width: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.32.1",
+  "version": "187.32.2",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"