fix: pssing params to richtext

closes #603
SoftwareBrothers · Sep 23, 2020 · fd6a3b1 · fd6a3b1
1 parent 20cc6a6
commit fd6a3b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
   },
   "homepage": "https://github.com/SoftwareBrothers/admin-bro#readme",
   "dependencies": {
-    "@admin-bro/design-system": "^1.7.0-beta.7",
+    "@admin-bro/design-system": "^1.7.0-beta.8",
     "@babel/core": "^7.10.2",
     "@babel/parser": "^7.10.2",
     "@babel/plugin-transform-runtime": "^7.10.1",

diff --git a/src/frontend/components/property-type/richtext/edit.tsx b/src/frontend/components/property-type/richtext/edit.tsx
@@ -22,10 +22,11 @@ const Edit: FC<EditPropertyProps> = (props) => {
 
   const { custom } = property
 
-  const quill = custom as QuillOptions
+  const quill = custom as QuillOptions || {}
   quill.theme = quill.theme || 'snow'
   quill.modules = {
     toolbar: DefaultQuillToolbarOptions,
+    ...(quill.modules || {}),
   }
 
   return (

diff --git a/src/frontend/components/property-type/richtext/show.tsx b/src/frontend/components/property-type/richtext/show.tsx
@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react'
-import { ValueGroup } from '@admin-bro/design-system'
+import { ValueGroup, Text, Box } from '@admin-bro/design-system'
 
 import { EditPropertyProps } from '../base-property-props'
 
@@ -22,7 +22,9 @@ export default class Show extends React.PureComponent<EditPropertyProps> {
 
     return (
       <ValueGroup label={property.label}>
-        <div className="rich-text-value content" ref={this.contentRef} />
+        <Box variant="grey" border="default">
+          <Text ref={this.contentRef} />
+        </Box>
       </ValueGroup>
     )
   }

diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@admin-bro/design-system@^1.7.0-beta.7":
-  version "1.7.0-beta.7"
-  resolved "https://registry.yarnpkg.com/@admin-bro/design-system/-/design-system-1.7.0-beta.7.tgz#87e15dcafe41030f5501409d805a7f2be308168e"
-  integrity sha512-2TfKu8DEfnzFFMTNR0xLW3UJlQhDkWXlVfstwQOyNFIjzd7urtDPKT2ez0K/AuZ1KEo7Jyw3bCdsqLcf6mwiag==
+"@admin-bro/design-system@^1.7.0-beta.8":
+  version "1.7.0-beta.8"
+  resolved "https://registry.yarnpkg.com/@admin-bro/design-system/-/design-system-1.7.0-beta.8.tgz#1834e02b5f3314c16be61518ff783f6c5c9c22d2"
+  integrity sha512-hByMBplQNfOjEbmo1lHX/wK8VGBwp4eXeM0tUUGnd73alSsAVOXkwZ2hhygeCbTj6NEpekny6ls51BQJmAXl0g==
   dependencies:
     "@carbon/icons-react" "^10.14.0"
     jw-paginate "^1.0.4"