Merge pull request #9 from kwinyyyc/release/v4.1.4

show the content field name
kwinyyyc · May 14, 2022 · 4917a0c · 4917a0c
2 parents 674335f + b437af9
commit 4917a0c
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 54 deletions.
diff --git a/admin/src/components/ReactMdEditor/index.js b/admin/src/components/ReactMdEditor/index.js
@@ -5,6 +5,10 @@ import MediaLib from "../MediaLib";
 import styled from "styled-components";
 import "@uiw/react-markdown-preview/dist/markdown.css";
 import "@uiw/react-md-editor/dist/markdown-editor.css";
+import { Stack } from "@strapi/design-system/Stack";
+import { Box } from "@strapi/design-system/Box";
+import { Typography } from "@strapi/design-system/Typography";
+import { useIntl } from "react-intl";
 
 const Wrapper = styled.div`
   > div:nth-child(2) {
@@ -48,7 +52,17 @@ const Wrapper = styled.div`
   }
 `;
 
-const Editor = ({ onChange, name, value }) => {
+const Editor = ({
+  name,
+  onChange,
+  value,
+  intlLabel,
+  disabled,
+  error,
+  description,
+  required,
+}) => {
+  const { formatMessage } = useIntl();
   const [mediaLibVisible, setMediaLibVisible] = useState(false);
 
   const handleToggleMediaLib = () => setMediaLibVisible((prev) => !prev);
@@ -70,57 +84,78 @@ const Editor = ({ onChange, name, value }) => {
     handleToggleMediaLib();
   };
   return (
-    <Wrapper>
-      <MDEditor
-        commands={[
-          commands.title,
-          commands.bold,
-          commands.codeBlock,
-          commands.italic,
-          commands.strikethrough,
-          commands.hr,
-          commands.group,
-          commands.divider,
-          commands.link,
-          commands.quote,
-          commands.code,
-          {
-            name: "image",
-            keyCommand: "image",
-            buttonProps: { "aria-label": "Insert title3" },
-            icon: (
-              <svg width="12" height="12" viewBox="0 0 20 20">
-                <path
-                  fill="currentColor"
-                  d="M15 9c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm4-7H1c-.55 0-1 .45-1 1v14c0 .55.45 1 1 1h18c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 13l-6-5-2 2-4-5-4 8V4h16v11z"
-                ></path>
-              </svg>
-            ),
-            execute: (state, api) => {
-              handleToggleMediaLib();
+    <Stack size={1}>
+      <Box>
+        <Typography variant="pi" fontWeight="bold">
+          {formatMessage(intlLabel)}
+        </Typography>
+        {required && (
+          <Typography variant="pi" fontWeight="bold" textColor="danger600">
+            *
+          </Typography>
+        )}
+      </Box>
+      <Wrapper>
+        <MDEditor
+          disabled={disabled}
+          commands={[
+            commands.title,
+            commands.bold,
+            commands.codeBlock,
+            commands.italic,
+            commands.strikethrough,
+            commands.hr,
+            commands.group,
+            commands.divider,
+            commands.link,
+            commands.quote,
+            commands.code,
+            {
+              name: "image",
+              keyCommand: "image",
+              buttonProps: { "aria-label": "Insert title3" },
+              icon: (
+                <svg width="12" height="12" viewBox="0 0 20 20">
+                  <path
+                    fill="currentColor"
+                    d="M15 9c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm4-7H1c-.55 0-1 .45-1 1v14c0 .55.45 1 1 1h18c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm-1 13l-6-5-2 2-4-5-4 8V4h16v11z"
+                  ></path>
+                </svg>
+              ),
+              execute: (state, api) => {
+                handleToggleMediaLib();
+              },
             },
-          },
-          commands.unorderedListCommand,
-          commands.orderedListCommand,
-          commands.checkedListCommand,
-          commands.codeEdit,
-          commands.codeLive,
-          commands.codePreview,
-          commands.fullscreen,
-        ]}
-        value={value || ""}
-        onChange={(newValue) => {
-          onChange({ target: { name, value: newValue || "" } });
-        }}
-      />
-      <div style={{ padding: "50px 0 0 0" }} />
-      <MDEditor.Markdown source={value || ""} />
-      <MediaLib
-        isOpen={mediaLibVisible}
-        onChange={handleChangeAssets}
-        onToggle={handleToggleMediaLib}
-      />
-    </Wrapper>
+            commands.unorderedListCommand,
+            commands.orderedListCommand,
+            commands.checkedListCommand,
+            commands.codeEdit,
+            commands.codeLive,
+            commands.codePreview,
+            commands.fullscreen,
+          ]}
+          value={value || ""}
+          onChange={(newValue) => {
+            onChange({ target: { name, value: newValue || "" } });
+          }}
+        />
+        <div style={{ padding: "50px 0 0 0" }} />
+        <MDEditor.Markdown source={value || ""} />
+        <MediaLib
+          isOpen={mediaLibVisible}
+          onChange={handleChangeAssets}
+          onToggle={handleToggleMediaLib}
+        />
+      </Wrapper>
+      {error && (
+        <Typography variant="pi" textColor="danger600">
+          {formatMessage({ id: error, defaultMessage: error })}
+        </Typography>
+      )}
+      {description && (
+        <Typography variant="pi">{formatMessage(description)}</Typography>
+      )}
+    </Stack>
   );
 };
 

diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "strapi-plugin-wysiwsg-react-md-editor",
-  "version": "4.1.3",
-  "description": "This is a strapi rich text editor plugin using react md editor.",
+  "version": "4.1.4",
+  "description": "Replaces the default Strapi WYSIWYG editor with react md editor.",
   "strapi": {
     "name": "wysiwsg-react-md-editor",
     "icon": "plug",
-    "description": "This is a strapi rich text editor plugin using react md editor.",
+    "displayName": "React MD Editor",
+    "description": "Replaces the default Strapi WYSIWYG editor with react md editor.",
     "required": false,
     "kind": "plugin"
   },