@atlaskit/editor-core 215.22.0 → 215.23.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-core
 
+## 215.23.0
+
+### Minor Changes
+
+- [`e4f9d3c00a126`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e4f9d3c00a126) -
+  [EDITOR-3919](https://hello.jira.atlassian.cloud/browse/EDITOR-3919) - use the real `getPos`
+  function as `nodeViweFactory` prop in `EditorSSRRenderer`
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 215.22.0
 
 ### Minor Changes

package/dist/cjs/create-editor/ReactEditorView.js

@@ -164,7 +164,7 @@ function ReactEditorView(props) {
         return viewRef.current.state;
       }
     } else {
-      config.current = (0, _createEditor.processPluginsList)((0, _createPluginsList.default)(options.props.preset, props.editorProps, pluginInjectionAPI.current));
+      config.current = (0, _createEditor.processPluginsList)((0, _createPluginsList.default)(options.props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current));
       schema = (0, _createSchema.createSchema)(config.current);
       if (!(0, _expVal.expVal)('platform_editor_no_state_plugin_injection_api', 'isEnabled', false)) {
         setEditorAPI(pluginInjectionAPI.current.api());
@@ -355,7 +355,7 @@ function ReactEditorView(props) {
     // so we blur here to stop ProseMirror from trying to apply selection to detached nodes or
     // nodes that haven't been re-rendered to the document yet.
     blur();
-    var editorPlugins = (0, _createPluginsList.default)(props.preset, props.editorProps, pluginInjectionAPI.current);
+    var editorPlugins = (0, _createPluginsList.default)(props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current);
     config.current = (0, _createEditor.processPluginsList)(editorPlugins);
     var state = viewRef.current.state;
     var plugins = (0, _createEditor.createPMPlugins)({
@@ -770,7 +770,7 @@ function ReactEditorView(props) {
   }, [disabled, shouldFocus, previousDisabledState, __livePage]);
   (0, _useFireFullWidthEvent.useFireFullWidthEvent)(nextAppearance, dispatchAnalyticsEvent);
 
-  // This function uses as prop as `<EditorSSRRender>` so, thay should be memoized,
+  // This function uses as prop as `<EditorSSRRenderer>` so, that should be memoized,
   // to avoid extra rerenders.
   var buildDoc = (0, _react.useCallback)(function (schema) {
     return parseDoc(schema, undefined, {
@@ -785,27 +785,43 @@ function ReactEditorView(props) {
       doc: defaultValue
     });
   }, [defaultValue, parseDoc, props.editorProps.sanitizePrivateContent, props.providerFactory]);
+  var _props$editorProps3 = props.editorProps,
+    assistiveLabel = _props$editorProps3.assistiveLabel,
+    assistiveDescribedBy = _props$editorProps3.assistiveDescribedBy;
+  // We need to check `allowBlockType` in props, because it is now exist in EditorNextProps type.
+  var _ref5 = 'allowBlockType' in props.editorProps ? props.editorProps : {
+      allowBlockType: undefined
+    },
+    allowBlockType = _ref5.allowBlockType;
   var ssrEditor = (0, _react.useMemo)(function () {
     if (!(0, _coreUtils.isSSR)() || !(0, _expValEquals.expValEquals)('platform_editor_ssr_renderer', 'isEnabled', true)) {
       return null;
     }
+    var plugins = (0, _createPluginsList.default)(props.preset,
+    // Don't pass props.editorProps directly, because editoProps in the dependency will lead to
+    // multiple repaints, because props.editorPros is not stable object.
+    {
+      allowBlockType: allowBlockType
+    }, pluginInjectionAPI.current);
+    var schema = (0, _createSchema.createSchema)((0, _createEditor.processPluginsList)(plugins));
+    var doc = buildDoc(schema);
     return /*#__PURE__*/_react.default.createElement(_editorSsrRenderer.EditorSSRRenderer, {
       intl: props.intl,
-      preset: preset,
-      portalProviderAPI: props.portalProviderAPI,
-      pluginInjectionAPI: pluginInjectionAPI.current,
-      buildDoc: buildDoc
+      doc: doc,
+      schema: schema,
+      plugins: plugins,
+      portalProviderAPI: props.portalProviderAPI
       // IMPORTANT: Keep next props in sync with div that renders a real ProseMirror editor.
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: "ProseMirror ".concat((0, _getUAPrefix.getUAPrefix)()),
       key: "ProseMirror",
-      "aria-label": props.editorProps.assistiveLabel || props.intl.formatMessage(_messages.editorMessages.editorAssistiveLabel),
+      "aria-label": assistiveLabel || props.intl.formatMessage(_messages.editorMessages.editorAssistiveLabel),
       id: EDIT_AREA_ID,
-      "aria-describedby": props.editorProps.assistiveDescribedBy,
+      "aria-describedby": assistiveDescribedBy,
       "data-editor-id": editorId.current
     });
-  }, [props.intl, props.portalProviderAPI, props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy, preset, buildDoc]);
+  }, [props.preset, allowBlockType, assistiveLabel, assistiveDescribedBy, props.intl, props.portalProviderAPI, buildDoc]);
   var editor = (0, _react.useMemo)(function () {
     // SSR editor will be available only in SSR environment,
     // in a browser `ssrEditor` will be `null`, and we will render a normal one ProseMirror.

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "0.0.0-development";
+var version = exports.version = "215.22.0";

package/dist/es2019/create-editor/ReactEditorView.js

@@ -137,7 +137,7 @@ export function ReactEditorView(props) {
         return viewRef.current.state;
       }
     } else {
-      config.current = processPluginsList(createPluginsList(options.props.preset, props.editorProps, pluginInjectionAPI.current));
+      config.current = processPluginsList(createPluginsList(options.props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current));
       schema = createSchema(config.current);
       if (!expVal('platform_editor_no_state_plugin_injection_api', 'isEnabled', false)) {
         setEditorAPI(pluginInjectionAPI.current.api());
@@ -329,7 +329,7 @@ export function ReactEditorView(props) {
     // so we blur here to stop ProseMirror from trying to apply selection to detached nodes or
     // nodes that haven't been re-rendered to the document yet.
     blur();
-    const editorPlugins = createPluginsList(props.preset, props.editorProps, pluginInjectionAPI.current);
+    const editorPlugins = createPluginsList(props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current);
     config.current = processPluginsList(editorPlugins);
     const state = viewRef.current.state;
     const plugins = createPMPlugins({
@@ -717,7 +717,7 @@ export function ReactEditorView(props) {
   }, [disabled, shouldFocus, previousDisabledState, __livePage]);
   useFireFullWidthEvent(nextAppearance, dispatchAnalyticsEvent);
 
-  // This function uses as prop as `<EditorSSRRender>` so, thay should be memoized,
+  // This function uses as prop as `<EditorSSRRenderer>` so, that should be memoized,
   // to avoid extra rerenders.
   const buildDoc = useCallback(schema => {
     return parseDoc(schema, undefined, {
@@ -732,27 +732,45 @@ export function ReactEditorView(props) {
       doc: defaultValue
     });
   }, [defaultValue, parseDoc, props.editorProps.sanitizePrivateContent, props.providerFactory]);
+  const {
+    assistiveLabel,
+    assistiveDescribedBy
+  } = props.editorProps;
+  // We need to check `allowBlockType` in props, because it is now exist in EditorNextProps type.
+  const {
+    allowBlockType
+  } = 'allowBlockType' in props.editorProps ? props.editorProps : {
+    allowBlockType: undefined
+  };
   const ssrEditor = useMemo(() => {
     if (!isSSR() || !expValEquals('platform_editor_ssr_renderer', 'isEnabled', true)) {
       return null;
     }
+    const plugins = createPluginsList(props.preset,
+    // Don't pass props.editorProps directly, because editoProps in the dependency will lead to
+    // multiple repaints, because props.editorPros is not stable object.
+    {
+      allowBlockType
+    }, pluginInjectionAPI.current);
+    const schema = createSchema(processPluginsList(plugins));
+    const doc = buildDoc(schema);
     return /*#__PURE__*/React.createElement(EditorSSRRenderer, {
       intl: props.intl,
-      preset: preset,
-      portalProviderAPI: props.portalProviderAPI,
-      pluginInjectionAPI: pluginInjectionAPI.current,
-      buildDoc: buildDoc
+      doc: doc,
+      schema: schema,
+      plugins: plugins,
+      portalProviderAPI: props.portalProviderAPI
       // IMPORTANT: Keep next props in sync with div that renders a real ProseMirror editor.
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: `ProseMirror ${getUAPrefix()}`,
       key: "ProseMirror",
-      "aria-label": props.editorProps.assistiveLabel || props.intl.formatMessage(editorMessages.editorAssistiveLabel),
+      "aria-label": assistiveLabel || props.intl.formatMessage(editorMessages.editorAssistiveLabel),
       id: EDIT_AREA_ID,
-      "aria-describedby": props.editorProps.assistiveDescribedBy,
+      "aria-describedby": assistiveDescribedBy,
       "data-editor-id": editorId.current
     });
-  }, [props.intl, props.portalProviderAPI, props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy, preset, buildDoc]);
+  }, [props.preset, allowBlockType, assistiveLabel, assistiveDescribedBy, props.intl, props.portalProviderAPI, buildDoc]);
   const editor = useMemo(() => {
     // SSR editor will be available only in SSR environment,
     // in a browser `ssrEditor` will be `null`, and we will render a normal one ProseMirror.

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "0.0.0-development";
+export const version = "215.22.0";

package/dist/esm/create-editor/ReactEditorView.js

@@ -155,7 +155,7 @@ export function ReactEditorView(props) {
         return viewRef.current.state;
       }
     } else {
-      config.current = processPluginsList(createPluginsList(options.props.preset, props.editorProps, pluginInjectionAPI.current));
+      config.current = processPluginsList(createPluginsList(options.props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current));
       schema = createSchema(config.current);
       if (!expVal('platform_editor_no_state_plugin_injection_api', 'isEnabled', false)) {
         setEditorAPI(pluginInjectionAPI.current.api());
@@ -346,7 +346,7 @@ export function ReactEditorView(props) {
     // so we blur here to stop ProseMirror from trying to apply selection to detached nodes or
     // nodes that haven't been re-rendered to the document yet.
     blur();
-    var editorPlugins = createPluginsList(props.preset, props.editorProps, pluginInjectionAPI.current);
+    var editorPlugins = createPluginsList(props.preset, 'allowBlockType' in props.editorProps ? props.editorProps : {}, pluginInjectionAPI.current);
     config.current = processPluginsList(editorPlugins);
     var state = viewRef.current.state;
     var plugins = createPMPlugins({
@@ -761,7 +761,7 @@ export function ReactEditorView(props) {
   }, [disabled, shouldFocus, previousDisabledState, __livePage]);
   useFireFullWidthEvent(nextAppearance, dispatchAnalyticsEvent);
 
-  // This function uses as prop as `<EditorSSRRender>` so, thay should be memoized,
+  // This function uses as prop as `<EditorSSRRenderer>` so, that should be memoized,
   // to avoid extra rerenders.
   var buildDoc = useCallback(function (schema) {
     return parseDoc(schema, undefined, {
@@ -776,27 +776,43 @@ export function ReactEditorView(props) {
       doc: defaultValue
     });
   }, [defaultValue, parseDoc, props.editorProps.sanitizePrivateContent, props.providerFactory]);
+  var _props$editorProps3 = props.editorProps,
+    assistiveLabel = _props$editorProps3.assistiveLabel,
+    assistiveDescribedBy = _props$editorProps3.assistiveDescribedBy;
+  // We need to check `allowBlockType` in props, because it is now exist in EditorNextProps type.
+  var _ref5 = 'allowBlockType' in props.editorProps ? props.editorProps : {
+      allowBlockType: undefined
+    },
+    allowBlockType = _ref5.allowBlockType;
   var ssrEditor = useMemo(function () {
     if (!isSSR() || !expValEquals('platform_editor_ssr_renderer', 'isEnabled', true)) {
       return null;
     }
+    var plugins = createPluginsList(props.preset,
+    // Don't pass props.editorProps directly, because editoProps in the dependency will lead to
+    // multiple repaints, because props.editorPros is not stable object.
+    {
+      allowBlockType: allowBlockType
+    }, pluginInjectionAPI.current);
+    var schema = createSchema(processPluginsList(plugins));
+    var doc = buildDoc(schema);
     return /*#__PURE__*/React.createElement(EditorSSRRenderer, {
       intl: props.intl,
-      preset: preset,
-      portalProviderAPI: props.portalProviderAPI,
-      pluginInjectionAPI: pluginInjectionAPI.current,
-      buildDoc: buildDoc
+      doc: doc,
+      schema: schema,
+      plugins: plugins,
+      portalProviderAPI: props.portalProviderAPI
       // IMPORTANT: Keep next props in sync with div that renders a real ProseMirror editor.
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: "ProseMirror ".concat(getUAPrefix()),
       key: "ProseMirror",
-      "aria-label": props.editorProps.assistiveLabel || props.intl.formatMessage(editorMessages.editorAssistiveLabel),
+      "aria-label": assistiveLabel || props.intl.formatMessage(editorMessages.editorAssistiveLabel),
       id: EDIT_AREA_ID,
-      "aria-describedby": props.editorProps.assistiveDescribedBy,
+      "aria-describedby": assistiveDescribedBy,
       "data-editor-id": editorId.current
     });
-  }, [props.intl, props.portalProviderAPI, props.editorProps.assistiveLabel, props.editorProps.assistiveDescribedBy, preset, buildDoc]);
+  }, [props.preset, allowBlockType, assistiveLabel, assistiveDescribedBy, props.intl, props.portalProviderAPI, buildDoc]);
   var editor = useMemo(function () {
     // SSR editor will be available only in SSR environment,
     // in a browser `ssrEditor` will be `null`, and we will render a normal one ProseMirror.

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "0.0.0-development";
+export var version = "215.22.0";

package/dist/types/create-editor/create-plugins-list.d.ts

@@ -13,4 +13,4 @@ export declare function getDefaultPresetOptionsFromEditorProps(props: EditorProp
  * Note: The order that presets are added determines
  * their placement in the editor toolbar.
  */
-export default function createPluginsList(preset: EditorPresetBuilder<any, any>, props: EditorProps, pluginInjectionAPI?: EditorPluginInjectionAPI): EditorPlugin[];
+export default function createPluginsList(preset: EditorPresetBuilder<any, any>, props: Pick<EditorProps, 'allowBlockType'>, pluginInjectionAPI?: EditorPluginInjectionAPI): EditorPlugin[];

package/dist/types-ts4.5/create-editor/create-plugins-list.d.ts

@@ -13,4 +13,4 @@ export declare function getDefaultPresetOptionsFromEditorProps(props: EditorProp
  * Note: The order that presets are added determines
  * their placement in the editor toolbar.
  */
-export default function createPluginsList(preset: EditorPresetBuilder<any, any>, props: EditorProps, pluginInjectionAPI?: EditorPluginInjectionAPI): EditorPlugin[];
+export default function createPluginsList(preset: EditorPresetBuilder<any, any>, props: Pick<EditorProps, 'allowBlockType'>, pluginInjectionAPI?: EditorPluginInjectionAPI): EditorPlugin[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "215.22.0",
+	"version": "215.23.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -53,7 +53,7 @@
 		"@atlaskit/editor-plugins": "^11.1.0",
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
-		"@atlaskit/editor-ssr-renderer": "^1.3.0",
+		"@atlaskit/editor-ssr-renderer": "^1.4.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/emoji": "^69.9.0",