fix: crash on bullet list de-selection

payloadcms · Jul 6, 2021 · 5388513 · 5388513
1 parent 0075912
commit 5388513
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/demo/client/components/richText/elements/Button/Button/index.scss b/demo/client/components/richText/elements/Button/Button/index.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../../scss';
+@import '../../../../../../../src/admin/scss/styles.scss';
 
 .button-rich-text-button {
   .btn {

diff --git a/demo/client/components/richText/elements/Button/Element/index.scss b/demo/client/components/richText/elements/Button/Element/index.scss
@@ -1,4 +1,4 @@
-@import '../../../../../../../scss';
+@import '../../../../../../../src/admin/scss/styles.scss';
 
 .rich-text-button {
   margin: $baseline 0;

diff --git a/src/admin/components/forms/field-types/RichText/RichText.tsx b/src/admin/components/forms/field-types/RichText/RichText.tsx
@@ -164,7 +164,9 @@ const RichText: React.FC<Props> = (props) => {
       // do nothing
     }
   }
+
   if (!valueToRender) valueToRender = defaultValue;
+
   return (
     <div
       className={classes}

diff --git a/src/admin/components/forms/field-types/RichText/elements/toggle.tsx b/src/admin/components/forms/field-types/RichText/elements/toggle.tsx
@@ -7,11 +7,6 @@ const toggleElement = (editor, format) => {
   const isActive = isElementActive(editor, format);
   const isList = listTypes.includes(format);
 
-  Transforms.unwrapNodes(editor, {
-    match: (n) => listTypes.includes(n.type as string),
-    split: true,
-  });
-
   let type = format;
 
   if (isActive) {
@@ -24,6 +19,11 @@ const toggleElement = (editor, format) => {
     Transforms.select(editor, editor.blurSelection);
   }
 
+  Transforms.unwrapNodes(editor, {
+    match: (n) => listTypes.includes(n.type as string),
+    split: true,
+  });
+
   Transforms.setNodes(editor, { type });
 
   if (!isActive && isList) {

diff --git a/src/admin/components/forms/field-types/RichText/leaves/isActive.tsx b/src/admin/components/forms/field-types/RichText/leaves/isActive.tsx
@@ -5,5 +5,4 @@ const isLeafActive = (editor, format) => {
   return leaves ? leaves[format] === true : false;
 };
 
-
 export default isLeafActive;