diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js index ec6c74c089ad34b0034334377cd0a613e45ed000..ef0b5d065c6c369262a36216f679f5432337109b 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js +++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js @@ -11,7 +11,7 @@ const FindAndReplaceComponent = ({ close }) => { const [isExpanded, setExpanded] = useState(false); const expand = () => { - setExpanded(!isExpanded); + setExpanded(true); }; return isExpanded ? ( diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js index 5e4724e45797d5114d54c89dd37e9f29b03084e3..0f721a2c72eede7a8c071fc3f9f72bcb01207eec 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js +++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceTool.js @@ -82,7 +82,7 @@ const FindAndReplaceTool = ({ view = {}, item }) => { )} </Wrapper> ), - [isOpen, styles], + [isOpen, style], ); return MemorizedDropdown; diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js index d8722a6a8465608a1b918398f3f31f71c611e95d..43147ae4e154e5329697da9b3cc76fe9b17ca413 100644 --- a/wax-prosemirror-core/src/WaxView.js +++ b/wax-prosemirror-core/src/WaxView.js @@ -58,7 +58,7 @@ export default props => { if (autoFocus) setTimeout(() => { view.focus(); - }); + }, 1000); return () => view.destroy(); } diff --git a/wax-prosemirror-services/src/lib/ToolGroup.js b/wax-prosemirror-services/src/lib/ToolGroup.js index efe1c529b940c81b97e3a2768e27aa53302ea0e2..3ab8f96c57c804aef8b4131a1b2ba2935bf964bf 100644 --- a/wax-prosemirror-services/src/lib/ToolGroup.js +++ b/wax-prosemirror-services/src/lib/ToolGroup.js @@ -2,6 +2,7 @@ import React, { useMemo } from 'react'; import { injectable } from 'inversify'; import { ToolGroupComponent, ToolGroups } from 'wax-prosemirror-components'; import { v4 as uuidv4 } from 'uuid'; +import { isEmpty } from 'lodash'; export default @injectable() @@ -57,6 +58,8 @@ class ToolGroup { } renderTools(view) { + if (isEmpty(view)) return null; + const { name } = this.constructor; if (this._toolGroups > 0) { return <ToolGroups toolGroups={this._toolGroups} view={view} />; @@ -72,7 +75,7 @@ class ToolGroup { name={name} /> ), - [view], + [], ); return MemorizedToolGroupComponent;