amis-ui 2.0.0 → 2.0.1

package/lib/components/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 
@@ -407,15 +407,10 @@ var Select = /** @class */ (function (_super) {
         e.stopPropagation();
         onDelete && onDelete(item);
     };
-    Select.prototype.menuItemRef = function (ref) {
-        if (ref && typeof ref.offsetHeight === 'number' && ref > 0) {
-            this.setState({ itemHeight: ref.offsetHeight });
-        }
-    };
     Select.prototype.renderValue = function (_a) {
         var _this = this;
         _a.inputValue; _a.isOpen;
-        var _b = this.props, cx = _b.classnames, multiple = _b.multiple, valuesNoWrap = _b.valuesNoWrap, placeholder = _b.placeholder, labelField = _b.labelField, disabled = _b.disabled, maxTagCount = _b.maxTagCount, overflowTagPopover = _b.overflowTagPopover, __ = _b.translate;
+        var _b = this.props, cx = _b.classnames, multiple = _b.multiple, valuesNoWrap = _b.valuesNoWrap, placeholder = _b.placeholder, labelField = _b.labelField, disabled = _b.disabled, maxTagCount = _b.maxTagCount, overflowTagPopover = _b.overflowTagPopover, showInvalidMatch = _b.showInvalidMatch, __ = _b.translate;
         var selection = this.state.selection;
         if (!selection.length) {
             return (React__default["default"].createElement("div", { key: "placeholder", className: cx('Select-placeholder') }, __(placeholder)));
@@ -437,7 +432,9 @@ var Select = /** @class */ (function (_super) {
                                 var itemIndex = index + maxVisibleCount_1;
                                 return (React__default["default"].createElement("div", { key: itemIndex, className: cx('Select-value', {
                                         'is-disabled': disabled,
-                                        'is-invalid': item.__unmatched
+                                        'is-invalid': showInvalidMatch
+                                            ? item.__unmatched
+                                            : false
                                     }) },
                                     React__default["default"].createElement("span", { className: cx('Select-valueLabel') }, item[labelField || 'label']),
                                     React__default["default"].createElement("span", { className: cx('Select-valueIcon', {
@@ -447,7 +444,7 @@ var Select = /** @class */ (function (_super) {
                             }))); } }) },
                         React__default["default"].createElement("div", { className: cx('Select-value', {
                                 'is-disabled': disabled,
-                                'is-invalid': item.__unmatched
+                                'is-invalid': showInvalidMatch ? item.__unmatched : false
                             }), onClick: function (e) {
                                 return e.stopPropagation();
                             } },
@@ -456,7 +453,7 @@ var Select = /** @class */ (function (_super) {
                 return (React__default["default"].createElement(TooltipWrapper["default"], { placement: 'top', tooltip: item[labelField || 'label'], trigger: 'hover', key: index },
                     React__default["default"].createElement("div", { className: cx('Select-value', {
                             'is-disabled': disabled,
-                            'is-invalid': item.__unmatched
+                            'is-invalid': showInvalidMatch ? item.__unmatched : false
                         }) },
                         React__default["default"].createElement("span", { className: cx('Select-valueLabel') }, item[labelField || 'label']),
                         React__default["default"].createElement("span", { className: cx('Select-valueIcon', {
@@ -469,13 +466,13 @@ var Select = /** @class */ (function (_super) {
             if (!multiple) {
                 return (React__default["default"].createElement("div", { className: cx('Select-value', {
                         'is-disabled': disabled,
-                        'is-invalid': item.__unmatched
+                        'is-invalid': showInvalidMatch ? item.__unmatched : false
                     }), key: index }, item[labelField || 'label']));
             }
             return valuesNoWrap ? ("".concat(item[labelField || 'label']).concat(index === selection.length - 1 ? '' : ' + ')) : (React__default["default"].createElement(TooltipWrapper["default"], { placement: 'top', tooltip: item[labelField || 'label'], trigger: 'hover', key: index },
                 React__default["default"].createElement("div", { className: cx('Select-value', {
                         'is-disabled': disabled,
-                        'is-invalid': item.__unmatched
+                        'is-invalid': showInvalidMatch ? item.__unmatched : false
                     }) },
                     React__default["default"].createElement("span", { className: cx('Select-valueLabel') }, item[labelField || 'label']),
                     React__default["default"].createElement("span", { className: cx('Select-valueIcon', {
@@ -588,7 +585,6 @@ var Select = /** @class */ (function (_super) {
                 ")")) : null,
             multiple && checkAll && filtedOptions.length ? (React__default["default"].createElement("div", { className: cx('Select-option') },
                 React__default["default"].createElement(Checkbox["default"], { checked: checkedPartial, partial: checkedPartial && !checkedAll, onChange: this.toggleCheckAll, size: "sm" }, __(checkAllLabel)))) : null,
-            React__default["default"].createElement("div", { ref: this.menuItemRef, className: cx('Select-option hidden') }, multiple ? (React__default["default"].createElement(Checkbox["default"], { size: "sm" }, "Placeholder")) : (React__default["default"].createElement("span", null, "Placeholder"))),
             creatable && !disabled ? (React__default["default"].createElement("a", { className: cx('Select-addBtn'), onClick: this.handleAddClick },
                 React__default["default"].createElement(icons.Icon, { icon: "plus", className: "icon" }),
                 __(createBtnLabel))) : null,
@@ -646,6 +642,7 @@ var Select = /** @class */ (function (_super) {
         multiple: false,
         clearable: true,
         creatable: false,
+        showInvalidMatch: false,
         createBtnLabel: 'Select.createLabel',
         searchPromptText: 'Select.searchPromptText',
         loadingPlaceholder: 'loading',
@@ -784,12 +781,6 @@ var Select = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Event, Object]),
         tslib.__metadata("design:returntype", void 0)
     ], Select.prototype, "handleDeleteClick", null);
-    tslib.__decorate([
-        amisCore.autobind,
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
-    ], Select.prototype, "menuItemRef", null);
     return Select;
 }(React__default["default"].Component));
 var EnhancedSelect = amisCore.themeable(amisCore.localeable(amisCore.uncontrollable(Select, {

package/lib/components/Selection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TableSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tabs.d.ts

@@ -170,15 +170,15 @@ export declare class Tabs extends React.Component<TabsProps, any> {
     render(): JSX.Element | null;
 }
 declare const _default: {
-    new (props: Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
@@ -186,17 +186,17 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "onClose" | "toolbar" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<TabsProps, keyof ThemeProps>, "toolbar" | "onClose" | "draggable" | "onSelect" | "onAdd" | "editable" | "onEdit" | "activeKey" | "tabsMode" | "additionBtns" | "linksClassName" | "tabs" | "tabRender" | "addable" | "closable" | "onDragChange" | "scrollable"> & Partial<Pick<Omit<TabsProps, keyof ThemeProps>, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">> & Partial<Pick<Pick<TabsProps, "contentClassName" | "mode" | "showTip" | "showTipClassName" | "sidePosition" | "addBtnText">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/components/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tag.d.ts

@@ -14,6 +14,7 @@ export interface TagProps extends ThemeProps {
     disabled?: boolean;
     closeIcon?: string | React.ReactNode;
     onClose?: (e: React.MouseEvent) => void;
+    onClick?: (e: React.MouseEvent) => void;
 }
 export interface CheckableTagProps extends TagProps {
     onClick?: (e: React.MouseEvent) => void;
@@ -25,6 +26,7 @@ export declare class Tag extends React.Component<TagProps> {
     static defaultProps: Partial<TagProps>;
     renderCloseIcon(): JSX.Element | null;
     handleClose(e: React.MouseEvent<HTMLElement>): void;
+    handleClick(e: React.MouseEvent<HTMLElement>): void;
     render(): JSX.Element;
 }
 declare class CheckableTagComp extends React.Component<CheckableTagProps> {
@@ -67,15 +69,15 @@ export declare const CheckableTag: {
     ComposedComponent: typeof CheckableTagComp;
 };
 declare const _default: {
-    new (props: Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
@@ -83,17 +85,17 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "onClose" | "color" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<TagProps, keyof ThemeProps>, never> & Partial<Pick<Omit<TagProps, keyof ThemeProps>, "label" | "style" | "disabled" | "icon" | "color" | "onClose" | "onClick" | "closable" | "displayMode" | "closeIcon">> & Partial<Pick<Partial<TagProps>, "classPrefix" | "classnames" | "className" | "theme">> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/components/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 
@@ -45,9 +45,13 @@ var Tag = /** @class */ (function (_super) {
         e.stopPropagation();
         onClose === null || onClose === void 0 ? void 0 : onClose(e);
     };
+    Tag.prototype.handleClick = function (e) {
+        var onClick = this.props.onClick;
+        onClick === null || onClick === void 0 ? void 0 : onClick(e);
+    };
     Tag.prototype.render = function () {
         var _a;
-        var _b = this.props, children = _b.children, cx = _b.classnames, className = _b.className, displayMode = _b.displayMode, disabled = _b.disabled, color = _b.color, icon = _b.icon, style = _b.style, label = _b.label;
+        var _b = this.props, children = _b.children, cx = _b.classnames, className = _b.className, displayMode = _b.displayMode, disabled = _b.disabled, color = _b.color, icon = _b.icon, style = _b.style, label = _b.label; _b.closable;
         var isPresetColor = color && PRESET_COLOR.indexOf(color) !== -1;
         var customColor = color && !isPresetColor ? color : undefined;
         var tagStyle = tslib.__assign({ backgroundColor: displayMode === 'normal' ? customColor : undefined, borderColor: displayMode === 'rounded' ? customColor : undefined, color: displayMode === 'rounded' ? customColor : undefined }, style);
@@ -56,9 +60,10 @@ var Tag = /** @class */ (function (_super) {
                 _a["Tag--".concat(displayMode, "--").concat(color)] = isPresetColor,
                 _a["Tag--".concat(displayMode, "--hasColor")] = color,
                 _a["Tag--disabled"] = disabled,
-                _a)), style: tagStyle },
-            prevIcon,
-            label || children,
+                _a)), style: tagStyle, onClick: this.handleClick },
+            React__default["default"].createElement("span", { className: cx('Tag-text') },
+                prevIcon,
+                label || children),
             this.renderCloseIcon()));
     };
     Tag.defaultProps = {
@@ -70,6 +75,12 @@ var Tag = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], Tag.prototype, "handleClose", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Tag.prototype, "handleClick", null);
     return Tag;
 }(React__default["default"].Component));
 var CheckableTagComp = /** @class */ (function (_super) {

package/lib/components/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TimelineItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tinymce.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tinymce2.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TitleBar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Toast.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tooltip.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 
@@ -9,7 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var lodash = require('lodash');
+var _ = require('lodash');
 var amisCore = require('amis-core');
 var Selection = require('./Selection.js');
 var ResultList = require('./ResultList.js');
@@ -39,7 +39,7 @@ var Transfer = /** @class */ (function (_super) {
             resultSelectMode: 'list'
         };
         _this.unmounted = false;
-        _this.lazySearch = lodash.debounce(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+        _this.lazySearch = _.debounce(function () { return tslib.__awaiter(_this, void 0, void 0, function () {
             var inputValue, onSearch, result;
             var _this = this;
             return tslib.__generator(this, function (_a) {
@@ -177,8 +177,8 @@ var Transfer = /** @class */ (function (_super) {
     Transfer.prototype.handleSearchTreeChange = function (values, searchOptions) {
         var _a = this.props, onChange = _a.onChange, value = _a.value;
         var searchAvailableOptions = this.getFlattenArr(searchOptions);
-        var useArr = lodash.intersectionWith(searchAvailableOptions, values, function (a, b) { return a.value === b.value; });
-        var unuseArr = lodash.differenceWith(searchAvailableOptions, values, function (a, b) { return a.value === b.value; });
+        var useArr = _.intersectionWith(searchAvailableOptions, values, function (a, b) { return a.value === b.value; });
+        var unuseArr = _.differenceWith(searchAvailableOptions, values, function (a, b) { return a.value === b.value; });
         var newArr = [];
         Array.isArray(value) &&
             value.forEach(function (item) {
@@ -206,7 +206,7 @@ var Transfer = /** @class */ (function (_super) {
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement("div", { className: cx('Transfer-title', selectMode === 'table' ? 'Transfer-title--light' : '') },
                 React__default["default"].createElement("span", null,
-                    lodash.includes(['list', 'tree'], selectMode) ? (React__default["default"].createElement(Checkbox["default"], { checked: checkedPartial, partial: checkedPartial && !checkedAll, onChange: props.onToggleAll || this.toggleAll, size: "sm" })) : null,
+                    _.includes(['list', 'tree'], selectMode) ? (React__default["default"].createElement(Checkbox["default"], { checked: checkedPartial, partial: checkedPartial && !checkedAll, onChange: props.onToggleAll || this.toggleAll, size: "sm" })) : null,
                     __(selectTitle || 'Transfer.available'),
                     statistics !== false ? (React__default["default"].createElement("span", null,
                         "\uFF08",
@@ -214,7 +214,7 @@ var Transfer = /** @class */ (function (_super) {
                         "/",
                         this.availableOptions.length,
                         "\uFF09")) : null),
-                lodash.includes(['chained', 'associated'], selectMode) ? (React__default["default"].createElement("a", { onClick: props.onToggleAll || this.toggleAll, className: cx('Transfer-checkAll', disabled || !options.length ? 'is-disabled' : '') }, __('Select.checkAll'))) : null),
+                _.includes(['chained', 'associated'], selectMode) ? (React__default["default"].createElement("a", { onClick: props.onToggleAll || this.toggleAll, className: cx('Transfer-checkAll', disabled || !options.length ? 'is-disabled' : '') }, __('Select.checkAll'))) : null),
             onSearch ? (React__default["default"].createElement("div", { className: cx('Transfer-search') },
                 React__default["default"].createElement(InputBox["default"], { value: this.state.inputValue, onChange: this.handleSearch, clearable: false, onKeyDown: this.handleSearchKeyDown, placeholder: searchPlaceholder }, this.state.searchResult !== null ? (React__default["default"].createElement("a", { onClick: this.handleSeachCancel },
                     React__default["default"].createElement(icons.Icon, { icon: "close", className: "icon" }))) : (React__default["default"].createElement(icons.Icon, { icon: "search", className: "icon" }))))) : null,

package/lib/components/TransferDropDown.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TransferSearch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 
@@ -9,7 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var lodash = require('lodash');
+var _ = require('lodash');
 var amisCore = require('amis-core');
 var icons = require('./icons.js');
 var InputBox = require('./InputBox.js');
@@ -25,7 +25,7 @@ var TransferSearch = /** @class */ (function (_super) {
         _this.state = {
             inputValue: ''
         };
-        _this.lazySearch = lodash.debounce(function () {
+        _this.lazySearch = _.debounce(function () {
             var inputValue = _this.state.inputValue;
             // 防止由于防抖导致空值问题
             if (!inputValue) {

package/lib/components/Tree.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TreeSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/UserTabSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/WithRemoteConfig.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/CalendarContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.0
+ * amis-ui v2.0.1
  * Copyright 2018-2022 fex
  */