Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple image upload #971

Merged
merged 12 commits into from
Apr 4, 2023
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/shared/translations
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"build:prod": "webpack --mode=production",
"clean": "yarn run rimraf dist",
"dev": "yarn start",
"lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'",
"lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check \"src/**/*.{ts,tsx}\"",
"prepare": "husky install",
"start": "yarn build:dev --watch"
},
Expand Down
5 changes: 4 additions & 1 deletion src/shared/components/common/emoji-picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Icon } from "./icon";

interface EmojiPickerProps {
onEmojiClick?(val: any): any;
disabled?: boolean;
}

interface EmojiPickerState {
Expand All @@ -15,8 +16,9 @@ export class EmojiPicker extends Component<EmojiPickerProps, EmojiPickerState> {
private emptyState: EmojiPickerState = {
showPicker: false,
};

state: EmojiPickerState;
constructor(props: any, context: any) {
constructor(props: EmojiPickerProps, context: any) {
SleeplessOne1917 marked this conversation as resolved.
Show resolved Hide resolved
super(props, context);
this.state = this.emptyState;
this.handleEmojiClick = this.handleEmojiClick.bind(this);
Expand All @@ -28,6 +30,7 @@ export class EmojiPicker extends Component<EmojiPickerProps, EmojiPickerState> {
className="btn btn-sm text-muted"
data-tippy-content={i18n.t("emoji")}
aria-label={i18n.t("emoji")}
disabled={this.props.disabled}
onClick={linkEvent(this, this.togglePicker)}
>
<Icon icon="smile" classes="icon-inline" />
Expand Down
34 changes: 19 additions & 15 deletions src/shared/components/common/language-select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ interface LanguageSelectProps {
allLanguages: Language[];
siteLanguages: number[];
selectedLanguageIds?: number[];
multiple: boolean;
multiple?: boolean;
onChange(val: number[]): any;
showAll?: boolean;
showSite?: boolean;
iconVersion?: boolean;
disabled?: boolean;
}

export class LanguageSelect extends Component<LanguageSelectProps, any> {
Expand Down Expand Up @@ -55,19 +56,19 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
)}
<div className="form-group row">
<label
className={classNames("col-form-label", {
"col-sm-3": this.props.multiple,
"col-sm-2": !this.props.multiple,
})}
className={classNames(
"col-form-label",
`col-sm-${this.props.multiple ? 3 : 2}`
)}
htmlFor={this.id}
>
{i18n.t(this.props.multiple ? "language_plural" : "language")}
</label>
<div
className={classNames("input-group", {
"col-sm-9": this.props.multiple,
"col-sm-10": !this.props.multiple,
})}
className={classNames(
"input-group",
`col-sm-${this.props.multiple ? 9 : 10}`
)}
>
{this.selectBtn}
{this.props.multiple && (
Expand All @@ -87,8 +88,8 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
}

get selectBtn() {
let selectedLangs = this.props.selectedLanguageIds;
let filteredLangs = selectableLanguages(
const selectedLangs = this.props.selectedLanguageIds;
const filteredLangs = selectableLanguages(
this.props.allLanguages,
this.props.siteLanguages,
this.props.showAll,
Expand All @@ -98,14 +99,17 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {

return (
<select
className={classNames("lang-select-action", {
"form-control custom-select": !this.props.iconVersion,
"btn btn-sm text-muted": this.props.iconVersion,
})}
className={classNames(
"lang-select-action",
this.props.iconVersion
? "btn btn-sm text-muted"
: "form-control custom-select"
)}
id={this.id}
onChange={linkEvent(this, this.handleLanguageChange)}
aria-label="action"
multiple={this.props.multiple}
disabled={this.props.disabled}
>
{filteredLangs.map(l => (
<option
Expand Down
Loading