@douyinfe/semi-foundation 2.1.0-beta.2 → 2.1.0-beta.3

package/calendar/foundation.ts

@@ -83,11 +83,13 @@ export type MonthData = Record<number, DateObj[]>;
 //     cacheEventKeys: (cachedKeys: Array<string>) => void;
 // }
 
+export type ParsedEventsType = ParsedEvents | ParsedEventsWithArray | MonthlyEvent;
+
 export interface CalendarAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
     updateCurrPos?: (currPos: number) => void;
     updateShowCurrTime?: () => void;
     updateScrollHeight?: (scrollHeight: number) => void;
-    setParsedEvents?: (parsedEvents: ParsedEvents | ParsedEventsWithArray | MonthlyEvent) => void;
+    setParsedEvents?: (parsedEvents: ParsedEventsType) => void;
     cacheEventKeys?: (cachedKeys: Array<string>) => void;
     setRangeData?: (data: RangeData) => void;
     getRangeData?: () => RangeData;

package/cascader/foundation.ts

@@ -77,7 +77,7 @@ export interface BasicTriggerRenderProps {
     /** The hierarchical position of the selected node in treeData,
      * as in the following example, when Zhejiang-Hangzhou-Xiaoshan
      * District is selected, the value here is 0-0-1 */
-    value?: string;
+    value?: string | Set<string>;
     /* The input value of the current input box */
     inputValue: string;
     /* Cascader's placeholder */

package/collapse/foundation.ts

@@ -23,7 +23,7 @@ export interface CollapseState{
 }
 
 export interface CollapseAdapter extends DefaultAdapter<CollapseProps, CollapseState>{
-    handleChange: (...args: ArgsType<CollapseProps['onChange']>) => ReturnType<CollapseProps['onChange']>;
+    handleChange: (activeKey: CollapseProps['activeKey'], e: any) => void;
     // getStates: () => CollapseState;
     // getProps: () => CollapseProps;
     addActiveKey: (newSet: CollapseState['activeSet']) => void;

package/lib/es/calendar/foundation.d.ts

@@ -36,11 +36,12 @@ export interface WeeklyData {
     week: DateObj[];
 }
 export declare type MonthData = Record<number, DateObj[]>;
+export declare type ParsedEventsType = ParsedEvents | ParsedEventsWithArray | MonthlyEvent;
 export interface CalendarAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
     updateCurrPos?: (currPos: number) => void;
     updateShowCurrTime?: () => void;
     updateScrollHeight?: (scrollHeight: number) => void;
-    setParsedEvents?: (parsedEvents: ParsedEvents | ParsedEventsWithArray | MonthlyEvent) => void;
+    setParsedEvents?: (parsedEvents: ParsedEventsType) => void;
     cacheEventKeys?: (cachedKeys: Array<string>) => void;
     setRangeData?: (data: RangeData) => void;
     getRangeData?: () => RangeData;

package/lib/es/cascader/foundation.d.ts

@@ -40,7 +40,7 @@ export interface BasicTriggerRenderProps {
     /** The hierarchical position of the selected node in treeData,
      * as in the following example, when Zhejiang-Hangzhou-Xiaoshan
      * District is selected, the value here is 0-0-1 */
-    value?: string;
+    value?: string | Set<string>;
     inputValue: string;
     placeholder?: string;
     /** The function used to update the value of the input box. You

package/lib/es/collapse/foundation.d.ts

@@ -18,7 +18,7 @@ export interface CollapseState {
     activeSet: Set<string>;
 }
 export interface CollapseAdapter extends DefaultAdapter<CollapseProps, CollapseState> {
-    handleChange: (...args: ArgsType<CollapseProps['onChange']>) => ReturnType<CollapseProps['onChange']>;
+    handleChange: (activeKey: CollapseProps['activeKey'], e: any) => void;
     addActiveKey: (newSet: CollapseState['activeSet']) => void;
 }
 export default class CollapseFoundation extends BaseFoundation<CollapseAdapter> {

package/lib/es/pagination/foundation.d.ts

@@ -8,9 +8,9 @@ export interface PaginationAdapter<P = Record<string, any>, S = Record<string, a
     setCurrentPage: (pageIndex: number) => void;
     registerKeyDownHandler: (handler: KeyDownHandler) => void;
     unregisterKeyDownHandler: (handler: KeyDownHandler) => void;
-    notifyPageChange: (pageIndex: number | string) => void;
+    notifyPageChange: (pageIndex: number) => void;
     notifyPageSizeChange: (pageSize: number) => void;
-    notifyChange: (pageIndex: number | string, pageSize: number) => void;
+    notifyChange: (pageIndex: number, pageSize: number) => void;
 }
 export declare type PageRenderText = number | '...';
 export declare type PageList = PageRenderText[];

package/lib/es/popconfirm/popconfirmFoundation.d.ts

@@ -4,11 +4,13 @@ export interface PopconfirmAdapter<P = Record<string, any>, S = Record<string, a
     notifyConfirm: (e: any) => void;
     notifyCancel: (e: any) => void;
     notifyVisibleChange: (visible: boolean) => void;
+    notifyClickOutSide: (e: any) => void;
 }
 export default class PopConfirmFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<PopconfirmAdapter<P, S>, P, S> {
     init(): void;
     destroy(): void;
     handleCancel(e: any): void;
     handleConfirm(e: any): void;
+    handleClickOutSide(e: any): void;
     handleVisibleChange(visible: boolean): void;
 }

package/lib/es/popconfirm/popconfirmFoundation.js

@@ -17,6 +17,10 @@ export default class PopConfirmFoundation extends BaseFoundation {
     this.handleVisibleChange(false);
   }
 
+  handleClickOutSide(e) {
+    this._adapter.notifyClickOutSide(e);
+  }
+
   handleVisibleChange(visible) {
     if (!this._isControlledComponent('visible')) {
       this._adapter.setVisible(visible);

package/lib/es/scrollList/itemFoundation.d.ts

@@ -6,15 +6,15 @@ export interface Item {
     text?: string;
     disabled?: boolean;
 }
-export interface ScrollItemAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
+export interface ScrollItemAdapter<P = Record<string, any>, S = Record<string, any>, I = Item> extends DefaultAdapter<P, S> {
     setPrependCount: (prependCount: number) => void;
     setAppendCount: (appendCount: number) => void;
     setSelectedNode: (el: HTMLElement) => void;
     isDisabledIndex: (i: number) => boolean;
-    notifySelectItem: (data: Item) => void;
+    notifySelectItem: (data: I) => void;
     scrollToCenter: (selectedNode: Element, scrollWrapper?: Element, duration?: number) => void;
 }
-export default class ItemFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<ScrollItemAdapter<P, S>, P, S> {
+export default class ItemFoundation<P = Record<string, any>, S = Record<string, any>, I = Item> extends BaseFoundation<ScrollItemAdapter<P, S, I>, P, S> {
     _cachedSelectedNode: HTMLElement;
     selectIndex(index: number, listWrapper: HTMLElement): void;
     selectNode(node: HTMLElement, listWrapper: HTMLElement): void;

package/lib/es/select/foundation.d.ts

@@ -38,7 +38,8 @@ export interface SelectAdapter<P = Record<string, any>, S = Record<string, any>>
     updateHovering(isHover: boolean): void;
     updateScrollTop(): void;
 }
-declare type PropValue = string | number | Record<string, any>;
+declare type LabelValue = string | number;
+declare type PropValue = LabelValue | Record<string, any>;
 export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
     constructor(adapter: SelectAdapter);
     _keydownHandler: (...arg: any[]) => void | null;

package/lib/es/select/foundation.js

@@ -29,7 +29,7 @@ var __rest = this && this.__rest || function (s, e) {
 
 import BaseFoundation from '../base/foundation';
 import KeyCode from '../utils/keyCode';
-import { isNumber, isString, isEqual } from 'lodash-es';
+import { isNumber, isString, isEqual, omit } from 'lodash-es';
 import warning from '../utils/warning';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 export default class SelectFoundation extends BaseFoundation {
@@ -266,12 +266,14 @@ export default class SelectFoundation extends BaseFoundation {
       let optionNotExist = {
         value: propValue,
         label: propValue,
-        _notExist: true
+        _notExist: true,
+        _scrollIndex: -1
       };
 
       if (onChangeWithObject) {
         optionNotExist = _Object$assign(_Object$assign({}, propValue), {
-          _notExist: true
+          _notExist: true,
+          _scrollIndex: -1
         });
       }
 
@@ -330,7 +332,9 @@ export default class SelectFoundation extends BaseFoundation {
             onChangeWithObject ? optionNotExist = _Object$assign(_Object$assign({}, propValue[i]), {
               _notExist: true
             }) : null;
-            selections.set(optionNotExist.label, optionNotExist);
+            selections.set(optionNotExist.label, _Object$assign(_Object$assign({}, optionNotExist), {
+              _scrollIndex: -1
+            }));
           }
         }
       });
@@ -515,7 +519,7 @@ export default class SelectFoundation extends BaseFoundation {
       this._adapter.notifyMaxLimit(_Object$assign({
         value,
         label
-      }, rest));
+      }, omit(rest, '_scrollIndex')));
 
       return;
     } else {
@@ -1016,6 +1020,7 @@ export default class SelectFoundation extends BaseFoundation {
     delete option._parentGroup;
     delete option._show;
     delete option._selected;
+    delete option._scrollIndex;
 
     if ('_keyInOptionList' in option) {
       option.key = option._keyInOptionList;

package/lib/es/table/utils.d.ts

@@ -21,7 +21,7 @@ export declare function isInnerColumnKey(key: string | number): boolean;
 export declare function isExpandedColumn(column: Record<string, any>): boolean;
 export declare function isScrollbarColumn(column: Record<string, any>): boolean;
 export declare function isSelectionColumn(column: Record<string, any>): boolean;
-export declare function filterColumns(columns: Record<string, any>[], ignoreKeys?: "column-scrollbar"[]): Record<string, any>[];
+export declare function filterColumns(columns: Record<string, any>[], ignoreKeys?: string[]): Record<string, any>[];
 /**
  * get width of scroll bar
  * @param {Array} columns

package/lib/es/tabs/foundation.d.ts

@@ -1,10 +1,12 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 export interface TabsAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
     collectPane: () => void;
+    collectActiveKey: () => void;
     notifyTabClick: (activeKey: string, event: any) => void;
     notifyChange: (activeKey: string) => void;
     setNewActiveKey: (activeKey: string) => void;
     getDefaultActiveKeyFromChildren: () => string;
+    notifyTabDelete: (tabKey: string) => void;
 }
 declare class TabsFoundation<P = Record<string, any>, S = Record<string, any>> extends BaseFoundation<TabsAdapter<P, S>, P, S> {
     constructor(adapter: TabsAdapter<P, S>);
@@ -16,5 +18,6 @@ declare class TabsFoundation<P = Record<string, any>, S = Record<string, any>> e
     getDefaultActiveKey(): string;
     handleTabListChange(): void;
     handleTabPanesChange(): void;
+    handleTabDelete(tabKey: string): void;
 }
 export default TabsFoundation;

package/lib/es/tabs/foundation.js

@@ -68,15 +68,11 @@ class TabsFoundation extends BaseFoundation {
   handleTabPanesChange() {
     this._adapter.collectPane();
 
-    let activeKey = this.getState('activeKey');
-
-    if (typeof activeKey === 'undefined') {
-      activeKey = this._adapter.getDefaultActiveKeyFromChildren();
-    }
+    this._adapter.collectActiveKey();
+  }
 
-    if (typeof activeKey !== 'undefined') {
-      this.handleNewActiveKey(activeKey);
-    }
+  handleTabDelete(tabKey) {
+    this._adapter.notifyTabDelete(tabKey);
   }
 
 }

package/lib/es/tabs/tabs.css

@@ -40,6 +40,13 @@
   top: 3px;
   color: var(--semi-color-text-2);
 }
+.semi-tabs-bar .semi-tabs-tab .semi-icon-close {
+  margin-right: 0;
+  font-size: 14px;
+  color: var(--semi-color-text-2);
+  margin-left: 10px;
+  cursor: pointer;
+}
 .semi-tabs-bar .semi-tabs-tab:hover {
   color: var(--semi-color-text-0);
 }
@@ -53,7 +60,6 @@
   color: var(--semi-color-text-0);
 }
 .semi-tabs-bar .semi-tabs-tab-active, .semi-tabs-bar .semi-tabs-tab-active:hover {
-  color: var(--semi-color-text-0);
   cursor: default;
   font-weight: 600;
   color: var(--semi-color-text-0);
@@ -61,6 +67,12 @@
 .semi-tabs-bar .semi-tabs-tab-active .semi-icon, .semi-tabs-bar .semi-tabs-tab-active:hover .semi-icon {
   color: var(--semi-color-primary);
 }
+.semi-tabs-bar .semi-tabs-tab-active .semi-icon-close, .semi-tabs-bar .semi-tabs-tab-active:hover .semi-icon-close {
+  color: var(--semi-color-text-2);
+}
+.semi-tabs-bar .semi-tabs-tab-active .semi-icon-close:hover {
+  color: var(--semi-color-text-1);
+}
 .semi-tabs-bar .semi-tabs-tab-disabled {
   cursor: not-allowed;
   color: var(--semi-color-disabled-text);