fix: Fix renderPreview props issue.

uiwjs · Aug 31, 2022 · 58275e8 · 58275e8
1 parent c36b4e3
commit 58275e8
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -224,12 +224,12 @@ export interface IMarkdownEditor extends ReactCodeMirrorProps {
   visibleEditor?: boolean;
   /** Option to hide the tool bar. */
   hideToolbar?: boolean;
+  /** Override the default preview component */
+  renderPreview?: (props: MarkdownPreviewProps, initVisible: boolean) => React.ReactNode;
   /** Tool display settings. */
   toolbars?: IToolBarProps['toolbars'];
   /** Tool display settings. */
   toolbarsMode?: IToolBarProps['toolbars'];
-  /** Override the default preview component */
-  renderPreview?: (props: MarkdownPreviewProps, visible: boolean) => React.ReactNode;
   /** [@uiw/react-markdown-preview](https://github.com/uiwjs/react-markdown-preview#options-props) options */
   previewProps?: MarkdownPreviewProps;
 }
@@ -240,8 +240,8 @@ import React from 'react';
 import { ReactCodeMirrorRef } from '@uiw/react-codemirror';
 import { MarkdownPreviewProps, MarkdownPreviewRef } from '@uiw/react-markdown-preview';
 export interface ToolBarProps {
-  editor?: ReactCodeMirrorRef;
-  preview: React.RefObject<MarkdownPreviewRef>;
+  editor: React.RefObject<ReactCodeMirrorRef>;
+  preview: React.RefObject<HTMLDivElement>;
   container: React.RefObject<HTMLDivElement>;
   containerEditor: React.RefObject<HTMLDivElement>;
   editorProps: IMarkdownEditor;

diff --git a/src/commands/preview.tsx b/src/commands/preview.tsx
@@ -4,35 +4,34 @@ import { IMarkdownEditor, ToolBarProps } from '../';
 
 const Preview: React.FC<{ command: ICommand; editorProps: IMarkdownEditor & ToolBarProps }> = (props) => {
   const { editorProps } = props;
-  const { preview, containerEditor } = editorProps;
+  const { containerEditor, preview } = editorProps;
   const [visible, setVisible] = useState(props.editorProps.visible);
   useEffect(() => setVisible(props.editorProps.visible), [props.editorProps.visible]);
   useEffect(() => {
-    if (editorProps && editorProps.preview.current) {
-      const preview = editorProps.preview.current.mdp.current;
+    if (preview.current) {
+      const $preview = preview.current;
       if (preview) {
-        preview.style.borderBottomRightRadius = '3px';
+        $preview.style.borderBottomRightRadius = '3px';
       }
-
-      if (preview && visible) {
-        preview.style.width = '50%';
-        preview.style.overflow = 'auto';
-        preview.style.borderLeft = '1px solid var(--color-border-muted)';
-        preview.style.padding = '20px';
+      if ($preview && visible) {
+        $preview.style.width = '50%';
+        $preview.style.overflow = 'auto';
+        $preview.style.borderLeft = '1px solid var(--color-border-muted)';
+        $preview.style.padding = '20px';
         if (containerEditor.current) {
           containerEditor.current.style.width = '50%';
         }
-      } else if (preview) {
-        preview.style.width = '0%';
-        preview.style.overflow = 'hidden';
-        preview.style.borderLeft = '0px';
-        preview.style.padding = '0';
+      } else if ($preview) {
+        $preview.style.width = '0%';
+        $preview.style.overflow = 'hidden';
+        $preview.style.borderLeft = '0px';
+        $preview.style.padding = '0';
         if (containerEditor.current) {
           containerEditor.current.style.width = '100%';
         }
       }
     }
-  }, [preview, editorProps, visible, containerEditor]);
+  }, [visible, containerEditor, preview]);
 
   return (
     <button onClick={() => setVisible(!visible)} type="button" className={visible ? 'active' : ''}>

diff --git a/src/index.less b/src/index.less
@@ -47,6 +47,7 @@
     top: 0;
     bottom: 0;
     box-sizing: border-box;
+    background-color: var(--color-canvas-default);
   }
   h1,
   h2,

diff --git a/src/index.tsx b/src/index.tsx
@@ -1,15 +1,16 @@
 import React, { useState, useRef, useImperativeHandle } from 'react';
 import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
 import { languages } from '@codemirror/language-data';
-import { EditorView } from '@codemirror/view';
+import { EditorView, ViewUpdate } from '@codemirror/view';
 import CodeMirror, { ReactCodeMirrorProps, ReactCodeMirrorRef } from '@uiw/react-codemirror';
-import MarkdownPreview, { MarkdownPreviewProps, MarkdownPreviewRef } from '@uiw/react-markdown-preview';
+import MarkdownPreview, { MarkdownPreviewProps } from '@uiw/react-markdown-preview';
 import ToolBar, { IToolBarProps } from './components/ToolBar';
 import { getCommands, getModeCommands } from './commands';
 import { defaultTheme } from './theme';
 import './index.less';
 
 export * from './commands';
+export * from '@uiw/react-markdown-preview';
 
 export const scrollerStyle = EditorView.theme({
   '&.cm-editor, & .cm-scroller': {
@@ -29,7 +30,7 @@ export interface IMarkdownEditor extends ReactCodeMirrorProps {
   /** Option to hide the tool bar. */
   hideToolbar?: boolean;
   /** Override the default preview component */
-  renderPreview?: (props: MarkdownPreviewProps, visible: boolean) => React.ReactNode;
+  renderPreview?: (props: MarkdownPreviewProps, initVisible: boolean) => React.ReactNode;
   /** Tool display settings. */
   toolbars?: IToolBarProps['toolbars'];
   /** Tool display settings. */
@@ -40,15 +41,15 @@ export interface IMarkdownEditor extends ReactCodeMirrorProps {
 
 export interface ToolBarProps {
   editor: React.RefObject<ReactCodeMirrorRef>;
-  preview: React.RefObject<MarkdownPreviewRef>;
+  preview: React.RefObject<HTMLDivElement>;
   container: React.RefObject<HTMLDivElement>;
   containerEditor: React.RefObject<HTMLDivElement>;
   editorProps: IMarkdownEditor;
 }
 
 export interface MarkdownEditorRef {
   editor: React.RefObject<ReactCodeMirrorRef>;
-  preview?: React.RefObject<MarkdownPreviewRef> | null;
+  preview: React.RefObject<HTMLDivElement> | null;
 }
 
 export default React.forwardRef<MarkdownEditorRef, IMarkdownEditor>(MarkdownEditor);
@@ -73,22 +74,22 @@ function MarkdownEditor(
   } = props;
   const [value, setValue] = useState(props.value || '');
   const codeMirror = useRef<ReactCodeMirrorRef>(null);
-  const previewContainer = useRef<MarkdownPreviewRef>(null);
   const container = useRef<HTMLDivElement>(null);
   const containerEditor = useRef<HTMLDivElement>(null);
+  const preview = useRef<HTMLDivElement>(null);
 
   useImperativeHandle(
     ref,
     () => ({
       editor: codeMirror,
-      preview: previewContainer,
+      preview: preview,
     }),
-    [codeMirror, previewContainer],
+    [codeMirror],
   );
 
   const toolBarProps: ToolBarProps = {
+    preview: preview,
     editor: codeMirror,
-    preview: previewContainer,
     container: container,
     containerEditor: containerEditor,
     editorProps: props,
@@ -99,10 +100,15 @@ function MarkdownEditor(
     scrollerStyle,
     ...extensions,
   ];
-  previewProps['className'] = `${prefixCls}-preview`;
+  const clsPreview = `${prefixCls}-preview`;
+  const cls = [prefixCls, 'wmde-markdown-var', className].filter(Boolean).join(' ');
   previewProps['source'] = value;
+  const handleChange = (value: string, viewUpdate: ViewUpdate) => {
+    setValue(value);
+    onChange && onChange(value, viewUpdate);
+  };
   return (
-    <div className={`${prefixCls || ''} wmde-markdown-var ${className || ''}`} ref={container}>
+    <div className={cls} ref={container}>
       {hideToolbar && (
         <div>
           <ToolBar {...toolBarProps} toolbars={toolbarsMode} mode />
@@ -118,18 +124,17 @@ function MarkdownEditor(
               extensions={extensionsData}
               height={height}
               ref={codeMirror}
-              onChange={(value, viewUpdate) => {
-                setValue(value);
-                onChange && onChange(value, viewUpdate);
-              }}
+              onChange={handleChange}
             />
           )}
         </div>
-        {renderPreview ? (
-          renderPreview(previewProps, !!visible)
-        ) : (
-          <MarkdownPreview {...previewProps} data-visible={!!visible} ref={previewContainer} />
-        )}
+        <div className={clsPreview} ref={preview}>
+          {renderPreview ? (
+            renderPreview(previewProps, !!visible)
+          ) : (
+            <MarkdownPreview {...previewProps} data-visible={!!visible} />
+          )}
+        </div>
       </div>
     </div>
   );
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ @@
         top: 0;
         bottom: 0;
         box-sizing: border-box;
+        background-color: var(--color-canvas-default);
       }
       h1,
       h2,
@@ Expand Down @@