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.

Sign up for GitHub

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

Bugfix/UIPSelectSetting: empty option processing #152

Merged
merged 2 commits into from
Nov 18, 2021
Merged

Bugfix/UIPSelectSetting: empty option processing #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1b9760
fix(select-setting): fix empty option processing
Sisha0 Aug 24, 2021
ab525c4
fix(select-setting): pr fix
Sisha0 Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/plugins/settings/settings/setting/select-setting/select-setting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {attr, boolAttr} from '@exadel/esl/modules/esl-base-element/core';
import type {ESLSelect} from '@exadel/esl/modules/esl-forms/esl-select/core';
import {randUID} from '@exadel/esl/modules/esl-utils/misc/uid';
import {memoize} from '@exadel/esl/modules/esl-utils/decorators/memoize';

import {UIPSetting} from '../setting';
import {ChangeAttrConfig, UIPStateModel} from '../../../../../core/registration';
import {ChangeAttrConfig, UIPStateModel} from '../../../../../core/base/model';
import TokenListUtils from '../../../../../utils/token-list-utils';
import {WARNING_MSG} from '../../../../../utils/warning-msg';

import type {ESLSelect} from '@exadel/esl/modules/esl-forms/esl-select/core';

/**
* Custom setting for selecting attribute's value.
* @extends UIPSetting
Expand All @@ -30,6 +30,7 @@ export class UIPSelectSetting extends UIPSetting {
/** Select field to change setting's value. */
protected $field: ESLSelect;

@memoize()
protected get settingOptions(): string[] {
return this.$field.options.map(opt => opt.value);
}
Expand Down Expand Up @@ -112,10 +113,18 @@ export class UIPSelectSetting extends UIPSetting {
return this.multiple ? this.setValue('') : this.setInconsistency(WARNING_MSG.noMatch);
}

/** Update setting's value for append {@link mode}. */
/** Update setting's value for {@link mode} = "append". */
protected updateAppend(attrValues: (string | null)[]): void {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically, the main problem with this method is that it's hard to understand what is going on.
Could you please try to add more comments, update variable names, and split the complex actions.

const commonOptions = TokenListUtils.intersection(
...attrValues.map(val => TokenListUtils.split(val)), this.settingOptions);
// array of each attribute's value intersection with select options
const valuesOptions = attrValues.map(val => TokenListUtils.intersection(this.settingOptions, TokenListUtils.split(val)));

// make empty option active if no options intersections among attribute values
if (this.settingOptions.includes('') && valuesOptions.every(inter => !inter.length)) {
return this.setValue('');
}

// common options among all attribute values
const commonOptions = TokenListUtils.intersection(...valuesOptions);

if (this.multiple || commonOptions.length) return this.setValue(TokenListUtils.join(commonOptions));

Expand Down
9 changes: 4 additions & 5 deletions src/utils/token-list-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ export default class TokenListUtils {
}

/** Get array which contains only common elements from arrays. */
static intersection<T>(...arrays: T[][]): T[] {
return Array.from(arrays.reduce((intersect, arr) => {
arr.forEach(val => !intersect.has(val) && intersect.delete(val));
return intersect;
}, new Set(arrays[0])));
static intersection<T>(...rest: T[][]): T[];
static intersection<T>(a: T[], b: T[], ...rest: T[][]): T[] {
if (rest.length) return TokenListUtils.intersection(a, TokenListUtils.intersection(b, ...rest));
return a.filter(Set.prototype.has, new Set(b));
}

/** Remove all element appearances from array. */
Expand Down