From 9d45b4afe3834305e7c91396f9dcfeec7c5190aa Mon Sep 17 00:00:00 2001 From: Sean Spade Date: Thu, 8 Jun 2023 19:42:39 -0400 Subject: [PATCH 1/4] fix: Adds ability to hide language warning --- src/shared/components/common/language-select.tsx | 3 ++- src/shared/components/community/community-form.tsx | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/components/common/language-select.tsx b/src/shared/components/common/language-select.tsx index 372d372a..a82d6517 100644 --- a/src/shared/components/common/language-select.tsx +++ b/src/shared/components/common/language-select.tsx @@ -16,6 +16,7 @@ interface LanguageSelectProps { showSite?: boolean; iconVersion?: boolean; disabled?: boolean; + hideLanguageWarning?: boolean; } export class LanguageSelect extends Component { @@ -49,7 +50,7 @@ export class LanguageSelect extends Component { this.selectBtn ) : (
- {this.props.multiple && ( + {this.props.multiple && !this.props.hideLanguageWarning && (
{i18n.t("undetermined_language_warning")}
diff --git a/src/shared/components/community/community-form.tsx b/src/shared/components/community/community-form.tsx index 372e66a6..25fd82f3 100644 --- a/src/shared/components/community/community-form.tsx +++ b/src/shared/components/community/community-form.tsx @@ -265,6 +265,7 @@ export class CommunityForm extends Component< showSite selectedLanguageIds={this.state.form.discussion_languages} multiple={true} + hideLanguageWarning={true} onChange={this.handleDiscussionLanguageChange} />
From 23c4b685ed62520629697787ae4877bf7fa8dfc5 Mon Sep 17 00:00:00 2001 From: Sean Spade Date: Thu, 8 Jun 2023 23:29:24 -0400 Subject: [PATCH 2/4] chore: switched to enabling language warning by prop rather than disabling --- src/shared/components/common/language-select.tsx | 4 ++-- src/shared/components/community/community-form.tsx | 1 - src/shared/components/person/settings.tsx | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/components/common/language-select.tsx b/src/shared/components/common/language-select.tsx index a82d6517..fac3216f 100644 --- a/src/shared/components/common/language-select.tsx +++ b/src/shared/components/common/language-select.tsx @@ -16,7 +16,7 @@ interface LanguageSelectProps { showSite?: boolean; iconVersion?: boolean; disabled?: boolean; - hideLanguageWarning?: boolean; + showLanguageWarning?: boolean; } export class LanguageSelect extends Component { @@ -50,7 +50,7 @@ export class LanguageSelect extends Component { this.selectBtn ) : (
- {this.props.multiple && !this.props.hideLanguageWarning && ( + {this.props.multiple && this.props.showLanguageWarning && (
{i18n.t("undetermined_language_warning")}
diff --git a/src/shared/components/community/community-form.tsx b/src/shared/components/community/community-form.tsx index 25fd82f3..372e66a6 100644 --- a/src/shared/components/community/community-form.tsx +++ b/src/shared/components/community/community-form.tsx @@ -265,7 +265,6 @@ export class CommunityForm extends Component< showSite selectedLanguageIds={this.state.form.discussion_languages} multiple={true} - hideLanguageWarning={true} onChange={this.handleDiscussionLanguageChange} />
diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx index a40b9049..40878f37 100644 --- a/src/shared/components/person/settings.tsx +++ b/src/shared/components/person/settings.tsx @@ -604,6 +604,7 @@ export class Settings extends Component { siteLanguages={this.state.siteRes.discussion_languages} selectedLanguageIds={selectedLangs} multiple={true} + showLanguageWarning={true} showSite onChange={this.handleDiscussionLanguageChange} /> From 400f345182caec6038df631a4392762d50b52944 Mon Sep 17 00:00:00 2001 From: Adam Shea Date: Fri, 9 Jun 2023 21:30:12 +0000 Subject: [PATCH 3/4] Added Ctrl-K keybind --- src/shared/components/common/markdown-textarea.tsx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx index eff10d72..efc812bf 100644 --- a/src/shared/components/common/markdown-textarea.tsx +++ b/src/shared/components/common/markdown-textarea.tsx @@ -148,6 +148,7 @@ export class MarkdownTextArea extends Component< value={this.state.content} onInput={linkEvent(this, this.handleContentChange)} onPaste={linkEvent(this, this.handleImageUploadPaste)} + onKeyDown={linkEvent(this, this.handleKeyBinds)} required disabled={this.isDisabled} rows={2} @@ -429,6 +430,18 @@ export class MarkdownTextArea extends Component< i.contentChange(); } + // Keybind handler + handleKeyBinds(i: MarkdownTextArea, event: KeyboardEvent) { + if (event.ctrlKey) { + switch (event.key) { + case "k": { + // Currently only one case but will support further keybinds + i.handleInsertLink(i, event); + } + } + } + } + handlePreviewToggle(i: MarkdownTextArea, event: any) { event.preventDefault(); i.setState({ previewMode: !i.state.previewMode }); From b54be0586d4559ed0e4a22c60dcf1409f77b4e22 Mon Sep 17 00:00:00 2001 From: Florian Heft Date: Sat, 10 Jun 2023 01:08:08 +0200 Subject: [PATCH 4/4] Only show 'saved' tab on own profile page * Users can't view saved posts of other users. * fixes #1090 --- src/shared/components/person/profile.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/person/profile.tsx b/src/shared/components/person/profile.tsx index 42c7c306..81186504 100644 --- a/src/shared/components/person/profile.tsx +++ b/src/shared/components/person/profile.tsx @@ -317,7 +317,7 @@ export class Profile extends Component< {this.getRadio(PersonDetailsView.Overview)} {this.getRadio(PersonDetailsView.Comments)} {this.getRadio(PersonDetailsView.Posts)} - {this.getRadio(PersonDetailsView.Saved)} + {this.amCurrentUser && this.getRadio(PersonDetailsView.Saved)}
); }