decap-cms-widget-markdown 3.7.0 → 3.8.0

package/dist/esm/MarkdownControl/index.js

@@ -39,13 +39,24 @@ export default class MarkdownControl extends React.Component {
     const preferredMode = localStorage.getItem(MODE_STORAGE_KEY) ?? 'rich_text';
     _getEditorComponents = props.getEditorComponents;
     this.state = {
-      mode: this.getAllowedModes().indexOf(preferredMode) !== -1 ? preferredMode : this.getAllowedModes()[0],
+      mode:
+      // When used inside a container/shortcode editor component, default to
+      // raw mode — the widget type already implies the editing surface.
+      props.isEditorComponent ? 'raw' : this.getAllowedModes().indexOf(preferredMode) !== -1 ? preferredMode : this.getAllowedModes()[0],
       pendingFocus: false
     };
   }
   componentDidMount() {
     // Manually validate PropTypes - React 19 breaking change
     PropTypes.checkPropTypes(MarkdownControl.propTypes, this.props, 'prop', 'MarkdownControl');
+
+    // Ensure containerised widgets start in the correct mode even if the
+    // constructor ran before the prop was available (e.g. HMR / late prop).
+    if (this.props.isEditorComponent && this.state.mode !== 'raw') {
+      this.setState({
+        mode: 'raw'
+      });
+    }
   }
   handleMode = mode => {
     this.setState({
@@ -84,7 +95,8 @@ export default class MarkdownControl extends React.Component {
       mode,
       pendingFocus
     } = this.state;
-    const isShowModeToggle = this.getAllowedModes().length > 1;
+    const isEditorComponent = this.props.isEditorComponent;
+    const isShowModeToggle = this.getAllowedModes().length > 1 && !isEditorComponent;
     const visualEditor = ___EmotionJSX("div", {
       className: "cms-editor-visual",
       ref: this.processRef

package/dist/esm/MarkdownControl/plugins/html/withHtml.js

@@ -82,7 +82,7 @@ const INLINE_STYLES = {
 };
 function deserialize(el) {
   if (el.nodeType === 3) {
-    return el.textContent;
+    return el.textContent.replace(/(\r)?\n/g, '');
   } else if (el.nodeType !== 1) {
     return null;
   } else if (el.nodeName === 'BR') {

package/dist/esm/MarkdownControl/plugins/shortcodes/insertShortcode.js

@@ -1,7 +1,7 @@
 import { Transforms } from 'slate';
 import isCursorInEmptyParagraph from './locations/isCursorInEmptyParagraph';
 function insertShortcode(editor, pluginConfig) {
-  const defaultValues = pluginConfig.fields.toMap().mapKeys((_, field) => field.get('name')).filter(field => field.has('default')).map(field => field.get('default'));
+  const defaultValues = pluginConfig.fields.toMap().mapKeys((_, field) => field.get('name')).map(field => field.get('default', ''));
   const nodeData = {
     type: 'shortcode',
     id: pluginConfig.id,