mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Create Parent Item: Only call ReactDOM.createRoot() once (#4472)

Browse source 
Also applied to Zotero.AnnotationBox
This commit is contained in:
Abe Jellinek 2024-08-01 00:44:34 -04:00 committed by GitHub
parent 255de649ca
commit 41fe1e4aea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/components/annotation.jsx
View file

@ -64,11 +64,6 @@ function AnnotationBox({ data }) {
Zotero.AnnotationBox = memo(AnnotationBox);
Zotero.AnnotationBox.render = (domEl, props) => {
Zotero.AnnotationBox.root = ReactDOM.createRoot(domEl);
Zotero.AnnotationBox.root.render(<AnnotationBox { ...props } />);
};
Zotero.AnnotationBox.destroy = () => {
Zotero.AnnotationBox.root.unmount();
Zotero.AnnotationBox.render = (root, props) => {
root.render(<AnnotationBox { ...props } />);
};

11
chrome/content/zotero/components/createParent/createParent.jsx
View file

@ -26,7 +26,6 @@
'use strict';
import React, { memo, useEffect } from 'react';
import ReactDOM from "react-dom";
import PropTypes from 'prop-types';
import cx from 'classnames';
@ -81,12 +80,6 @@ CreateParent.propTypes = {
Zotero.CreateParent = memo(CreateParent);
Zotero.CreateParent.destroy = () => {
Zotero.CreateParent.root.unmount();
};
Zotero.CreateParent.render = (domEl, props) => {
Zotero.CreateParent.root = ReactDOM.createRoot(domEl);
Zotero.CreateParent.root.render(<CreateParent { ...props } />);
Zotero.CreateParent.render = (root, props) => {
root.render(<CreateParent { ...props } />);
};

10
chrome/content/zotero/createParentDialog.js
View file

@ -25,8 +25,11 @@
"use strict";
import ReactDOM from "react-dom";
var io;
let createParent;
let root;
function toggleAccept(enabled) {
document.querySelector('dialog').getButton("accept").disabled = !enabled;
@ -40,7 +43,8 @@ function doLoad() {
io = window.arguments[0];
createParent = document.getElementById('create-parent');
Zotero.CreateParent.render(createParent, {
root = ReactDOM.createRoot(createParent);
Zotero.CreateParent.render(root, {
loading: false,
item: io.dataIn.item,
toggleAccept
@ -54,7 +58,7 @@ function doLoad() {
}
function doUnload() {
Zotero.CreateParent.destroy(createParent);
root.unmount();
}
async function doAccept() {
@ -65,7 +69,7 @@ async function doAccept() {
childItem,
(on) => {
// Render react again with correct loading value
Zotero.CreateParent.render(createParent, {
Zotero.CreateParent.render(root, {
loading: on,
item: childItem,
toggleAccept

11
chrome/content/zotero/elements/mergeGroup.js
View file

@ -23,6 +23,8 @@
***** END LICENSE BLOCK *****
*/
import ReactDOM from "react-dom";
{
class MergeGroup extends XULElement {
constructor() {
@ -292,6 +294,12 @@
}
}
disconnectedCallback() {
if (this._objboxRoot) {
this._objboxRoot.unmount();
}
}
get type() {
return this.parent.type;
}
@ -448,7 +456,8 @@
if (item.isAnnotation()) {
Zotero.Annotations.toJSON(item)
.then((data) => {
Zotero.AnnotationBox.render(objbox, { data });
this._objboxRoot = ReactDOM.createRoot(objbox);
Zotero.AnnotationBox.render(this._objboxRoot, { data });
});
}
else {