Trevor davis/another inline toolbar positioning fix (draft-js-plugins#2787)

trevor-davis-dover · fxOne · web-flow · commit 0e9c8784d23c · 2022-05-25T09:06:43.000+02:00
* inline toolbar plugin should account for ancestor scrolltop

* change log

* change log link to issue

* update version

* account for scroll offsets of 0 in parent elements of DraftEditor-root

Co-authored-by: fxOne &lt;fxOne@users.noreply.github.com&gt;
diff --git a/packages/inline-toolbar/CHANGELOG.md b/packages/inline-toolbar/CHANGELOG.md
@@ -5,7 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## To be released
 
-#4.1.4
+## 4.1.5
+
+- Account for scroll offsets of 0 in parent elements of DraftEditor-root
+
+## 4.1.4
 
 - Account for scroll offsets in parent elements of DraftEditor-root [#2766](https://github.com/draft-js-plugins/draft-js-plugins/issues/2766)
 
diff --git a/packages/inline-toolbar/package.json b/packages/inline-toolbar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@draft-js-plugins/inline-toolbar",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "sideEffects": [
     "*.css"
   ],
diff --git a/packages/inline-toolbar/src/components/Toolbar/index.tsx b/packages/inline-toolbar/src/components/Toolbar/index.tsx
@@ -115,8 +115,8 @@ export default class Toolbar extends React.Component<ToolbarProps> {
       // Account for scrollTop of all ancestors
       let scrollOffset = 0;
       let ancestorNode = editorRoot.parentNode as HTMLElement;
-      while (ancestorNode !== null && !! ancestorNode.scrollTop) {
-        scrollOffset += ancestorNode.scrollTop;
+      while (ancestorNode !== null) {
+        scrollOffset += ancestorNode.scrollTop ?? 0;
         ancestorNode = ancestorNode.parentNode as HTMLElement;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@draft-js-plugins/inline-toolbar",`
`3`		`- "version": "4.1.4",`
	`3`	`+ "version": "4.1.5",`
`4`	`4`	`"sideEffects": [`
`5`	`5`	`"*.css"`
`6`	`6`	`],`