diff options
| author | bobzel <zzzman@gmail.com> | 2021-09-02 12:14:20 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2021-09-02 12:14:20 -0400 |
| commit | 5c6946fd211f6b0ee5d860ade968f4353344974d (patch) | |
| tree | 420859fc5935369b05e527989e2432abd9ee97fd | |
| parent | 4d058ec6e2aaa20f240de5d65680e396f035f36e (diff) | |
fixed autoHeight for formattedText to work better with stacking and contentfitting views.
| -rw-r--r-- | src/client/views/PropertiesButtons.tsx | 4 | ||||
| -rw-r--r-- | src/client/views/nodes/formattedText/FormattedTextBox.tsx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx index 0bcdbac19..9fe2122e6 100644 --- a/src/client/views/PropertiesButtons.tsx +++ b/src/client/views/PropertiesButtons.tsx @@ -218,8 +218,8 @@ export class PropertiesButtons extends React.Component<{}, {}> { {toggle(this.autoHeightButton, { display: !isText && !isStacking && !isTree ? "none" : "" })} {toggle(this.maskButton, { display: !isInk ? "none" : "" })} {toggle(this.chromeButton, { display: !isCollection || isNovice ? "none" : "" })} - {toggle(this.gridButton, { display: isCollection ? "" : "none" })} - {toggle(this.snapButton, { display: isCollection ? "" : "none" })} + {toggle(this.gridButton, { display: !isCollection ? "none" : "" })} + {toggle(this.snapButton, { display: !isCollection ? "none" : "" })} {toggle(this.clustersButton, { display: !isFreeForm ? "none" : "" })} {toggle(this.panButton, { display: !isFreeForm ? "none" : "" })} {toggle(this.perspectiveButton, { display: !isCollection || isNovice ? "none" : "" })} diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx index 468edf6cc..59d43f8d7 100644 --- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx +++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx @@ -905,7 +905,7 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<(FieldViewProp }, { fireImmediately: true } ); quickScroll = undefined; - this.tryUpdateScrollHeight(); + setTimeout(this.tryUpdateScrollHeight, 10); } pushToGoogleDoc = async () => { @@ -1492,8 +1492,8 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<(FieldViewProp backgroundColor: backgroundColor, color: color }} > - <FontAwesomeIcon icon={"comment-alt"}/> - </div>; + <FontAwesomeIcon icon={"comment-alt"} /> + </div>; } @computed get sidebarCollection() { const renderComponent = (tag: string) => { |