superdesk-ui-framework 3.0.30 → 3.0.32

package/app-typescript/components/Modal.tsx

@@ -1,12 +1,15 @@
 import * as React from 'react';
 import { Dialog as PrimeDialog } from '@superdesk/primereact/dialog';
 import classNames from 'classnames';
+import {noop} from 'lodash';
 
 interface IProps {
     id?: string;
     className?: string;
     theme?: string;
     visible?: boolean;
+    zIndex?: number;
+    closeOnEscape?: boolean;
     contentBg?: 'default' | 'medium' | 'dark';
     contentPadding?: 'none' | 'small' | 'medium' | 'large';
     size?: 'small' | 'medium' | 'large' | 'x-large';
@@ -15,10 +18,8 @@ interface IProps {
     maximizable?: boolean;
     headerTemplate?: JSX.Element | string;
     footerTemplate?: JSX.Element | string;
-    closeOnEscape?: boolean;
-    zIndex?: number;
     onShow?(): void;
-    onHide(): void;
+    onHide?(): void;
 }
 
 export class Modal extends React.Component<IProps, {}> {
@@ -43,9 +44,10 @@ export class Modal extends React.Component<IProps, {}> {
                     maximizable={this.props.maximizable}
                     contentClassName={classes}
                     onShow={this.props.onShow}
-                    onHide={this.props.onHide}
+                    onHide={this.props.onHide ?? noop}
                     zIndex={this.props.zIndex ? this.props.zIndex : 1000}
                     position={this.props.position}
+                    closable={this.props.onHide != null ? true : false}
                 >
                     {this.props.children}
                 </PrimeDialog>

package/app-typescript/components/TreeSelect.tsx

@@ -132,11 +132,10 @@ export class TreeSelect<T> extends React.Component<IProps<T>, IState<T>> {
     componentDidMount = () => {
         this.recursion(this.state.options);
         document.addEventListener("mousedown", (event) => {
-            if (!(event.target instanceof HTMLInputElement)) {
-                return;
-            }
-            if ((this.dropdownRef.current && !this.dropdownRef.current.contains(event.target))
-            && (this.openDropdownRef.current && !this.openDropdownRef.current.contains(event.target))) {
+            if (
+                (this.dropdownRef.current?.contains(event.target as HTMLElement) !== true)
+                && (this.openDropdownRef.current?.contains(event.target as HTMLElement) !== true)
+            ) {
                 this.setState({openDropdown: false});
             }
         });
@@ -150,6 +149,7 @@ export class TreeSelect<T> extends React.Component<IProps<T>, IState<T>> {
                 );
                 if (e.key === 'Backspace') {
                     this.backButton();
+                    this.backButtonValue();
 
                     const {buttonTarget} = this.state;
                     const className = buttonTarget.pop();