From be0f252351e5938b903d3647f8638247857c2e0f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 23 Aug 2021 15:31:42 -0500 Subject: [PATCH] Mastodon: conditionally display Markdown, emojiReact column settings, sidebar features, and account aliases --- .../compose/components/text_icon_button.js | 7 ++- .../containers/markdown_button_container.js | 19 +++++--- .../components/column_settings.js | 7 +-- .../notifications/components/filter_bar.js | 7 +-- .../containers/column_settings_container.js | 15 +++++-- .../containers/filter_bar_container.js | 5 +++ .../features/ui/components/features_panel.js | 43 +++++++++++++++---- .../features/ui/components/link_footer.js | 6 ++- app/soapbox/utils/accounts.js | 9 ++++ app/soapbox/utils/features.js | 4 ++ 10 files changed, 94 insertions(+), 28 deletions(-) diff --git a/app/soapbox/features/compose/components/text_icon_button.js b/app/soapbox/features/compose/components/text_icon_button.js index a952ed082..8ac334fd6 100644 --- a/app/soapbox/features/compose/components/text_icon_button.js +++ b/app/soapbox/features/compose/components/text_icon_button.js @@ -9,6 +9,7 @@ export default class TextIconButton extends React.PureComponent { active: PropTypes.bool, onClick: PropTypes.func.isRequired, ariaControls: PropTypes.string, + unavailable: PropTypes.bool, }; handleClick = (e) => { @@ -17,7 +18,11 @@ export default class TextIconButton extends React.PureComponent { } render() { - const { label, title, active, ariaControls } = this.props; + const { label, title, active, ariaControls, unavailable } = this.props; + + if (unavailable) { + return null; + } return ( - + }