superdesk-ui-framework 3.0.6 → 3.0.7

package/examples/pages/react/MultiSelect.tsx

@@ -69,7 +69,7 @@ export class MultiselectDocs extends React.Component<{}, IState> {
                                     showSelectAll
                                     zIndex={2000}
                                     placeholder='Select a color'
-                                    optionLabel='name'
+                                    optionLabel={(option) => `${option.name} :: ${option.colorCode}`}
                                     required
                                     tabindex={1}
                                     label={'This is Label'}
@@ -106,10 +106,10 @@ export class MultiselectDocs extends React.Component<{}, IState> {
                                 <MultiSelect
                                     value={this.state.value2}
                                     options={ItemArr}
+                                    optionLabel={(option) => `${option.name} :: ${option.colorCode}`}
                                     onChange={(e: any) => this.setState({value2: e})}
                                     filter
                                     showSelectAll
-                                    optionLabel='name'
                                     itemTemplate={(option) => {
                                         if (option) {
                                             return (

package/examples/pages/react/TreeSelect.tsx

@@ -20,41 +20,53 @@ let options = [
             {
                 value: {name: 'Sub-category1'},
                 children: [
-                    {value: {name: 'Item20'}}
+                    {value: {name: 'Item31'}},
+                    // {value: {name: 'Item32'}},
+                    // {value: {name: 'Item33'}},
+                    // {value: {name: 'Item34'}},
+
                 ]
             },
             {
                 value: {name: 'Sub-category2'},
                 children: [
-                    {value: {name: 'Item21'}}
+                    {value: {name: 'Item41'}},
+                    {value: {name: 'Item42'}},
+                    {value: {name: 'Item43'}}
                 ]
-            }
-            ,
+            },
             {
                 value: {name: 'Sub-category3'},
                 children: [
-                    {value: {name: 'Item22'}}
+                    {value: {name: 'Item50'}},
+                    {value: {name: 'Item51'}},
+                    {value: {name: 'Item53'}}
                 ]
-            }
-            ,
+            },
             {
                 value: {name: 'Sub-category4'},
                 children: [
-                    {value: {name: 'Item23'}}
+                    {value: {name: 'Item23'}},
+                    {value: {name: 'Item41'}},
+                    {value: {name: 'Item42'}},
+                    {value: {name: 'Item43'}}
                 ]
-            }
-            ,
+            },
             {
                 value: {name: 'Sub-category5'},
                 children: [
-                    {value: {name: 'Item24'}}
+                    {value: {name: 'Item24'}},
+                    {value: {name: 'Item41'}},
+                    {value: {name: 'Item42'}},
+                    {value: {name: 'Item43'}}
                 ]
-            }
-            ,
+            },
             {
                 value: {name: 'Sub-category6'},
                 children: [
-                    {value: {name: 'Item25'}}
+                    {value: {name: 'Item50'}},
+                    {value: {name: 'Item51'}},
+                    {value: {name: 'Item52'}}
                 ]
             }
         ]
@@ -65,9 +77,9 @@ let options = [
             {
                 value: {name: 'Item8'}
             },
-            {
-                value: {name: 'Item9'}
-            }
+            // {
+            //     value: {name: 'Item9'}
+            // }
         ]
     },
     {
@@ -164,7 +176,7 @@ function searchOptions(
     callback: (res: any) => void,
 ): ICancelFn {
     let timeout = setTimeout(() => {
-        
+
         callback(
             fetchedArr
                 .filter((item: any) => item.display_name.toLocaleLowerCase().includes(term.toLocaleLowerCase()))
@@ -188,7 +200,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
             inputValue: '',
             arr: []
         }
-        
+
 
         this.handleChange = this.handleChange.bind(this);
     }
@@ -197,7 +209,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
         if(option.item) {
             e.stopPropagation();
             e.preventDefault();
-            
+
             this.setState({
                 options: option.item
             })
@@ -219,7 +231,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
                     />
                 `}
                 </Markup.ReactMarkupCodePreview>
-                
+
                 <Markup.ReactMarkup>
                     <Markup.ReactMarkupPreview>
                         <div className='docs-page__content-row docs-page__content-row--no-margin'>
@@ -234,7 +246,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
                                     selectBranchWithChildren={true}
                                     allowMultiple
                                     fullWidth
-                                    singleLevelSearch
+                                    //singleLevelSearch
                                     required
                                     info={'Info Message'}
                                     error={'Error Message'}
@@ -247,7 +259,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
                                                 <span>{item.name}</span>
                                             </Wrapper>
                                         );
-                                    }}    
+                                    }}
                                 />
                             </div>
                         </div>
@@ -277,10 +289,10 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
                                         <span>{item.name}</span>
                                     </Wrapper>
                                 );
-                            }}    
+                            }}
                         />
                     `}</Markup.ReactMarkupCode>
-                    
+
                 </Markup.ReactMarkup>
 
                 <p className='docs-page__paragraph'>Asynchronous mode in TreeSelect component.</p>
@@ -320,7 +332,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
                             allowMultiple={true}
                         />
                     `}</Markup.ReactMarkupCode>
-                    
+
                 </Markup.ReactMarkup>
 
                 <p className='docs-page__paragraph'>TreeSelect with custom template.</p>
@@ -415,7 +427,7 @@ export class TreeSelectDocs extends React.Component<{}, IState> {
                     <Prop name='getOptions' isRequired={false} type='Function' default='/' description='An array of selectitems to display as the available options.'/>
                     <Prop name='searchOptions' isRequired={false} type='Function' default='/' description='function will be called when a search is initiated from UI.'/>
                 </PropsList>
-  
+
             </section>
         )
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superdesk-ui-framework",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
@@ -84,7 +84,7 @@
   "dependencies": {
     "@material-ui/lab": "^4.0.0-alpha.56",
     "@popperjs/core": "^2.4.0",
-    "@superdesk/primereact": "^5.0.2-8",
+    "@superdesk/primereact": "^5.0.2-10",
     "@types/node": "^14.10.2",
     "chart.js": "^2.9.3",
     "date-fns": "2.7.0",

package/react/components/MultiSelect.d.ts

@@ -3,7 +3,6 @@ interface IProps<T> {
     value: Array<T>;
     options: Array<T>;
     placeholder?: string;
-    optionLabel: string;
     emptyFilterMessage?: string;
     filterPlaceholder?: string;
     maxSelectedLabels?: number;
@@ -14,6 +13,7 @@ interface IProps<T> {
     showClear?: boolean;
     showSelectAll?: boolean;
     zIndex?: number;
+    optionLabel: (option: T) => string;
     itemTemplate?(item: any): JSX.Element | undefined;
     selectedItemTemplate?(value: any): JSX.Element | undefined;
     onChange(newValue: Array<T>): void;

package/react/components/MultiSelect.js

@@ -66,7 +66,7 @@ var MultiSelect = /** @class */ (function (_super) {
             React.createElement(multiselect_1.MultiSelect, { panelClassName: classes, value: this.props.value, options: this.props.options, onChange: function (_a) {
                     var value = _a.value;
                     return _this.props.onChange(value);
-                }, display: "chip", zIndex: this.props.zIndex, filter: this.props.filter, filterBy: this.props.optionLabel, appendTo: document.body, placeholder: this.props.placeholder, optionLabel: this.props.optionLabel, emptyFilterMessage: this.props.emptyFilterMessage, filterPlaceholder: this.props.filterPlaceholder, itemTemplate: this.props.itemTemplate, selectedItemTemplate: this.props.selectedItemTemplate, maxSelectedLabels: (_a = this.props.maxSelectedLabels) !== null && _a !== void 0 ? _a : 4, selectedItemsLabel: this.props.selectedItemsLabel, ariaLabelledBy: this.htmlId + 'label', tabIndex: this.props.tabIndex ? this.props.tabIndex : '0', showClear: this.props.showClear, disabled: this.props.disabled, inputId: this.htmlId })));
+                }, display: "chip", zIndex: this.props.zIndex, filter: this.props.filter, appendTo: document.body, placeholder: this.props.placeholder, optionLabel: function (option) { return _this.props.optionLabel(option); }, emptyFilterMessage: this.props.emptyFilterMessage, filterPlaceholder: this.props.filterPlaceholder, itemTemplate: this.props.itemTemplate, selectedItemTemplate: this.props.selectedItemTemplate, maxSelectedLabels: (_a = this.props.maxSelectedLabels) !== null && _a !== void 0 ? _a : 4, selectedItemsLabel: this.props.selectedItemsLabel, ariaLabelledBy: this.htmlId + 'label', tabIndex: this.props.tabIndex ? this.props.tabIndex : '0', showClear: this.props.showClear, disabled: this.props.disabled, inputId: this.htmlId })));
     };
     return MultiSelect;
 }(React.Component));

package/react/components/TreeSelect.d.ts

@@ -2,15 +2,16 @@ import * as React from "react";
 interface IState<T> {
     value: Array<T>;
     options: Array<ITreeNode<T>>;
-    firstBranchOptions: Array<any>;
+    firstBranchOptions: Array<ITreeNode<T>>;
     openDropdown: boolean;
-    activeTree: Array<any>;
-    filterArr: Array<any>;
+    activeTree: Array<Array<ITreeNode<T>>>;
+    filterArr: Array<ITreeNode<T>>;
     searchFieldValue: string;
-    buttonTree: Array<any>;
-    buttonValue: any;
+    buttonTree: Array<ITreeNode<T>>;
+    buttonValue: ITreeNode<T> | null;
     buttonMouseEvent: boolean;
     loading: boolean;
+    buttonTarget: Array<string>;
 }
 interface IPropsBase<T> {
     value?: Array<T>;
@@ -37,17 +38,18 @@ interface IPropsBase<T> {
     getBackgroundColor?(item: T): string;
     getBorderColor?(item: T): string;
     optionTemplate?(item: T): React.ComponentType<T> | JSX.Element;
-    valueTemplate?(item: T, Wrapper: any): React.ComponentType<T> | JSX.Element;
+    valueTemplate?(item: T, Wrapper: React.ElementType): React.ComponentType<T> | JSX.Element;
     onChange(e: Array<T>): void;
 }
 interface IPropsSync<T> extends IPropsBase<T> {
     kind: 'synchronous';
     getOptions(): Array<ITreeNode<T>>;
 }
+declare type ICancelFn = () => void;
 interface IPropsAsync<T> extends IPropsBase<T> {
     kind: 'asynchronous';
     getOptions?(): Array<ITreeNode<T>>;
-    searchOptions(term: string, callback?: (options: Array<ITreeNode<T>>) => void): any;
+    searchOptions(term: string, callback?: (options: Array<ITreeNode<T>>) => void): ICancelFn;
 }
 declare type IProps<T> = IPropsSync<T> | IPropsAsync<T>;
 export interface ITreeNode<T> {
@@ -56,10 +58,16 @@ export interface ITreeNode<T> {
 }
 export declare class TreeSelect<T> extends React.Component<IProps<T>, IState<T>> {
     private dropdownRef;
+    private ref;
+    private inputRef;
+    private categoryButtonRef;
     private openDropdownRef;
     private htmlId;
     private popperInstance;
     constructor(props: IProps<T>);
+    inputFocus: () => void;
+    listNavigation: () => void;
+    buttonFocus: () => void;
     componentDidMount: () => void;
     componentDidUpdate(prevProps: Readonly<IProps<T>>, prevState: Readonly<IState<T>>): void;
     toggleMenu(): void;
@@ -69,11 +77,11 @@ export declare class TreeSelect<T> extends React.Component<IProps<T>, IState<T>>
     handleValue(event: React.MouseEvent<HTMLLIElement, MouseEvent>, item: ITreeNode<T>): void;
     handleBranchValue(event: React.MouseEvent<HTMLButtonElement, MouseEvent>, item: ITreeNode<T>): void;
     handleTree(event: React.MouseEvent<HTMLLIElement, MouseEvent>, option: ITreeNode<T>): void;
-    backButton: () => false | undefined;
+    backButton(): void;
     backButtonValue: () => void;
     recursion(arr: Array<ITreeNode<T>>): void;
     filteredItem(arr: Array<ITreeNode<T>>): JSX.Element | JSX.Element[] | undefined;
-    banchButton(): JSX.Element;
+    branchButton(buttonValue: ITreeNode<T>): JSX.Element;
     private debounceFn;
     private ICancelFn;
     handleDebounce(): void;