fix(select-setting): fix options processing

exadel-inc · Nov 22, 2021 · bc9c8b8 · bc9c8b8
1 parent 3acb8ec
commit bc9c8b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/settings/select-setting/select-setting.ts b/src/settings/select-setting/select-setting.ts
@@ -1,12 +1,11 @@
 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/base/model';
-import TokenListUtils from '../../../../../utils/token-list-utils';
-import {WARNING_MSG} from '../../../../../utils/warning-msg';
+import {UIPSetting} from '../setting/setting';
+import {ChangeAttrConfig, UIPStateModel} from '../../core/base/model';
+import TokenListUtils from '../../utils/token-list-utils';
+import {WARNING_MSG} from '../../utils/warning-msg';
 
 /**
  * Custom setting for selecting attribute's value.
@@ -30,7 +29,6 @@ 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);
   }

diff --git a/src/utils/token-list-utils.ts b/src/utils/token-list-utils.ts
@@ -28,7 +28,7 @@ export default class TokenListUtils {
   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));
+    return b ? a.filter(Set.prototype.has, new Set(b)) : a;
   }
 
   /** Remove all element appearances from array. */