Skip to content
Snippets Groups Projects
Commit dfd422cf authored by chris's avatar chris
Browse files

fix rerender

parent 69c111ad
No related branches found
No related tags found
1 merge request!190Find and replace
...@@ -11,7 +11,7 @@ const FindAndReplaceComponent = ({ close }) => { ...@@ -11,7 +11,7 @@ const FindAndReplaceComponent = ({ close }) => {
const [isExpanded, setExpanded] = useState(false); const [isExpanded, setExpanded] = useState(false);
const expand = () => { const expand = () => {
setExpanded(!isExpanded); setExpanded(true);
}; };
return isExpanded ? ( return isExpanded ? (
......
...@@ -82,7 +82,7 @@ const FindAndReplaceTool = ({ view = {}, item }) => { ...@@ -82,7 +82,7 @@ const FindAndReplaceTool = ({ view = {}, item }) => {
)} )}
</Wrapper> </Wrapper>
), ),
[isOpen, styles], [isOpen, style],
); );
return MemorizedDropdown; return MemorizedDropdown;
......
...@@ -58,7 +58,7 @@ export default props => { ...@@ -58,7 +58,7 @@ export default props => {
if (autoFocus) if (autoFocus)
setTimeout(() => { setTimeout(() => {
view.focus(); view.focus();
}); }, 1000);
return () => view.destroy(); return () => view.destroy();
} }
......
...@@ -2,6 +2,7 @@ import React, { useMemo } from 'react'; ...@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
import { injectable } from 'inversify'; import { injectable } from 'inversify';
import { ToolGroupComponent, ToolGroups } from 'wax-prosemirror-components'; import { ToolGroupComponent, ToolGroups } from 'wax-prosemirror-components';
import { v4 as uuidv4 } from 'uuid'; import { v4 as uuidv4 } from 'uuid';
import { isEmpty } from 'lodash';
export default export default
@injectable() @injectable()
...@@ -57,6 +58,8 @@ class ToolGroup { ...@@ -57,6 +58,8 @@ class ToolGroup {
} }
renderTools(view) { renderTools(view) {
if (isEmpty(view)) return null;
const { name } = this.constructor; const { name } = this.constructor;
if (this._toolGroups > 0) { if (this._toolGroups > 0) {
return <ToolGroups toolGroups={this._toolGroups} view={view} />; return <ToolGroups toolGroups={this._toolGroups} view={view} />;
...@@ -72,7 +75,7 @@ class ToolGroup { ...@@ -72,7 +75,7 @@ class ToolGroup {
name={name} name={name}
/> />
), ),
[view], [],
); );
return MemorizedToolGroupComponent; return MemorizedToolGroupComponent;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment