Merge pull request #96 from perimetre/9.2.4

9.2.4

CHANGELOG.md

@@ -25,6 +25,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [9.2.4] 2023-01-04
+
+### Fixed
+
+- Fixed a bug that would cause `WYSIWYGInput` component to incorrectly render nested ordered/unordered lists
+- Tweaked default list style classes from `draft-js` to conform with list styles from class `pui-prose`
+
 ## [9.2.3] 2022-12-15
 
 ### Fixed

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@perimetre/ui",
   "description": "A component library made by @perimetre",
-  "version": "9.2.3",
+  "version": "9.2.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/perimetre/ui.git"

src/components/WYSIWYGInput/draft.css

@@ -1,5 +1,5 @@
 /*
-  This the `draft-js/dist/Draft.css` file With the list part commented out.
+  This the `draft-js/dist/Draft.css` file, but with the lists part tweaked to conform with our "prose" classes for lists.
   Because it's too opinionated and conflicts with tailwind's "prose".
   Ref: https://github.com/facebook/draft-js/blob/master/src/component/utils/DraftStyleDefault.css, https://draftjs.org/docs/advanced-topics-issues-and-pitfalls/#missing-draftcss
 */
@@ -98,7 +98,7 @@
   text-align: right;
 }
 
-/* .public-DraftStyleDefault-listLTR {
+.public-DraftStyleDefault-listLTR {
   direction: ltr;
 }
 
@@ -108,7 +108,7 @@
 
 .public-DraftStyleDefault-ol, .public-DraftStyleDefault-ul {
   margin: 16px 0;
-  padding: 0;
+  padding: 0 !important;
 }
 
 .public-DraftStyleDefault-depth0 {
@@ -183,38 +183,45 @@
     position: absolute;
     text-align: right;
     width: 30px;
+    font-weight: initial;
   }
 
   &.public-DraftStyleDefault-listRTL:before {
     position: absolute;
     right: -36px;
     text-align: left;
     width: 30px;
+    font-weight: initial;
   }
 
   &:before {
     content: counter(ol0) ". ";
     counter-increment: ol0;
+    font-weight: initial;
   }
 
   &.public-DraftStyleDefault-depth1:before {
-    content: counter(ol1, lower-alpha) ". ";
+    content: counter(ol1, initial) ". ";
     counter-increment: ol1;
+    font-weight: initial;
   }
 
   &.public-DraftStyleDefault-depth2:before {
-    content: counter(ol2, lower-roman) ". ";
+    content: counter(ol2, initial) ". ";
     counter-increment: ol2;
+    font-weight: initial;
   }
 
   &.public-DraftStyleDefault-depth3:before {
     content: counter(ol3) ". ";
     counter-increment: ol3;
+    font-weight: initial;
   }
 
   &.public-DraftStyleDefault-depth4:before {
-    content: counter(ol4, lower-alpha) ". ";
+    content: counter(ol4, initial) ". ";
     counter-increment: ol4;
+    font-weight: initial;
   }
 }
 
@@ -237,4 +244,4 @@
 .public-DraftStyleDefault-depth4.public-DraftStyleDefault-reset {
   counter-reset: ol4;
 }
- */
+