superdesk-ui-framework 3.0.12 → 3.0.14

package/app-typescript/components/Dropdown.tsx

@@ -257,13 +257,17 @@ export const Dropdown = ({
             {typeof children === 'object' ?
                 (React.isValidElement(children) ?
                     <div ref={buttonRef} style={{ display: 'content' }}>
-                        {React.cloneElement(children, {
-                            className: children.props.className ? (children.props.className + ' dropdown__toggle dropdown-toggle') : 'dropdown__toggle dropdown-toggle',
-                            'aria-haspopup': "menu",
-                            'aria-expanded': open,
-                            onClick: toggleDisplay,
-                            ref: buttonRef,
-                        })}
+                        {(() => {
+                            const attrs = {
+                                className: children.props.className ? (children.props.className + ' dropdown__toggle dropdown-toggle') : 'dropdown__toggle dropdown-toggle',
+                                'aria-haspopup': "menu",
+                                'aria-expanded': open,
+                                onClick: toggleDisplay,
+                                ref: buttonRef,
+                            };
+
+                            return React.cloneElement(children, attrs);
+                        })()}
                     </div> : null)
                 :
                 <button ref={buttonRef}

package/app-typescript/components/Tooltip.tsx

@@ -26,8 +26,10 @@ class TooltipBasic extends React.PureComponent<IProps> {
     }
     render() {
         if (React.isValidElement(this.props.children)) {
+            const attrs = {id: 't' + this.htmlId};
+
             return (
-                React.cloneElement(this.props.children, { id: 't' + this.htmlId })
+                React.cloneElement(this.props.children, attrs)
             );
         } else {
             return (
@@ -45,10 +47,14 @@ const TooltipAppended: React.FC<IProps> = ({children, flow, text}) => {
     return (
         <React.Fragment>
             <PRTooltip target={"#" + triggerId} content={text} position={position ?? 'top'}/>
-            {React.isValidElement(children) ?
-                React.cloneElement(children, { id: triggerId})
-                :
-                <React.Fragment />}
+            {   React.isValidElement(children)
+                    ? (() => {
+                        const attrs = {id: triggerId};
+
+                        return React.cloneElement(children, attrs);
+                    })()
+                    : <React.Fragment />
+            }
         </React.Fragment>
     );
 };

package/app-typescript/components/TreeSelect.tsx

@@ -780,7 +780,7 @@ export class TreeSelect<T> extends React.Component<IProps<T>, IState<T>> {
                                         {this.state.options
                                             .map((option, i: React.Key | undefined) => {
                                                 let selectedItem = this.state.value.some((obj) =>
-                                                    this.props.getId(obj) === this.props.getLabel(option.value),
+                                                    this.props.getId(obj) === this.props.getId(option.value),
                                                 );
                                                 return (
                                                     <li